Added implemetation for updatecompartment to managed core resources

Author: srishtipmishra

CHANGELOG.md

@@ -10,6 +10,7 @@
 - Support Update `DrgAttachment` of types `Virtual_Circuit`, `RPC` and `IPSec`
 - Support for E3 Flex Notebooks added to `datascience`
 - Support for Non-Rolling patch mode added to `database_maintenance_run_resource`
+- Support for update compartment for `oci_core_default_security_list`, `oci_core_default_dhcp_options`, `oci_core_default_route_table`
 
 ## 4.27.0 (May 19, 2021)
 

oci/core_dhcp_options_resource_test.go

@@ -19,6 +19,7 @@ import (
 var defaultDhcpOpts = `
 resource "oci_core_default_dhcp_options" "default" {
 	manage_default_resource_id = "${oci_core_virtual_network.t.default_dhcp_options_id}"
+	compartment_id = "${var.compartment_id}"
 	options {
 		type = "DomainNameServer"
 		server_type = "CustomDnsServer"
@@ -55,6 +56,10 @@ func TestResourceCoreDHCPOptions_basic(t *testing.T) {
 
 	provider := testAccProvider
 
+	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdU := getEnvSettingWithDefault("compartment_id_for_update", compartmentId)
+	compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
+
 	config := legacyTestProviderConfig() + `
 	resource "oci_core_virtual_network" "t" {
 		cidr_block = "10.0.0.0/16"
@@ -178,7 +183,7 @@ func TestResourceCoreDHCPOptions_basic(t *testing.T) {
 				ExpectError: regexp.MustCompile(".*JSON input"),
 			},
 			{
-				Config: config + additionalDhcpOption4 + defaultDhcpOpts,
+				Config: config + additionalDhcpOption4 + defaultDhcpOpts + compartmentIdUVariableStr,
 				Check: resource.ComposeAggregateTestCheckFunc(
 
 					resource.TestCheckResourceAttr("oci_core_dhcp_options.opt1", "display_name", "display_name1"),
@@ -251,8 +256,7 @@ func TestResourceCoreDHCPOptions_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("oci_core_default_dhcp_options.default", "time_created"),
 					resource.TestCheckResourceAttr("oci_core_default_dhcp_options.default", "state", string(core.DhcpOptionsLifecycleStateAvailable)),
 					resource.TestCheckNoResourceAttr("oci_core_default_dhcp_options.default", "vcn_id"),
-					resource.TestCheckNoResourceAttr("oci_core_default_dhcp_options.default", "compartment_id"),
-
+					resource.TestCheckResourceAttr("oci_core_default_dhcp_options.default", "compartment_id", compartmentIdU),
 					func(s *terraform.State) (err error) {
 						if resDefaultId, err = fromInstanceState(s, "oci_core_default_dhcp_options.default", "id"); err != nil {
 							return err
@@ -286,7 +290,6 @@ func TestResourceCoreDHCPOptions_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("oci_core_default_dhcp_options.default", "time_created"),
 					resource.TestCheckResourceAttr("oci_core_default_dhcp_options.default", "state", string(core.DhcpOptionsLifecycleStateAvailable)),
 					resource.TestCheckNoResourceAttr("oci_core_default_dhcp_options.default", "vcn_id"),
-					resource.TestCheckNoResourceAttr("oci_core_default_dhcp_options.default", "compartment_id"),
 
 					func(s *terraform.State) (err error) {
 						resId2, err = fromInstanceState(s, "oci_core_default_dhcp_options.default", "id")

oci/core_route_table_resource_test.go

@@ -299,6 +299,8 @@ func TestResourceCoreRouteTable_defaultResource(t *testing.T) {
 			display_name = "-tf-internet-gateway"
 		}`
 
+	compartmentIdU := getEnvSettingWithDefault("compartment_id_for_update", compartmentId)
+	compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
 	resourceName := "oci_core_route_table.t"
 	defaultResourceName := "oci_core_default_route_table.default"
 
@@ -356,6 +358,7 @@ func TestResourceCoreRouteTable_defaultResource(t *testing.T) {
 							"network_entity_id",
 						}),
 					resource.TestCheckResourceAttrSet(defaultResourceName, "manage_default_resource_id"),
+					resource.TestCheckResourceAttrSet(defaultResourceName, "compartment_id"),
 					resource.TestCheckResourceAttr(defaultResourceName, "state", string(core.RouteTableLifecycleStateAvailable)),
 					resource.TestCheckResourceAttrSet(defaultResourceName, "display_name"),
 					resource.TestCheckResourceAttr(defaultResourceName, "route_rules.#", "1"),
@@ -369,7 +372,7 @@ func TestResourceCoreRouteTable_defaultResource(t *testing.T) {
 			},
 			// verify update
 			{
-				Config: config + `
+				Config: compartmentIdUVariableStr + config + `
 					resource "oci_core_route_table" "t" {
 						compartment_id = "${var.compartment_id}"
 						vcn_id = "${oci_core_virtual_network.t.id}"
@@ -386,6 +389,7 @@ func TestResourceCoreRouteTable_defaultResource(t *testing.T) {
 					resource "oci_core_default_route_table" "default" {
 						manage_default_resource_id = "${oci_core_virtual_network.t.default_route_table_id}"
 						display_name = "default-tf-route-table"
+						compartment_id = "${var.compartment_id_for_update}"
 						route_rules {
 							cidr_block = "0.0.0.0/0"
 							network_entity_id = "${oci_core_internet_gateway.internet-gateway1.id}"
@@ -415,6 +419,7 @@ func TestResourceCoreRouteTable_defaultResource(t *testing.T) {
 						}),
 					resource.TestCheckResourceAttr(resourceName, "state", string(core.RouteTableLifecycleStateAvailable)),
 					resource.TestCheckResourceAttrSet(defaultResourceName, "manage_default_resource_id"),
+					resource.TestCheckResourceAttr(defaultResourceName, "compartment_id", compartmentIdU),
 					resource.TestCheckResourceAttr(defaultResourceName, "display_name", "default-tf-route-table"),
 					resource.TestCheckResourceAttr(defaultResourceName, "route_rules.#", "2"),
 					CheckResourceSetContainsElementWithProperties(defaultResourceName, "route_rules", map[string]string{
@@ -443,6 +448,7 @@ func TestResourceCoreRouteTable_defaultResource(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(defaultResourceName, "manage_default_resource_id"),
 					resource.TestCheckResourceAttrSet(defaultResourceName, "display_name"),
+					resource.TestCheckResourceAttrSet(defaultResourceName, "compartment_id"),
 					resource.TestCheckResourceAttr(defaultResourceName, "route_rules.#", "1"),
 					CheckResourceSetContainsElementWithProperties(defaultResourceName, "route_rules", map[string]string{
 						"cidr_block": "0.0.0.0/0",

oci/core_security_list_resource_test.go

@@ -4,6 +4,7 @@
 package oci
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/terraform-providers/terraform-provider-oci/httpreplay"
@@ -134,6 +135,7 @@ var fullConfig = `
 func (s *ResourceCoreSecurityListTestSuite) BuildTestsForFullConfig(resourceName, prefix string) []resource.TestCheckFunc {
 	return []resource.TestCheckFunc{
 		resource.TestCheckResourceAttr(resourceName, prefix+"display_name", "-tf-security_list"),
+		//resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 		resource.TestCheckResourceAttr(resourceName, prefix+"egress_security_rules.#", "4"),
 		CheckResourceSetContainsElementWithProperties(resourceName, prefix+"egress_security_rules", map[string]string{
 			"destination":    "0.0.0.0/1",
@@ -566,6 +568,9 @@ func (s *ResourceCoreSecurityListTestSuite) TestAccResourceCoreSecurityList_defa
 				}
 			}
 		}`
+	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdU := getEnvSettingWithDefault("compartment_id_for_update", compartmentId)
+	compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
 	resource.Test(s.T(), resource.TestCase{
 		Providers: s.Providers,
 		Steps: []resource.TestStep{
@@ -595,10 +600,11 @@ func (s *ResourceCoreSecurityListTestSuite) TestAccResourceCoreSecurityList_defa
 			},
 			// Update
 			{
-				Config: s.Config + `
+				Config: compartmentIdUVariableStr + s.Config + `
 					resource "oci_core_default_security_list" "default" {
 						manage_default_resource_id = "${oci_core_virtual_network.t.default_security_list_id}"
 						display_name = "default-tf-security_list-updated"
+						compartment_id = "${var.compartment_id_for_update}"
 						egress_security_rules {
 							destination = "0.0.0.0/0"
 							protocol = "17"
@@ -654,6 +660,7 @@ func (s *ResourceCoreSecurityListTestSuite) TestAccResourceCoreSecurityList_defa
 					},
 						nil),
 					resource.TestCheckNoResourceAttr(s.DefaultResourceName, "ingress_security_rules.2.udp_options"),
+					resource.TestCheckResourceAttr(s.DefaultResourceName, "compartment_id", compartmentIdU),
 				),
 			},
 			// Verify removing the default resource

oci/helpers_core.go

@@ -41,7 +41,12 @@ func ConvertToDefaultVcnResourceSchema(resourceSchema *schema.Resource) *schema.
 		ForceNew: true,
 	}
 
-	delete(resourceSchema.Schema, "compartment_id")
+	resourceSchema.Schema["compartment_id"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Optional: true,
+		Computed: true,
+	}
+
 	delete(resourceSchema.Schema, "vcn_id")
 
 	return resourceSchema