Fix ipv6 bug causing backwards incompatibility for vcn

Author: Hao Liu

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Fixed update and destroy operations for management resources for external databases
 - Fixed retry behavior for database and db_home resources to honor user timeouts 
 - Added Operations Insights doc update to `autonomous_database` resource
+- Fixed backward incompatibility of vcn resource caused due to `is_ipv6enabled` field
 
 ## 4.24.0 (April 29, 2021)
 

oci/core_vcn_realm_test.go

@@ -43,7 +43,7 @@ func TestGovSpecificCoreVcnResource_basic(t *testing.T) {
 			{
 				Config: config + compartmentIdVariableStr + VcnResourceDependencies +
 					generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Optional, Create, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
-						"is_ipv6enabled": Representation{repType: Optional, create: `true`},
+						"is_ipv6enabled": Representation{repType: Optional, create: `false`},
 					})),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "cidr_block", "10.0.0.0/16"),
@@ -53,8 +53,7 @@ func TestGovSpecificCoreVcnResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "dns_label", "dnslabel"),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttr(resourceName, "ipv6cidr_blocks.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "is_ipv6enabled", "true"),
+					resource.TestCheckResourceAttr(resourceName, "is_ipv6enabled", "false"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 
 					func(s *terraform.State) (err error) {
@@ -68,7 +67,7 @@ func TestGovSpecificCoreVcnResource_basic(t *testing.T) {
 			{
 				Config: config + compartmentIdVariableStr + VcnResourceDependencies +
 					generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Optional, Update, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
-						"is_ipv6enabled": Representation{repType: Optional, create: `true`},
+						"is_ipv6enabled": Representation{repType: Optional, update: `true`},
 					})),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "cidr_block", "10.0.0.0/16"),
@@ -97,7 +96,7 @@ func TestGovSpecificCoreVcnResource_basic(t *testing.T) {
 					generateDataSourceFromRepresentationMap("oci_core_vcns", "test_vcns", Optional, Update, vcnDataSourceRepresentation) +
 					compartmentIdVariableStr + VcnResourceDependencies +
 					generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Optional, Update, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
-						"is_ipv6enabled": Representation{repType: Optional, create: `true`},
+						"is_ipv6enabled": Representation{repType: Optional, update: `true`},
 					})),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),

oci/core_vcn_resource.go

@@ -77,7 +77,6 @@ func CoreVcnResource() *schema.Resource {
 				Type:     schema.TypeBool,
 				Optional: true,
 				Computed: true,
-				ForceNew: true,
 			},
 
 			// Computed
@@ -275,6 +274,19 @@ func (s *CoreVcnResourceCrud) Update() error {
 			}
 		}
 	}
+
+	if _, ok := s.D.GetOkExists("is_ipv6enabled"); ok && s.D.HasChange("is_ipv6enabled") {
+		enableIPv6Request := oci_core.AddIpv6VcnCidrRequest{}
+		tmp := s.D.Id()
+		enableIPv6Request.VcnId = &tmp
+		enableIPv6Request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+		_, err := s.Client.AddIpv6VcnCidr(context.Background(), enableIPv6Request)
+		if err != nil {
+			return err
+		}
+	}
+
 	request := oci_core.UpdateVcnRequest{}
 
 	if _, ok := s.D.GetOkExists("cidr_blocks"); ok && s.D.HasChange("cidr_blocks") {
@@ -371,6 +383,8 @@ func (s *CoreVcnResourceCrud) SetData() error {
 
 	if s.Res.Ipv6CidrBlocks != nil && len(s.Res.Ipv6CidrBlocks) > 0 {
 		s.D.Set("is_ipv6enabled", true)
+	} else {
+		s.D.Set("is_ipv6enabled", nil)
 	}
 
 	s.D.Set("state", s.Res.LifecycleState)

oci/core_vcn_test.go

@@ -162,7 +162,7 @@ func TestCoreVcnResource_basic(t *testing.T) {
 			{
 				Config: config + compartmentIdVariableStr + VcnResourceDependencies +
 					generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Optional, Update, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
-						"is_ipv6enabled": Representation{repType: Optional, create: `true`},
+						"is_ipv6enabled": Representation{repType: Optional, update: `true`},
 					})),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "cidr_block", "10.0.0.0/16"),
@@ -190,7 +190,7 @@ func TestCoreVcnResource_basic(t *testing.T) {
 					generateDataSourceFromRepresentationMap("oci_core_vcns", "test_vcns", Optional, Update, vcnDataSourceRepresentation) +
 					compartmentIdVariableStr + VcnResourceDependencies +
 					generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Optional, Update, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
-						"is_ipv6enabled": Representation{repType: Optional, create: `true`},
+						"is_ipv6enabled": Representation{repType: Optional, update: `true`},
 					})),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),

website/docs/r/core_vcn.html.markdown

@@ -90,7 +90,7 @@ The following arguments are supported:
 
 	Example: `vcn1` 
 * `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"}` 
-* `is_ipv6enabled` - (Optional) Whether IPv6 is enabled for the VCN. Default is `false`. You cannot change this later. If enabled, Oracle will assign the VCN a IPv6 /56 CIDR block. For important details about IPv6 addressing in a VCN, see [IPv6 Addresses](https://docs.cloud.oracle.com/iaas/Content/Network/Concepts/ipv6.htm).  Example: `true` 
+* `is_ipv6enabled` - (Optional) Whether IPv6 is enabled for the VCN. Default is `false`. If enabled, Oracle will assign the VCN a IPv6 /56 CIDR block. Once added the IPv6 CIDR block cannot be removed or modified. For important details about IPv6 addressing in a VCN, see [IPv6 Addresses](https://docs.cloud.oracle.com/iaas/Content/Network/Concepts/ipv6.htm).  Example: `true` 
 
 
 ** IMPORTANT **