Merge pull request #1094 from terraform-providers/release_merge_v3.81.0

Candidate for release_v3.81.0

Author: srishtipmishra

CHANGELOG.md

@@ -1,4 +1,23 @@
 ## 3.81.0 (Unreleased)
+
+### Added
+- Support Token base security authentication
+- Support for Scheduled Autoscaling
+- Support for `dbVersion` field in Autonomous databases Container database resources
+- Support for Archive Log Backup and Point in time restore
+- Support resource discovery for `datacatalog` resources
+- Support resource discovery for `dataSafe` resources
+- Support resource discovery for `integration` resources
+- Support resource discovery for `marketplace` resources
+- Added resource discovery support for `oce` resources
+- Support resource discovery for `oda` resources
+- Support resource discovery for `datascience` resources
+- Support resource discovery for `oci_objectstorage_object`, `oci_objectstorage_object_lifecycle_policy`, `oci_objectstorage_preauthrequest` resources
+- Support restore from file for `kms` resources
+
+### Fixed
+- Fixed plan failure in case of missing required attributes in resource discovery. Placeholder values will be added for missing required attributes and the attributes will be added to `lifecycle ignore_changes`
+ 
 ## 3.80.0 (June 10, 2020)
 
 ### Added

examples/autoscaling/compute.tf

@@ -69,6 +69,19 @@ resource "oci_core_instance_pool" "TFInstancePool" {
   }
 }
 
+resource "oci_core_instance_pool" "TFInstancePoolForScheduledPolicy" {
+  compartment_id            = "${var.compartment_ocid}"
+  instance_configuration_id = "${oci_core_instance_configuration.TFInstanceConfiguration.id}"
+  size                      = 2
+  state                     = "RUNNING"
+  display_name              = "TFInstancePoolForScheduledPolicy"
+
+  placement_configurations {
+    availability_domain = "${data.oci_identity_availability_domain.AD.name}"
+    primary_subnet_id   = "${oci_core_subnet.ExampleSubnet.id}"
+  }
+}
+
 resource "oci_autoscaling_auto_scaling_configuration" "TFAutoScalingConfiguration" {
   compartment_id       = "${var.compartment_ocid}"
   cool_down_in_seconds = "300"
@@ -127,3 +140,32 @@ resource "oci_autoscaling_auto_scaling_configuration" "TFAutoScalingConfiguratio
     type = "instancePool"
   }
 }
+
+resource "oci_autoscaling_auto_scaling_configuration" "TFAutoScalingConfigurationScheduledPolicy" {
+  compartment_id       = "${var.compartment_ocid}"
+  cool_down_in_seconds = "300"
+  display_name         = "TFAutoScalingConfigurationScheduledPolicy"
+  is_enabled           = "true"
+
+  policies {
+    capacity {
+      initial = "4"
+      max     = "4"
+      min     = "2"
+    }
+
+    display_name = "TFScheduledPolicy"
+    policy_type  = "scheduled"
+
+    execution_schedule {
+      expression = "0 15 10 ? * *"
+      timezone   = "UTC"
+      type       = "cron"
+    }
+  }
+
+  auto_scaling_resources {
+    id   = "${oci_core_instance_pool.TFInstancePoolForScheduledPolicy.id}"
+    type = "instancePool"
+  }
+}

examples/autoscaling/datasources.tf

@@ -45,6 +45,10 @@ data "oci_autoscaling_auto_scaling_configuration" "TFAutoScalingConfigurationDat
   auto_scaling_configuration_id = "${oci_autoscaling_auto_scaling_configuration.TFAutoScalingConfiguration.id}"
 }
 
