feat(sqlserverflex): migrate to v3 API (#1492)

Author: cgoetz-inovex

docs/stackit_beta_sqlserverflex_instance_create.md

@@ -13,29 +13,26 @@ stackit beta sqlserverflex instance create [flags]
 ### Examples
 
 ```
-  Create a SQLServer Flex instance with name "my-instance" and specify flavor by CPU and RAM. Other parameters are set to default values
-  $ stackit beta sqlserverflex instance create --name my-instance --cpu 1 --ram 4
-
   Create a SQLServer Flex instance with name "my-instance" and specify flavor by ID. Other parameters are set to default values.
   The flavor ID can be retrieved by running "$ stackit beta sqlserverflex options --flavors"
-  $ stackit beta sqlserverflex instance create --name my-instance --flavor-id xxx
+  $ stackit beta sqlserverflex instance create --name my-instance --flavor-id xxx --backup-schedule "0 1-3 * * *" --retention-days 30 --storage-class premium-perf2-stackit --storage-size 10 --version 2022
 
   Create a SQLServer Flex instance with name "my-instance", specify flavor by CPU and RAM, set storage size to 20 GB, and restrict access to a specific range of IP addresses. Other parameters are set to default values
-  $ stackit beta sqlserverflex instance create --name my-instance --cpu 1 --ram 4 --storage-size 20 --acl 1.2.3.0/24
+  $ stackit beta sqlserverflex instance create --name my-instance --cpu 1 --ram 4 --storage-size 20 --backup-schedule "0 1-3 * * *" --retention-days 30 --storage-class premium-perf2-stackit --storage-size 10 --version 2022 --acl 1.2.3.0/24
 ```
 
 ### Options
 
 ```
       --acl strings              The access control list (ACL). Must contain at least one valid subnet, for instance '0.0.0.0/0' for open access (discouraged), '1.2.3.0/24 for a public IP range of an organization, '1.2.3.4/32' for a single IP range, etc. (default [])
       --backup-schedule string   Backup schedule
-      --cpu int32                Number of CPUs
+      --cpu int                  Number of CPUs
       --edition string           Edition of the SQLServer instance
       --flavor-id string         ID of the flavor
   -h, --help                     Help for "stackit beta sqlserverflex instance create"
   -n, --name string              Instance name
-      --ram int32                Amount of RAM (in GB)
-      --retention-days int       The days for how long the backup files should be stored before being cleaned up
+      --ram int                  Amount of RAM (in GB)
+      --retention-days int32     The days for how long the backup files should be stored before being cleaned up
       --storage-class string     Storage class
       --storage-size int         Storage size (in GB)
       --version string           SQLServer version

docs/stackit_beta_sqlserverflex_instance_update.md

@@ -25,11 +25,11 @@ stackit beta sqlserverflex instance update INSTANCE_ID [flags]
 ```
       --acl strings              Lists of IP networks in CIDR notation which are allowed to access this instance (default [])
       --backup-schedule string   Backup schedule
-      --cpu int32                Number of CPUs
+      --cpu int                  Number of CPUs
       --flavor-id string         ID of the flavor
   -h, --help                     Help for "stackit beta sqlserverflex instance update"
   -n, --name string              Instance name
-      --ram int32                Amount of RAM (in GB)
+      --ram int                  Amount of RAM (in GB)
       --version string           Version
 ```
 

go.mod

@@ -36,7 +36,7 @@ require (
 	github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.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/sqlserverflex v1.11.0
+	github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.16.0
 	github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0
 	github.com/zalando/go-keyring v0.2.8
 	golang.org/x/mod v0.37.0

go.sum

@@ -650,8 +650,8 @@ github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0 h1:JWAFnskRbNKT8x62pZ
 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/sqlserverflex v1.11.0 h1:PwjQeupEnXxhu+uWCUzO/hUfL4yqNblOcZbP2jvaQtU=
-github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M=
+github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.16.0 h1:A6zN5JUz5DOTigTxAyAC+4p5VpJzaYDftx2yIH0mgn8=
+github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.16.0/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M=
 github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0 h1:LMgbzhPunuelsIsfyEj/5O/aYfNcg/eGHsnZ7AZOhYg=
 github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0/go.mod h1:toIjQk1dhxdUFVyCWJJja0w/0nFpDid8MWX0ukQfvfo=
 github.com/stbenjam/no-sprintf-host-port v0.3.1 h1:AyX7+dxI4IdLBPtDbsGAyqiTSLpCP9hWRrXQDU4Cm/g=

internal/cmd/beta/sqlserverflex/database/create/create.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/types"
 
-	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
+	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/args"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -108,12 +108,10 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverflex.APIClient) sqlserverflex.ApiCreateDatabaseRequest {
-	req := apiClient.DefaultAPI.CreateDatabase(ctx, model.ProjectId, model.InstanceId, model.Region)
+	req := apiClient.DefaultAPI.CreateDatabase(ctx, model.ProjectId, model.Region, model.InstanceId)
 	payload := sqlserverflex.CreateDatabasePayload{
-		Name: model.DatabaseName,
-		Options: sqlserverflex.DatabaseDocumentationCreateDatabaseRequestOptions{
-			Owner: model.Owner,
-		},
+		Name:  model.DatabaseName,
+		Owner: model.Owner,
 	}
 	req = req.CreateDatabasePayload(payload)
 	return req

internal/cmd/beta/sqlserverflex/database/create/create_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
-	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
+	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
 
@@ -67,12 +67,10 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *sqlserverflex.ApiCreateDatabaseRequest)) sqlserverflex.ApiCreateDatabaseRequest {
-	request := testClient.DefaultAPI.CreateDatabase(testCtx, testProjectId, testInstanceId, testRegion)
+	request := testClient.DefaultAPI.CreateDatabase(testCtx, testProjectId, testRegion, testInstanceId)
 	payload := sqlserverflex.CreateDatabasePayload{
-		Name: testDatabaseName,
-		Options: sqlserverflex.DatabaseDocumentationCreateDatabaseRequestOptions{
-			Owner: testOwner,
-		},
+		Name:  testDatabaseName,
+		Owner: testOwner,
 	}
 	request = request.CreateDatabasePayload(payload)
 	for _, mod := range mods {

internal/cmd/beta/sqlserverflex/database/delete/delete.go

@@ -16,7 +16,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
 
 	"github.com/spf13/cobra"
-	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
+	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3api"
 )
 
 const (
@@ -107,6 +107,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverflex.APIClient) sqlserverflex.ApiDeleteDatabaseRequest {
-	req := apiClient.DefaultAPI.DeleteDatabase(ctx, model.ProjectId, model.InstanceId, model.DatabaseName, model.Region)
+	req := apiClient.DefaultAPI.DeleteDatabase(ctx, model.ProjectId, model.Region, model.InstanceId, model.DatabaseName)
 	return req
 }

internal/cmd/beta/sqlserverflex/database/delete/delete_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
+	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
@@ -63,7 +63,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *sqlserverflex.ApiDeleteDatabaseRequest)) sqlserverflex.ApiDeleteDatabaseRequest {
-	request := testClient.DefaultAPI.DeleteDatabase(testCtx, testProjectId, testInstanceId, testDatabaseName, testRegion)
+	request := testClient.DefaultAPI.DeleteDatabase(testCtx, testProjectId, testRegion, testInstanceId, testDatabaseName)
 	for _, mod := range mods {
 		mod(&request)
 	}

internal/cmd/beta/sqlserverflex/database/describe/describe.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/types"
 
 	"github.com/spf13/cobra"
-	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
+	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/args"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -17,7 +17,6 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/sqlserverflex/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 )
 
 const (
@@ -98,35 +97,26 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverflex.APIClient) sqlserverflex.ApiGetDatabaseRequest {
-	req := apiClient.DefaultAPI.GetDatabase(ctx, model.ProjectId, model.InstanceId, model.DatabaseName, model.Region)
+	req := apiClient.DefaultAPI.GetDatabase(ctx, model.ProjectId, model.Region, model.InstanceId, model.DatabaseName)
 	return req
 }
 
 func outputResult(p *print.Printer, outputFormat string, resp *sqlserverflex.GetDatabaseResponse) error {
-	if resp == nil || resp.Database == nil {
-		return fmt.Errorf("database response is empty")
-	}
-
 	return p.OutputResult(outputFormat, resp, func() error {
-		database := resp.Database
+		if resp == nil {
+			return fmt.Errorf("database response is empty")
+		}
+
 		table := tables.NewTable()
-		table.AddRow("ID", utils.PtrString(database.Id))
+		table.AddRow("ID", resp.Id)
 		table.AddSeparator()
-		table.AddRow("NAME", utils.PtrString(database.Name))
+		table.AddRow("NAME", resp.Name)
 		table.AddSeparator()
-		if database.Options != nil {
-			if database.Options.CompatibilityLevel != nil {
-				table.AddRow("COMPATIBILITY LEVEL", *database.Options.CompatibilityLevel)
-				table.AddSeparator()
-			}
-			if database.Options.Owner != nil {
-				table.AddRow("OWNER", *database.Options.Owner)
-				table.AddSeparator()
-			}
-			if database.Options.CollationName != nil {
-				table.AddRow("COLLATION", *database.Options.CollationName)
-			}
-		}
+		table.AddRow("COMPATIBILITY LEVEL", resp.CompatibilityLevel)
+		table.AddSeparator()
+		table.AddRow("OWNER", resp.Owner)
+		table.AddSeparator()
+		table.AddRow("COLLATION", resp.CollationName)
 		err := table.Display(p)
 		if err != nil {
 			return fmt.Errorf("render table: %w", err)

internal/cmd/beta/sqlserverflex/database/describe/describe_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
-	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
+	sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
 
@@ -64,7 +64,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *sqlserverflex.ApiGetDatabaseRequest)) sqlserverflex.ApiGetDatabaseRequest {
-	request := testClient.DefaultAPI.GetDatabase(testCtx, testProjectId, testInstanceId, testDatabaseName, testRegion)
+	request := testClient.DefaultAPI.GetDatabase(testCtx, testProjectId, testRegion, testInstanceId, testDatabaseName)
 	for _, mod := range mods {
 		mod(&request)
 	}
@@ -210,20 +210,6 @@ func TestOutputResult(t *testing.T) {
 			args:    args{},
 			wantErr: true,
 		},
-		{
-			name: "empty response",
-			args: args{
-				resp: &sqlserverflex.GetDatabaseResponse{},
-			},
-			wantErr: true,
-		},
-		{
-			name: "only database as argument",
-			args: args{
-				resp: &sqlserverflex.GetDatabaseResponse{Database: &sqlserverflex.SingleDatabase{}},
-			},
-			wantErr: false,
-		},
 	}
 	params := testparams.NewTestParams()