test(instance): fix TestAccScalewayInstanceServer_AlterTags (#716)

remyleone · web-flow · commit 113e11f38767 · 2020-11-26T16:03:13.000+01:00
diff --git a/scaleway/helpers.go b/scaleway/helpers.go
@@ -374,10 +374,7 @@ func expandStringWithDefault(data interface{}, defaultValue string) string {
 }
 
 func expandStrings(data interface{}) []string {
-	if data == nil {
-		return []string{}
-	}
-	stringSlice := []string(nil)
+	stringSlice := []string{}
 	for _, s := range data.([]interface{}) {
 		stringSlice = append(stringSlice, s.(string))
 	}
diff --git a/scaleway/resource_instance_server.go b/scaleway/resource_instance_server.go
@@ -510,8 +510,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
 	}
 
 	if d.HasChange("tags") {
-		tags := expandStrings(d.Get("tags"))
-		updateRequest.Tags = scw.StringsPtr(tags)
+		updateRequest.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))
 	}
 
 	if d.HasChange("security_group_id") {
diff --git a/scaleway/testdata/instance-server-alter-tags.cassette.yaml b/scaleway/testdata/instance-server-alter-tags.cassette.yaml

Original file line number	Diff line number	Diff line change
`@@ -374,10 +374,7 @@ func expandStringWithDefault(data interface{}, defaultValue string) string {`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`func expandStrings(data interface{}) []string {`
`377`		`- if data == nil {`
`378`		`- return []string{}`
`379`		`- }`
`380`		`- stringSlice := []string(nil)`
	`377`	`+ stringSlice := []string{}`
`381`	`378`	`for _, s := range data.([]interface{}) {`
`382`	`379`	`stringSlice = append(stringSlice, s.(string))`
`383`	`380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -510,8 +510,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc`
`510`	`510`	`}`
`511`	`511`
`512`	`512`	`if d.HasChange("tags") {`
`513`		`- tags := expandStrings(d.Get("tags"))`
`514`		`- updateRequest.Tags = scw.StringsPtr(tags)`
	`513`	`+ updateRequest.Tags = scw.StringsPtr(expandStrings(d.Get("tags")))`
`515`	`514`	`}`
`516`	`515`
`517`	`516`	`if d.HasChange("security_group_id") {`