Release v3.32.0

Release v3.32.0

Author: dshelbyo

.travis.yml

@@ -21,6 +21,7 @@ script:
 branches:
   only:
   - master
+  - release_gh
 matrix:
   fast_finish: true
   allow_failures:

CHANGELOG.md

@@ -1,4 +1,13 @@
 ## 3.32.0 (Unreleased)
+
+### Added
+- Support for moving Images across compartments
+- Support for moving Instance Pools and Instance Configurations across compartments
+- Support for compartment move of auto-scaling configuration resource
+
+### Fixed
+- We were throwing an error for some resources if the resource no longer existed during refresh. This is fixed now. 
+
 ## 3.31.0 (June 26, 2019)
 
 ### Added

go.mod

@@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-oci
 require (
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
 	github.com/hashicorp/terraform v0.12.3-0.20190619193004-2ab2796c932c
-	github.com/oracle/oci-go-sdk v5.12.0+incompatible
+	github.com/oracle/oci-go-sdk v5.13.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

@@ -264,6 +264,8 @@ github.com/oracle/oci-go-sdk v5.11.0+incompatible h1:p1gTVX65AZbH/x8w13fLRbAsGqd
 github.com/oracle/oci-go-sdk v5.11.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v5.12.0+incompatible h1:y1ISDE4Rq7dMTl+M2F10TuNQy4Q0to7/Jr4hGRQoS/o=
 github.com/oracle/oci-go-sdk v5.12.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v5.13.0+incompatible h1:CAs2Aq71RxYwDBT+L0z4cLmW20AM8PermmlO0Y8GfuA=
+github.com/oracle/oci-go-sdk v5.13.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/auto_scaling_auto_scaling_configuration_resource.go

@@ -57,7 +57,6 @@ func AutoScalingAutoScalingConfigurationResource() *schema.Resource {
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"policies": {
 				Type:     schema.TypeList,
@@ -398,6 +397,15 @@ func (s *AutoScalingAutoScalingConfigurationResourceCrud) Get() error {
 }
 
 func (s *AutoScalingAutoScalingConfigurationResourceCrud) Update() error {
+	if compartment, ok := s.D.GetOkExists("compartment_id"); ok && s.D.HasChange("compartment_id") {
+		oldRaw, newRaw := s.D.GetChange("compartment_id")
+		if newRaw != "" && oldRaw != "" {
+			err := s.updateCompartment(compartment)
+			if err != nil {
+				return err
+			}
+		}
+	}
 	request := oci_auto_scaling.UpdateAutoScalingConfigurationRequest{}
 
 	tmp := s.D.Id()
@@ -851,3 +859,21 @@ func autoScalingConfigurationPolicyRulesHashCodeForSets(v interface{}) int {
 	}
 	return hashcode.String(buf.String())
 }
+func (s *AutoScalingAutoScalingConfigurationResourceCrud) updateCompartment(compartment interface{}) error {
+	changeCompartmentRequest := oci_auto_scaling.ChangeAutoScalingConfigurationCompartmentRequest{}
+
+	idTmp := s.D.Id()
+	changeCompartmentRequest.AutoScalingConfigurationId = &idTmp
+
+	compartmentTmp := compartment.(string)
+	changeCompartmentRequest.ChangeCompartmentDetails = oci_auto_scaling.ChangeAutoScalingCompartmentDetails{}
+	changeCompartmentRequest.ChangeCompartmentDetails.CompartmentId = &compartmentTmp
+
+	changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "auto_scaling")
+
+	_, err := s.Client.ChangeAutoScalingConfigurationCompartment(context.Background(), changeCompartmentRequest)
+	if err != nil {
+		return err
+	}
+	return nil
+}

oci/auto_scaling_auto_scaling_configuration_test.go

@@ -110,6 +110,9 @@ func TestAutoScalingAutoScalingConfigurationResource_basic(t *testing.T) {
 	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
 
+	compartmentIdU := getEnvSettingWithDefault("compartment_id_for_update", compartmentId)
+	compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
+
 	resourceName := "oci_autoscaling_auto_scaling_configuration.test_auto_scaling_configuration"
 	datasourceName := "data.oci_autoscaling_auto_scaling_configurations.test_auto_scaling_configurations"
 	singularDatasourceName := "data.oci_autoscaling_auto_scaling_configuration.test_auto_scaling_configuration"
@@ -231,6 +234,67 @@ func TestAutoScalingAutoScalingConfigurationResource_basic(t *testing.T) {
 				),
 			},
 
+			// verify update to the compartment (the compartment will be switched back in the next step)
+			{
+				Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + AutoScalingConfigurationResourceDependencies +
+					generateResourceFromRepresentationMap("oci_autoscaling_auto_scaling_configuration", "test_auto_scaling_configuration", Optional, Create,
+						representationCopyWithNewProperties(autoScalingConfigurationRepresentation, map[string]interface{}{
+							"compartment_id": Representation{repType: Required, create: `${var.compartment_id_for_update}`},
+						})),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.#", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "auto_scaling_resources.0.id"),
+					resource.TestCheckResourceAttr(resourceName, "auto_scaling_resources.0.type", "instancePool"),
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
+					resource.TestCheckResourceAttr(resourceName, "cool_down_in_seconds", "300"),
+					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "display_name", "example_autoscaling_configuration"),
+					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttr(resourceName, "is_enabled", "false"),
+					resource.TestCheckResourceAttr(resourceName, "policies.#", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "policies.0.id"),
+					resource.TestCheckResourceAttr(resourceName, "policies.0.capacity.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "policies.0.capacity.0.initial", "2"),
+					resource.TestCheckResourceAttr(resourceName, "policies.0.capacity.0.max", "3"),
+					resource.TestCheckResourceAttr(resourceName, "policies.0.capacity.0.min", "2"),
+					resource.TestCheckResourceAttr(resourceName, "policies.0.display_name", "example_autoscaling_configuration"),
+					resource.TestCheckResourceAttr(resourceName, "policies.0.policy_type", "threshold"),
+					resource.TestCheckResourceAttr(resourceName, "policies.0.rules.#", "2"),
+					CheckResourceSetContainsElementWithProperties(resourceName, "policies.0.rules", map[string]string{
+						"action.#":                      "1",
+						"action.0.type":                 "CHANGE_COUNT_BY",
+						"action.0.value":                "1",
+						"display_name":                  "scale out rule",
+						"metric.#":                      "1",
+						"metric.0.metric_type":          "CPU_UTILIZATION",
+						"metric.0.threshold.#":          "1",
+						"metric.0.threshold.0.operator": "GT",
+						"metric.0.threshold.0.value":    "1",
+					},
+						[]string{}),
+					CheckResourceSetContainsElementWithProperties(resourceName, "policies.0.rules", map[string]string{
+						"action.#":                      "1",
+						"action.0.type":                 "CHANGE_COUNT_BY",
+						"action.0.value":                "-1",
+						"display_name":                  "scale in rule",
+						"metric.#":                      "1",
+						"metric.0.metric_type":          "CPU_UTILIZATION",
+						"metric.0.threshold.#":          "1",
+						"metric.0.threshold.0.operator": "LT",
+						"metric.0.threshold.0.value":    "1",
+					},
+						[]string{}),
+					resource.TestCheckResourceAttrSet(resourceName, "policies.0.time_created"),
+					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+
+					func(s *terraform.State) (err error) {
+						resId, err = fromInstanceState(s, resourceName, "id")
+						return err
+					},
+				),
+			},
+
 			// verify updates to updatable parameters
 			{
 				Config: config + compartmentIdVariableStr + AutoScalingConfigurationResourceDependencies +

oci/core_dhcp_options_resource_test.go

@@ -50,7 +50,7 @@ var additionalDhcpOption4 = `
 //To avoid multiple applies we perform an apply after the create in order have the options match what the user has in the config
 //This test makes sure we handle that case correctly and that there is a non empty plan after the apply
 func TestResourceCoreDHCPOptions_avoidServiceDefault(t *testing.T) {
-	httpreplay.SetScenario("TestAccResourceCoreDHCPOptions_avoidServiceDefault")
+	httpreplay.SetScenario("TestResourceCoreDHCPOptions_avoidServiceDefault")
 	defer httpreplay.SaveScenario()
 
 	provider := testAccProvider
@@ -93,7 +93,7 @@ func TestResourceCoreDHCPOptions_avoidServiceDefault(t *testing.T) {
 }
 
 func TestResourceCoreDHCPOptions_basic(t *testing.T) {
-	httpreplay.SetScenario("TestAccResourceCoreDHCPOptions_basic")
+	httpreplay.SetScenario("TestResourceCoreDHCPOptions_basic")
 	defer httpreplay.SaveScenario()
 
 	var resDefaultId, resOpt4Id, resId2 string

oci/core_image_resource.go

@@ -33,7 +33,6 @@ func CoreImageResource() *schema.Resource {
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 
 			// Optional
@@ -352,6 +351,15 @@ func (s *CoreImageResourceCrud) Get() error {
 }
 
 func (s *CoreImageResourceCrud) Update() error {
+	if compartment, ok := s.D.GetOkExists("compartment_id"); ok && s.D.HasChange("compartment_id") {
+		oldRaw, newRaw := s.D.GetChange("compartment_id")
+		if newRaw != "" && oldRaw != "" {
+			err := s.updateCompartment(compartment)
+			if err != nil {
+				return err
+			}
+		}
+	}
 	request := oci_core.UpdateImageRequest{}
 
 	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {
@@ -509,3 +517,21 @@ func InstanceAgentFeaturesToMap(obj *oci_core.InstanceAgentFeatures) map[string]
 
 	return result
 }
+
+func (s *CoreImageResourceCrud) updateCompartment(compartment interface{}) error {
+	changeCompartmentRequest := oci_core.ChangeImageCompartmentRequest{}
+
+	compartmentTmp := compartment.(string)
+	changeCompartmentRequest.CompartmentId = &compartmentTmp
+
+	idTmp := s.D.Id()
+	changeCompartmentRequest.ImageId = &idTmp
+
+	changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	_, err := s.Client.ChangeImageCompartment(context.Background(), changeCompartmentRequest)
+	if err != nil {
+		return err
+	}
+	return nil
+}

oci/core_image_test.go

@@ -58,6 +58,9 @@ func TestCoreImageResource_basic(t *testing.T) {
 	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
 
+	compartmentIdU := getEnvSettingWithDefault("compartment_id_for_update", compartmentId)
+	compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
+
 	resourceName := "oci_core_image.test_image"
 	datasourceName := "data.oci_core_images.test_images"
 
@@ -114,6 +117,37 @@ func TestCoreImageResource_basic(t *testing.T) {
 				),
 			},
 
+			// verify update to the compartment (the compartment will be switched back in the next step)
+			{
+				Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + ImageResourceDependencies +
+					generateResourceFromRepresentationMap("oci_core_image", "test_image", Optional, Create,
+						representationCopyWithNewProperties(imageRepresentation, map[string]interface{}{
+							"compartment_id": Representation{repType: Required, create: `${var.compartment_id_for_update}`},
+						})),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
+					resource.TestCheckResourceAttrSet(resourceName, "create_image_allowed"),
+					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "display_name", "MyCustomImage"),
+					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttrSet(resourceName, "instance_id"),
+					resource.TestCheckResourceAttr(resourceName, "launch_mode", "NATIVE"),
+					resource.TestCheckResourceAttrSet(resourceName, "operating_system"),
+					resource.TestCheckResourceAttrSet(resourceName, "operating_system_version"),
+					resource.TestCheckResourceAttrSet(resourceName, "state"),
+					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+
+					func(s *terraform.State) (err error) {
+						resId2, err = fromInstanceState(s, resourceName, "id")
+						if resId != resId2 {
+							return fmt.Errorf("resource recreated when it was supposed to be updated")
+						}
+						return err
+					},
+				),
+			},
+
 			// verify updates to updatable parameters
 			{
 				Config: config + compartmentIdVariableStr + ImageResourceDependencies +

oci/core_instance_configuration_resource.go

@@ -30,7 +30,6 @@ func CoreInstanceConfigurationResource() *schema.Resource {
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"instance_details": {
 				Type:     schema.TypeList,
@@ -630,6 +629,15 @@ func (s *CoreInstanceConfigurationResourceCrud) Get() error {
 }
 
 func (s *CoreInstanceConfigurationResourceCrud) Update() error {
+	if compartment, ok := s.D.GetOkExists("compartment_id"); ok && s.D.HasChange("compartment_id") {
+		oldRaw, newRaw := s.D.GetChange("compartment_id")
+		if newRaw != "" && oldRaw != "" {
+			err := s.updateCompartment(compartment)
+			if err != nil {
+				return err
+			}
+		}
+	}
 	request := oci_core.UpdateInstanceConfigurationRequest{}
 
 	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {
@@ -1393,3 +1401,21 @@ func InstanceConfigurationVolumeSourceDetailsToMap(obj *oci_core.InstanceConfigu
 
 	return result
 }
+
+func (s *CoreInstanceConfigurationResourceCrud) updateCompartment(compartment interface{}) error {
+	changeCompartmentRequest := oci_core.ChangeInstanceConfigurationCompartmentRequest{}
+
+	compartmentTmp := compartment.(string)
+	changeCompartmentRequest.CompartmentId = &compartmentTmp
+
+	idTmp := s.D.Id()
+	changeCompartmentRequest.InstanceConfigurationId = &idTmp
+
+	changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	_, err := s.Client.ChangeInstanceConfigurationCompartment(context.Background(), changeCompartmentRequest)
+	if err != nil {
+		return err
+	}
+	return nil
+}