Skip to content

Commit eb35b4c

Browse files
authored
fix: delete forced volume removal (#71)
1 parent 45f1d1e commit eb35b4c

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

builder/scaleway/builder_acc_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ source "scaleway" "basic" {
4444
image_name = "Acceptance test"
4545
ssh_username = "root"
4646
zone = "fr-par-1"
47+
remove_volume = true
4748
}
4849
4950
build {

builder/scaleway/step_create_server.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@ func (s *stepCreateServer) Run(ctx context.Context, state multistep.StateBag) mu
126126
}
127127

128128
func (s *stepCreateServer) Cleanup(state multistep.StateBag) {
129-
volumeID := state.Get("root_volume_id").(string)
130-
131129
if s.serverID == "" {
132130
return
133131
}
@@ -150,15 +148,4 @@ func (s *stepCreateServer) Cleanup(state multistep.StateBag) {
150148
"Error destroying server. Please destroy it manually: %s", err))
151149
}
152150
}
153-
154-
ui.Say("Removing volume ...")
155-
156-
err = instanceAPI.DeleteVolume(&instance.DeleteVolumeRequest{
157-
VolumeID: volumeID,
158-
})
159-
if err != nil {
160-
err := fmt.Errorf("error removing volume: %s", err)
161-
state.Put("error", err)
162-
ui.Error(fmt.Sprintf("Error removing volume: %s. Please destroy it manually", err))
163-
}
164151
}

0 commit comments

Comments
 (0)