Release 3.28.0

Release 3.28.0

Author: dshelbyo

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.28.0 (Unreleased)
+
+### Added
+- Support for ATP-S autoscaling
+- Support for specifying Fault Domains in `launch_details` for `oci_core_instance_configuration` resource
+- Support for defined tags and tag namespace deletion
+
 ## 3.27.0 (May 29, 2019)
 
 ### Added
@@ -43,7 +50,7 @@
 - Support for updating `license_model` for `oci_autonomous_database` resource
 - Support for updating `static_routes` and new `cpe_local_identifier` in `oci_core_ipsec` resource for improved VPN service usability
 - Support for updating `whitelisted_ips` in `autonomous_database`. Note: Cannot be used during creation.
-- Support tagging for Dynamic Groups in Identity 
+- Support tagging for Dynamic Groups in Identity
 
 ## 3.22.0 (April 10, 2019)
 

examples/database/adb/autonomous_data_warehouse.tf

@@ -12,13 +12,13 @@ resource "oci_database_autonomous_database" "autonomous_data_warehouse" {
   #Required
   admin_password           = "${random_string.autonomous_data_warehouse_admin_password.result}"
   compartment_id           = "${var.compartment_ocid}"
-  cpu_core_count           = "${var.autonomous_database_cpu_core_count}"
-  data_storage_size_in_tbs = "${var.autonomous_database_data_storage_size_in_tbs}"
-  db_name                  = "${var.autonomous_data_warehouse_db_name}"
+  cpu_core_count           = "1"
+  data_storage_size_in_tbs = "1"
+  db_name                  = "adbdw1"
 
   #Optional
   db_workload   = "${var.autonomous_data_warehouse_db_workload}"
-  display_name  = "${var.autonomous_data_warehouse_display_name}"
+  display_name  = "example_autonomous_data_warehouse"
   freeform_tags = "${var.autonomous_database_freeform_tags}"
   license_model = "${var.autonomous_database_license_model}"
 }

examples/database/adb/autonomous_database.tf

