megaport_aws_vxc: remove ForceNew from b_end arguments

Although they will result in a new interface on AWS, this is handled by Megaport and so the actual VXC resource we manage does not need to be recreated. Signed-off-by: Dimitrios Karagiannis <[email protected]>
utilitywarehouse · Jan 23, 2020 · 1e03152 · 1e03152
1 parent bd771cb
commit 1e03152
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/megaport/resource_megaport_aws_vxc.go b/megaport/resource_megaport_aws_vxc.go
@@ -70,7 +70,6 @@ func resourceMegaportVxcAwsEndElem() *schema.Resource {
 			"aws_account_id": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"aws_ip_address": {
 				Type:         schema.TypeString,
@@ -87,7 +86,6 @@ func resourceMegaportVxcAwsEndElem() *schema.Resource {
 			"customer_asn": {
 				Type:     schema.TypeInt,
 				Required: true,
-				ForceNew: true,
 			},
 			"customer_ip_address": {
 				Type:         schema.TypeString,

diff --git a/megaport/resource_megaport_aws_vxc_test.go b/megaport/resource_megaport_aws_vxc_test.go
@@ -18,8 +18,6 @@ func TestAccMegaportAwsVxc_basic(t *testing.T) {
 		port            api.Product
 	)
 	rName := "t" + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
-	rId := acctest.RandStringFromCharSet(12, "012346789")
-	rAsn := uint64(acctest.RandIntRange(1, 65535))
 	rand.Seed(time.Now().UnixNano())
 	n := &net.IPNet{
 		IP:   net.IPv4(169, 254, byte(rand.Intn(255)), byte(rand.Intn(63)*4+1)),
@@ -31,16 +29,24 @@ func TestAccMegaportAwsVxc_basic(t *testing.T) {
 	configValues := map[string]interface{}{
 		"uid":                 rName,
 		"location":            "Equinix LD5",
-		"aws_account_id":      rId,
-		"customer_asn":        rAsn,
+		"aws_account_id":      acctest.RandStringFromCharSet(12, "012346789"),
+		"customer_asn":        acctest.RandIntRange(1, 65535),
 		"aws_ip_address":      ipA,
 		"customer_ip_address": ipB,
 	}
 	cfg, err := newTestAccConfig("megaport_aws_vxc_basic", configValues, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
-	cfgUpdate, err := newTestAccConfig("megaport_aws_vxc_basic_update", configValues, 1)
+	configValuesUpdate := map[string]interface{}{
+		"uid":                 rName,
+		"location":            "Equinix LD5",
+		"aws_account_id":      acctest.RandStringFromCharSet(12, "012346789"),
+		"customer_asn":        acctest.RandIntRange(1, 65535),
+		"aws_ip_address":      ipA,
+		"customer_ip_address": ipB,
+	}
+	cfgUpdate, err := newTestAccConfig("megaport_aws_vxc_basic_update", configValuesUpdate, 1)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -63,11 +69,11 @@ func TestAccMegaportAwsVxc_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "a_end.0.vlan", "567"),
 					resource.TestCheckResourceAttrPair("megaport_aws_vxc.foo", "b_end.0.product_uid", "data.megaport_partner_port.aws", "id"),
 					resource.TestCheckResourceAttrSet("megaport_aws_vxc.foo", "b_end.0.connected_product_uid"),
-					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.aws_account_id", rId),
+					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.aws_account_id", configValues["aws_account_id"].(string)),
 					resource.TestCheckResourceAttrSet("megaport_aws_vxc.foo", "b_end.0.aws_connection_name"),
 					resource.TestCheckResourceAttrSet("megaport_aws_vxc.foo", "b_end.0.aws_ip_address"),
 					resource.TestCheckResourceAttrSet("megaport_aws_vxc.foo", "b_end.0.bgp_auth_key"),
-					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.customer_asn", strconv.Itoa(int(rAsn))),
+					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.customer_asn", strconv.Itoa(configValues["customer_asn"].(int))),
 					resource.TestCheckResourceAttrSet("megaport_aws_vxc.foo", "b_end.0.customer_ip_address"),
 					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.type", "private"),
 				),
@@ -85,17 +91,18 @@ func TestAccMegaportAwsVxc_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "a_end.0.vlan", "568"),
 					resource.TestCheckResourceAttrPair("megaport_aws_vxc.foo", "b_end.0.product_uid", "data.megaport_partner_port.aws", "id"),
 					resource.TestCheckResourceAttrSet("megaport_aws_vxc.foo", "b_end.0.connected_product_uid"),
-					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.aws_account_id", rId),
+					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.aws_account_id", configValuesUpdate["aws_account_id"].(string)),
 					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.aws_connection_name", rName),
 					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.aws_ip_address", ipA),
 					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.bgp_auth_key", rName),
-					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.customer_asn", strconv.Itoa(int(rAsn))),
+					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.customer_asn", strconv.Itoa(configValuesUpdate["customer_asn"].(int))),
 					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.customer_ip_address", ipB),
 					resource.TestCheckResourceAttr("megaport_aws_vxc.foo", "b_end.0.type", "private"),
 				),
 			},
 		},
 	})
+
 	if vxc.ProductUid != vxcUpdated.ProductUid {
 		t.Errorf("TestAccMegaportAwsVxc_basic: expected the VXC to be updated but the resource ids differ")
 	}