Merge pull request #1039 from terraform-providers/release_merge_v3.72.0

Candidate for release_v3.72.0

Author: rashik-bhasin

CHANGELOG.md

@@ -1,4 +1,20 @@
 ## 3.72.0 (Unreleased)
+
+### Added
+- Support for resource discovery in Big Data service
+- Support for Scheduled Cross-Region Backups in `oci_core_volume_backup_policy`
+- Support Closing InstanceConfigurationLaunchInstanceDetails parity gaps with LaunchInstanceDetails 
+- Support Flexible Infrastructure - Flexible VM Instance
+- Support for object versioning in Object Storage 
+- Support for `is_free_tier_enabled` attribute in `oci_database_autonomous_db_versions` data source
+- Support for `maintenance_window` in `oci_database_db_system` resource for ExaCS infrastructure
+
+### Fixed
+- Update `cpu_core_count` with the other attributes in `oci_database_db_system` resource [Github issue #1026](https://github.com/terraform-providers/terraform-provider-oci/issues/1026)
+
+### Notes
+`oci_streaming_stream_archiver` data source and resource were not supported by the service and removed from the provider since v3.72.0
+
 ## 3.71.0 (April 16, 2020)
 
 ### Added

examples/compute/instance/instance.tf

@@ -38,6 +38,10 @@ variable "instance_shape" {
   default = "VM.Standard2.1"
 }
 
+variable "instance_ocpus" {
+  default = 1
+}
+
 variable "instance_image_ocid" {
   type = "map"
 
@@ -71,6 +75,10 @@ resource "oci_core_instance" "test_instance" {
   display_name        = "TestInstance${count.index}"
   shape               = "${var.instance_shape}"
 
+  shape_config {
+    ocpus = "${var.instance_ocpus}"
+  }
+
   create_vnic_details {
     subnet_id        = "${oci_core_subnet.test_subnet.id}"
     display_name     = "Primaryvnic"

examples/compute/instance_pool/instance_pool.tf

@@ -136,10 +136,26 @@ resource "oci_core_instance_configuration" "test_instance_configuration" {
     instance_type = "compute"
 
     launch_details {
-      compartment_id = "${var.compartment_ocid}"
-      ipxe_script    = "ipxeScript"
-      shape          = "${var.instance_shape}"
-      display_name   = "TestInstanceConfigurationLaunchDetails"
+      compartment_id                      = "${var.compartment_ocid}"
+      ipxe_script                         = "ipxeScript"
+      shape                               = "${var.instance_shape}"
+      display_name                        = "TestInstanceConfigurationLaunchDetails"
+      is_pv_encryption_in_transit_enabled = false
+      preferred_maintenance_action        = "LIVE_MIGRATE"
+      launch_mode                         = "NATIVE"
+
+      agent_config {
+        is_management_disabled = false
+        is_monitoring_disabled = false
+      }
+
+      launch_options {
+        network_type = "PARAVIRTUALIZED"
+      }
+
+      shape_config {
+        ocpus = 1
+      }
 
       create_vnic_details {
         assign_public_ip       = true

examples/database/db_systems/db_exadata/resources.tf

@@ -25,6 +25,23 @@ resource "oci_database_db_system" "test_db_system" {
     display_name = "MyTFDBHome1Exa"
   }
 
+  maintenance_window_details {
+    preference = "CUSTOM_PREFERENCE"
+
+    days_of_week {
+      name = "MONDAY"
+    }
+
+    hours_of_day       = ["4"]
+    lead_time_in_weeks = 2
+
+    months {
+      name = "APRIL"
+    }
+
+    weeks_of_month = ["2"]
+  }
+
   disk_redundancy  = "${var.db_disk_redundancy}"
   shape            = "${var.db_system_shape}"
   subnet_id        = "${oci_core_subnet.subnet.id}"

examples/object_storage/bucket.tf

@@ -11,9 +11,17 @@ resource "oci_objectstorage_bucket" "bucket1" {
   access_type    = "NoPublicAccess"
 }
 
+resource "oci_objectstorage_bucket" "bucket_with_versioning" {
+  compartment_id = "${var.compartment_ocid}"
+  namespace      = "${data.oci_objectstorage_namespace.ns.namespace}"
+  name           = "bucketWithVersioning"
+  access_type    = "NoPublicAccess"
+  versioning     = "Suspended"
+}
+
 resource "oci_objectstorage_object_lifecycle_policy" "lifecyclePolicy1" {
   namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
-  bucket    = "tf-example-bucket"
+  bucket    = "${oci_objectstorage_bucket.bucket1.name}"
 
   #Optional
   rules {
@@ -48,11 +56,21 @@ output buckets {
 
 data "oci_objectstorage_object_lifecycle_policy" "lifecyclePolicies1" {
   namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
-  bucket    = "tf-example-bucket"
+  bucket    = "${oci_objectstorage_bucket.bucket1.name}"
 
   depends_on = ["oci_objectstorage_object_lifecycle_policy.lifecyclePolicy1"]
 }
 
 output lifecyclePolicies1 {
   value = "${data.oci_objectstorage_object_lifecycle_policy.lifecyclePolicies1.rules}"
 }
+
+data "oci_objectstorage_object_versions" "test_object_versions1" {
+  #Required
+  bucket    = "${oci_objectstorage_bucket.bucket1.name}"
+  namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
+}
+
+output test_object_versions1 {
+  value = "${data.oci_objectstorage_object_versions.test_object_versions1.items}"
+}

examples/object_storage/object.tf

@@ -23,7 +23,7 @@ resource "oci_objectstorage_object" "source_object" {
   object              = "same_index.html"
   content_language    = "en-US"
   content_type        = "text/html"
-  source              = "index.html"
+  source              = "${oci_objectstorage_object.object1.object}"
   content_disposition = "attachment; filename=\"filename.html\""
 }
 
@@ -39,10 +39,29 @@ resource "oci_objectstorage_object" "source_uri_object" {
     region    = "${local.source_region}"
     namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
     bucket    = "${oci_objectstorage_bucket.bucket1.name}"
-    object    = "index.html"
+    object    = "${oci_objectstorage_object.object1.object}"
   }
 }
 
+resource "oci_objectstorage_object" "source_uri_object_from_version" {
+  namespace           = "${data.oci_objectstorage_namespace.ns.namespace}"
+  bucket              = "${oci_objectstorage_bucket.bucket_with_versioning.name}"
+  object              = "copy_from_version_index.html"
+  content_language    = "en-US"
+  content_type        = "text/html"
+  content_disposition = "attachment; filename=\"filename.html\""
+
+  source_uri_details {
+    region            = "${local.source_region}"
+    namespace         = "${data.oci_objectstorage_namespace.ns.namespace}"
+    bucket            = "${oci_objectstorage_bucket.bucket1.name}"
+    object            = "${oci_objectstorage_object.object1.object}"
+    source_version_id = "${oci_objectstorage_object.object1.version_id}"
+  }
+
+  delete_all_object_versions = true
+}
+
 data "oci_objectstorage_object_head" "object_head1" {
   namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
   bucket    = "${oci_objectstorage_bucket.bucket1.name}"

examples/object_storage/retentionrule.tf

@@ -24,7 +24,7 @@ resource "oci_objectstorage_bucket" "retention_rule_bucket" {
 
 data "oci_objectstorage_bucket" "retention_rule_bucket" {
   namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
-  name      = "tf-example-bucket-with-retention-rule"
+  name      = "${oci_objectstorage_bucket.retention_rule_bucket.name}"
 }
 
 output "retention_rules_on_bucket" {

examples/storage/block/volume/volume_backup_policy.tf

@@ -6,6 +6,7 @@ variable "fingerprint" {}
 variable "private_key_path" {}
 variable "region" {}
 variable "compartment_ocid" {}
+variable "destination_region" {}
 
 provider "oci" {
   tenancy_ocid     = "${var.tenancy_ocid}"
@@ -87,6 +88,8 @@ resource "oci_core_volume_backup_policy" "test_volume_backup_policy_custom" {
     offset_type    = "STRUCTURED"
     time_zone      = "UTC"
   }
+
+  destination_region = "${var.destination_region}"
 }
 
 resource "oci_core_volume" "test_volume_2" {

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 v17.4.0+incompatible
+	github.com/oracle/oci-go-sdk v18.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

@@ -438,6 +438,8 @@ github.com/oracle/oci-go-sdk v17.3.0+incompatible h1:a9PyjUO0hU/FvwUqOcFMfWS3iz3
 github.com/oracle/oci-go-sdk v17.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v17.4.0+incompatible h1:W9yFhlwQ9+p0mE2oPrS++v821eIT17gTUpJXkmGZb9o=
 github.com/oracle/oci-go-sdk v17.4.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v18.0.0+incompatible h1:FLV4KixsVfF3rwyVTMI6Ryp/Q+OSb9sR5TawbfjFLN4=
+github.com/oracle/oci-go-sdk v18.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=