Update tests and waiter with the new region parameter

Author: marceljk

examples/sqlserverflex/sqlserverflex.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/stackitcloud/stackit-sdk-go/core/config"
 	"github.com/stackitcloud/stackit-sdk-go/core/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
 	"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/wait"
@@ -15,23 +14,24 @@ func main() {
 	// Specify the project ID
 	projectId := "PROJECT_ID"
 
+	// Specify the region
+	region := "REGION"
+
 	// Specify instance configuration options
 	flavorId := "FLAVOR_ID"
 	version := "VERSION"
 
 	ctx := context.Background()
 
 	// Create a new API client, that uses default authentication and configuration
-	sqlserverflexClient, err := sqlserverflex.NewAPIClient(
-		config.WithRegion("eu01"),
-	)
+	sqlserverflexClient, err := sqlserverflex.NewAPIClient()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Creating API client: %v\n", err)
 		os.Exit(1)
 	}
 
 	// Get the SQLServer Flex instances for your project
-	getInstancesResp, err := sqlserverflexClient.ListInstances(ctx, projectId).Execute()
+	getInstancesResp, err := sqlserverflexClient.ListInstances(ctx, projectId, region).Execute()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error when calling `ListInstances`: %v\n", err)
 		os.Exit(1)
@@ -45,27 +45,27 @@ func main() {
 		FlavorId: utils.Ptr(flavorId),
 		Version:  utils.Ptr(version),
 	}
-	instance, err := sqlserverflexClient.CreateInstance(ctx, projectId).CreateInstancePayload(createInstancePayload).Execute()
+	instance, err := sqlserverflexClient.CreateInstance(ctx, projectId, region).CreateInstancePayload(createInstancePayload).Execute()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error creating SQL Server Flex instance: %v\n", err)
 	}
 	instanceId := *instance.Id
 
-	_, err = wait.CreateInstanceWaitHandler(ctx, sqlserverflexClient, projectId, instanceId).WaitWithContext(ctx)
+	_, err = wait.CreateInstanceWaitHandler(ctx, sqlserverflexClient, projectId, instanceId, region).WaitWithContext(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error when waiting for SQL Server Flex instance creation: %v\n", err)
 	}
 
 	fmt.Printf("Created SQL Server Flex instance \"%s\".\n", instanceId)
 
 	// Delete an instance
-	err = sqlserverflexClient.DeleteInstance(ctx, projectId, instanceId).Execute()
+	err = sqlserverflexClient.DeleteInstance(ctx, projectId, instanceId, region).Execute()
 
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error deleting SQL Server Flex instance: %v\n", err)
 	}
 
-	_, err = wait.DeleteInstanceWaitHandler(ctx, sqlserverflexClient, projectId, instanceId).WaitWithContext(ctx)
+	_, err = wait.DeleteInstanceWaitHandler(ctx, sqlserverflexClient, projectId, instanceId, region).WaitWithContext(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error when waiting for SQL Server Flex instance deletion: %v\n", err)
 	}

services/sqlserverflex/wait/wait.go

@@ -21,13 +21,13 @@ const (
 
 // Interface needed for tests
 type APIClientInstanceInterface interface {
-	GetInstanceExecute(ctx context.Context, projectId, instanceId string) (*sqlserverflex.GetInstanceResponse, error)
+	GetInstanceExecute(ctx context.Context, projectId, instanceId, region string) (*sqlserverflex.GetInstanceResponse, error)
 }
 
 // CreateInstanceWaitHandler will wait for instance creation
-func CreateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface, projectId, instanceId string) *wait.AsyncActionHandler[sqlserverflex.GetInstanceResponse] {
+func CreateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface, projectId, instanceId, region string) *wait.AsyncActionHandler[sqlserverflex.GetInstanceResponse] {
 	handler := wait.New(func() (waitFinished bool, response *sqlserverflex.GetInstanceResponse, err error) {
-		s, err := a.GetInstanceExecute(ctx, projectId, instanceId)
+		s, err := a.GetInstanceExecute(ctx, projectId, instanceId, region)
 		if err != nil {
 			return false, nil, err
 		}
@@ -55,9 +55,9 @@ func CreateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface
 }
 
 // UpdateInstanceWaitHandler will wait for instance update
-func UpdateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface, projectId, instanceId string) *wait.AsyncActionHandler[sqlserverflex.GetInstanceResponse] {
+func UpdateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface, projectId, instanceId, region string) *wait.AsyncActionHandler[sqlserverflex.GetInstanceResponse] {
 	handler := wait.New(func() (waitFinished bool, response *sqlserverflex.GetInstanceResponse, err error) {
-		s, err := a.GetInstanceExecute(ctx, projectId, instanceId)
+		s, err := a.GetInstanceExecute(ctx, projectId, instanceId, region)
 		if err != nil {
 			return false, nil, err
 		}
@@ -85,14 +85,14 @@ func UpdateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface
 }
 
 // PartialUpdateInstanceWaitHandler will wait for instance update
-func PartialUpdateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface, projectId, instanceId string) *wait.AsyncActionHandler[sqlserverflex.GetInstanceResponse] {
-	return UpdateInstanceWaitHandler(ctx, a, projectId, instanceId)
+func PartialUpdateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface, projectId, instanceId, region string) *wait.AsyncActionHandler[sqlserverflex.GetInstanceResponse] {
+	return UpdateInstanceWaitHandler(ctx, a, projectId, instanceId, region)
 }
 
 // DeleteInstanceWaitHandler will wait for instance deletion
-func DeleteInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface, projectId, instanceId string) *wait.AsyncActionHandler[struct{}] {
+func DeleteInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface, projectId, instanceId, region string) *wait.AsyncActionHandler[struct{}] {
 	handler := wait.New(func() (waitFinished bool, response *struct{}, err error) {
-		_, err = a.GetInstanceExecute(ctx, projectId, instanceId)
+		_, err = a.GetInstanceExecute(ctx, projectId, instanceId, region)
 		if err == nil {
 			return false, nil, nil
 		}

services/sqlserverflex/wait/wait_test.go

@@ -19,7 +19,7 @@ type apiClientInstanceMocked struct {
 	instanceGetFails  bool
 }
 
-func (a *apiClientInstanceMocked) GetInstanceExecute(_ context.Context, _, _ string) (*sqlserverflex.GetInstanceResponse, error) {
+func (a *apiClientInstanceMocked) GetInstanceExecute(_ context.Context, _, _, _ string) (*sqlserverflex.GetInstanceResponse, error) {
 	if a.instanceGetFails {
 		return nil, &oapierror.GenericOpenAPIError{
 			StatusCode: 500,
@@ -103,7 +103,7 @@ func TestCreateInstanceWaitHandler(t *testing.T) {
 				}
 			}
 
-			handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", instanceId)
+			handler := CreateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "")
 
 			gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background())
 
@@ -180,7 +180,7 @@ func TestUpdateInstanceWaitHandler(t *testing.T) {
 				}
 			}
 
-			handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId)
+			handler := UpdateInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "")
 
 			gotRes, err := handler.SetTimeout(10 * time.Millisecond).SetSleepBeforeWait(1 * time.Millisecond).WaitWithContext(context.Background())
 
@@ -230,7 +230,7 @@ func TestDeleteInstanceWaitHandler(t *testing.T) {
 				instanceState:     tt.instanceState,
 			}
 
-			handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId)
+			handler := DeleteInstanceWaitHandler(context.Background(), apiClient, "", instanceId, "")
 
 			_, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background())