bugfix for the restriction on infoblox_ipvX_network resource updates for 'gateway' and 'reserve_ip'/'reserve_ipv6' fields (#196)

Author: skudriavtsev

infoblox/resource_infoblox_network.go

@@ -51,6 +51,7 @@ func resourceNetwork() *schema.Resource {
 				Optional:    true,
 				Description: "Gateway's IP address of the network. By default, the first IP address is set as gateway address; if the value is 'none' then the network has no gateway.",
 				Computed:    true,
+				// TODO: implement full support for this field
 			},
 			"comment": {
 				Type:        schema.TypeString,
@@ -200,7 +201,13 @@ func resourceNetworkRead(d *schema.ResourceData, m interface{}) error {
 	d.SetId(obj.Ref)
 	return nil
 }
-func resourceNetworkUpdate(d *schema.ResourceData, m interface{}) error {
+func resourceNetworkUpdate(d *schema.ResourceData, m interface{}) (err error) {
+
+	defer func() {
+		if err != nil {
+			d.Partial(true)
+		}
+	}()
 
 	networkViewName := d.Get("network_view").(string)
 	if d.HasChange("network_view") {
@@ -212,13 +219,16 @@ func resourceNetworkUpdate(d *schema.ResourceData, m interface{}) error {
 	if d.HasChange("reserve_ip") {
 		return fmt.Errorf("changing the value of 'reserve_ip' field is not allowed")
 	}
+	if d.HasChange("reserve_ipv6") {
+		return fmt.Errorf("changing the value of 'reserve_ipv6' field is not allowed")
+	}
 	if d.HasChange("gateway") {
 		return fmt.Errorf("changing the value of 'gateway' field is not allowed")
 	}
 	extAttrJSON := d.Get("ext_attrs").(string)
 	extAttrs := make(map[string]interface{})
 	if extAttrJSON != "" {
-		if err := json.Unmarshal([]byte(extAttrJSON), &extAttrs); err != nil {
+		if err = json.Unmarshal([]byte(extAttrJSON), &extAttrs); err != nil {
 			return fmt.Errorf("cannot process 'ext_attrs' field: %s", err.Error())
 		}
 	}
@@ -241,8 +251,6 @@ func resourceNetworkUpdate(d *schema.ResourceData, m interface{}) error {
 		comment = commentVal.(string)
 	}
 
-	var err error
-
 	Network, err = objMgr.UpdateNetwork(d.Id(), extAttrs, comment)
 	if err != nil {
 		return fmt.Errorf("Updation of IPv4 Network under network view '%s' failed: '%s'", networkViewName, err.Error())

infoblox/resource_infoblox_network_test.go

@@ -2,42 +2,14 @@ package infoblox
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	ibclient "github.com/infobloxopen/infoblox-go-client/v2"
 )
 
-var testAccresourceIPv4NetworkCreate = fmt.Sprintf(`
-resource "infoblox_ipv4_network" "foo"{
-	network_view="default"
-	cidr="10.10.0.0/24"
-    reserve_ip = 5
-    gateway = "10.10.0.250"
-	comment = "10.0.0.0/24 network created"
-	ext_attrs = jsonencode({
-		"Network Name"= "demo-network"
-		"Tenant ID" = "terraform_test_tenant"
-		"Location" = "Test loc."
-		"Site" = "Test site"
-	  })
-	}`)
-
-var testAccresourceIPv6NetworkCreate = fmt.Sprintf(`
-	resource "infoblox_ipv6_network" "foo"{
-		network_view="default"
-		cidr="2001:db8:abcd:12::/64"
-                reserve_ipv6 = 10
-		comment = "2001:db8:abcd:12::/64 network created"
-		ext_attrs = jsonencode({
-			"Tenant ID" = "terraform_test_tenant"
-			"Network Name"= "demo-network"
-			"Location" = "Test loc."
-			"Site" = "Test site"
-		})
-	}`)
-
 func validateNetwork(
 	resourceName string,
 	expectedValue *ibclient.Network) resource.TestCheckFunc {
@@ -122,14 +94,29 @@ func testAccCheckNetworkDestroy(s *terraform.State) error {
 	return nil
 }
 
+var updateNotAllowedErrorRegexp = regexp.MustCompile("changing the value of '.+' field is not allowed")
+
 func TestAcc_resourceNetwork_ipv4(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckNetworkDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccresourceIPv4NetworkCreate,
+				Config: `
+					resource "infoblox_ipv4_network" "foo"{
+						network_view="default"
+						cidr="10.10.0.0/24"
+						reserve_ip = 5
+						gateway = "10.10.0.250"
+						comment = "10.0.0.0/24 network created"
+						ext_attrs = jsonencode({
+							"Network Name"= "demo-network"
+							"Tenant ID" = "terraform_test_tenant"
+							"Location" = "Test loc."
+							"Site" = "Test site"
+						  })
+						}`,
 				Check: validateNetwork(
 					"infoblox_ipv4_network.foo",
 					&ibclient.Network{
@@ -144,6 +131,76 @@ func TestAcc_resourceNetwork_ipv4(t *testing.T) {
 					},
 				),
 			},
+			{
+				Config: `
+					resource "infoblox_ipv4_network" "foo"{
+						network_view="default"
+						cidr="10.10.0.0/24"
+						reserve_ip = 6
+						gateway = "10.10.0.250"
+						comment = "10.0.0.0/24 network created"
+						ext_attrs = jsonencode({
+							"Network Name"= "demo-network"
+							"Tenant ID" = "terraform_test_tenant"
+							"Location" = "Test loc."
+							"Site" = "Test site"
+						  })
+						}`,
+				ExpectError: updateNotAllowedErrorRegexp,
+			},
+			{
+				Config: `
+					resource "infoblox_ipv4_network" "foo"{
+						network_view="default"
+						cidr="10.10.0.0/24"
+						reserve_ip = 6
+						gateway = "10.10.0.250"
+						comment = "10.0.0.0/24 network created"
+						ext_attrs = jsonencode({
+							"Network Name"= "demo-network"
+							"Tenant ID" = "terraform_test_tenant"
+							"Location" = "Test loc."
+							"Site" = "Test site"
+						  })
+						}`,
+				// double-check that the next update (with the same changes) returns an error as well
+				// (in case the field to be updated is 'computed' and the main code do not clear it to the previous state)
+				ExpectError: updateNotAllowedErrorRegexp,
+			},
+			{
+				Config: `
+					resource "infoblox_ipv4_network" "foo"{
+						network_view="default"
+						cidr="10.10.0.0/24"
+						reserve_ip = 5
+						gateway = "10.10.0.251"
+						comment = "10.0.0.0/24 network created"
+						ext_attrs = jsonencode({
+							"Network Name"= "demo-network"
+							"Tenant ID" = "terraform_test_tenant"
+							"Location" = "Test loc."
+							"Site" = "Test site"
+						  })
+						}`,
+				ExpectError: updateNotAllowedErrorRegexp,
+			},
+			{
+				Config: `
+					resource "infoblox_ipv4_network" "foo"{
+						network_view="default"
+						cidr="10.10.0.0/24"
+						reserve_ip = 5
+						gateway = "10.10.0.251"
+						comment = "10.0.0.0/24 network created"
+						ext_attrs = jsonencode({
+							"Network Name"= "demo-network"
+							"Tenant ID" = "terraform_test_tenant"
+							"Location" = "Test loc."
+							"Site" = "Test site"
+						  })
+						}`,
+				ExpectError: updateNotAllowedErrorRegexp,
+			},
 		},
 	})
 }
@@ -155,7 +212,19 @@ func TestAcc_resourceNetwork_ipv6(t *testing.T) {
 		CheckDestroy: testAccCheckNetworkDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccresourceIPv6NetworkCreate,
+				Config: `
+					resource "infoblox_ipv6_network" "foo"{
+						network_view="default"
+						cidr="2001:db8:abcd:12::/64"
+						reserve_ipv6 = 10
+						comment = "2001:db8:abcd:12::/64 network created"
+						ext_attrs = jsonencode({
+							"Tenant ID" = "terraform_test_tenant"
+							"Network Name"= "demo-network"
+							"Location" = "Test loc."
+							"Site" = "Test site"
+						})
+					}`,
 				Check: validateNetwork(
 					"infoblox_ipv6_network.foo",
 					&ibclient.Network{
@@ -170,6 +239,38 @@ func TestAcc_resourceNetwork_ipv6(t *testing.T) {
 					},
 				),
 			},
+			{
+				Config: `
+					resource "infoblox_ipv6_network" "foo"{
+						network_view="default"
+						cidr="2001:db8:abcd:12::/64"
+						reserve_ipv6 = 11
+						comment = "2001:db8:abcd:12::/64 network created"
+						ext_attrs = jsonencode({
+							"Tenant ID" = "terraform_test_tenant"
+							"Network Name"= "demo-network"
+							"Location" = "Test loc."
+							"Site" = "Test site"
+						})
+					}`,
+				ExpectError: updateNotAllowedErrorRegexp,
+			},
+			{
+				Config: `
+					resource "infoblox_ipv6_network" "foo"{
+						network_view="default"
+						cidr="2001:db8:abcd:12::/64"
+						reserve_ipv6 = 11
+						comment = "2001:db8:abcd:12::/64 network created"
+						ext_attrs = jsonencode({
+							"Tenant ID" = "terraform_test_tenant"
+							"Network Name"= "demo-network"
+							"Location" = "Test loc."
+							"Site" = "Test site"
+						})
+					}`,
+				ExpectError: updateNotAllowedErrorRegexp,
+			},
 		},
 	})
 }