Skip to content

Commit 4ab2029

Browse files
parrneetparrneet
authored
Merge pull request #973 from terraform-providers/release_merge_v3.62.0
Release merge v3.62.0
2 parents 5fe6eef + 12b482f commit 4ab2029

File tree

66 files changed

+941
-156
lines changed

Some content is hidden

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

66 files changed

+941
-156
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
## 3.62.0 (Unreleased)
2+
3+
### Added
4+
- Support for Proxy Protocol for `oci_load_balancer_listener`
5+
- Support for specifying db version while creating a database for ADB Serverless
6+
27
## 3.61.0 (February 05, 2020)
38

49
### Added

‎examples/database/adb/autonomous_data_warehouse.tf‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ resource "random_string" "autonomous_data_warehouse_admin_password" {
88
min_special = 1
99
}
1010

11+
data "oci_database_autonomous_db_versions" "test_autonomous_dw_versions" {
12+
#Required
13+
compartment_id = "${var.compartment_ocid}"
14+
15+
#Optional
16+
db_workload = "${var.autonomous_data_warehouse_db_workload}"
17+
}
18+
1119
resource "oci_database_autonomous_database" "autonomous_data_warehouse" {
1220
#Required
1321
admin_password = "${random_string.autonomous_data_warehouse_admin_password.result}"
@@ -17,6 +25,7 @@ resource "oci_database_autonomous_database" "autonomous_data_warehouse" {
1725
db_name = "adbdw1"
1826

1927
#Optional
28+
db_version = "${data.oci_database_autonomous_db_versions.test_autonomous_dw_versions.autonomous_db_versions.0.version}"
2029
db_workload = "${var.autonomous_data_warehouse_db_workload}"
2130
display_name = "example_autonomous_data_warehouse"
2231
freeform_tags = "${var.autonomous_database_freeform_tags}"

‎examples/database/adb/autonomous_database.tf‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ resource "random_string" "autonomous_database_admin_password" {
88
min_special = 1
99
}
1010

11+
data "oci_database_autonomous_db_versions" "test_autonomous_db_versions" {
12+
#Required
13+
compartment_id = "${var.compartment_ocid}"
14+
15+
#Optional
16+
db_workload = "${var.autonomous_database_db_workload}"
17+
}
18+
1119
resource "oci_database_autonomous_database" "autonomous_database" {
1220
#Required
1321
admin_password = "${random_string.autonomous_database_admin_password.result}"
@@ -17,6 +25,7 @@ resource "oci_database_autonomous_database" "autonomous_database" {
1725
db_name = "adbdb1"
1826

1927
#Optional
28+
db_version = "${data.oci_database_autonomous_db_versions.test_autonomous_db_versions.autonomous_db_versions.0.version}"
2029
db_workload = "${var.autonomous_database_db_workload}"
2130
display_name = "example_autonomous_database"
2231
freeform_tags = "${var.autonomous_database_freeform_tags}"

‎examples/load_balancer/lb_full/lb_full.tf‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,20 @@ resource "oci_load_balancer_listener" "lb-listener2" {
314314
}
315315
}
316316

317+
resource "oci_load_balancer_listener" "lb-listener3" {
318+
load_balancer_id = "${oci_load_balancer.lb1.id}"
319+
name = "tcp"
320+
default_backend_set_name = "${oci_load_balancer_backend_set.lb-bes1.name}"
321+
port = 80
322+
protocol = "TCP"
323+
rule_set_names = ["${oci_load_balancer_rule_set.test_rule_set.name}"]
324+
325+
connection_configuration {
326+
idle_timeout_in_seconds = "2"
327+
backend_tcp_proxy_protocol_version = "1"
328+
}
329+
}
330+
317331
resource "oci_load_balancer_backend" "lb-be1" {
318332
load_balancer_id = "${oci_load_balancer.lb1.id}"
319333
backendset_name = "${oci_load_balancer_backend_set.lb-bes1.name}"

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
77
github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
88
github.com/mitchellh/cli v1.0.0
9-
github.com/oracle/oci-go-sdk v15.4.0+incompatible
9+
github.com/oracle/oci-go-sdk v15.5.0+incompatible
1010
github.com/stretchr/objx v0.1.1 // indirect
1111
github.com/stretchr/testify v1.3.0
1212
gopkg.in/yaml.v2 v2.2.2

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,8 @@ github.com/oracle/oci-go-sdk v15.3.0+incompatible h1:b3/jwxjLAvx1992VxahQhtjjhRE
350350
github.com/oracle/oci-go-sdk v15.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
351351
github.com/oracle/oci-go-sdk v15.4.0+incompatible h1:340zNuNGctKSrh/hX9dgfstETssSysphXSHXcht+bZo=
352352
github.com/oracle/oci-go-sdk v15.4.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
353+
github.com/oracle/oci-go-sdk v15.5.0+incompatible h1:GdG5NWt+lhv0+WslpaF1dbz8KkScYba+zLdr3Nf0ElU=
354+
github.com/oracle/oci-go-sdk v15.5.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
353355
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58 h1:m3CEgv3ah1Rhy82L+c0QG/U3VyY1UsvsIdkh0/rU97Y=
354356
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
355357
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=

‎oci/database_autonomous_database_resource.go‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@ func DatabaseAutonomousDatabaseResource() *schema.Resource {
9090
string(oci_database.AutonomousDatabaseSummaryDataSafeStatusNotRegistered),
9191
}, true),
9292
},
93+
"db_version": {
94+
Type: schema.TypeString,
95+
Optional: true,
96+
Computed: true,
97+
ForceNew: true,
98+
DiffSuppressFunc: dbVersionDiffSuppress,
99+
},
93100
"db_workload": {
94101
Type: schema.TypeString,
95102
Optional: true,
@@ -239,10 +246,6 @@ func DatabaseAutonomousDatabaseResource() *schema.Resource {
239246
},
240247
},
241248
},
242-
"db_version": {
243-
Type: schema.TypeString,
244-
Computed: true,
245-
},
246249
"is_preview": {
247250
Type: schema.TypeBool,
248251
Computed: true,
@@ -743,6 +746,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
743746
tmp := dbName.(string)
744747
details.DbName = &tmp
745748
}
749+
if dbVersion, ok := s.D.GetOkExists("db_version"); ok {
750+
tmp := dbVersion.(string)
751+
details.DbVersion = &tmp
752+
}
746753
if dbWorkload, ok := s.D.GetOkExists("db_workload"); ok {
747754
details.DbWorkload = oci_database.CreateAutonomousDatabaseBaseDbWorkloadEnum(dbWorkload.(string))
748755
}
@@ -832,6 +839,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
832839
tmp := dbName.(string)
833840
details.DbName = &tmp
834841
}
842+
if dbVersion, ok := s.D.GetOkExists("db_version"); ok {
843+
tmp := dbVersion.(string)
844+
details.DbVersion = &tmp
845+
}
835846
if dbWorkload, ok := s.D.GetOkExists("db_workload"); ok {
836847
details.DbWorkload = oci_database.CreateAutonomousDatabaseBaseDbWorkloadEnum(dbWorkload.(string))
837848
}
@@ -914,6 +925,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
914925
tmp := dbName.(string)
915926
details.DbName = &tmp
916927
}
928+
if dbVersion, ok := s.D.GetOkExists("db_version"); ok {
929+
tmp := dbVersion.(string)
930+
details.DbVersion = &tmp
931+
}
917932
if dbWorkload, ok := s.D.GetOkExists("db_workload"); ok {
918933
details.DbWorkload = oci_database.CreateAutonomousDatabaseBaseDbWorkloadEnum(dbWorkload.(string))
919934
}
@@ -987,6 +1002,10 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
9871002
tmp := dbName.(string)
9881003
details.DbName = &tmp
9891004
}
1005+
if dbVersion, ok := s.D.GetOkExists("db_version"); ok {
1006+
tmp := dbVersion.(string)
1007+
details.DbVersion = &tmp
1008+
}
9901009
if dbWorkload, ok := s.D.GetOkExists("db_workload"); ok {
9911010
details.DbWorkload = oci_database.CreateAutonomousDatabaseBaseDbWorkloadEnum(dbWorkload.(string))
9921011
}

0 commit comments

Comments
 (0)