Add support for moving Compartment tree across compartments

Author: parrneet

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Support for moving `oci_kms_key` and `oci_kms_vault` Across Compartments
 - Support for moving `core_instance` resources across compartments
 - Support for LBaaS Cookie Insertion (Sticky Cookie) 
+- Support for moving `identity_compartment` resource tree across compartments
 
 ## 3.33.0 (July 10, 2019)
 

oci/identity_compartment_resource.go

@@ -36,7 +36,6 @@ func IdentityCompartmentResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 				Optional: true,
-				ForceNew: true,
 			},
 			"enable_delete": {
 				Type:     schema.TypeBool,
@@ -277,6 +276,15 @@ func (s *IdentityCompartmentResourceCrud) Get() error {
 }
 
 func (s *IdentityCompartmentResourceCrud) 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_identity.UpdateCompartmentRequest{}
 
 	tmp := s.D.Id()
@@ -362,3 +370,23 @@ func (s *IdentityCompartmentResourceCrud) SetData() error {
 
 	return nil
 }
+
+func (s *IdentityCompartmentResourceCrud) updateCompartment(compartment interface{}) error {
+	changeCompartmentRequest := oci_identity.MoveCompartmentRequest{}
+
+	idTmp := s.D.Id()
+	changeCompartmentRequest.CompartmentId = &idTmp
+
+	if targetCompartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := targetCompartmentId.(string)
+		changeCompartmentRequest.TargetCompartmentId = &tmp
+	}
+
+	changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "identity")
+
+	_, err := s.Client.MoveCompartment(context.Background(), changeCompartmentRequest)
+	if err != nil {
+		return err
+	}
+	return nil
+}

oci/identity_compartment_test.go

@@ -28,7 +28,7 @@ var (
 	}
 
 	compartmentDataSourceRepresentation = map[string]interface{}{
-		"compartment_id":            Representation{repType: Required, create: `${var.tenancy_ocid}`},
+		"compartment_id":            Representation{repType: Required, create: `${var.compartment_id}`},
 		"access_level":              Representation{repType: Optional, create: `ANY`},
 		"compartment_id_in_subtree": Representation{repType: Optional, create: `false`},
 		"filter":                    RepresentationGroup{Required, compartmentDataSourceFilterRepresentation}}
