Skip to content

fix(instance): ensure that tags are removed when deleted in tf #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scaleway/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ func expandStringWithDefault(data interface{}, defaultValue string) string {

func expandStrings(data interface{}) []string {
if data == nil {
return nil
return []string{}
}
stringSlice := []string(nil)
for _, s := range data.([]interface{}) {
Expand Down
2 changes: 1 addition & 1 deletion scaleway/resource_instance_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
return diag.FromErr(err)
}
}
_, err = instanceAPI.UpdateServer(updateRequest)
_, err = instanceAPI.UpdateServer(updateRequest, scw.WithContext(ctx))
if err != nil {
return diag.FromErr(err)
}
Expand Down
40 changes: 40 additions & 0 deletions scaleway/resource_instance_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -936,3 +936,43 @@ func TestAccScalewayInstanceServer_Bootscript(t *testing.T) {
},
})
}

func TestAccScalewayInstanceServer_AlterTags(t *testing.T) {
tt := NewTestTools(t)
defer tt.Cleanup()
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: testAccCheckScalewayInstanceServerDestroy(tt),
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_instance_server" "base" {
type = "DEV1-L"
image = "ubuntu_focal"
state = "stopped"
tags = [ "front", "web" ]
}
`,
Check: resource.ComposeTestCheckFunc(
testAccCheckScalewayInstanceServerExists(tt, "scaleway_instance_server.base"),
resource.TestCheckResourceAttr("scaleway_instance_server.base", "tags.0", "front"),
resource.TestCheckResourceAttr("scaleway_instance_server.base", "tags.1", "web"),
),
},
{
Config: `
resource "scaleway_instance_server" "base" {
type = "DEV1-L"
state = "stopped"
image = "ubuntu_focal"
}
`,
Check: resource.ComposeTestCheckFunc(
testAccCheckScalewayInstanceServerExists(tt, "scaleway_instance_server.base"),
resource.TestCheckNoResourceAttr("scaleway_instance_server.base", "tags"),
),
},
},
})
}
Loading