Bug Fix - Fix for VCN is_ipv6enabled plan drift on apply.

Author: nitimis

examples/networking/vcn/vcn.tf

@@ -39,7 +39,25 @@ resource "oci_core_vcn" "vcn" {
   security_attributes = {"sample-namespace.value": "examplevalue", "sample-namespace.mode": "examplemode"}
 }
 
+resource "oci_core_vcn" "test_vcn_ipv6" {
+  compartment_id = var.compartment_ocid
+  display_name = "test-vcn-ipv6"
+  cidr_blocks = [
+    "10.0.100.0/24",
+    "10.0.101.0/24",
+  ]
+  is_ipv6enabled = "true"
+  is_oracle_gua_allocation_enabled = "false"
+  ipv6private_cidr_blocks = [
+    "2a04:4447:f001:100::/64",
+  ]
+}
+
 output "vcn_id" {
   value = oci_core_vcn.vcn.id
 }
 
+output "vcn_ipv6_id" {
+  value = oci_core_vcn.test_vcn_ipv6.id
+}
+

internal/integrationtest/core_vcn_test.go

@@ -48,7 +48,7 @@ var (
 	CoreVcnRepresentation = map[string]interface{}{
 		"cidr_block":          acctest.Representation{RepType: acctest.Required, Create: `10.0.0.0/16`},
 		"compartment_id":      acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
-		"defined_tags":        acctest.Representation{RepType: acctest.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")}`},
+		"defined_tags":        acctest.Representation{RepType: acctest.Optional, Create: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"})}`, Update: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}"= "updatedValue"})}`},
 		"display_name":        acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"dns_label":           acctest.Representation{RepType: acctest.Optional, Create: `dnslabel`},
 		"freeform_tags":       acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
@@ -61,7 +61,7 @@ var (
 		"is_ipv6enabled":          acctest.Representation{RepType: acctest.Required, Create: `true`},
 		"ipv6private_cidr_blocks": acctest.Representation{RepType: acctest.Required, Create: []string{`fc00:1000::/56`}},
 		"compartment_id":          acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
-		"defined_tags":            acctest.Representation{RepType: acctest.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")}`},
+		"defined_tags":            acctest.Representation{RepType: acctest.Optional, Create: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}"= "value"})}`, Update: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}"= "updatedValue"})}`},
 		"display_name":            acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"dns_label":               acctest.Representation{RepType: acctest.Optional, Create: `dnslabel`},
 		"freeform_tags":           acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
@@ -103,7 +103,7 @@ func TestCoreVcnResource_basic(t *testing.T) {
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "cidr_block", "10.0.0.0/16"),
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
-
+				resource.TestCheckResourceAttr(resourceName, "is_ipv6enabled", "false"),
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
 					return err

internal/service/core/core_vcn_resource.go

@@ -597,10 +597,10 @@ func (s *CoreVcnResourceCrud) SetData() error {
 
 	s.D.Set("security_attributes", tfresource.SecurityAttributesToMap(s.Res.SecurityAttributes))
 
-	if s.Res.Ipv6CidrBlocks != nil && len(s.Res.Ipv6CidrBlocks) > 0 {
+	if (s.Res.Ipv6CidrBlocks != nil && len(s.Res.Ipv6CidrBlocks) > 0) || (s.Res.Ipv6PrivateCidrBlocks != nil && len(s.Res.Ipv6PrivateCidrBlocks) > 0) {
 		s.D.Set("is_ipv6enabled", true)
 	} else {
-		s.D.Set("is_ipv6enabled", nil)
+		s.D.Set("is_ipv6enabled", false)
 	}
 
 	s.D.Set("state", s.Res.LifecycleState)