fix: optional strings update and skip empty updates (#1427)

Codelax · web-flow · commit ff4cb462b1ef · 2022-08-30T14:54:05.000+02:00
diff --git a/scaleway/helpers.go b/scaleway/helpers.go
@@ -503,6 +503,14 @@ func expandStringPtr(data interface{}) *string {
 	return scw.StringPtr(data.(string))
 }
 
+func expandUpdatedStringPtr(data interface{}) *string {
+	str := ""
+	if data != nil {
+		str = data.(string)
+	}
+	return &str
+}
+
 func expandBoolPtr(data interface{}) *bool {
 	if data == nil {
 		return nil
diff --git a/scaleway/resource_account_project.go b/scaleway/resource_account_project.go
@@ -94,11 +94,11 @@ func resourceScalewayAccountProjectUpdate(ctx context.Context, d *schema.Resourc
 	hasChanged := false
 
 	if d.HasChange("name") {
-		req.Name = expandStringPtr(d.Get("name"))
+		req.Name = expandUpdatedStringPtr(d.Get("name"))
 		hasChanged = true
 	}
 	if d.HasChange("description") {
-		req.Description = expandStringPtr(d.Get("description"))
+		req.Description = expandUpdatedStringPtr(d.Get("description"))
 		hasChanged = true
 	}
 
diff --git a/scaleway/resource_account_ssh_key.go b/scaleway/resource_account_ssh_key.go
@@ -89,7 +89,7 @@ func resourceScalewayAccountSSHKeyUpdate(ctx context.Context, d *schema.Resource
 	if d.HasChange("name") {
 		_, err := accountAPI.UpdateSSHKey(&account.UpdateSSHKeyRequest{
 			SSHKeyID: d.Id(),
-			Name:     expandStringPtr(d.Get("name")),
+			Name:     expandUpdatedStringPtr(d.Get("name")),
 		}, scw.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)
diff --git a/scaleway/resource_baremetal_server.go b/scaleway/resource_baremetal_server.go
@@ -228,15 +228,33 @@ func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.Resour
 		return diag.FromErr(err)
 	}
 
-	_, err = baremetalAPI.UpdateServer(&baremetal.UpdateServerRequest{
-		Zone:        zonedID.Zone,
-		ServerID:    zonedID.ID,
-		Name:        expandStringPtr(d.Get("name")),
-		Description: expandStringPtr(d.Get("description")),
-		Tags:        expandUpdatedStringsPtr(d.Get("tags")),
-	}, scw.WithContext(ctx))
-	if err != nil {
-		return diag.FromErr(err)
+	req := &baremetal.UpdateServerRequest{
+		Zone:     zonedID.Zone,
+		ServerID: zonedID.ID,
+	}
+
+	hasChanged := false
+
+	if d.HasChange("name") {
+		req.Name = expandUpdatedStringPtr("name")
+		hasChanged = true
+	}
+
+	if d.HasChange("description") {
+		req.Description = expandUpdatedStringPtr("description")
+		hasChanged = true
+	}
+
+	if d.HasChange("tags") {
+		req.Tags = expandUpdatedStringsPtr(d.Get("tags"))
+		hasChanged = true
+	}
+
+	if hasChanged {
+		_, err = baremetalAPI.UpdateServer(req, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	if d.HasChanges("os", "ssh_key_ids") {
diff --git a/scaleway/resource_container.go b/scaleway/resource_container.go
@@ -313,7 +313,7 @@ func resourceScalewayContainerUpdate(ctx context.Context, d *schema.ResourceData
 	}
 
 	if d.HasChanges("description") {
-		req.Description = expandStringPtr(d.Get("description"))
+		req.Description = expandUpdatedStringPtr(d.Get("description"))
 	}
 
 	if d.HasChanges("registry_image") {
diff --git a/scaleway/resource_container_namespace.go b/scaleway/resource_container_namespace.go
@@ -145,8 +145,7 @@ func resourceScalewayContainerNamespaceUpdate(ctx context.Context, d *schema.Res
 	}
 
 	if d.HasChange("description") {
-		description := d.Get("description").(string)
-		req.Description = &description
+		req.Description = expandUpdatedStringPtr(d.Get("description"))
 	}
 
 	if d.HasChanges("environment_variables") {
diff --git a/scaleway/resource_flexible_ip.go b/scaleway/resource_flexible_ip.go
@@ -161,26 +161,33 @@ func resourceScalewayFlexibleIPUpdate(ctx context.Context, d *schema.ResourceDat
 		FipID: flexibleIP.ID,
 	}
 
+	hasChanged := false
+
 	if d.HasChanges("reverse") {
-		updateRequest.Reverse = expandStringPtr(d.Get("reverse"))
+		updateRequest.Reverse = expandUpdatedStringPtr(d.Get("reverse"))
+		hasChanged = true
 	}
 
 	if d.HasChange("tags") {
-		updateRequest.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))
+		updateRequest.Tags = expandUpdatedStringsPtr(d.Get("tags"))
+		hasChanged = true
 	}
 
 	if d.HasChange("description") {
-		updateRequest.Description = expandStringPtr(d.Get("description"))
+		updateRequest.Description = expandUpdatedStringPtr(d.Get("description"))
+		hasChanged = true
 	}
 
-	_, err = fipAPI.UpdateFlexibleIP(updateRequest, scw.WithContext(ctx))
-	if err != nil {
-		return diag.FromErr(err)
-	}
+	if hasChanged {
+		_, err = fipAPI.UpdateFlexibleIP(updateRequest, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
 
-	_, err = waitFlexibleIP(ctx, fipAPI, zone, ID, d.Timeout(schema.TimeoutUpdate))
-	if err != nil {
-		return diag.FromErr(err)
+		_, err = waitFlexibleIP(ctx, fipAPI, zone, ID, d.Timeout(schema.TimeoutUpdate))
+		if err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	if d.HasChange("server_id") {
diff --git a/scaleway/resource_flexible_ip_test.go b/scaleway/resource_flexible_ip_test.go
@@ -124,7 +124,7 @@ func TestAccScalewayFlexibleIP_CreateAndAttachToBaremetalServer(t *testing.T) {
 						data "scaleway_baremetal_os" "by_id" {
 							zone = "fr-par-2"
 							name = "Ubuntu"
-							version = "20.04 LTS (Focal Fossa)"						
+							version = "22.04 LTS (Jammy Jellyfish)"						
 						}
 
 						data "scaleway_baremetal_offer" "my_offer" {
@@ -190,7 +190,7 @@ func TestAccScalewayFlexibleIP_AttachAndDetachFromBaremetalServer(t *testing.T)
 						data "scaleway_baremetal_os" "by_id" {
 							zone = "fr-par-2"
 							name = "Ubuntu"
-							version = "20.04 LTS (Focal Fossa)"						
+							version = "22.04 LTS (Jammy Jellyfish)"						
 						}
 
 						data "scaleway_baremetal_offer" "my_offer" {
diff --git a/scaleway/resource_function.go b/scaleway/resource_function.go
@@ -299,7 +299,7 @@ func resourceScalewayFunctionUpdate(ctx context.Context, d *schema.ResourceData,
 	}
 
 	if d.HasChange("description") {
-		req.Description = expandStringPtr(d.Get("description"))
+		req.Description = expandUpdatedStringPtr(d.Get("description"))
 		updated = true
 	}
 
diff --git a/scaleway/resource_function_namespace.go b/scaleway/resource_function_namespace.go
@@ -142,7 +142,7 @@ func resourceScalewayFunctionNamespaceUpdate(ctx context.Context, d *schema.Reso
 	}
 
 	if d.HasChange("description") {
-		req.Description = scw.StringPtr(d.Get("description").(string))
+		req.Description = expandUpdatedStringPtr(d.Get("description"))
 	}
 
 	if d.HasChanges("environment_variables") {
diff --git a/scaleway/resource_iam_api_key.go b/scaleway/resource_iam_api_key.go
@@ -142,7 +142,7 @@ func resourceScalewayIamAPIKeyUpdate(ctx context.Context, d *schema.ResourceData
 	hasChanged := false
 
 	if d.HasChange("description") {
-		req.Description = expandStringPtr(d.Get("description"))
+		req.Description = expandUpdatedStringPtr(d.Get("description"))
 		hasChanged = true
 	}
 
diff --git a/scaleway/resource_iam_application.go b/scaleway/resource_iam_application.go
@@ -102,7 +102,7 @@ func resourceScalewayIamApplicationUpdate(ctx context.Context, d *schema.Resourc
 		hasChanged = true
 	}
 	if d.HasChange("description") {
-		req.Description = expandStringPtr(d.Get("description"))
+		req.Description = expandUpdatedStringPtr(d.Get("description"))
 		hasChanged = true
 	}
 
diff --git a/scaleway/resource_iam_group.go b/scaleway/resource_iam_group.go
@@ -131,8 +131,8 @@ func resourceScalewayIamGroupUpdate(ctx context.Context, d *schema.ResourceData,
 	if d.HasChanges("name", "description") {
 		_, err = api.UpdateGroup(&iam.UpdateGroupRequest{
 			GroupID:     group.ID,
-			Name:        expandStringPtr(d.Get("name").(string)),
-			Description: expandStringPtr(d.Get("description").(string)),
+			Name:        expandUpdatedStringPtr(d.Get("name")),
+			Description: expandUpdatedStringPtr(d.Get("description")),
 		}, scw.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)
diff --git a/scaleway/resource_iam_policy.go b/scaleway/resource_iam_policy.go
@@ -190,7 +190,7 @@ func resourceScalewayIamPolicyUpdate(ctx context.Context, d *schema.ResourceData
 	}
 	if d.HasChange("description") {
 		hasUpdated = true
-		req.Description = expandStringPtr(d.Get("description"))
+		req.Description = expandUpdatedStringPtr(d.Get("description"))
 	}
 	if d.HasChange("user_id") {
 		hasUpdated = true
diff --git a/scaleway/resource_iot_device.go b/scaleway/resource_iot_device.go
@@ -405,7 +405,7 @@ func resourceScalewayIotDeviceUpdate(ctx context.Context, d *schema.ResourceData
 	}
 
 	if d.HasChange("description") {
-		updateRequest.Description = scw.StringPtr(d.Get("description").(string))
+		updateRequest.Description = expandUpdatedStringPtr(d.Get("description"))
 	}
 
 	_, err = iotAPI.UpdateDevice(updateRequest, scw.WithContext(ctx))
diff --git a/scaleway/resource_registry_namespace.go b/scaleway/resource_registry_namespace.go
@@ -127,7 +127,7 @@ func resourceScalewayRegistryNamespaceUpdate(ctx context.Context, d *schema.Reso
 		if _, err := api.UpdateNamespace(&registry.UpdateNamespaceRequest{
 			Region:      region,
 			NamespaceID: id,
-			Description: expandStringPtr(d.Get("description")),
+			Description: expandUpdatedStringPtr(d.Get("description")),
 			IsPublic:    scw.BoolPtr(d.Get("is_public").(bool)),
 		}, scw.WithContext(ctx)); err != nil {
 			return diag.FromErr(err)
diff --git a/scaleway/resource_vpc_private_network.go b/scaleway/resource_vpc_private_network.go
@@ -114,7 +114,7 @@ func resourceScalewayVPCPrivateNetworkUpdate(ctx context.Context, d *schema.Reso
 			PrivateNetworkID: ID,
 			Zone:             zone,
 			Name:             scw.StringPtr(d.Get("name").(string)),
-			Tags:             scw.StringsPtr(expandStrings(d.Get("tags"))),
+			Tags:             expandUpdatedStringsPtr(d.Get("tags")),
 		}
 
 		_, err = vpcAPI.UpdatePrivateNetwork(updateRequest, scw.WithContext(ctx))
diff --git a/scaleway/testdata/flexible-ip-attach-and-detach-from-baremetal-server.cassette.yaml b/scaleway/testdata/flexible-ip-attach-and-detach-from-baremetal-server.cassette.yaml
diff --git a/scaleway/testdata/flexible-ip-basic.cassette.yaml b/scaleway/testdata/flexible-ip-basic.cassette.yaml
diff --git a/scaleway/testdata/flexible-ip-create-and-attach-to-baremetal-server.cassette.yaml b/scaleway/testdata/flexible-ip-create-and-attach-to-baremetal-server.cassette.yaml
diff --git a/scaleway/testdata/flexible-ip-with-zone.cassette.yaml b/scaleway/testdata/flexible-ip-with-zone.cassette.yaml

Original file line number	Diff line number	Diff line change
`@@ -94,11 +94,11 @@ func resourceScalewayAccountProjectUpdate(ctx context.Context, d *schema.Resourc`
`94`	`94`	`hasChanged := false`
`95`	`95`
`96`	`96`	`if d.HasChange("name") {`
`97`		`- req.Name = expandStringPtr(d.Get("name"))`
	`97`	`+ req.Name = expandUpdatedStringPtr(d.Get("name"))`
`98`	`98`	`hasChanged = true`
`99`	`99`	`}`
`100`	`100`	`if d.HasChange("description") {`
`101`		`- req.Description = expandStringPtr(d.Get("description"))`
	`101`	`+ req.Description = expandUpdatedStringPtr(d.Get("description"))`
`102`	`102`	`hasChanged = true`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ func resourceScalewayContainerUpdate(ctx context.Context, d *schema.ResourceData`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`if d.HasChanges("description") {`
`316`		`- req.Description = expandStringPtr(d.Get("description"))`
	`316`	`+ req.Description = expandUpdatedStringPtr(d.Get("description"))`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`if d.HasChanges("registry_image") {`
Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,7 @@ func resourceScalewayContainerNamespaceUpdate(ctx context.Context, d *schema.Res`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`if d.HasChange("description") {`
`148`		`- description := d.Get("description").(string)`
`149`		`- req.Description = &description`
	`148`	`+ req.Description = expandUpdatedStringPtr(d.Get("description"))`
`150`	`149`	`}`
`151`	`150`
`152`	`151`	`if d.HasChanges("environment_variables") {`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ func resourceScalewayFunctionUpdate(ctx context.Context, d *schema.ResourceData,`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`if d.HasChange("description") {`
`302`		`- req.Description = expandStringPtr(d.Get("description"))`
	`302`	`+ req.Description = expandUpdatedStringPtr(d.Get("description"))`
`303`	`303`	`updated = true`
`304`	`304`	`}`
`305`	`305`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ func resourceScalewayFunctionNamespaceUpdate(ctx context.Context, d *schema.Reso`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`if d.HasChange("description") {`
`145`		`- req.Description = scw.StringPtr(d.Get("description").(string))`
	`145`	`+ req.Description = expandUpdatedStringPtr(d.Get("description"))`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`if d.HasChanges("environment_variables") {`