fix(vpc): reverse issue (scaleway#887)

* fix(vpc): reverse issue * fix(vpc): add test to check reverse and address * fix(vpc): double retry interval Co-authored-by: scaleway-bot <[email protected]>
clement-gilbert · Oct 6, 2021 · 178754e · 178754e
1 parent 198bbf8
commit 178754e
Show file tree

Hide file tree

Showing 8 changed files with 1,290 additions and 690 deletions.
diff --git a/scaleway/resource_vpc_public_gateway.go b/scaleway/resource_vpc_public_gateway.go
@@ -183,11 +183,12 @@ func resourceScalewayVPCPublicGatewayDelete(ctx context.Context, d *schema.Resou
 		return diag.FromErr(err)
 	}
 
+	retryInterval := 30 * time.Second
 	_, err = vpcgwAPI.WaitForGateway(&vpcgw.WaitForGatewayRequest{
 		GatewayID:     ID,
 		Zone:          zone,
 		Timeout:       scw.TimeDurationPtr(gatewayWaitForTimeout),
-		RetryInterval: DefaultWaitRetryInterval,
+		RetryInterval: &retryInterval,
 	}, scw.WithContext(ctx))
 
 	if err != nil && !is404Error(err) {

diff --git a/scaleway/resource_vpc_public_gateway_ip.go b/scaleway/resource_vpc_public_gateway_ip.go
@@ -34,15 +34,16 @@ func resourceScalewayVPCPublicGatewayIP() *schema.Resource {
 					Type: schema.TypeString,
 				},
 			},
+			"project_id": projectIDSchema(),
+			"zone":       zoneSchema(),
+			// Computed elements
+			"organization_id": organizationIDSchema(),
 			"reverse": {
 				Type:        schema.TypeString,
 				Optional:    true,
+				Computed:    true,
 				Description: "reverse domain name for the IP address",
 			},
-			"project_id": projectIDSchema(),
-			"zone":       zoneSchema(),
-			// Computed elements
-			"organization_id": organizationIDSchema(),
 			"created_at": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -74,6 +75,20 @@ func resourceScalewayVPCPublicGatewayIPCreate(ctx context.Context, d *schema.Res
 		return diag.FromErr(err)
 	}
 
+	reverse := d.Get("reverse")
+	if len(reverse.(string)) > 0 {
+		updateRequest := &vpcgw.UpdateIPRequest{
+			IPID:    res.ID,
+			Zone:    zone,
+			Tags:    scw.StringsPtr(expandStrings(d.Get("tags"))),
+			Reverse: expandStringPtr(reverse.(string)),
+		}
+		_, err = vpcgwAPI.UpdateIP(updateRequest, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	d.SetId(newZonedIDString(zone, res.ID))
 
 	return resourceScalewayVPCPublicGatewayIPRead(ctx, d, meta)
@@ -98,6 +113,7 @@ func resourceScalewayVPCPublicGatewayIPRead(ctx context.Context, d *schema.Resou
 	}
 
 	_ = d.Set("organization_id", ip.OrganizationID)
+	_ = d.Set("address", ip.Address.String())
 	_ = d.Set("project_id", ip.ProjectID)
 	_ = d.Set("created_at", ip.CreatedAt.Format(time.RFC3339))
 	_ = d.Set("updated_at", ip.UpdatedAt.Format(time.RFC3339))

diff --git a/scaleway/resource_vpc_public_gateway_ip_test.go b/scaleway/resource_vpc_public_gateway_ip_test.go
@@ -58,6 +58,10 @@ func TestAccScalewayVPCPublicGatewayIP_Basic(t *testing.T) {
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayVPCPublicGatewayIPExists(tt, "scaleway_vpc_public_gateway_ip.main"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_ip.main", "reverse"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_ip.main", "address"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_ip.main", "created_at"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_ip.main", "updated_at"),
 				),
 			},
 			{
@@ -72,6 +76,25 @@ func TestAccScalewayVPCPublicGatewayIP_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_vpc_public_gateway_ip.main", "tags.0", "tag0"),
 					resource.TestCheckResourceAttr("scaleway_vpc_public_gateway_ip.main", "tags.1", "tag1"),
 					resource.TestCheckResourceAttr("scaleway_vpc_public_gateway_ip.main", "reverse", "example.com"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_ip.main", "address"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_ip.main", "created_at"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_ip.main", "updated_at"),
+				),
+			},
+			{
+				Config: `
+					resource scaleway_vpc_public_gateway_ip main {
+						tags = ["tag2", "tag3"]
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayVPCPublicGatewayIPExists(tt, "scaleway_vpc_public_gateway_ip.main"),
+					resource.TestCheckResourceAttr("scaleway_vpc_public_gateway_ip.main", "tags.0", "tag2"),
+					resource.TestCheckResourceAttr("scaleway_vpc_public_gateway_ip.main", "tags.1", "tag3"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_ip.main", "reverse"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_ip.main", "address"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_ip.main", "created_at"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_ip.main", "updated_at"),
 				),
 			},
 		},

diff --git a/scaleway/testdata/data-source-baremetal-offer-basic.cassette.yaml b/scaleway/testdata/data-source-baremetal-offer-basic.cassette.yaml
diff --git a/scaleway/testdata/data-source-vpc-public-gateway-basic.cassette.yaml b/scaleway/testdata/data-source-vpc-public-gateway-basic.cassette.yaml
diff --git a/scaleway/testdata/vpc-public-gateway-attach-to-ip.cassette.yaml b/scaleway/testdata/vpc-public-gateway-attach-to-ip.cassette.yaml
diff --git a/scaleway/testdata/vpc-public-gateway-basic.cassette.yaml b/scaleway/testdata/vpc-public-gateway-basic.cassette.yaml