Skip to content

Commit fd8af93

Browse files
dshelbyodshelbyo
authored
Candidate for Release v3.34.0
Candidate for Release v3.34.0
2 parents 30b0ac0 + 39d26ea commit fd8af93

File tree

357 files changed

+13707
-2292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

357 files changed

+13707
-2292
lines changed

‎CHANGELOG.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
## 3.34.0 (Unreleased)
2+
3+
### Added
4+
- Support for Functions as a service
5+
- Support for adding resource limits to compartments
6+
- Support for KMS encryption key for Cross-region backup copy in Block Storage.
7+
- Support for exposing KmsKeyId on backups in Block Storage.
8+
- Support for Permitted Methods feature in LBaaS
9+
- Support for VCN access control lists via `load_balancer_rule_set`
10+
- Support for LBaaS Cookie Insertion (Sticky Cookie)
11+
- Support for VCN Transit Routing to Oracle Services via Service Gateways
12+
- Support for moving `ons_notification_topic`, `ons_subscription` resources across compartments
13+
- Support for moving `oci_load_balancer` resources across compartments
14+
- Support for moving `oci_kms_key` and `oci_kms_vault` resources across compartments
15+
- Support for moving `core_instance` resources across compartments
16+
- Support for moving `identity_compartment` resource tree across compartments
17+
- Support for moving `dns_zone` and `dns_steering_policy` resources across compartments
18+
19+
### Fixed
20+
- Removing deprecated fields that have no current valid use
21+
- We are removing page and limit in list operations that are obsolete in terraform because of our pagination logic
22+
- We are also removing deprecated "time_modified" fields that are not being populated from the following resources:
23+
- core_internet_gateway
24+
- core_route_table
25+
- identity_compartment
26+
- identity_group
27+
- identity_policy
28+
- identity_user
29+
- Removing deprecated field `time_state_modifed` from data source `oci_core_ip_sec_connection_device_status`. `time_state_modified` should be used instead
30+
- Removing deprecated fields `content-length` and `content-type` from data source `oci_objectstorage_object_head`. `content_length` and `content_type` should be used instead
31+
- Removing `compartment_id` from resource `oci_core_drg_attachment` as an Optional field as the service does not accept it. The compartment of the VCN is the one used by the service. Keeping it as a computed field.
32+
- Removing deprecated field `db_data_size_in_mbs` from resource `oci_database_backup`. `database_size_in_gbs` should be used instead
33+
- Fixed `extended_metadata` field in `oci_core_instance` to correctly handle JSON [Issue #817](https://github.com/terraform-providers/terraform-provider-oci/issues/817)
34+
- Consistently use the new `oci_core_vcn` rather than the legacy `oci_core_virtual_network` resource for VCN in examples
35+
136
## 3.33.0 (July 10, 2019)
237

338
### Added

‎examples/autoscaling/network.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22

3-
resource "oci_core_virtual_network" "ExampleVCN" {
3+
resource "oci_core_vcn" "ExampleVCN" {
44
cidr_block = "10.1.0.0/16"
55
compartment_id = "${var.compartment_ocid}"
66
display_name = "TFExampleVCN"
@@ -12,22 +12,22 @@ resource "oci_core_subnet" "ExampleSubnet" {
1212
cidr_block = "10.1.20.0/24"
1313
display_name = "TFExampleSubnet"
1414
dns_label = "tfexamplesubnet"
15-
security_list_ids = ["${oci_core_virtual_network.ExampleVCN.default_security_list_id}"]
15+
security_list_ids = ["${oci_core_vcn.ExampleVCN.default_security_list_id}"]
1616
compartment_id = "${var.compartment_ocid}"
17-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
17+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
1818
route_table_id = "${oci_core_route_table.ExampleRT.id}"
19-
dhcp_options_id = "${oci_core_virtual_network.ExampleVCN.default_dhcp_options_id}"
19+
dhcp_options_id = "${oci_core_vcn.ExampleVCN.default_dhcp_options_id}"
2020
}
2121

2222
resource "oci_core_internet_gateway" "ExampleIG" {
2323
compartment_id = "${var.compartment_ocid}"
2424
display_name = "TFExampleIG"
25-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
25+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
2626
}
2727

2828
resource "oci_core_route_table" "ExampleRT" {
2929
compartment_id = "${var.compartment_ocid}"
30-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
30+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
3131
display_name = "TFExampleRouteTable"
3232

3333
route_rules {

‎examples/compute/boot_volume/network.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22

3-
resource "oci_core_virtual_network" "ExampleVCN" {
3+
resource "oci_core_vcn" "ExampleVCN" {
44
cidr_block = "10.1.0.0/16"
55
compartment_id = "${var.compartment_ocid}"
66
display_name = "TFExampleVCN"
@@ -12,22 +12,22 @@ resource "oci_core_subnet" "ExampleSubnet" {
1212
cidr_block = "10.1.20.0/24"
1313
display_name = "TFExampleSubnet"
1414
dns_label = "tfexamplesubnet"
15-
security_list_ids = ["${oci_core_virtual_network.ExampleVCN.default_security_list_id}"]
15+
security_list_ids = ["${oci_core_vcn.ExampleVCN.default_security_list_id}"]
1616
compartment_id = "${var.compartment_ocid}"
17-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
17+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
1818
route_table_id = "${oci_core_route_table.ExampleRT.id}"
19-
dhcp_options_id = "${oci_core_virtual_network.ExampleVCN.default_dhcp_options_id}"
19+
dhcp_options_id = "${oci_core_vcn.ExampleVCN.default_dhcp_options_id}"
2020
}
2121

2222
resource "oci_core_internet_gateway" "ExampleIG" {
2323
compartment_id = "${var.compartment_ocid}"
2424
display_name = "TFExampleIG"
25-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
25+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
2626
}
2727

2828
resource "oci_core_route_table" "ExampleRT" {
2929
compartment_id = "${var.compartment_ocid}"
30-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
30+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
3131
display_name = "TFExampleRouteTable"
3232

3333
route_rules {

‎examples/compute/console_connection/console_connection.tf‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ data "oci_identity_availability_domain" "ad" {
4040
ad_number = 1
4141
}
4242

43-
resource "oci_core_virtual_network" "ExampleVCN" {
43+
resource "oci_core_vcn" "ExampleVCN" {
4444
cidr_block = "10.1.0.0/16"
4545
compartment_id = "${var.compartment_ocid}"
4646
display_name = "TFExampleVCN"
@@ -52,21 +52,21 @@ resource "oci_core_subnet" "ExampleSubnet" {
5252
cidr_block = "10.1.20.0/24"
5353
display_name = "TFExampleSubnet"
5454
dns_label = "tfexamplesubnet"
55-
security_list_ids = ["${oci_core_virtual_network.ExampleVCN.default_security_list_id}"]
55+
security_list_ids = ["${oci_core_vcn.ExampleVCN.default_security_list_id}"]
5656
compartment_id = "${var.compartment_ocid}"
57-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
58-
route_table_id = "${oci_core_virtual_network.ExampleVCN.default_route_table_id}"
59-
dhcp_options_id = "${oci_core_virtual_network.ExampleVCN.default_dhcp_options_id}"
57+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
58+
route_table_id = "${oci_core_vcn.ExampleVCN.default_route_table_id}"
59+
dhcp_options_id = "${oci_core_vcn.ExampleVCN.default_dhcp_options_id}"
6060
}
6161

6262
resource "oci_core_internet_gateway" "ExampleIG" {
6363
compartment_id = "${var.compartment_ocid}"
6464
display_name = "TFExampleIG"
65-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
65+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
6666
}
6767

6868
resource "oci_core_default_route_table" "ExampleRT" {
69-
manage_default_resource_id = "${oci_core_virtual_network.ExampleVCN.default_route_table_id}"
69+
manage_default_resource_id = "${oci_core_vcn.ExampleVCN.default_route_table_id}"
7070

7171
route_rules {
7272
destination = "0.0.0.0/0"

‎examples/compute/extended_metadata/extended_metadata.tf‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ data "oci_identity_availability_domain" "ad" {
4141
ad_number = 1
4242
}
4343

44-
resource "oci_core_virtual_network" "ExampleVCN" {
44+
resource "oci_core_vcn" "ExampleVCN" {
4545
cidr_block = "10.1.0.0/16"
4646
compartment_id = "${var.compartment_ocid}"
4747
display_name = "TFExampleVCN"
@@ -53,21 +53,21 @@ resource "oci_core_subnet" "ExampleSubnet" {
5353
cidr_block = "10.1.20.0/24"
5454
display_name = "TFExampleSubnet"
5555
dns_label = "tfexamplesubnet"
56-
security_list_ids = ["${oci_core_virtual_network.ExampleVCN.default_security_list_id}"]
56+
security_list_ids = ["${oci_core_vcn.ExampleVCN.default_security_list_id}"]
5757
compartment_id = "${var.compartment_ocid}"
58-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
59-
route_table_id = "${oci_core_virtual_network.ExampleVCN.default_route_table_id}"
60-
dhcp_options_id = "${oci_core_virtual_network.ExampleVCN.default_dhcp_options_id}"
58+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
59+
route_table_id = "${oci_core_vcn.ExampleVCN.default_route_table_id}"
60+
dhcp_options_id = "${oci_core_vcn.ExampleVCN.default_dhcp_options_id}"
6161
}
6262

6363
resource "oci_core_internet_gateway" "ExampleIG" {
6464
compartment_id = "${var.compartment_ocid}"
6565
display_name = "TFExampleIG"
66-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
66+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
6767
}
6868

6969
resource "oci_core_default_route_table" "ExampleRT" {
70-
manage_default_resource_id = "${oci_core_virtual_network.ExampleVCN.default_route_table_id}"
70+
manage_default_resource_id = "${oci_core_vcn.ExampleVCN.default_route_table_id}"
7171

7272
route_rules {
7373
destination = "0.0.0.0/0"
@@ -105,6 +105,7 @@ resource "oci_core_instance" "TFInstance1" {
105105
ssh_authorized_keys = "${var.ssh_public_key}"
106106
some_string = "stringA"
107107
nested_object = "{\"some_string\": \"stringB\", \"object\": {\"some_string\": \"stringC\"}}"
108+
array = "[\"stringA\", \"stringB\"]"
108109
}
109110
}
110111

‎examples/compute/image/network.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22

3-
resource "oci_core_virtual_network" "ExampleVCN" {
3+
resource "oci_core_vcn" "ExampleVCN" {
44
cidr_block = "10.1.0.0/16"
55
compartment_id = "${var.compartment_ocid}"
66
display_name = "TFExampleVCN"
@@ -12,22 +12,22 @@ resource "oci_core_subnet" "ExampleSubnet" {
1212
cidr_block = "10.1.20.0/24"
1313
display_name = "TFExampleSubnet"
1414
dns_label = "tfexamplesubnet"
15-
security_list_ids = ["${oci_core_virtual_network.ExampleVCN.default_security_list_id}"]
15+
security_list_ids = ["${oci_core_vcn.ExampleVCN.default_security_list_id}"]
1616
compartment_id = "${var.compartment_ocid}"
17-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
17+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
1818
route_table_id = "${oci_core_route_table.ExampleRT.id}"
19-
dhcp_options_id = "${oci_core_virtual_network.ExampleVCN.default_dhcp_options_id}"
19+
dhcp_options_id = "${oci_core_vcn.ExampleVCN.default_dhcp_options_id}"
2020
}
2121

2222
resource "oci_core_internet_gateway" "ExampleIG" {
2323
compartment_id = "${var.compartment_ocid}"
2424
display_name = "TFExampleIG"
25-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
25+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
2626
}
2727

2828
resource "oci_core_route_table" "ExampleRT" {
2929
compartment_id = "${var.compartment_ocid}"
30-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
30+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
3131
display_name = "TFExampleRouteTable"
3232

3333
route_rules {

‎examples/compute/instance/network.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22

3-
resource "oci_core_virtual_network" "ExampleVCN" {
3+
resource "oci_core_vcn" "ExampleVCN" {
44
cidr_block = "10.1.0.0/16"
55
compartment_id = "${var.compartment_ocid}"
66
display_name = "TFExampleVCN"
@@ -12,22 +12,22 @@ resource "oci_core_subnet" "ExampleSubnet" {
1212
cidr_block = "10.1.20.0/24"
1313
display_name = "TFExampleSubnet"
1414
dns_label = "tfexamplesubnet"
15-
security_list_ids = ["${oci_core_virtual_network.ExampleVCN.default_security_list_id}"]
15+
security_list_ids = ["${oci_core_vcn.ExampleVCN.default_security_list_id}"]
1616
compartment_id = "${var.compartment_ocid}"
17-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
17+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
1818
route_table_id = "${oci_core_route_table.ExampleRT.id}"
19-
dhcp_options_id = "${oci_core_virtual_network.ExampleVCN.default_dhcp_options_id}"
19+
dhcp_options_id = "${oci_core_vcn.ExampleVCN.default_dhcp_options_id}"
2020
}
2121

2222
resource "oci_core_internet_gateway" "ExampleIG" {
2323
compartment_id = "${var.compartment_ocid}"
2424
display_name = "TFExampleIG"
25-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
25+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
2626
}
2727

2828
resource "oci_core_route_table" "ExampleRT" {
2929
compartment_id = "${var.compartment_ocid}"
30-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
30+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
3131
display_name = "TFExampleRouteTable"
3232

3333
route_rules {

‎examples/compute/instance_pool/network.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22

3-
resource "oci_core_virtual_network" "ExampleVCN" {
3+
resource "oci_core_vcn" "ExampleVCN" {
44
cidr_block = "10.1.0.0/16"
55
compartment_id = "${var.compartment_ocid}"
66
display_name = "TFExampleVCN"
@@ -12,22 +12,22 @@ resource "oci_core_subnet" "ExampleSubnet" {
1212
cidr_block = "10.1.20.0/24"
1313
display_name = "TFExampleSubnet"
1414
dns_label = "tfexamplesubnet"
15-
security_list_ids = ["${oci_core_virtual_network.ExampleVCN.default_security_list_id}"]
15+
security_list_ids = ["${oci_core_vcn.ExampleVCN.default_security_list_id}"]
1616
compartment_id = "${var.compartment_ocid}"
17-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
17+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
1818
route_table_id = "${oci_core_route_table.ExampleRT.id}"
19-
dhcp_options_id = "${oci_core_virtual_network.ExampleVCN.default_dhcp_options_id}"
19+
dhcp_options_id = "${oci_core_vcn.ExampleVCN.default_dhcp_options_id}"
2020
}
2121

2222
resource "oci_core_internet_gateway" "ExampleIG" {
2323
compartment_id = "${var.compartment_ocid}"
2424
display_name = "TFExampleIG"
25-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
25+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
2626
}
2727

2828
resource "oci_core_route_table" "ExampleRT" {
2929
compartment_id = "${var.compartment_ocid}"
30-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
30+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
3131
display_name = "TFExampleRouteTable"
3232

3333
route_rules {

‎examples/compute/multi_vnic/multi_vnic.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ data "oci_identity_availability_domain" "ad" {
4343
ad_number = 1
4444
}
4545

46-
resource "oci_core_virtual_network" "ExampleVCN" {
46+
resource "oci_core_vcn" "ExampleVCN" {
4747
cidr_block = "10.0.0.0/16"
4848
compartment_id = "${var.compartment_ocid}"
4949
display_name = "CompleteVCN"
@@ -55,17 +55,17 @@ resource "oci_core_subnet" "ExampleSubnet" {
5555
cidr_block = "10.0.1.0/24"
5656
display_name = "TFExampleSubnet"
5757
compartment_id = "${var.compartment_ocid}"
58-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
59-
route_table_id = "${oci_core_virtual_network.ExampleVCN.default_route_table_id}"
60-
security_list_ids = ["${oci_core_virtual_network.ExampleVCN.default_security_list_id}"]
61-
dhcp_options_id = "${oci_core_virtual_network.ExampleVCN.default_dhcp_options_id}"
58+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
59+
route_table_id = "${oci_core_vcn.ExampleVCN.default_route_table_id}"
60+
security_list_ids = ["${oci_core_vcn.ExampleVCN.default_security_list_id}"]
61+
dhcp_options_id = "${oci_core_vcn.ExampleVCN.default_dhcp_options_id}"
6262
dns_label = "examplesubnet"
6363
}
6464

6565
resource "oci_core_network_security_group" "ExampleNetworkSecurityGroup" {
6666
#Required
6767
compartment_id = "${var.compartment_ocid}"
68-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
68+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
6969

7070
#Optional
7171
display_name = "TFExampleNetworkSecurityGroup"

‎examples/compute/private_ip/private_ip.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ data "oci_identity_availability_domain" "ad" {
4141
ad_number = 1
4242
}
4343

44-
resource "oci_core_virtual_network" "ExampleVCN" {
44+
resource "oci_core_vcn" "ExampleVCN" {
4545
cidr_block = "10.1.0.0/16"
4646
compartment_id = "${var.compartment_ocid}"
4747
display_name = "TFExampleVCN"
@@ -53,11 +53,11 @@ resource "oci_core_subnet" "ExampleSubnet" {
5353
cidr_block = "10.1.20.0/24"
5454
display_name = "TFExampleSubnet"
5555
dns_label = "tfexamplesubnet"
56-
security_list_ids = ["${oci_core_virtual_network.ExampleVCN.default_security_list_id}"]
56+
security_list_ids = ["${oci_core_vcn.ExampleVCN.default_security_list_id}"]
5757
compartment_id = "${var.compartment_ocid}"
58-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
59-
route_table_id = "${oci_core_virtual_network.ExampleVCN.default_route_table_id}"
60-
dhcp_options_id = "${oci_core_virtual_network.ExampleVCN.default_dhcp_options_id}"
58+
vcn_id = "${oci_core_vcn.ExampleVCN.id}"
59+
route_table_id = "${oci_core_vcn.ExampleVCN.default_route_table_id}"
60+
dhcp_options_id = "${oci_core_vcn.ExampleVCN.default_dhcp_options_id}"
6161
}
6262

6363
# Create Instance

0 commit comments

Comments
 (0)