@@ -12,15 +12,16 @@ resource "oci_database_autonomous_database" "autonomous_database" {
   #Required
   admin_password           = "${random_string.autonomous_database_admin_password.result}"
   compartment_id           = "${var.compartment_ocid}"
-  cpu_core_count           = "${var.autonomous_database_cpu_core_count}"
-  data_storage_size_in_tbs = "${var.autonomous_database_data_storage_size_in_tbs}"
-  db_name                  = "${var.autonomous_database_db_name}"
+  cpu_core_count           = "1"
+  data_storage_size_in_tbs = "1"
+  db_name                  = "adbdb1"
 
   #Optional
-  db_workload   = "${var.autonomous_database_db_workload}"
-  display_name  = "${var.autonomous_database_display_name}"
-  freeform_tags = "${var.autonomous_database_freeform_tags}"
-  license_model = "${var.autonomous_database_license_model}"
+  db_workload             = "${var.autonomous_database_db_workload}"
+  display_name            = "example_autonomous_database"
+  freeform_tags           = "${var.autonomous_database_freeform_tags}"
+  is_auto_scaling_enabled = "true"
+  license_model           = "${var.autonomous_database_license_model}"
 }
 
 data "oci_database_autonomous_databases" "autonomous_databases" {

examples/database/adb/variables.tf

@@ -7,22 +7,6 @@ variable "private_key_path" {}
 variable "region" {}
 variable "compartment_ocid" {}
 
-variable "autonomous_database_cpu_core_count" {
-  default = 1
-}
-
-variable "autonomous_database_data_storage_size_in_tbs" {
-  default = 1
-}
-
-variable "autonomous_database_db_name" {
-  default = "adbdb1"
-}
-
-variable "autonomous_data_warehouse_db_name" {
-  default = "adbdw1"
-}
-
 variable "autonomous_database_db_workload" {
   default = "OLTP"
 }
@@ -35,14 +19,6 @@ variable "autonomous_database_defined_tags_value" {
   default = "value"
 }
 
-variable "autonomous_database_display_name" {
-  default = "example_autonomous_database"
-}
-
-variable "autonomous_data_warehouse_display_name" {
-  default = "example_autonomous_data_warehouse"
-}
-
 variable "autonomous_database_freeform_tags" {
   default = {
     "Department" = "Finance"

go.mod

@@ -4,7 +4,7 @@ require (
 	github.com/go-ini/ini v0.0.0-20170209042415-ee900ca56593 // indirect
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
 	github.com/hashicorp/terraform v0.12.0-rc1
-	github.com/oracle/oci-go-sdk v5.8.0+incompatible
+	github.com/oracle/oci-go-sdk v5.9.0+incompatible
 	github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa // indirect
 	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.3.0

go.sum

@@ -336,6 +336,8 @@ github.com/oracle/oci-go-sdk v5.6.0+incompatible h1:SvLqCT/jr1H8yT20Iq9DGpc5f5dX
 github.com/oracle/oci-go-sdk v5.6.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v5.8.0+incompatible h1:OaobVD/YJYLiU7nJQUUYI+uqhpaCnz0eWCEJLuclgGY=
 github.com/oracle/oci-go-sdk v5.8.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v5.9.0+incompatible h1:YUb4nKl06QU1Y3768sS3siNmla1UlSzSqqareLOKYak=
+github.com/oracle/oci-go-sdk v5.9.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

oci/autoscaling_auto_scaling_configuration_resource.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform/helper/hashcode"
-
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
 
@@ -504,8 +503,7 @@ func (s *AutoscalingAutoScalingConfigurationResourceCrud) mapToAction(fieldKeyFo
 	result := oci_autoscaling.Action{}
 
 	if type_, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "type")); ok {
-		tmp := oci_autoscaling.ActionTypeEnum(type_.(string))
-		result.Type = tmp
+		result.Type = oci_autoscaling.ActionTypeEnum(type_.(string))
 	}
 
 	if value, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "value")); ok {
@@ -587,21 +585,21 @@ func (s *AutoscalingAutoScalingConfigurationResourceCrud) mapToCreateAutoScaling
 			tmp := make([]oci_autoscaling.CreateConditionDetails, len(interfaces))
 			for i := range interfaces {
 				stateDataIndex := autoScalingConfigurationPolicyRulesHashCodeForSets(interfaces[i])
-				fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", fmt.Sprintf(fieldKeyFormat, "rules"), stateDataIndex)
-				converted, err := s.mapToCreateConditionDetails(fieldKeyFormat)
+				fieldKeyFormatNextLevel := fmt.Sprintf("%s.%d.%%s", fmt.Sprintf(fieldKeyFormat, "rules"), stateDataIndex)
+				converted, err := s.mapToCreateConditionDetails(fieldKeyFormatNextLevel)
 				if err != nil {
-					return nil, err
+					return details, err
 				}
 				tmp[i] = converted
 			}
 			details.Rules = tmp
 		}
 		if capacity, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "capacity")); ok {
 			if tmpList := capacity.([]interface{}); len(tmpList) > 0 {
-				fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", fmt.Sprintf(fieldKeyFormat, "capacity"), 0)
-				tmp, err := s.mapToCapacity(fieldKeyFormat)
+				fieldKeyFormatNextLevel := fmt.Sprintf("%s.%d.%%s", fmt.Sprintf(fieldKeyFormat, "capacity"), 0)
+				tmp, err := s.mapToCapacity(fieldKeyFormatNextLevel)
 				if err != nil {
-					return nil, err
+					return details, fmt.Errorf("unable to convert capacity, encountered error: %v", err)
 				}
 				details.Capacity = &tmp
 			}
@@ -717,8 +715,7 @@ func (s *AutoscalingAutoScalingConfigurationResourceCrud) mapToMetric(fieldKeyFo
 	result := oci_autoscaling.Metric{}
 
 	if metricType, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "metric_type")); ok {
-		tmp := oci_autoscaling.MetricMetricTypeEnum(metricType.(string))
-		result.MetricType = tmp
+		result.MetricType = oci_autoscaling.MetricMetricTypeEnum(metricType.(string))
 	}
 
 	if threshold, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "threshold")); ok {
@@ -790,8 +787,7 @@ func (s *AutoscalingAutoScalingConfigurationResourceCrud) mapToThreshold(fieldKe
 	result := oci_autoscaling.Threshold{}
 
 	if operator, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "operator")); ok {
-		tmp := oci_autoscaling.ThresholdOperatorEnum(operator.(string))
-		result.Operator = tmp
+		result.Operator = oci_autoscaling.ThresholdOperatorEnum(operator.(string))
 	}
 
 	if value, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "value")); ok {

oci/autoscaling_auto_scaling_configuration_scenario_test.go

@@ -92,7 +92,7 @@ func (s *ResourceAutoscalingConfigurationTestSuite) SetupTest() {
 						nested_object = "{\"some_string\": \"stringB\", \"object\": {\"some_string\": \"stringC\"}}"
 					}
 	
-					source_details = {
+					source_details {
 						source_type = "image"
 						image_id    = "${var.InstanceImageOCID[var.region]}"
 					}

oci/budget_alert_rule_resource.go

@@ -12,9 +12,6 @@ import (
 
 func BudgetAlertRuleResource() *schema.Resource {
 	return &schema.Resource{
-		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
-		},
 		Timeouts: DefaultTimeout,
 		Create:   createBudgetAlertRule,
 		Read:     readBudgetAlertRule,

oci/budget_alert_rule_test.go

@@ -209,10 +209,6 @@ func TestBudgetAlertRuleResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "version"),
 				),
 			},
-			// remove singular datasource from previous step so that it doesn't conflict with import tests
-			{
-				Config: config + compartmentIdVariableStr + AlertRuleResourceConfig,
-			},
 		},
 	})
 }