feat(sfs): refactored and tested sfs share wait handler to use wait helper

Author: j1n-o9r

services/sfs/v1api/wait/wait.go

@@ -3,11 +3,8 @@ package wait
 import (
 	"context"
 	"errors"
-	"fmt"
-	"net/http"
 	"time"
 
-	"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
 	"github.com/stackitcloud/stackit-sdk-go/core/wait"
 	sfs "github.com/stackitcloud/stackit-sdk-go/services/sfs/v1api"
 )
@@ -71,89 +68,76 @@ func DeleteResourcePoolWaitHandler(ctx context.Context, api sfs.DefaultAPI, proj
 	return handler
 }
 
-func GetStateResourcePool(response *sfs.GetResourcePoolResponse) (string, error) {
-	if response == nil {
-		return "", errors.New("empty response")
-	}
-	if response.ResourcePool == nil {
-		return "", errors.New("resource pool is nil")
-	}
-	if response.ResourcePool.State == nil {
-		return "", errors.New("resource pool state is nil")
+func CreateShareWaitHandler(ctx context.Context, api sfs.DefaultAPI, projectId, region, resourcePoolId, shareId string) *wait.AsyncActionHandler[sfs.GetShareResponse] {
+	waitConfig := wait.WaiterHelper[sfs.GetShareResponse, string]{
+		FetchInstance: api.GetShare(ctx, projectId, region, resourcePoolId, shareId).Execute,
+		GetState:      GetStateShare,
+		ActiveState:   []string{ShareStateCreated},
+		ErrorState:    []string{},
 	}
-	return *response.ResourcePool.State, nil
-}
 
-func CreateShareWaitHandler(ctx context.Context, api sfs.DefaultAPI, projectId, region, resourcePoolId, shareId string) *wait.AsyncActionHandler[sfs.GetShareResponse] {
-	handler := wait.New(func() (waitFinished bool, share *sfs.GetShareResponse, err error) {
-		share, err = api.GetShare(ctx, projectId, region, resourcePoolId, shareId).Execute()
-		if err != nil {
-			return false, share, err
-		}
-		if share == nil ||
-			share.Share == nil ||
-			share.Share.Id == nil ||
-			share.Share.State == nil {
-			return false, share, fmt.Errorf("create failed for  share with id %s %s, the response is not valid (state missing)", resourcePoolId, shareId)
-		}
-		if *share.Share.Id == shareId {
-			switch *share.Share.State {
-			case ShareStateCreated:
-				return true, share, err
-			default:
-				return false, share, err
-			}
-		}
-
-		return false, nil, nil
-	})
+	handler := wait.New(waitConfig.Wait())
 
 	handler.SetTimeout(10 * time.Minute)
 	return handler
 }
 
 func UpdateShareWaitHandler(ctx context.Context, api sfs.DefaultAPI, projectId, region, resourcePoolId, shareId string) *wait.AsyncActionHandler[sfs.GetShareResponse] {
-	handler := wait.New(func() (waitFinished bool, share *sfs.GetShareResponse, err error) {
-		share, err = api.GetShare(ctx, projectId, region, resourcePoolId, shareId).Execute()
-		if err != nil {
-			return false, share, err
-		}
-		if share == nil ||
-			share.Share == nil ||
-			share.Share.Id == nil ||
-			share.Share.State == nil {
-			return false, share, fmt.Errorf("update failed for resourcepool with id %s, the response is not valid (state missing)", resourcePoolId)
-		}
-		if *share.Share.Id == shareId {
-			switch *share.Share.State {
-			case ResourcePoolStateCreated:
-				return true, share, err
-			default:
-				return false, share, err
-			}
-		}
-
-		return false, nil, nil
-	})
+	waitConfig := wait.WaiterHelper[sfs.GetShareResponse, string]{
+		FetchInstance: api.GetShare(ctx, projectId, region, resourcePoolId, shareId).Execute,
+		GetState:      GetStateShare,
+		ActiveState:   []string{ShareStateCreated},
+		ErrorState:    []string{},
+	}
+
+	handler := wait.New(waitConfig.Wait())
 
 	handler.SetTimeout(10 * time.Minute)
 	return handler
 }
 
 func DeleteShareWaitHandler(ctx context.Context, api sfs.DefaultAPI, projectId, region, resourcePoolId, shareId string) *wait.AsyncActionHandler[sfs.GetShareResponse] {
-	handler := wait.New(func() (waitFinished bool, share *sfs.GetShareResponse, err error) {
-		share, err = api.GetShare(ctx, projectId, region, resourcePoolId, shareId).Execute()
-		if err != nil {
-			var oapiError *oapierror.GenericOpenAPIError
-			if errors.As(err, &oapiError) {
-				if statusCode := oapiError.StatusCode; statusCode == http.StatusNotFound || statusCode == http.StatusGone {
-					return true, share, nil
-				}
-			}
-		}
-		return false, nil, nil
-	})
+	waitConfig := wait.WaiterHelper[sfs.GetShareResponse, string]{
+		FetchInstance: api.GetShare(ctx, projectId, region, resourcePoolId, shareId).Execute,
+		GetState:      GetStateShare,
+		ActiveState:   []string{},
+		ErrorState:    []string{},
+	}
+
+	handler := wait.New(waitConfig.Wait())
 
 	handler.SetTimeout(10 * time.Minute)
 	return handler
 }
+
+func GetStateResourcePool(response *sfs.GetResourcePoolResponse) (string, error) {
+	if response == nil {
+		return "", errors.New("empty response")
+	}
+	if response.ResourcePool == nil {
+		return "", errors.New("resource pool is nil")
+	}
+	if response.ResourcePool.Id == nil {
+		return "", errors.New("resource pool id is nil")
+	}
+	if response.ResourcePool.State == nil {
+		return "", errors.New("resource pool state is nil")
+	}
+	return *response.ResourcePool.State, nil
+}
+
+func GetStateShare(response *sfs.GetShareResponse) (string, error) {
+	if response == nil {
+		return "", errors.New("empty response")
+	}
+	if response.Share == nil {
+		return "", errors.New("share is nil")
+	}
+	if response.Share.Id == nil {
+		return "", errors.New("share id is nil")
+	}
+	if response.Share.State == nil {
+		return "", errors.New("share state is nil")
+	}
+	return *response.Share.State, nil
+}

services/sfs/v1api/wait/wait_test.go

@@ -378,7 +378,7 @@ func TestCreateShareWaitHandler(t *testing.T) {
 					{ShareStateCreating, 0},
 				},
 			},
-			ShareStateCreating,
+			"",
 			true,
 		},
 	}
@@ -467,7 +467,7 @@ func TestUpdateShareWaitHandler(t *testing.T) {
 					{ShareStateCreating, 0},
 				},
 			},
-			ShareStateCreating,
+			"",
 			true,
 		},
 	}