fix: force update empty list if a string list has been updated to an empty list (#1333)

Codelax · web-flow · commit 593ddffe0b0b · 2022-06-16T11:47:52.000+02:00
diff --git a/scaleway/resource_baremetal_server.go b/scaleway/resource_baremetal_server.go
@@ -233,7 +233,7 @@ func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.Resour
 		ServerID:    zonedID.ID,
 		Name:        expandStringPtr(d.Get("name")),
 		Description: expandStringPtr(d.Get("description")),
-		Tags:        scw.StringsPtr(expandStrings(d.Get("tags"))),
+		Tags:        expandUpdatedStringsPtr(d.Get("tags")),
 	}, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
diff --git a/scaleway/resource_instance_ip.go b/scaleway/resource_instance_ip.go
@@ -100,7 +100,7 @@ func resourceScalewayInstanceIPUpdate(ctx context.Context, d *schema.ResourceDat
 	}
 
 	if d.HasChange("tags") {
-		req.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))
+		req.Tags = expandUpdatedStringsPtr(d.Get("tags"))
 	}
 
 	_, err = instanceAPI.UpdateIP(req, scw.WithContext(ctx))
diff --git a/scaleway/resource_instance_placement_group.go b/scaleway/resource_instance_placement_group.go
@@ -153,9 +153,7 @@ func resourceScalewayInstancePlacementGroupUpdate(ctx context.Context, d *schema
 	}
 
 	if d.HasChange("tags") {
-		if len(expandStrings(d.Get("tags"))) > 0 {
-			req.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))
-		}
+		req.Tags = expandUpdatedStringsPtr(d.Get("tags"))
 		hasChanged = true
 	}
 
diff --git a/scaleway/resource_instance_server.go b/scaleway/resource_instance_server.go
@@ -661,7 +661,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
 	}
 
 	if d.HasChange("tags") {
-		updateRequest.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))
+		updateRequest.Tags = expandUpdatedStringsPtr(d.Get("tags"))
 	}
 
 	if d.HasChange("security_group_id") {
diff --git a/scaleway/resource_k8s_cluster.go b/scaleway/resource_k8s_cluster.go
@@ -513,20 +513,19 @@ func resourceScalewayK8SClusterUpdate(ctx context.Context, d *schema.ResourceDat
 	}
 
 	if d.HasChange("tags") {
-		tags := expandStrings(d.Get("tags"))
-		updateRequest.Tags = scw.StringsPtr(tags)
+		updateRequest.Tags = expandUpdatedStringsPtr(d.Get("tags"))
 	}
 
 	if d.HasChange("apiserver_cert_sans") {
-		updateRequest.ApiserverCertSans = scw.StringsPtr(expandStrings(d.Get("apiserver_cert_sans")))
+		updateRequest.ApiserverCertSans = expandUpdatedStringsPtr(d.Get("apiserver_cert_sans"))
 	}
 
 	if d.HasChange("feature_gates") {
-		updateRequest.FeatureGates = scw.StringsPtr(expandStrings(d.Get("feature_gates")))
+		updateRequest.FeatureGates = expandUpdatedStringsPtr(d.Get("feature_gates"))
 	}
 
 	if d.HasChange("admission_plugins") {
-		updateRequest.AdmissionPlugins = scw.StringsPtr(expandStrings(d.Get("admission_plugins")))
+		updateRequest.AdmissionPlugins = expandUpdatedStringsPtr(d.Get("admission_plugins"))
 	}
 
 	updateRequest.AutoUpgrade = &k8s.UpdateClusterRequestAutoUpgrade{}
diff --git a/scaleway/resource_k8s_pool.go b/scaleway/resource_k8s_pool.go
@@ -388,7 +388,7 @@ func resourceScalewayK8SPoolUpdate(ctx context.Context, d *schema.ResourceData,
 	}
 
 	if d.HasChange("tags") {
-		updateRequest.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))
+		updateRequest.Tags = expandUpdatedStringsPtr(d.Get("tags"))
 	}
 
 	if d.HasChange("kubelet_args") {
diff --git a/scaleway/resource_rdb_instance.go b/scaleway/resource_rdb_instance.go
@@ -471,7 +471,7 @@ func resourceScalewayRdbInstanceUpdate(ctx context.Context, d *schema.ResourceDa
 		req.BackupSameRegion = expandBoolPtr(d.Get("backup_same_region"))
 	}
 	if d.HasChange("tags") {
-		req.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))
+		req.Tags = expandUpdatedStringsPtr(d.Get("tags"))
 	}
 
 	_, err = waitForRDBInstance(ctx, rdbAPI, region, ID, d.Timeout(schema.TimeoutUpdate))