@@ -38,7 +38,7 @@ var (
 	}
 
 	compartmentRepresentation = map[string]interface{}{
-		"compartment_id": Representation{repType: Required, create: `${var.tenancy_ocid}`},
+		"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
 		"description":    Representation{repType: Required, create: `For network components`, update: `description2`},
 		"name":           Representation{repType: Required, create: `Network`, update: `name2`},
 		"defined_tags":   Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
@@ -57,7 +57,9 @@ func TestIdentityCompartmentResource_basic(t *testing.T) {
 
 	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
-	tenancyId := getEnvSettingWithBlankDefault("tenancy_ocid")
+
+	compartmentIdU := getEnvSettingWithDefault("compartment_id_for_update", compartmentId)
+	compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
 
 	resourceName := "oci_identity_compartment.test_compartment"
 	datasourceName := "data.oci_identity_compartments.test_compartments"
@@ -77,7 +79,7 @@ func TestIdentityCompartmentResource_basic(t *testing.T) {
 				Config: config + compartmentIdVariableStr + CompartmentResourceDependencies +
 					generateResourceFromRepresentationMap("oci_identity_compartment", "test_compartment", Required, Create, compartmentRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "compartment_id", tenancyId),
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(resourceName, "description", "For network components"),
 					resource.TestCheckResourceAttr(resourceName, "name", "Network"),
 
@@ -92,7 +94,7 @@ func TestIdentityCompartmentResource_basic(t *testing.T) {
 				Config: config + compartmentIdVariableStr + CompartmentResourceDependencies +
 					generateResourceFromRepresentationMap("oci_identity_compartment", "test_compartment", Optional, Create, compartmentRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "compartment_id", tenancyId),
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
 					resource.TestCheckResourceAttr(resourceName, "description", "For network components"),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
@@ -108,12 +110,39 @@ func TestIdentityCompartmentResource_basic(t *testing.T) {
 				),
 			},
 
+			// verify update to the compartment (the compartment will be switched back in the next step)
+			{
+				Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + CompartmentResourceDependencies +
+					generateResourceFromRepresentationMap("oci_identity_compartment", "test_compartment", Optional, Create,
+						representationCopyWithNewProperties(compartmentRepresentation, map[string]interface{}{
+							"compartment_id": Representation{repType: Required, create: `${var.compartment_id_for_update}`},
+						})),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
+					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "description", "For network components"),
+					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttr(resourceName, "name", "Network"),
+					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 + CompartmentResourceDependencies +
 					generateResourceFromRepresentationMap("oci_identity_compartment", "test_compartment", Optional, Update, compartmentRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "compartment_id", tenancyId),
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
 					resource.TestCheckResourceAttr(resourceName, "description", "description2"),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
@@ -139,11 +168,11 @@ func TestIdentityCompartmentResource_basic(t *testing.T) {
 					generateResourceFromRepresentationMap("oci_identity_compartment", "test_compartment", Optional, Update, compartmentRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(datasourceName, "access_level", "ANY"),
-					resource.TestCheckResourceAttr(datasourceName, "compartment_id", tenancyId),
+					resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(datasourceName, "compartment_id_in_subtree", "false"),
 
 					resource.TestCheckResourceAttr(datasourceName, "compartments.#", "1"),
-					resource.TestCheckResourceAttr(datasourceName, "compartments.0.compartment_id", tenancyId),
+					resource.TestCheckResourceAttr(datasourceName, "compartments.0.compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(datasourceName, "compartments.0.defined_tags.%", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "compartments.0.description", "description2"),
 					resource.TestCheckResourceAttr(datasourceName, "compartments.0.freeform_tags.%", "1"),
@@ -159,7 +188,7 @@ func TestIdentityCompartmentResource_basic(t *testing.T) {
 					generateDataSourceFromRepresentationMap("oci_identity_compartment", "test_compartment", Required, Create, compartmentSingularDataSourceRepresentation) +
 					compartmentIdVariableStr + CompartmentResourceConfig,
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrSet(singularDatasourceName, "compartment_id"),
+					resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(singularDatasourceName, "defined_tags.%", "1"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "description", "description2"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),

website/docs/d/identity_compartments.html.markdown

@@ -34,7 +34,7 @@ See [Where to Get the Tenancy's OCID and User's OCID](https://docs.cloud.oracle.
 ```hcl
 data "oci_identity_compartments" "test_compartments" {
 	#Required
-	compartment_id = "${var.tenancy_ocid}"
+	compartment_id = "${var.compartment_id}"
 
 	#Optional
 	access_level = "${var.compartment_access_level}"

website/docs/r/identity_compartment.html.markdown

@@ -34,7 +34,7 @@ not have to be unique, and you can change it anytime with
 ```hcl
 resource "oci_identity_compartment" "test_compartment" {
 	#Required
-	compartment_id = "${var.tenancy_ocid}"
+	compartment_id = "${var.compartment_id}"
 	description = "${var.compartment_description}"
 	name = "${var.compartment_name}"
 
@@ -48,7 +48,7 @@ resource "oci_identity_compartment" "test_compartment" {
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) The OCID of the parent compartment containing the compartment.
+* `compartment_id` - (Required) (Updatable) The OCID of the parent compartment containing the compartment.
 * `defined_tags` - (Optional) (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` 
 * `description` - (Required) (Updatable) The description you assign to the compartment during creation. Does not have to be unique, and it's changeable. 
 * `freeform_tags` - (Optional) (Updatable) Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}`