fix(instance_server): delete_after_termination for sbs volumes

internal/services/block/volume.go

@@ -205,6 +205,10 @@ func ResourceBlockVolumeDelete(ctx context.Context, d *schema.ResourceData, m in
 
 	_, err = waitForBlockVolume(ctx, api, zone, id, d.Timeout(schema.TimeoutDelete))
 	if err != nil {
+		if httperrors.Is404(err) {
+			d.SetId("")
+			return nil
+		}
 		return diag.FromErr(err)
 	}
 

internal/services/instance/helpers_instance_block.go

@@ -28,6 +28,11 @@ type ResizeUnknownVolumeRequest struct {
 	Size     *scw.Size
 }
 
+type DeleteUnknownVolumeRequest struct {
+	VolumeID string
+	Zone     scw.Zone
+}
+
 type UnknownVolume struct {
 	Zone     scw.Zone
 	ID       string
@@ -168,6 +173,30 @@ func (api *BlockAndInstanceAPI) ResizeUnknownVolume(req *ResizeUnknownVolumeRequ
 	return err
 }
 
+func (api *BlockAndInstanceAPI) DeleteUnknownVolume(req *DeleteUnknownVolumeRequest, opts ...scw.RequestOption) error {
+	unknownVolume, err := api.GetUnknownVolume(&GetUnknownVolumeRequest{
+		VolumeID: req.VolumeID,
+		Zone:     req.Zone,
+	}, opts...)
+	if err != nil {
+		return err
+	}
+
+	if unknownVolume.IsBlockVolume() {
+		err = api.blockAPI.DeleteVolume(&block.DeleteVolumeRequest{
+			Zone:     req.Zone,
+			VolumeID: req.VolumeID,
+		}, opts...)
+	} else {
+		err = api.API.DeleteVolume(&instance.DeleteVolumeRequest{
+			Zone:     req.Zone,
+			VolumeID: req.VolumeID,
+		}, opts...)
+	}
+
+	return err
+}
+
 type GetUnknownSnapshotRequest struct {
 	Zone       scw.Zone
 	SnapshotID string
@@ -212,36 +241,34 @@ func (api *BlockAndInstanceAPI) GetUnknownSnapshot(req *GetUnknownSnapshotReques
 	return snap, nil
 }
 
+func NewBlockAndInstanceAPI(client *scw.Client) *BlockAndInstanceAPI {
+	instanceAPI := instance.NewAPI(client)
+	blockAPI := block.NewAPI(client)
+
+	return &BlockAndInstanceAPI{
+		API:      instanceAPI,
+		blockAPI: blockAPI,
+	}
+}
+
 // newAPIWithZone returns a new instance API and the zone for a Create request
 func instanceAndBlockAPIWithZone(d *schema.ResourceData, m interface{}) (*BlockAndInstanceAPI, scw.Zone, error) {
-	instanceAPI := instance.NewAPI(meta.ExtractScwClient(m))
-	blockAPI := block.NewAPI(meta.ExtractScwClient(m))
-
 	zone, err := meta.ExtractZone(d, m)
 	if err != nil {
 		return nil, "", err
 	}
 
-	return &BlockAndInstanceAPI{
-		API:      instanceAPI,
-		blockAPI: blockAPI,
-	}, zone, nil
+	return NewBlockAndInstanceAPI(meta.ExtractScwClient(m)), zone, nil
 }
 
 // NewAPIWithZoneAndID returns an instance API with zone and ID extracted from the state
 func instanceAndBlockAPIWithZoneAndID(m interface{}, zonedID string) (*BlockAndInstanceAPI, scw.Zone, string, error) {
-	instanceAPI := instance.NewAPI(meta.ExtractScwClient(m))
-	blockAPI := block.NewAPI(meta.ExtractScwClient(m))
-
 	zone, ID, err := zonal.ParseID(zonedID)
 	if err != nil {
 		return nil, "", "", err
 	}
 
-	return &BlockAndInstanceAPI{
-		API:      instanceAPI,
-		blockAPI: blockAPI,
-	}, zone, ID, nil
+	return NewBlockAndInstanceAPI(meta.ExtractScwClient(m)), zone, ID, nil
 }
 
 func volumeTypeToMarketplaceFilter(volumeType instance.VolumeVolumeType) marketplace.LocalImageType {

internal/services/instance/server.go

@@ -1128,7 +1128,7 @@ func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m
 		if !volumeExist {
 			return diag.Errorf("volume ID not found")
 		}
-		err = api.DeleteVolume(&instanceSDK.DeleteVolumeRequest{
+		err = api.DeleteUnknownVolume(&DeleteUnknownVolumeRequest{
 			Zone:     zone,
 			VolumeID: locality.ExpandID(volumeID),
 		})

internal/services/instance/server_test.go

@@ -1713,7 +1713,10 @@ func TestAccServer_BlockExternalRootVolume(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
-		CheckDestroy:      instancechecks.IsServerDestroyed(tt),
+		CheckDestroy: resource.ComposeTestCheckFunc(
+			instancechecks.IsServerDestroyed(tt),
+			instancechecks.IsServerRootVolumeDestroyed(tt),
+		),
 		Steps: []resource.TestStep{
 			{
 				Config: `