Merge pull request #950 from terraform-providers/release_merge_v3.57.0

Candidate for release_v3.57.0

Author: afedorch

CHANGELOG.md

@@ -1,4 +1,12 @@
-## 3.56.1 (Unreleased)
+## 3.57.0 (Unreleased)
+
+### Added
+- Support for change in `corporate_proxy` parameter in `oci_database_exadata_infrastructure`
+- Support for `maintenance_window_details` attribute in `database_autonomous_container_database` resource and datasource
+
+### Fixed
+- Support of the deprecated `node_image_id`, `node_image_name` attributes in `oci_containerengine_node_pool` resource for Terraform v0.11
+
 ## 3.56.0 (December 18, 2019)
 
 ### Added

examples/database/atp-d/main.tf

@@ -23,6 +23,22 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
   compartment_id               = "${var.compartment_ocid}"
   freeform_tags                = "${var.autonomous_database_freeform_tags}"
   service_level_agreement_type = "STANDARD"
+
+  maintenance_window_details {
+    preference = "CUSTOM_PREFERENCE"
+
+    days_of_week {
+      name = "MONDAY"
+    }
+
+    hours_of_day = ["4"]
+
+    months {
+      name = "APRIL"
+    }
+
+    weeks_of_month = ["2"]
+  }
 }
 
 resource "random_string" "autonomous_database_admin_password" {

examples/database/exadata_cc/exadata-infrastructure.tf

@@ -18,23 +18,23 @@ provider "oci" {
 
 resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
   #Required
-  admin_network_cidr          = "192.168.19.2/16"
+  admin_network_cidr          = "192.168.0.0/16"
   cloud_control_plane_server1 = "192.168.19.1"
   cloud_control_plane_server2 = "192.168.19.2"
   compartment_id              = "${var.compartment_id}"
-  corporate_proxy             = "http://192.168.19.1:80"
   display_name                = "tstExaInfra"
   dns_server                  = ["192.168.10.10"]
   gateway                     = "192.168.20.1"
-  infini_band_network_cidr    = "10.172.19.1/22"
+  infini_band_network_cidr    = "10.172.0.0/19"
   netmask                     = "255.255.0.0"
   ntp_server                  = ["192.168.10.20"]
   shape                       = "ExadataCC.Quarter3.100"
   time_zone                   = "US/Pacific"
   activation_file             = "activation.zip"
 
   #Optional
-  defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedvalue")}"
+  corporate_proxy = "http://192.168.19.1:80"
+  defined_tags    = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedvalue")}"
 
   freeform_tags = {
     "Department" = "Accounting"

examples/database/exadata_cc/vm_cluster.tf

@@ -109,7 +109,6 @@ data "oci_database_vm_cluster_recommended_network" "test_vm_cluster_recommended_
     network_type = "CLIENT"
     prefix       = "myprefix1"
     vlan_id      = "10"
-    domain       = "oracle.com"
   }
 
   networks {
@@ -121,7 +120,6 @@ data "oci_database_vm_cluster_recommended_network" "test_vm_cluster_recommended_
     network_type = "BACKUP"
     prefix       = "myprefix2"
     vlan_id      = "11"
-    domain       = "oracle.com"
   }
 
   defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedvalue")}"

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
 	github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
 	github.com/mitchellh/cli v1.0.0
-	github.com/oracle/oci-go-sdk v14.0.0+incompatible
+	github.com/oracle/oci-go-sdk v15.0.0+incompatible
 	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.3.0
 	gopkg.in/yaml.v2 v2.2.2

go.sum

@@ -340,6 +340,8 @@ github.com/oracle/oci-go-sdk v13.1.0+incompatible h1:inwbT0b/mMbnTfzYoW2xcU1cCMI
 github.com/oracle/oci-go-sdk v13.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v14.0.0+incompatible h1:DqmXj/YCn1RLTBO4wKNdZ5lTT6DbhU0ymFYDm6lHZSY=
 github.com/oracle/oci-go-sdk v14.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v15.0.0+incompatible h1:DN9mJZUJMm2IKY9z+lDg7Hz6e+ns1PtWSSbQ8PrmOmw=
+github.com/oracle/oci-go-sdk v15.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58 h1:m3CEgv3ah1Rhy82L+c0QG/U3VyY1UsvsIdkh0/rU97Y=
 github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=

oci/analytics_analytics_instance_resource.go

@@ -23,9 +23,9 @@ func AnalyticsAnalyticsInstanceResource() *schema.Resource {
 			State: schema.ImportStatePassthrough,
 		},
 		Timeouts: &schema.ResourceTimeout{
-			Create: &OneHour,
-			Update: &OneHour,
-			Delete: &OneHour,
+			Create: getTimeoutDuration("1h"),
+			Update: getTimeoutDuration("1h"),
+			Delete: getTimeoutDuration("1h"),
 		},
 		Create: createAnalyticsAnalyticsInstance,
 		Read:   readAnalyticsAnalyticsInstance,

oci/containerengine_cluster_resource.go

@@ -26,9 +26,9 @@ func ContainerengineClusterResource() *schema.Resource {
 			State: schema.ImportStatePassthrough,
 		},
 		Timeouts: &schema.ResourceTimeout{
-			Create: &OneHour,
-			Update: &OneHour,
-			Delete: &OneHour,
+			Create: getTimeoutDuration("1h"),
+			Update: getTimeoutDuration("1h"),
+			Delete: getTimeoutDuration("1h"),
 		},
 		Create: createContainerengineCluster,
 		Read:   readContainerengineCluster,

oci/containerengine_node_pool_resource.go

@@ -20,9 +20,9 @@ func ContainerengineNodePoolResource() *schema.Resource {
 			State: schema.ImportStatePassthrough,
 		},
 		Timeouts: &schema.ResourceTimeout{
-			Create: &TwentyMinutes,
-			Update: &TwentyMinutes,
-			Delete: &TwentyMinutes,
+			Create: getTimeoutDuration("20m"),
+			Update: getTimeoutDuration("20m"),
+			Delete: getTimeoutDuration("20m"),
 		},
 		Create: createContainerengineNodePool,
 		Read:   readContainerengineNodePool,
@@ -148,7 +148,6 @@ func ContainerengineNodePoolResource() *schema.Resource {
 			"node_source_details": {
 				Type:          schema.TypeList,
 				Optional:      true,
-				Computed:      true,
 				ForceNew:      true,
 				MaxItems:      1,
 				MinItems:      1,

oci/core_image_resource.go

@@ -20,9 +20,9 @@ func CoreImageResource() *schema.Resource {
 			State: schema.ImportStatePassthrough,
 		},
 		Timeouts: &schema.ResourceTimeout{
-			Create: &TwoHours,
-			Update: &TwoHours,
-			Delete: &TwoHours,
+			Create: getTimeoutDuration("2h"),
+			Update: getTimeoutDuration("2h"),
+			Delete: getTimeoutDuration("2h"),
 		},
 		Create: createCoreImage,
 		Read:   readCoreImage,