feat(instance): add support for tags in ip (scaleway#1130)

Author: remyleone

docs/resources/instance_ip.md

@@ -29,6 +29,7 @@ In addition to all above arguments, the following attributes are exported:
 - `address` - The IP address.
 - `reverse` - The reverse dns attached to this IP
 - `organization_id` - The organization ID the IP is associated with.
+- `tags` - The tags associated with the IP.
 
 ## Import
 

scaleway/resource_instance_ip.go

@@ -13,6 +13,7 @@ func resourceScalewayInstanceIP() *schema.Resource {
 	return &schema.Resource{
 		CreateContext: resourceScalewayInstanceIPCreate,
 		ReadContext:   resourceScalewayInstanceIPRead,
+		UpdateContext: resourceScalewayInstanceIPUpdate,
 		DeleteContext: resourceScalewayInstanceIPDelete,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
@@ -37,6 +38,14 @@ func resourceScalewayInstanceIP() *schema.Resource {
 				Computed:    true,
 				Description: "The server associated with this IP",
 			},
+			"tags": {
+				Type: schema.TypeList,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Optional:    true,
+				Description: "The tags associated with the ip",
+			},
 			"zone":            zoneSchema(),
 			"organization_id": organizationIDSchema(),
 			"project_id":      projectIDSchema(),
@@ -53,6 +62,7 @@ func resourceScalewayInstanceIPCreate(ctx context.Context, d *schema.ResourceDat
 	res, err := instanceAPI.CreateIP(&instance.CreateIPRequest{
 		Zone:    zone,
 		Project: expandStringPtr(d.Get("project_id")),
+		Tags:    expandStrings(d.Get("tags")),
 	}, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
@@ -62,6 +72,28 @@ func resourceScalewayInstanceIPCreate(ctx context.Context, d *schema.ResourceDat
 	return resourceScalewayInstanceIPRead(ctx, d, meta)
 }
 
+func resourceScalewayInstanceIPUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id())
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	req := &instance.UpdateIPRequest{
+		IP:   ID,
+		Zone: zone,
+	}
+
+	if d.HasChange("tags") {
+		req.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))
+	}
+
+	_, err = instanceAPI.UpdateIP(req, scw.WithContext(ctx))
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	return resourceScalewayInstanceIPRead(ctx, d, meta)
+}
+
 func resourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id())
 	if err != nil {
@@ -87,6 +119,7 @@ func resourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceData,
 	_ = d.Set("organization_id", res.IP.Organization)
 	_ = d.Set("project_id", res.IP.Project)
 	_ = d.Set("reverse", res.IP.Reverse)
+	_ = d.Set("tags", res.IP.Tags)
 
 	if res.IP.Server != nil {
 		_ = d.Set("server_id", newZonedIDString(res.IP.Zone, res.IP.Server.ID))

scaleway/resource_instance_ip_test.go

@@ -93,6 +93,48 @@ func TestAccScalewayInstanceIP_WithZone(t *testing.T) {
 	})
 }
 
+func TestAccScalewayInstanceIP_Tags(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+	resource.ParallelTest(t, resource.TestCase{
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayInstanceIPDestroy(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+						resource "scaleway_instance_ip" "main" {}
+					`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayInstanceIPExists(tt, "scaleway_instance_ip.main"),
+					resource.TestCheckNoResourceAttr("scaleway_instance_ip.main", "tags"),
+				),
+			},
+			{
+				Config: `
+						resource "scaleway_instance_ip" "main" {
+							tags = ["foo", "bar"]
+						}
+					`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayInstanceIPExists(tt, "scaleway_instance_ip.main"),
+					resource.TestCheckResourceAttr("scaleway_instance_ip.main", "tags.0", "foo"),
+					resource.TestCheckResourceAttr("scaleway_instance_ip.main", "tags.1", "bar"),
+				),
+			},
+			{
+				Config: `
+						resource "scaleway_instance_ip" "main" {
+						}
+					`,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckNoResourceAttr("scaleway_instance_ip.main", "tags"),
+					testAccCheckScalewayInstanceIPExists(tt, "scaleway_instance_ip.main"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckScalewayInstanceIPExists(tt *TestTools, name string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[name]