+data "oci_autoscaling_auto_scaling_configuration" "TFAutoScalingConfigurationScheduledPolicyDatasource" {
+  auto_scaling_configuration_id = "${oci_autoscaling_auto_scaling_configuration.TFAutoScalingConfigurationScheduledPolicy.id}"
+}
+
 data "oci_autoscaling_auto_scaling_configurations" "TFAutoScalingConfigurationDatasources" {
   compartment_id = "${var.compartment_ocid}"
   display_name   = "TFAutoScalingConfiguration"
@@ -61,14 +65,14 @@ data "oci_core_instance" "TFInstancePoolInstanceSingularDatasources" {
   instance_id = "${lookup(data.oci_core_instance_pool_instances.TFInstancePoolInstanceDatasources.instances[count.index], "id")}"
 }
 
-output "Pooled instances private IPs" {
+output "Pooled_instances_private_IPs" {
   value = ["${data.oci_core_instance.TFInstancePoolInstanceSingularDatasources.*.private_ip}"]
 }
 
-output "Pooled instances public IPs" {
+output "Pooled_instances_public_IPs" {
   value = ["${data.oci_core_instance.TFInstancePoolInstanceSingularDatasources.*.public_ip}"]
 }
 
-output "Pooled instances hostname labels" {
+output "Pooled_instances_hostname_labels" {
   value = ["${data.oci_core_instance.TFInstancePoolInstanceSingularDatasources.*.hostname_label}"]
 }

examples/kms/data_sources.tf

@@ -13,7 +13,7 @@ data "oci_kms_vault" "test_vault" {
 }
 
 /*
-//if want to create a new vault
+//create a new vault
 resource "oci_kms_vault" "test_vault" {
 	#Required
 	compartment_id = "${var.compartment_id}"

examples/kms/key.tf

@@ -13,22 +13,32 @@ resource "oci_kms_key" "test_key" {
     length    = "${var.key_key_shape_length}"
   }
 
-  //If using bucket to restore a key use below
+  //If using object to restore a key use below
   /*restore_from_object_store {
     bucket      = "${data.oci_objectstorage_object.key_backup_object.bucket}"
     destination = "${var.destination[0]}"
     namespace   = "${data.oci_objectstorage_object.key_backup_object.namespace}"
     object      = "${data.oci_objectstorage_object.key_backup_object.object}"
   }*/
 
-
   //If using Pre-authenticated-request to restore a key use below
   /*restore_from_object_store {
     destination = "${var.destination[1]}"
     uri         = "${data.oci_objectstorage_preauthrequest.key_backup_preauthenticated_request}"
   }*/
 
-  restore_trigger = "${var.key_restore_trigger}"
+  //If using file stored in object storage to restore a key use below
+  /*restore_from_file {
+    //Required
+    restore_key_from_file_details = "${data.oci_objectstorage_object.key_backup_object.content}"
+    content_length                = "${data.oci_objectstorage_object.key_backup_object.content_length}"
+
+    //Optional
+    content_md5                   = "${data.oci_objectstorage_object.key_backup_object.content_md5}"
+  }*/
+
+  //Flip the trigger when restore operation on key needs to be performed
+  //restore_trigger = "${var.key_restore_trigger}"
 }
 
 resource "oci_kms_key_version" "test_key_version" {

examples/kms/vault.tf

@@ -3,20 +3,33 @@ resource "oci_kms_vault" "private-vault-kms" {
 
   /*restore_from_object_store {
     bucket      = "${data.oci_objectstorage_object.vault_backup_object.bucket}"
-    destination = "${var.destination.bucket}"
+    destination = "${var.destination[0]}"
     namespace   = "${data.oci_objectstorage_object.vault_backup_object.namespace}"
     object      = "${data.oci_objectstorage_object.vault_backup_object.object}"
   }*/
 
   //If restoring using a pre-authenticated-uri use the config below
 
   /*restore_from_object_store {
-    destination = "${var.destination[1]}"
-    uri         = "${data.oci_objectstorage_preauthrequest.vault_backup_preauthenticated_request}"
+          destination = "${var.destination[1]}"
+          uri         = "${data.oci_objectstorage_preauthrequest.vault_backup_preauthenticated_request}"
+        }*/
+
+  //If restoring using object in object storage use the config below
+
+  /*restore_from_file {
+    restore_vault_from_file_details = "${data.oci_objectstorage_object.vault_backup_object.content}"
+    content_length                = "${data.oci_objectstorage_object.vault_backup_object.content_length}"
+
+    //Optional
+    content_md5                   = "${data.oci_objectstorage_object.vault_backup_object.content_md5}"
   }*/
 
-  compartment_id  = "${var.compartment_id}"
-  display_name    = "${var.vault_display_name}"
-  vault_type      = "${var.vault_type[1]}"
-  restore_trigger = "${var.vault_restore_trigger}"
+  compartment_id = "${var.compartment_id}"
+
+  display_name = "${var.vault_display_name}"
+  vault_type   = "${var.vault_type[1]}"
+
+  //Flip the trigger when restore operation on vault needs to be performed
+  //restore_trigger = "${var.vault_restore_trigger}"
 }

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
 	github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
 	github.com/mitchellh/cli v1.0.0
-	github.com/oracle/oci-go-sdk v20.0.0+incompatible
+	github.com/oracle/oci-go-sdk v20.1.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

@@ -451,6 +451,8 @@ github.com/oracle/oci-go-sdk v19.4.0+incompatible h1:9C9TQzYDbylb/dlDLwr9CL3EWK9
 github.com/oracle/oci-go-sdk v19.4.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v20.0.0+incompatible h1:PdKuaDT0DKwG7YMDpwjqsogpLhXt4z7Uxdabssvaucc=
 github.com/oracle/oci-go-sdk v20.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v20.1.0+incompatible h1:griRQj1BxbX+Drx8mKcRfey98S8/j5JKImFL2kh+qXE=
+github.com/oracle/oci-go-sdk v20.1.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/autoscaling_auto_scaling_configuration_data_source.go

@@ -99,6 +99,14 @@ func (s *AutoScalingAutoScalingConfigurationDataSourceCrud) SetData() error {
 		s.D.Set("is_enabled", *s.Res.IsEnabled)
 	}
 
+	if s.Res.MaxResourceCount != nil {
+		s.D.Set("max_resource_count", *s.Res.MaxResourceCount)
+	}
+
+	if s.Res.MinResourceCount != nil {
+		s.D.Set("min_resource_count", *s.Res.MinResourceCount)
+	}
+
 	policies := []interface{}{}
 	for _, item := range s.Res.Policies {
 		policies = append(policies, AutoScalingPolicyToMap(item, true))