diff --git a/scaleway/resource_vpc_public_gateway.go b/scaleway/resource_vpc_public_gateway.go
@@ -183,7 +183,7 @@ func resourceScalewayVPCPublicGatewayUpdate(ctx context.Context, d *schema.Resou
 	}
 
 	if d.HasChange("tags") {
-		updateRequest.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))
+		updateRequest.Tags = expandUpdatedStringsPtr(d.Get("tags"))
 	}
 
 	if d.HasChange("bastion_port") {
@@ -195,7 +195,7 @@ func resourceScalewayVPCPublicGatewayUpdate(ctx context.Context, d *schema.Resou
 	}
 
 	if d.HasChange("upstream_dns_servers") {
-		updateRequest.UpstreamDNSServers = scw.StringsPtr(expandStrings(d.Get("upstream_dns_servers")))
+		updateRequest.UpstreamDNSServers = expandUpdatedStringsPtr(d.Get("upstream_dns_servers"))
 	}
 
 	_, err = vpcgwAPI.UpdateGateway(updateRequest, scw.WithContext(ctx))

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func resourceScalewayInstanceIPUpdate(ctx context.Context, d *schema.ResourceDat`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if d.HasChange("tags") {`
`103`		`- req.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))`
	`103`	`+ req.Tags = expandUpdatedStringsPtr(d.Get("tags"))`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`_, err = instanceAPI.UpdateIP(req, scw.WithContext(ctx))`
Original file line number	Diff line number	Diff line change
`@@ -153,9 +153,7 @@ func resourceScalewayInstancePlacementGroupUpdate(ctx context.Context, d *schema`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`if d.HasChange("tags") {`
`156`		`- if len(expandStrings(d.Get("tags"))) > 0 {`
`157`		`- req.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))`
`158`		`- }`
	`156`	`+ req.Tags = expandUpdatedStringsPtr(d.Get("tags"))`
`159`	`157`	`hasChanged = true`
`160`	`158`	`}`
`161`	`159`
Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc`
`661`	`661`	`}`
`662`	`662`
`663`	`663`	`if d.HasChange("tags") {`
`664`		`- updateRequest.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))`
	`664`	`+ updateRequest.Tags = expandUpdatedStringsPtr(d.Get("tags"))`
`665`	`665`	`}`
`666`	`666`
`667`	`667`	`if d.HasChange("security_group_id") {`
Original file line number	Diff line number	Diff line change
`@@ -513,20 +513,19 @@ func resourceScalewayK8SClusterUpdate(ctx context.Context, d *schema.ResourceDat`
`513`	`513`	`}`
`514`	`514`
`515`	`515`	`if d.HasChange("tags") {`
`516`		`- tags := expandStrings(d.Get("tags"))`
`517`		`- updateRequest.Tags = scw.StringsPtr(tags)`
	`516`	`+ updateRequest.Tags = expandUpdatedStringsPtr(d.Get("tags"))`
`518`	`517`	`}`
`519`	`518`
`520`	`519`	`if d.HasChange("apiserver_cert_sans") {`
`521`		`- updateRequest.ApiserverCertSans = scw.StringsPtr(expandStrings(d.Get("apiserver_cert_sans")))`
	`520`	`+ updateRequest.ApiserverCertSans = expandUpdatedStringsPtr(d.Get("apiserver_cert_sans"))`
`522`	`521`	`}`
`523`	`522`
`524`	`523`	`if d.HasChange("feature_gates") {`
`525`		`- updateRequest.FeatureGates = scw.StringsPtr(expandStrings(d.Get("feature_gates")))`
	`524`	`+ updateRequest.FeatureGates = expandUpdatedStringsPtr(d.Get("feature_gates"))`
`526`	`525`	`}`
`527`	`526`
`528`	`527`	`if d.HasChange("admission_plugins") {`
`529`		`- updateRequest.AdmissionPlugins = scw.StringsPtr(expandStrings(d.Get("admission_plugins")))`
	`528`	`+ updateRequest.AdmissionPlugins = expandUpdatedStringsPtr(d.Get("admission_plugins"))`
`530`	`529`	`}`
`531`	`530`
`532`	`531`	`updateRequest.AutoUpgrade = &k8s.UpdateClusterRequestAutoUpgrade{}`
Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ func resourceScalewayK8SPoolUpdate(ctx context.Context, d *schema.ResourceData,`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`if d.HasChange("tags") {`
`391`		`- updateRequest.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))`
	`391`	`+ updateRequest.Tags = expandUpdatedStringsPtr(d.Get("tags"))`
`392`	`392`	`}`
`393`	`393`
`394`	`394`	`if d.HasChange("kubelet_args") {`
Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ func resourceScalewayRdbInstanceUpdate(ctx context.Context, d *schema.ResourceDa`
`471`	`471`	`req.BackupSameRegion = expandBoolPtr(d.Get("backup_same_region"))`
`472`	`472`	`}`
`473`	`473`	`if d.HasChange("tags") {`
`474`		`- req.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))`
	`474`	`+ req.Tags = expandUpdatedStringsPtr(d.Get("tags"))`
`475`	`475`	`}`
`476`	`476`
`477`	`477`	`_, err = waitForRDBInstance(ctx, rdbAPI, region, ID, d.Timeout(schema.TimeoutUpdate))`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func resourceScalewayVPCPublicGatewayUpdate(ctx context.Context, d *schema.Resou`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`if d.HasChange("tags") {`
`186`		`- updateRequest.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))`
	`186`	`+ updateRequest.Tags = expandUpdatedStringsPtr(d.Get("tags"))`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`if d.HasChange("bastion_port") {`
`@@ -195,7 +195,7 @@ func resourceScalewayVPCPublicGatewayUpdate(ctx context.Context, d *schema.Resou`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`if d.HasChange("upstream_dns_servers") {`
`198`		`- updateRequest.UpstreamDNSServers = scw.StringsPtr(expandStrings(d.Get("upstream_dns_servers")))`
	`198`	`+ updateRequest.UpstreamDNSServers = expandUpdatedStringsPtr(d.Get("upstream_dns_servers"))`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`_, err = vpcgwAPI.UpdateGateway(updateRequest, scw.WithContext(ctx))`