fix: IaaS dependency in waiters

Author: joaopalet

services/iaas/wait/wait.go

@@ -9,7 +9,6 @@ import (
 	"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
 	"github.com/stackitcloud/stackit-sdk-go/core/wait"
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas"
-	"github.com/stackitcloud/stackit-sdk-go/services/iaasalpha"
 )
 
 const (
@@ -46,7 +45,7 @@ type APIClientInterface interface {
 	GetVolumeExecute(ctx context.Context, projectId string, volumeId string) (*iaas.Volume, error)
 	GetServerExecute(ctx context.Context, projectId string, serverId string) (*iaas.Server, error)
 	GetAttachedVolumeExecute(ctx context.Context, projectId string, serverId string, volumeId string) (*iaas.VolumeAttachment, error)
-	GetImageExecute(ctx context.Context, projectId string, imageId string) (*iaasalpha.Image, error)
+	GetImageExecute(ctx context.Context, projectId string, imageId string) (*iaas.Image, error)
 }
 
 // CreateNetworkAreaWaitHandler will wait for network area creation
@@ -552,8 +551,8 @@ func RemoveVolumeFromServerWaitHandler(ctx context.Context, a APIClientInterface
 }
 
 // UploadImageWaitHandler will wait for the status image to become AVAILABLE, which indicates the upload of the image has been completed successfully
-func UploadImageWaitHandler(ctx context.Context, a APIClientInterface, projectId, imageId string) *wait.AsyncActionHandler[iaasalpha.Image] {
-	handler := wait.New(func() (waitFinished bool, response *iaasalpha.Image, err error) {
+func UploadImageWaitHandler(ctx context.Context, a APIClientInterface, projectId, imageId string) *wait.AsyncActionHandler[iaas.Image] {
+	handler := wait.New(func() (waitFinished bool, response *iaas.Image, err error) {
 		image, err := a.GetImageExecute(ctx, projectId, imageId)
 		if err != nil {
 			return false, image, err
@@ -574,8 +573,8 @@ func UploadImageWaitHandler(ctx context.Context, a APIClientInterface, projectId
 }
 
 // DeleteImageWaitHandler will wait for image deletion
-func DeleteImageWaitHandler(ctx context.Context, a APIClientInterface, projectId, imageId string) *wait.AsyncActionHandler[iaasalpha.Image] {
-	handler := wait.New(func() (waitFinished bool, response *iaasalpha.Image, err error) {
+func DeleteImageWaitHandler(ctx context.Context, a APIClientInterface, projectId, imageId string) *wait.AsyncActionHandler[iaas.Image] {
+	handler := wait.New(func() (waitFinished bool, response *iaas.Image, err error) {
 		image, err := a.GetImageExecute(ctx, projectId, imageId)
 		if err == nil {
 			if image != nil {

services/iaas/wait/wait_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
 	"github.com/stackitcloud/stackit-sdk-go/core/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas"
-	"github.com/stackitcloud/stackit-sdk-go/services/iaasalpha"
 )
 
 type apiClientMocked struct {
@@ -144,7 +143,7 @@ func (a *apiClientMocked) GetAttachedVolumeExecute(_ context.Context, _, _, _ st
 	}, nil
 }
 
-func (a *apiClientMocked) GetImageExecute(_ context.Context, _, _ string) (*iaasalpha.Image, error) {
+func (a *apiClientMocked) GetImageExecute(_ context.Context, _, _ string) (*iaas.Image, error) {
 	if a.getImageFails {
 		return nil, &oapierror.GenericOpenAPIError{
 			StatusCode: 500,
@@ -157,7 +156,7 @@ func (a *apiClientMocked) GetImageExecute(_ context.Context, _, _ string) (*iaas
 		}
 	}
 
-	return &iaasalpha.Image{
+	return &iaas.Image{
 		Id:     utils.Ptr("iid"),
 		Status: &a.resourceState,
 	}, nil
@@ -1438,9 +1437,9 @@ func TestUploadImageWaitHandler(t *testing.T) {
 				resourceState: tt.resourceState,
 			}
 
-			var wantRes *iaasalpha.Image
+			var wantRes *iaas.Image
 			if tt.wantResp {
-				wantRes = &iaasalpha.Image{
+				wantRes = &iaas.Image{
 					Id:     utils.Ptr("iid"),
 					Status: utils.Ptr(tt.resourceState),
 				}