add step for 'terminate' action

Author: Mia-Cross

internal/services/instance/action_server_action.go

@@ -136,7 +136,7 @@ func (a *ServerAction) Invoke(ctx context.Context, req action.InvokeRequest, res
 		}
 
 		_, errWait := a.instanceAPI.WaitForServer(waitReq)
-		if errWait != nil {
+		if errWait != nil && data.Action.ValueString() != instance.ServerActionTerminate.String() {
 			resp.Diagnostics.AddError(
 				"error in wait server",
 				fmt.Sprintf("%s", err))

internal/services/instance/action_server_action_test.go

@@ -12,6 +12,7 @@ import (
 	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance"
+	instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs"
 )
 
 func TestAccActionServer_Basic(t *testing.T) {
@@ -24,6 +25,7 @@ func TestAccActionServer_Basic(t *testing.T) {
 
 	resource.ParallelTest(t, resource.TestCase{
 		ProtoV6ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:             instancechecks.IsServerDestroyed(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
@@ -110,6 +112,7 @@ func TestAccActionServer_On_Off(t *testing.T) {
 
 	resource.ParallelTest(t, resource.TestCase{
 		ProtoV6ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:             instancechecks.IsServerDestroyed(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
@@ -144,28 +147,46 @@ func TestAccActionServer_On_Off(t *testing.T) {
 			{
 				Config: fmt.Sprintf(`
 					resource "scaleway_instance_server" "main" {
-						name = "should-be-started"
+						name = "should-be-powered-off"
 						type = "DEV1-S"
 						image = "ubuntu_jammy"
 
 					  	lifecycle {
-							action_trigger {
-						  		events  = [after_create]
-						  		actions = [action.scaleway_instance_server_action.stop]
-							}
 							action_trigger {
 						  		events  = [after_update]
-						  		actions = [action.scaleway_instance_server_action.start]
+						  		actions = [action.scaleway_instance_server_action.poweroff]
 							}
 					  	}
 					}
 
-					action "scaleway_instance_server_action" "stop" {
+					action "scaleway_instance_server_action" "poweroff" {
 						config {
 						  	action = "%s"
 							server_id = scaleway_instance_server.main.id
 							wait = true
 						}
+					}`, instanceSDK.ServerActionPoweroff),
+			},
+			{
+				RefreshState: true,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("scaleway_instance_server.main", "state", instance.InstanceServerStateStopped),
+					readActualServerState(tt, "scaleway_instance_server.main", instanceSDK.ServerStateStopped.String()),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_instance_server" "main" {
+						name = "should-be-started"
+						type = "DEV1-S"
+						image = "ubuntu_jammy"
+
+					  	lifecycle {
+							action_trigger {
+						  		events  = [after_update]
+						  		actions = [action.scaleway_instance_server_action.start]
+							}
+					  	}
 					}
 
 					action "scaleway_instance_server_action" "start" {
@@ -174,7 +195,7 @@ func TestAccActionServer_On_Off(t *testing.T) {
 							server_id = scaleway_instance_server.main.id
 							wait = true
 						}
-					}`, instanceSDK.ServerActionStopInPlace, instanceSDK.ServerActionPoweron),
+					}`, instanceSDK.ServerActionPoweron),
 			},
 			{
 				RefreshState: true,
@@ -186,44 +207,31 @@ func TestAccActionServer_On_Off(t *testing.T) {
 			{
 				Config: fmt.Sprintf(`
 					resource "scaleway_instance_server" "main" {
-						name = "should-be-powered-off"
+						name = "should-be-terminated"
 						type = "DEV1-S"
 						image = "ubuntu_jammy"
 
 					  	lifecycle {
-							action_trigger {
-						  		events  = [after_create]
-						  		actions = [action.scaleway_instance_server_action.stop]
-							}
 							action_trigger {
 						  		events  = [after_update]
-						  		actions = [action.scaleway_instance_server_action.poweroff]
+						  		actions = [action.scaleway_instance_server_action.terminate]
 							}
 					  	}
 					}
 
-					action "scaleway_instance_server_action" "stop" {
-						config {
-						  	action = "%s"
-							server_id = scaleway_instance_server.main.id
-							wait = true
-						}
-					}
-
-					action "scaleway_instance_server_action" "poweroff" {
+					action "scaleway_instance_server_action" "terminate" {
 						config {
 						  	action = "%s"
 							server_id = scaleway_instance_server.main.id
-							wait = true
+							wait = false
 						}
-					}`, instanceSDK.ServerActionStopInPlace, instanceSDK.ServerActionPoweroff),
+					}`, instanceSDK.ServerActionTerminate),
+				ExpectNonEmptyPlan: true,
 			},
 			{
-				RefreshState: true,
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("scaleway_instance_server.main", "state", instance.InstanceServerStateStopped),
-					readActualServerState(tt, "scaleway_instance_server.main", instanceSDK.ServerStateStopped.String()),
-				),
+				RefreshState:       true,
+				Check:              instancechecks.IsServerDestroyed(tt),
+				ExpectNonEmptyPlan: true,
 			},
 		},
 	})