Skip to content

Commit e265f92

Browse files
authored
Candidate for release_v3.46.0
Candidate for Release v3.46.0
2 parents 59d54da + 8d25f5b commit e265f92

File tree

131 files changed

+3873
-196
lines changed

Some content is hidden

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

131 files changed

+3873
-196
lines changed

.github/ISSUE_TEMPLATE/Bug_Report.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,26 @@ labels: bug
55
---
66

77
<!---
8-
Please note the following potential times when an issue might be in Terraform core:
8+
Before filing a bug report, see if your issue is already covered in the [troubleshooting guide](https://www.terraform.io/docs/providers/oci/guides/troubleshooting.html)
99
10+
Please note the following times when an issue is likely outside of the OCI provider.
11+
This could be either due to issues in the Oracle Cloud Infrastructure service or the Terraform core.
12+
13+
Examples of Oracle Cloud Infrastructure service issues:
14+
* You receive an error with HTTP status code such as 500
15+
* One of your resources timed out while waiting to reach a specific state, even after increasing your operation timeout value
16+
17+
If you are running into one of the above scenarios, we recommend contacting Oracle support at https://docs.cloud.oracle.com/iaas/Content/GSG/Tasks/contactingsupport.htm
18+
19+
20+
Examples of Terraform core issues:
1021
* [Configuration Language](https://www.terraform.io/docs/configuration/index.html) or resource ordering issues
1122
* [State](https://www.terraform.io/docs/state/index.html) and [State Backend](https://www.terraform.io/docs/backends/index.html) issues
1223
* [Provisioner](https://www.terraform.io/docs/provisioners/index.html) issues
1324
* [Registry](https://registry.terraform.io/) issues
1425
* Spans resources across multiple providers
1526
16-
If you are running into one of these scenarios, we recommend opening an issue in the [Terraform core repository](https://github.com/hashicorp/terraform/) instead.
27+
If you are running into a Terraform core issue, we recommend opening an issue in the [Terraform core repository](https://github.com/hashicorp/terraform/) instead.
1728
--->
1829

1930
<!--- Please keep this note for the community --->

.github/ISSUE_TEMPLATE/Question.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ labels: question
66

77
This Github template is intended for questions regarding the Terraform **Oracle Cloud Infrastructure** provider.
88

9+
Before using this template, check whether your question is already answered in one of the following guides:
10+
* [Frequently Asked Questions](https://www.terraform.io/docs/providers/oci/guides/faq.html)
11+
* [Troubleshooting](https://www.terraform.io/docs/providers/oci/guides/troubleshooting.html)
12+
13+
14+
If you have a support request related to Oracle Cloud Infrastructure services, please [contact Oracle support](https://docs.cloud.oracle.com/iaas/Content/GSG/Tasks/contactingsupport.htm)
15+
916
If you have a support request or question related to core Terraform functionality, please submit them to one of these resources:
1017

1118
* [Terraform community resources](https://www.terraform.io/docs/extend/community/index.html)

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
## 3.45.1 (Unreleased)
1+
## 3.46.0 (Unreleased)
2+
3+
### Added
4+
- Support DBaaS VM DB Fast Provisioning
5+
- Support for required default tags
6+
- Support for moving `oci_core_drg` resources across compartments
7+
- Support for enumerated tag values
8+
9+
### Fixed
10+
11+
- Fix compositeId parsing for pre-authenticated requests in object storage [Issue #867](https://github.com/terraform-providers/terraform-provider-oci/issues/867)
12+
- Fixed ssl_configuration is optional only in `oci_load_balancer_backend_set` resource
13+
214
## 3.45.0 (September 25, 2019)
315

416
### Added

examples/container_engine/regional_subnet/kube_config.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ variable "cluster_kube_config_expiration" {
55
}
66

77
variable "cluster_kube_config_token_version" {
8-
default = "1.0.0"
8+
default = "2.0.0"
99
}
1010

1111
data "oci_containerengine_cluster_kube_config" "test_cluster_kube_config" {
Lines changed: 305 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,305 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
variable "tenancy_ocid" {}
3+
4+
variable "user_ocid" {}
5+
variable "fingerprint" {}
6+
variable "private_key_path" {}
7+
variable "region" {}
8+
9+
variable "compartment_ocid" {}
10+
variable "ssh_public_key" {}
11+
variable "ssh_private_key" {}
12+
13+
# DBSystem specific
14+
variable "db_system_shape" {
15+
default = "VM.Standard2.1"
16+
}
17+
18+
variable "db_edition" {
19+
default = "ENTERPRISE_EDITION"
20+
}
21+
22+
variable "db_admin_password" {
23+
default = "BEstrO0ng_#12"
24+
}
25+
26+
variable "db_name" {
27+
default = "aTFdb"
28+
}
29+
30+
variable "db_version" {
31+
default = "19.0.0.0"
32+
}
33+
34+
variable "db_home_display_name" {
35+
default = "MyTFDBHome"
36+
}
37+
38+
variable "db_disk_redundancy" {
39+
default = "NORMAL"
40+
}
41+
42+
variable "sparse_diskgroup" {
43+
default = true
44+
}
45+
46+
variable "db_system_display_name" {
47+
default = "MyTFDBSystem"
48+
}
49+
50+
variable "hostname" {
51+
default = "myoracledb"
52+
}
53+
54+
variable "host_user_name" {
55+
default = "opc"
56+
}
57+
58+
variable "n_character_set" {
59+
default = "AL16UTF16"
60+
}
61+
62+
variable "character_set" {
63+
default = "AL32UTF8"
64+
}
65+
66+
variable "db_workload" {
67+
default = "OLTP"
68+
}
69+
70+
variable "pdb_name" {
71+
default = "pdbName"
72+
}
73+
74+
variable "data_storage_size_in_gb" {
75+
default = "256"
76+
}
77+
78+
variable "license_model" {
79+
default = "LICENSE_INCLUDED"
80+
}
81+
82+
variable "node_count" {
83+
default = "2"
84+
}
85+
86+
provider "oci" {
87+
tenancy_ocid = "${var.tenancy_ocid}"
88+
user_ocid = "${var.user_ocid}"
89+
fingerprint = "${var.fingerprint}"
90+
private_key_path = "${var.private_key_path}"
91+
region = "${var.region}"
92+
}
93+
94+
data "oci_identity_availability_domain" "ad" {
95+
compartment_id = "${var.tenancy_ocid}"
96+
ad_number = 3
97+
}
98+
99+
# Get DB node list
100+
data "oci_database_db_nodes" "db_nodes" {
101+
compartment_id = "${var.compartment_ocid}"
102+
db_system_id = "${oci_database_db_system.test_db_system.id}"
103+
}
104+
105+
# Get DB node details
106+
data "oci_database_db_node" "db_node_details" {
107+
db_node_id = "${lookup(data.oci_database_db_nodes.db_nodes.db_nodes[0], "id")}"
108+
}
109+
110+
# Gets the OCID of the first (default) vNIC
111+
#data "oci_core_vnic" "db_node_vnic" {
112+
# vnic_id = "${data.oci_database_db_node.db_node_details.vnic_id}"
113+
#}
114+
115+
data "oci_database_db_homes" "db_homes" {
116+
compartment_id = "${var.compartment_ocid}"
117+
db_system_id = "${oci_database_db_system.test_db_system.id}"
118+
}
119+
120+
data "oci_database_databases" "databases" {
121+
compartment_id = "${var.compartment_ocid}"
122+
db_home_id = "${data.oci_database_db_homes.db_homes.db_homes.0.db_home_id}"
123+
}
124+
125+
data "oci_database_db_versions" "test_db_versions_by_db_system_id" {
126+
compartment_id = "${var.compartment_ocid}"
127+
db_system_id = "${oci_database_db_system.test_db_system.id}"
128+
}
129+
130+
data "oci_database_db_system_shapes" "test_db_system_shapes" {
131+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
132+
compartment_id = "${var.compartment_ocid}"
133+
134+
filter {
135+
name = "shape"
136+
values = ["${var.db_system_shape}"]
137+
}
138+
}
139+
140+
data "oci_database_db_systems" "db_systems" {
141+
compartment_id = "${var.compartment_ocid}"
142+
143+
filter {
144+
name = "id"
145+
values = ["${oci_database_db_system.test_db_system.id}"]
146+
}
147+
}
148+
149+
resource "oci_core_vcn" "vcn" {
150+
cidr_block = "10.1.0.0/16"
151+
compartment_id = "${var.compartment_ocid}"
152+
display_name = "TFExampleVCNDBSystem"
153+
dns_label = "tfexvcndbsys"
154+
}
155+
156+
resource "oci_core_subnet" "subnet" {
157+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
158+
cidr_block = "10.1.20.0/24"
159+
display_name = "TFExampleSubnetDBSystem"
160+
dns_label = "tfexsubdbsys"
161+
security_list_ids = ["${oci_core_security_list.ExampleSecurityList.id}"]
162+
compartment_id = "${var.compartment_ocid}"
163+
vcn_id = "${oci_core_vcn.vcn.id}"
164+
route_table_id = "${oci_core_route_table.route_table.id}"
165+
dhcp_options_id = "${oci_core_vcn.vcn.default_dhcp_options_id}"
166+
}
167+
168+
resource "oci_core_subnet" "subnet_backup" {
169+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
170+
cidr_block = "10.1.1.0/24"
171+
display_name = "TFExampleSubnetDBSystemBackup"
172+
dns_label = "tfexsubdbsysbp"
173+
security_list_ids = ["${oci_core_security_list.ExampleSecurityList.id}"]
174+
compartment_id = "${var.compartment_ocid}"
175+
vcn_id = "${oci_core_vcn.vcn.id}"
176+
route_table_id = "${oci_core_route_table.route_table_backup.id}"
177+
dhcp_options_id = "${oci_core_vcn.vcn.default_dhcp_options_id}"
178+
}
179+
180+
resource "oci_core_internet_gateway" "internet_gateway" {
181+
compartment_id = "${var.compartment_ocid}"
182+
display_name = "TFExampleIGDBSystem"
183+
vcn_id = "${oci_core_vcn.vcn.id}"
184+
}
185+
186+
resource "oci_core_route_table" "route_table" {
187+
compartment_id = "${var.compartment_ocid}"
188+
vcn_id = "${oci_core_vcn.vcn.id}"
189+
display_name = "TFExampleRouteTableDBSystem"
190+
191+
route_rules {
192+
destination = "0.0.0.0/0"
193+
destination_type = "CIDR_BLOCK"
194+
network_entity_id = "${oci_core_internet_gateway.internet_gateway.id}"
195+
}
196+
}
197+
198+
resource "oci_core_route_table" "route_table_backup" {
199+
compartment_id = "${var.compartment_ocid}"
200+
vcn_id = "${oci_core_vcn.vcn.id}"
201+
display_name = "TFExampleRouteTableDBSystemBackup"
202+
203+
route_rules {
204+
destination = "0.0.0.0/0"
205+
destination_type = "CIDR_BLOCK"
206+
network_entity_id = "${oci_core_internet_gateway.internet_gateway.id}"
207+
}
208+
}
209+
210+
resource "oci_core_security_list" "ExampleSecurityList" {
211+
compartment_id = "${var.compartment_ocid}"
212+
vcn_id = "${oci_core_vcn.vcn.id}"
213+
display_name = "TFExampleSecurityList"
214+
215+
// allow outbound tcp traffic on all ports
216+
egress_security_rules {
217+
destination = "0.0.0.0/0"
218+
protocol = "6"
219+
}
220+
221+
// allow outbound udp traffic on a port range
222+
egress_security_rules {
223+
destination = "0.0.0.0/0"
224+
protocol = "17" // udp
225+
stateless = true
226+
}
227+
228+
egress_security_rules {
229+
destination = "0.0.0.0/0"
230+
protocol = "1"
231+
stateless = true
232+
}
233+
234+
// allow inbound ssh traffic from a specific port
235+
ingress_security_rules {
236+
protocol = "6" // tcp
237+
source = "0.0.0.0/0"
238+
stateless = false
239+
}
240+
241+
// allow inbound icmp traffic of a specific type
242+
ingress_security_rules {
243+
protocol = 1
244+
source = "0.0.0.0/0"
245+
stateless = true
246+
}
247+
}
248+
249+
resource "oci_core_network_security_group" "test_network_security_group" {
250+
compartment_id = "${var.compartment_ocid}"
251+
vcn_id = "${oci_core_vcn.vcn.id}"
252+
display_name = "displayName"
253+
}
254+
255+
resource "oci_core_network_security_group" "test_network_security_group_backup" {
256+
compartment_id = "${var.compartment_ocid}"
257+
vcn_id = "${oci_core_vcn.vcn.id}"
258+
display_name = "displayName"
259+
}
260+
261+
resource "oci_database_db_system" "test_db_system" {
262+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
263+
compartment_id = "${var.compartment_ocid}"
264+
database_edition = "${var.db_edition}"
265+
266+
db_home {
267+
database {
268+
admin_password = "${var.db_admin_password}"
269+
db_name = "${var.db_name}"
270+
character_set = "${var.character_set}"
271+
ncharacter_set = "${var.n_character_set}"
272+
db_workload = "${var.db_workload}"
273+
pdb_name = "${var.pdb_name}"
274+
275+
db_backup_config {
276+
auto_backup_enabled = false
277+
}
278+
}
279+
280+
db_version = "${var.db_version}"
281+
display_name = "${var.db_home_display_name}"
282+
}
283+
284+
db_system_options {
285+
storage_management = "LVM"
286+
}
287+
288+
disk_redundancy = "${var.db_disk_redundancy}"
289+
shape = "${var.db_system_shape}"
290+
subnet_id = "${oci_core_subnet.subnet.id}"
291+
ssh_public_keys = ["${var.ssh_public_key}"]
292+
display_name = "${var.db_system_display_name}"
293+
hostname = "${var.hostname}"
294+
data_storage_size_in_gb = "${var.data_storage_size_in_gb}"
295+
license_model = "${var.license_model}"
296+
node_count = "${lookup(data.oci_database_db_system_shapes.test_db_system_shapes.db_system_shapes[0], "minimum_node_count")}"
297+
nsg_ids = ["${oci_core_network_security_group.test_network_security_group_backup.id}", "${oci_core_network_security_group.test_network_security_group.id}"]
298+
299+
#To use defined_tags, set the values below to an existing tag namespace, refer to the identity example on how to create tag namespaces
300+
#defined_tags = "${map("example-tag-namespace-all.example-tag", "originalValue")}"
301+
302+
freeform_tags = {
303+
"Department" = "Finance"
304+
}
305+
}

examples/identity/tags.tf

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ resource "oci_identity_tag" "tag1" {
1616
tag_namespace_id = "${oci_identity_tag_namespace.tag-namespace1.id}"
1717

1818
#Optional
19-
is_cost_tracking = false // default is "false". The value "true" is only permitted if the associated tag namespace is part of the root compartment.
19+
is_cost_tracking = false // default is "false". The value "true" is only permitted if the associated tag namespace is part of the root compartment.
2020
is_retired = false
21+
22+
validator {
23+
validator_type = "ENUM"
24+
values = ["test_value", "value1", "value2"]
25+
}
2126
}
2227

2328
resource "oci_identity_tag_default" "tag_default" {

0 commit comments

Comments
 (0)