Skip to content

Commit a07442d

Browse files
dshelbyodshelbyo
authored
Release 3.29.0
Release 3.29.0
2 parents cac0c5c + 1472346 commit a07442d

File tree

195 files changed

+9048
-360
lines changed

Some content is hidden

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

195 files changed

+9048
-360
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
## 3.28.3 (Unreleased)
1+
## 3.29.0 (Unreleased)
2+
3+
### Added
4+
- Support for autonomous transaction database-dedicated, autonomous exadata infrastructures, autonomous container databases and maintenance runs.
5+
- Support for `boot_volume_size_in_gbs` argument in the `oci_instance_configuration` resource
6+
27
## 3.28.2 (June 07, 2019)
38

49
### Added

‎examples/database/adb/variables.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ variable "autonomous_database_freeform_tags" {
2828
variable "autonomous_database_license_model" {
2929
default = "LICENSE_INCLUDED"
3030
}
31+
32+
variable "autonomous_database_is_dedicated" {
33+
default = false
34+
}

‎examples/database/atp-d/exadata.tf‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
resource "oci_core_virtual_network" "t" {
4+
compartment_id = "${var.compartment_ocid}"
5+
cidr_block = "10.1.0.0/16"
6+
display_name = "-tf-vcn"
7+
dns_label = "tfvcn"
8+
}
9+
10+
data "oci_identity_availability_domain" "ad" {
11+
compartment_id = "${var.compartment_ocid}"
12+
ad_number = 1
13+
}
14+
15+
resource "oci_core_security_list" "exadata_shapes_security_list" {
16+
compartment_id = "${var.compartment_ocid}"
17+
vcn_id = "${oci_core_virtual_network.t.id}"
18+
display_name = "ExadataSecurityList"
19+
20+
ingress_security_rules {
21+
source = "10.1.22.0/24"
22+
protocol = "6"
23+
}
24+
25+
ingress_security_rules {
26+
source = "10.1.22.0/24"
27+
protocol = "1"
28+
}
29+
30+
egress_security_rules {
31+
destination = "10.1.22.0/24"
32+
protocol = "6"
33+
}
34+
35+
egress_security_rules {
36+
destination = "10.1.22.0/24"
37+
protocol = "1"
38+
}
39+
}
40+
41+
resource "oci_core_subnet" "exadata_subnet" {
42+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
43+
cidr_block = "10.1.22.0/24"
44+
display_name = "ExadataSubnet"
45+
compartment_id = "${var.compartment_ocid}"
46+
vcn_id = "${oci_core_virtual_network.t.id}"
47+
route_table_id = "${oci_core_virtual_network.t.default_route_table_id}"
48+
dhcp_options_id = "${oci_core_virtual_network.t.default_dhcp_options_id}"
49+
security_list_ids = ["${oci_core_virtual_network.t.default_security_list_id}", "${oci_core_security_list.exadata_shapes_security_list.id}"]
50+
dns_label = "subnetexadata"
51+
}
52+
53+
resource "oci_database_autonomous_exadata_infrastructure" "test_autonomous_exadata_infrastructure" {
54+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
55+
compartment_id = "${var.compartment_ocid}"
56+
display_name = "exadata-display-name"
57+
domain = "${var.autonomous_exadata_infrastructure_domain}"
58+
freeform_tags = "${var.autonomous_database_freeform_tags}"
59+
license_model = "LICENSE_INCLUDED"
60+
61+
maintenance_window_details {
62+
preference = "CUSTOM_PREFERENCE"
63+
64+
days_of_week = {
65+
name = "MONDAY"
66+
}
67+
68+
hours_of_day = ["2"]
69+
70+
months = {
71+
name = "APRIL"
72+
}
73+
74+
weeks_of_month = ["2"]
75+
}
76+
77+
shape = "${var.autonomous_exadata_infrastructure_shape}"
78+
subnet_id = "${oci_core_subnet.exadata_subnet.id}"
79+
}
80+
81+
data "oci_database_autonomous_exadata_infrastructures" "test_autonomous_exadata_infrastructures" {
82+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
83+
compartment_id = "${var.compartment_ocid}"
84+
display_name = "exadata-display-name"
85+
state = "AVAILABLE"
86+
}
87+
88+
output "test_autonomous_exadata_infrastructure" {
89+
value = "${data.oci_database_autonomous_exadata_infrastructures.test_autonomous_exadata_infrastructures.autonomous_exadata_infrastructures}"
90+
}

‎examples/database/atp-d/main.tf‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
provider "oci" {
4+
tenancy_ocid = "${var.tenancy_ocid}"
5+
user_ocid = "${var.user_ocid}"
6+
fingerprint = "${var.fingerprint}"
7+
private_key_path = "${var.private_key_path}"
8+
region = "${var.region}"
9+
}
10+
11+
resource "oci_database_autonomous_container_database" "test_autonomous_container_database" {
12+
#Required
13+
autonomous_exadata_infrastructure_id = "${oci_database_autonomous_exadata_infrastructure.test_autonomous_exadata_infrastructure.id}"
14+
display_name = "example-container-database"
15+
patch_model = "RELEASE_UPDATES"
16+
17+
#Optional
18+
backup_config {
19+
#Optional
20+
recovery_window_in_days = "${var.autonomous_container_database_backup_config_recovery_window_in_days}"
21+
}
22+
23+
compartment_id = "${var.compartment_ocid}"
24+
freeform_tags = "${var.autonomous_database_freeform_tags}"
25+
service_level_agreement_type = "STANDARD"
26+
}
27+
28+
resource "random_string" "autonomous_database_admin_password" {
29+
length = 16
30+
min_numeric = 1
31+
min_lower = 1
32+
min_upper = 1
33+
min_special = 1
34+
}
35+
36+
resource "oci_database_autonomous_database" "test_autonomous_database" {
37+
#Required
38+
admin_password = "${random_string.autonomous_database_admin_password.result}"
39+
compartment_id = "${var.compartment_ocid}"
40+
cpu_core_count = "1"
41+
data_storage_size_in_tbs = "1"
42+
db_name = "atpdb1"
43+
44+
#Optional
45+
autonomous_container_database_id = "${oci_database_autonomous_container_database.test_autonomous_container_database.id}"
46+
db_workload = "OLTP"
47+
display_name = "example_autonomous_database"
48+
freeform_tags = "${var.autonomous_database_freeform_tags}"
49+
is_dedicated = "true"
50+
}
51+
52+
data "oci_database_autonomous_container_databases" "test_autonomous_container_databases" {
53+
#Required
54+
compartment_id = "${var.compartment_ocid}"
55+
56+
#Optional
57+
autonomous_exadata_infrastructure_id = "${oci_database_autonomous_exadata_infrastructure.test_autonomous_exadata_infrastructure.id}"
58+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
59+
display_name = "example-container-database"
60+
state = "AVAILABLE"
61+
}
62+
63+
data "oci_database_autonomous_databases" "autonomous_databases" {
64+
#Required
65+
compartment_id = "${var.compartment_ocid}"
66+
67+
#Optional
68+
autonomous_container_database_id = "${oci_database_autonomous_container_database.test_autonomous_container_database.id}"
69+
display_name = "${oci_database_autonomous_database.test_autonomous_database.display_name}"
70+
db_workload = "OLTP"
71+
}
72+
73+
output "autonomous_database_admin_password" {
74+
value = "${random_string.autonomous_database_admin_password.result}"
75+
}
76+
77+
output "autonomous_database_high_connection_string" {
78+
value = "${lookup(oci_database_autonomous_database.test_autonomous_database.connection_strings.0.all_connection_strings, "high", "unavailable")}"
79+
}
80+
81+
output "autonomous_databases" {
82+
value = "${data.oci_database_autonomous_databases.autonomous_databases.autonomous_databases}"
83+
}
84+
85+
output "autonomous_container_databases" {
86+
value = "${data.oci_database_autonomous_container_databases.test_autonomous_container_databases.autonomous_container_databases}"
87+
}

‎examples/database/atp-d/variables.tf‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
variable "tenancy_ocid" {}
4+
variable "user_ocid" {}
5+
variable "fingerprint" {}
6+
variable "private_key_path" {}
7+
variable "region" {}
8+
variable "compartment_ocid" {}
9+
10+
variable "autonomous_database_defined_tags_value" {
11+
default = "value"
12+
}
13+
14+
variable "autonomous_database_freeform_tags" {
15+
default = {
16+
"Department" = "Finance"
17+
}
18+
}
19+
20+
variable "autonomous_database_license_model" {
21+
default = "LICENSE_INCLUDED"
22+
}
23+
24+
variable "autonomous_exadata_infrastructure_domain" {
25+
default = "subnetexadata.tfvcn.oraclevcn.com"
26+
}
27+
28+
variable "autonomous_exadata_infrastructure_shape" {
29+
default = "Exadata.Quarter2.92"
30+
}
31+
32+
variable "autonomous_container_database_backup_config_recovery_window_in_days" {
33+
default = 10
34+
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require (
44
github.com/go-ini/ini v0.0.0-20170209042415-ee900ca56593 // indirect
55
github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
66
github.com/hashicorp/terraform v0.12.0-rc1
7-
github.com/oracle/oci-go-sdk v5.9.0+incompatible
7+
github.com/oracle/oci-go-sdk v5.10.0+incompatible
88
github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa // indirect
99
github.com/stretchr/objx v0.1.1 // indirect
1010
github.com/stretchr/testify v1.3.0

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,8 @@ github.com/oracle/oci-go-sdk v5.8.0+incompatible h1:OaobVD/YJYLiU7nJQUUYI+uqhpaC
338338
github.com/oracle/oci-go-sdk v5.8.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
339339
github.com/oracle/oci-go-sdk v5.9.0+incompatible h1:YUb4nKl06QU1Y3768sS3siNmla1UlSzSqqareLOKYak=
340340
github.com/oracle/oci-go-sdk v5.9.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
341+
github.com/oracle/oci-go-sdk v5.10.0+incompatible h1:rA89e7c3IVfGaV8Sn7gYWlff9HI/ljveuHHNEyQSQoU=
342+
github.com/oracle/oci-go-sdk v5.10.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
341343
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
342344
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
343345
github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

‎httpreplay/replaying.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ func SetScenario(name string) error {
1919
if recorder, err = NewRecorderAsMode(name, ModeReplaying); err == nil {
2020
// cleanup existing files in /tmp folder
2121
RemoveContents("/tmp")
22+
// cleanup existing
2223
recorder.SetMatcher(matcher)
23-
recorder.SetTransformer(transformer)
24+
recorder.SetTransformer(recorder.scenario.transformer)
2425
}
2526
return err
2627
}

0 commit comments

Comments
 (0)