Merge branch 'main' into feat/STACKITCLI-410-mariadb-region-adjustments

GokceGK · web-flow · commit e046b7fdd8d3 · 2026-08-03T08:09:24.000+02:00
diff --git a/go.mod b/go.mod
@@ -35,7 +35,7 @@ require (
 	github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2
 	github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.20.0
 	github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0
-	github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0
+	github.com/stackitcloud/stackit-sdk-go/services/ske v1.21.0
 	github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.16.1
 	github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0
 	github.com/zalando/go-keyring v0.2.8
diff --git a/go.sum b/go.sum
@@ -648,8 +648,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0 h1:TNZH
 github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0/go.mod h1:fXq3TmVLb4JMSve989NFFViMFoYa83s7M3hJWgN6mdQ=
 github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0 h1:JWAFnskRbNKT8x62pZcAMCC+p5hyTEkAyxqFwy39jFA=
 github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0/go.mod h1:jMlBoXqrPNX5nXbo6oT7exalqilw1jiLPoIp4Cn0CdI=
-github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0 h1:QoKyQPe8FqDqJLNgE5uRlZ/y1c1GUxjV1DDLu5QEBD8=
-github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0/go.mod h1:KhVYCR58wETqdI7Quwhe3OR3BhB2T/b7DzaMsfDnr8g=
+github.com/stackitcloud/stackit-sdk-go/services/ske v1.21.0 h1:eu9PhRdL2GkXpHtf4NN9YBCUYcARdvAwq+g/FW4hmi4=
+github.com/stackitcloud/stackit-sdk-go/services/ske v1.21.0/go.mod h1:TbqmZhLMofmfl+HhVl6oHYcI3zvXTm1vRjN3A/fOkM4=
 github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.16.1 h1:pjFVw2Tc0cSfAzmyZRiLknuKSADs7nPXNUyrM216CwQ=
 github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.16.1/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M=
 github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0 h1:LMgbzhPunuelsIsfyEj/5O/aYfNcg/eGHsnZ7AZOhYg=
diff --git a/internal/cmd/beta/sqlserverflex/instance/create/create.go b/internal/cmd/beta/sqlserverflex/instance/create/create.go
@@ -186,13 +186,13 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient sqlserverfle
 	var flavorId string
 	var err error
 
-	flavors, err := apiClient.ListFlavors(ctx, model.ProjectId, model.Region).Execute()
+	flavors, err := sqlserverflexUtils.ListAllFlavors(ctx, apiClient, model.ProjectId, model.Region)
 	if err != nil {
 		return req, fmt.Errorf("get SQLServer Flex flavors: %w", err)
 	}
 
 	if model.FlavorId == nil {
-		flavorId, err = sqlserverflexUtils.LoadFlavorId(*model.CPU, *model.RAM, flavors.Flavors)
+		flavorId, err = sqlserverflexUtils.LoadFlavorId(*model.CPU, *model.RAM, flavors)
 		if err != nil {
 			var dsaInvalidPlanError *cliErr.DSAInvalidPlanError
 			if !errors.As(err, &dsaInvalidPlanError) {
@@ -201,7 +201,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient sqlserverfle
 			return req, err
 		}
 	} else {
-		err := sqlserverflexUtils.ValidateFlavorId(*model.FlavorId, flavors.Flavors)
+		err := sqlserverflexUtils.ValidateFlavorId(*model.FlavorId, flavors)
 		if err != nil {
 			return req, err
 		}
diff --git a/internal/cmd/beta/sqlserverflex/instance/update/update.go b/internal/cmd/beta/sqlserverflex/instance/update/update.go
@@ -184,7 +184,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient sqlserverfle
 	var flavorId *string
 	var err error
 
-	flavors, err := apiClient.ListFlavors(ctx, model.ProjectId, model.Region).Execute()
+	flavors, err := sqlserverflexUtils.ListAllFlavors(ctx, apiClient, model.ProjectId, model.Region)
 	if err != nil {
 		return req, fmt.Errorf("get SQLServer Flex flavors: %w", err)
 	}
@@ -198,7 +198,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient sqlserverfle
 				return req, fmt.Errorf("get SQLServer Flex instance: %w", err)
 			}
 			var currentFlavor *sqlserverflex.ListFlavors
-			for _, flavor := range flavors.Flavors {
+			for _, flavor := range flavors {
 				if flavor.Id == currentInstance.FlavorId {
 					currentFlavor = &flavor
 				}
@@ -213,7 +213,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient sqlserverfle
 				cpu = &currentFlavor.Cpu
 			}
 		}
-		loadedId, err := sqlserverflexUtils.LoadFlavorId(*cpu, *ram, flavors.Flavors)
+		loadedId, err := sqlserverflexUtils.LoadFlavorId(*cpu, *ram, flavors)
 		if err != nil {
 			var dsaInvalidPlanError *cliErr.DSAInvalidPlanError
 			if !errors.As(err, &dsaInvalidPlanError) {
@@ -223,7 +223,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient sqlserverfle
 		}
 		flavorId = &loadedId
 	} else if model.FlavorId != nil {
-		err := sqlserverflexUtils.ValidateFlavorId(*model.FlavorId, flavors.Flavors)
+		err := sqlserverflexUtils.ValidateFlavorId(*model.FlavorId, flavors)
 		if err != nil {
 			return req, err
 		}
diff --git a/internal/cmd/beta/sqlserverflex/instance/update/update_test.go b/internal/cmd/beta/sqlserverflex/instance/update/update_test.go
@@ -356,6 +356,9 @@ func TestBuildRequest(t *testing.T) {
 			model:           fixtureRequiredInputModel(),
 			isValid:         true,
 			expectedRequest: fixtureRequest(),
+			listFlavorsResp: &sqlserverflex.ListFlavorsResponse{
+				Flavors: make([]sqlserverflex.ListFlavors, 0),
+			},
 		},
 		{
 			description: "update flavor from id",
@@ -443,6 +446,9 @@ func TestBuildRequest(t *testing.T) {
 			),
 			getInstanceFails: true,
 			isValid:          false,
+			listFlavorsResp: &sqlserverflex.ListFlavorsResponse{
+				Flavors: make([]sqlserverflex.ListFlavors, 0),
+			},
 		},
 		{
 			description: "get storages fails",
diff --git a/internal/cmd/beta/sqlserverflex/options/options.go b/internal/cmd/beta/sqlserverflex/options/options.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	sqlserverflexUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/sqlserverflex/utils"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/types"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
@@ -181,7 +182,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 }
 
 func buildAndExecuteRequest(ctx context.Context, p *print.Printer, model *inputModel, apiClient sqlserverflex.DefaultAPI) error {
-	var flavors *sqlserverflex.ListFlavorsResponse
+	var flavors []sqlserverflex.ListFlavors
 	var versions *sqlserverflex.ListVersionsResponse
 	var storages *sqlserverflex.ListStoragesResponse
 	var userRoles *sqlserverflex.ListRolesResponse
@@ -190,7 +191,7 @@ func buildAndExecuteRequest(ctx context.Context, p *print.Printer, model *inputM
 	var err error
 
 	if model.Flavors {
-		flavors, err = apiClient.ListFlavors(ctx, model.ProjectId, model.Region).Execute()
+		flavors, err = sqlserverflexUtils.ListAllFlavors(ctx, apiClient, model.ProjectId, model.Region)
 		if err != nil {
 			return fmt.Errorf("get SQL Server Flex flavors: %w", err)
 		}
@@ -229,10 +230,10 @@ func buildAndExecuteRequest(ctx context.Context, p *print.Printer, model *inputM
 	return outputResult(p, model, flavors, versions, storages, userRoles, dbCollations, dbCompatibilities)
 }
 
-func outputResult(p *print.Printer, model *inputModel, flavors *sqlserverflex.ListFlavorsResponse, versions *sqlserverflex.ListVersionsResponse, storages *sqlserverflex.ListStoragesResponse, userRoles *sqlserverflex.ListRolesResponse, dbCollations *sqlserverflex.ListCollationsResponse, dbCompatibilities *sqlserverflex.ListCompatibilityResponse) error {
+func outputResult(p *print.Printer, model *inputModel, flavors []sqlserverflex.ListFlavors, versions *sqlserverflex.ListVersionsResponse, storages *sqlserverflex.ListStoragesResponse, userRoles *sqlserverflex.ListRolesResponse, dbCollations *sqlserverflex.ListCollationsResponse, dbCompatibilities *sqlserverflex.ListCompatibilityResponse) error {
 	options := &options{}
 	if flavors != nil {
-		options.Flavors = flavors.Flavors
+		options.Flavors = flavors
 	}
 	if versions != nil {
 		options.Versions = versions.Versions
diff --git a/internal/cmd/beta/sqlserverflex/options/options_test.go b/internal/cmd/beta/sqlserverflex/options/options_test.go
@@ -466,7 +466,7 @@ func TestBuildAndExecuteRequest(t *testing.T) {
 func TestOutputResult(t *testing.T) {
 	type args struct {
 		model             *inputModel
-		flavors           *sqlserverflex.ListFlavorsResponse
+		flavors           []sqlserverflex.ListFlavors
 		versions          *sqlserverflex.ListVersionsResponse
 		storages          *sqlserverflex.ListStoragesResponse
 		userRoles         *sqlserverflex.ListRolesResponse
@@ -489,7 +489,7 @@ func TestOutputResult(t *testing.T) {
 			name: "all input set",
 			args: args{
 				model:             fixtureInputModelAllTrue(),
-				flavors:           &sqlserverflex.ListFlavorsResponse{Flavors: []sqlserverflex.ListFlavors{}},
+				flavors:           []sqlserverflex.ListFlavors{},
 				versions:          &sqlserverflex.ListVersionsResponse{Versions: []sqlserverflex.Version{}},
 				storages:          &sqlserverflex.ListStoragesResponse{StorageClasses: []sqlserverflex.FlavorStorageClassesStorageClass{}},
 				userRoles:         &sqlserverflex.ListRolesResponse{Roles: []string{}},
diff --git a/internal/cmd/ske/cluster/create/create.go b/internal/cmd/ske/cluster/create/create.go
@@ -134,7 +134,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			// Wait for async operation, if async mode not enabled
 			if !model.Async {
 				err := spinner.Run(params.Printer, "Creating cluster", func() error {
-					_, err = wait.CreateOrUpdateClusterWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, name).WaitWithContext(ctx)
+					_, err = wait.CreateClusterWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, name).WaitWithContext(ctx)
 					return err
 				})
 				if err != nil {
diff --git a/internal/cmd/ske/cluster/create/create_test.go b/internal/cmd/ske/cluster/create/create_test.go
@@ -55,7 +55,7 @@ var testPayload = &ske.CreateOrUpdateClusterPayload{
 			},
 			AvailabilityZones: []string{"eu01-3"},
 			Cri: &ske.CRI{
-				Name:                 utils.Ptr("containerd"),
+				Name:                 ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
 				AdditionalProperties: map[string]any{},
 			},
 			AdditionalProperties: map[string]any{},
diff --git a/internal/cmd/ske/cluster/update/update.go b/internal/cmd/ske/cluster/update/update.go
@@ -96,7 +96,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			// Wait for async operation, if async mode not enabled
 			if !model.Async {
 				err := spinner.Run(params.Printer, "Updating cluster", func() error {
-					_, err = wait.CreateOrUpdateClusterWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, name).WaitWithContext(ctx)
+					_, err = wait.UpdateClusterWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, name).WaitWithContext(ctx)
 					return err
 				})
 				if err != nil {
diff --git a/internal/cmd/ske/cluster/update/update_test.go b/internal/cmd/ske/cluster/update/update_test.go
@@ -54,7 +54,7 @@ var testPayload = ske.CreateOrUpdateClusterPayload{
 			},
 			AvailabilityZones: []string{"eu01-3"},
 			Cri: &ske.CRI{
-				Name:                 utils.Ptr("containerd"),
+				Name:                 ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
 				AdditionalProperties: map[string]any{},
 			},
 			AdditionalProperties: map[string]any{},
diff --git a/internal/cmd/ske/options/machine_images/machine_images_test.go b/internal/cmd/ske/options/machine_images/machine_images_test.go
@@ -186,7 +186,7 @@ func TestOutputResult(t *testing.T) {
 								{
 									Cri: []ske.CRI{
 										{
-											Name: utils.Ptr("containerd"),
+											Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
 										},
 									},
 									ExpirationDate: utils.Ptr(time.Now()),
diff --git a/internal/pkg/services/ske/utils/utils.go b/internal/pkg/services/ske/utils/utils.go
@@ -18,7 +18,7 @@ import (
 )
 
 const (
-	defaultNodepoolCRI              = "containerd"
+	defaultNodepoolCRI              = ske.NAMEOFTHECRILIBRARY_CONTAINERD
 	defaultNodepoolMachineImageName = "flatcar"
 	defaultNodepoolMaxUnavailable   = 0
 	defaultNodepoolMinimum          = 1
@@ -128,7 +128,7 @@ func getDefaultPayloadNodepool(resp *ske.ProviderOptions) (*ske.Nodepool, error)
 	output := &ske.Nodepool{
 		AvailabilityZones: availabilityZones,
 		Cri: &ske.CRI{
-			Name: utils.Ptr(defaultNodepoolCRI),
+			Name: new(defaultNodepoolCRI),
 		},
 		Machine: ske.Machine{
 			Type: machineType,
@@ -137,13 +137,13 @@ func getDefaultPayloadNodepool(resp *ske.ProviderOptions) (*ske.Nodepool, error)
 			},
 		},
 		// there must be as many nodes as availability zones are given
-		MaxSurge:       utils.Ptr(int32(azLen)),
-		MaxUnavailable: utils.Ptr(int32(defaultNodepoolMaxUnavailable)),
+		MaxSurge:       new(int32(azLen)),
+		MaxUnavailable: new(int32(defaultNodepoolMaxUnavailable)),
 		Maximum:        int32(azLen),
 		Minimum:        int32(defaultNodepoolMinimum),
 		Name:           defaultNodepoolName,
 		Volume: ske.Volume{
-			Type: utils.Ptr(defaultNodepoolVolumeType),
+			Type: new(defaultNodepoolVolumeType),
 			Size: int32(defaultNodepoolVolumeSize),
 		},
 	}
diff --git a/internal/pkg/services/ske/utils/utils_test.go b/internal/pkg/services/ske/utils/utils_test.go
@@ -164,10 +164,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt
 						Version: utils.Ptr("1.2.3"),
 						Cri: []ske.CRI{
 							{
-								Name: utils.Ptr("docker"),
-							},
-							{
-								Name: utils.Ptr("containerd"),
+								Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
 							},
 						},
 					},
@@ -176,10 +173,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt
 						Version: utils.Ptr("3.2.1"),
 						Cri: []ske.CRI{
 							{
-								Name: utils.Ptr("docker"),
-							},
-							{
-								Name: utils.Ptr("containerd"),
+								Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
 							},
 						},
 					},
@@ -193,7 +187,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt
 						Version: utils.Ptr("4.4.4"),
 						Cri: []ske.CRI{
 							{
-								Name: utils.Ptr("containerd"),
+								Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
 							},
 						},
 					},
@@ -216,7 +210,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt
 						Version: utils.Ptr("4.4.4"),
 						Cri: []ske.CRI{
 							{
-								Name: utils.Ptr("containerd"),
+								Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
 							},
 						},
 					},
@@ -228,11 +222,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt
 					{
 						State:   utils.Ptr("supported"),
 						Version: utils.Ptr("4.4.4"),
-						Cri: []ske.CRI{
-							{
-								Name: utils.Ptr("docker"),
-							},
-						},
+						Cri:     []ske.CRI{},
 					},
 				},
 			},
@@ -263,7 +253,7 @@ func fixtureGetDefaultPayload(mods ...func(*ske.CreateOrUpdateClusterPayload)) *
 					"eu01-3",
 				},
 				Cri: &ske.CRI{
-					Name: utils.Ptr("containerd"),
+					Name: ske.NAMEOFTHECRILIBRARY_CONTAINERD.Ptr(),
 				},
 				Machine: ske.Machine{
 					Type: "b1.2",
diff --git a/internal/pkg/services/sqlserverflex/utils/utils.go b/internal/pkg/services/sqlserverflex/utils/utils.go
@@ -3,6 +3,7 @@ package utils
 import (
 	"context"
 	"fmt"
+	"math"
 	"strings"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -75,6 +76,23 @@ func LoadFlavorId(cpu, ram int64, flavors []sqlserverflex.ListFlavors) (string,
 	}
 }
 
+func ListAllFlavors(ctx context.Context, api sqlserverflex.DefaultAPI, projectId, region string) ([]sqlserverflex.ListFlavors, error) {
+	const pageSize = 100
+	const sort = sqlserverflex.FLAVORSORT_ID_ASC
+	totalRows := int64(math.MaxInt64)
+	var page int64 = 1
+	var result []sqlserverflex.ListFlavors
+	for ; int64(len(result)) < totalRows; page++ {
+		flavors, err := api.ListFlavors(ctx, projectId, region).Page(page).Sort(sort).Size(pageSize).Execute()
+		if err != nil {
+			return result, fmt.Errorf("listing flavors: %w", err)
+		}
+		result = append(result, flavors.Flavors...)
+		totalRows = flavors.Pagination.TotalRows
+	}
+	return result, nil
+}
+
 func GetInstanceName(ctx context.Context, apiClient sqlserverflex.DefaultAPI, projectId, instanceId, region string) (string, error) {
 	resp, err := apiClient.GetInstance(ctx, projectId, region, instanceId).Execute()
 	if err != nil {
@@ -92,12 +110,11 @@ func GetUserName(ctx context.Context, apiClient sqlserverflex.DefaultAPI, projec
 }
 
 func GetFlavor(ctx context.Context, client sqlserverflex.DefaultAPI, projectId, region, flavorId string) (*sqlserverflex.ListFlavors, error) {
-	req := client.ListFlavors(ctx, projectId, region)
-	flavorsResp, err := client.ListFlavorsExecute(req)
+	flavors, err := ListAllFlavors(ctx, client, projectId, region)
 	if err != nil {
 		return nil, fmt.Errorf("failed to list flavors: %w", err)
 	}
-	for _, flavor := range flavorsResp.Flavors {
+	for _, flavor := range flavors {
 		if flavor.Id == flavorId {
 			return &flavor, nil
 		}
diff --git a/internal/pkg/services/sqlserverflex/utils/utils_test.go b/internal/pkg/services/sqlserverflex/utils/utils_test.go

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient sqlserverfle`
`184`	`184`	`var flavorId *string`
`185`	`185`	`var err error`
`186`	`186`
`187`		`- flavors, err := apiClient.ListFlavors(ctx, model.ProjectId, model.Region).Execute()`
	`187`	`+ flavors, err := sqlserverflexUtils.ListAllFlavors(ctx, apiClient, model.ProjectId, model.Region)`
`188`	`188`	`if err != nil {`
`189`	`189`	`return req, fmt.Errorf("get SQLServer Flex flavors: %w", err)`
`190`	`190`	`}`
`@@ -198,7 +198,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient sqlserverfle`
`198`	`198`	`return req, fmt.Errorf("get SQLServer Flex instance: %w", err)`
`199`	`199`	`}`
`200`	`200`	`var currentFlavor *sqlserverflex.ListFlavors`
`201`		`- for _, flavor := range flavors.Flavors {`
	`201`	`+ for _, flavor := range flavors {`
`202`	`202`	`if flavor.Id == currentInstance.FlavorId {`
`203`	`203`	`currentFlavor = &flavor`
`204`	`204`	`}`
`@@ -213,7 +213,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient sqlserverfle`
`213`	`213`	`cpu = &currentFlavor.Cpu`
`214`	`214`	`}`
`215`	`215`	`}`
`216`		`- loadedId, err := sqlserverflexUtils.LoadFlavorId(cpu, ram, flavors.Flavors)`
	`216`	`+ loadedId, err := sqlserverflexUtils.LoadFlavorId(cpu, ram, flavors)`
`217`	`217`	`if err != nil {`
`218`	`218`	`var dsaInvalidPlanError *cliErr.DSAInvalidPlanError`
`219`	`219`	`if !errors.As(err, &dsaInvalidPlanError) {`
`@@ -223,7 +223,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient sqlserverfle`
`223`	`223`	`}`
`224`	`224`	`flavorId = &loadedId`
`225`	`225`	`} else if model.FlavorId != nil {`
`226`		`- err := sqlserverflexUtils.ValidateFlavorId(*model.FlavorId, flavors.Flavors)`
	`226`	`+ err := sqlserverflexUtils.ValidateFlavorId(*model.FlavorId, flavors)`
`227`	`227`	`if err != nil {`
`228`	`228`	`return req, err`
`229`	`229`	`}`