Skip to content

Commit e1ea056

Browse files
cgoetz-inovexcgoetz-inovex
committed
chore(sqlserverflex): migrate to multiversion sdk
1 parent 4cafb60 commit e1ea056

35 files changed

Lines changed: 475 additions & 480 deletions

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ require (
3636
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0
3737
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7
3838
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0
39-
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.3
39+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0
4040
github.com/zalando/go-keyring v0.2.6
4141
golang.org/x/mod v0.34.0
4242
golang.org/x/oauth2 v0.35.0

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,8 @@ github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0 h1:QoKyQPe8FqDqJLNgE
658658
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0/go.mod h1:KhVYCR58wETqdI7Quwhe3OR3BhB2T/b7DzaMsfDnr8g=
659659
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.3 h1:AQrcr+qeIuZob+3TT2q1L4WOPtpsu5SEpkTnOUHDqfE=
660660
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.3/go.mod h1:8BBGC69WFXWWmKgzSjgE4HvsI7pEgO0RN2cASwuPJ18=
661+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0 h1:PwjQeupEnXxhu+uWCUzO/hUfL4yqNblOcZbP2jvaQtU=
662+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M=
661663
github.com/stbenjam/no-sprintf-host-port v0.3.1 h1:AyX7+dxI4IdLBPtDbsGAyqiTSLpCP9hWRrXQDU4Cm/g=
662664
github.com/stbenjam/no-sprintf-host-port v0.3.1/go.mod h1:ODbZesTCHMVKthBHskvUUexdcNHAQRXk9NpSsL8p/HQ=
663665
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
88

9-
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
9+
sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
1010

1111
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1212
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -69,9 +69,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
6969

7070
// Call API
7171
req := buildRequest(ctx, model, apiClient)
72-
resp, err := spinner.Run2(params.Printer, "Creating database", func() (*sqlserverflex.CreateDatabaseResponse, error) {
73-
return req.Execute()
74-
})
72+
resp, err := spinner.Run2(params.Printer, "Creating database", req.Execute)
7573
if err != nil {
7674
return fmt.Errorf("create SQLServer Flex database: %w", err)
7775
}
@@ -110,11 +108,11 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
110108
}
111109

112110
func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverflex.APIClient) sqlserverflex.ApiCreateDatabaseRequest {
113-
req := apiClient.CreateDatabase(ctx, model.ProjectId, model.InstanceId, model.Region)
111+
req := apiClient.DefaultAPI.CreateDatabase(ctx, model.ProjectId, model.InstanceId, model.Region)
114112
payload := sqlserverflex.CreateDatabasePayload{
115-
Name: &model.DatabaseName,
116-
Options: &sqlserverflex.DatabaseDocumentationCreateDatabaseRequestOptions{
117-
Owner: &model.Owner,
113+
Name: model.DatabaseName,
114+
Options: sqlserverflex.DatabaseDocumentationCreateDatabaseRequestOptions{
115+
Owner: model.Owner,
118116
},
119117
}
120118
req = req.CreateDatabasePayload(payload)

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/google/go-cmp/cmp"
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/google/uuid"
10-
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
10+
sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
1111

1212
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
1313

@@ -18,7 +18,8 @@ import (
1818
type testCtxKey struct{}
1919

2020
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
21-
var testClient = &sqlserverflex.APIClient{}
21+
var testClient = &sqlserverflex.APIClient{DefaultAPI: &sqlserverflex.DefaultAPIService{}}
22+
2223
var testProjectId = uuid.NewString()
2324
var testInstanceId = uuid.NewString()
2425
var testDatabaseName = "my-database"
@@ -66,11 +67,11 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6667
}
6768

6869
func fixtureRequest(mods ...func(request *sqlserverflex.ApiCreateDatabaseRequest)) sqlserverflex.ApiCreateDatabaseRequest {
69-
request := testClient.CreateDatabase(testCtx, testProjectId, testInstanceId, testRegion)
70+
request := testClient.DefaultAPI.CreateDatabase(testCtx, testProjectId, testInstanceId, testRegion)
7071
payload := sqlserverflex.CreateDatabasePayload{
71-
Name: &testDatabaseName,
72-
Options: &sqlserverflex.DatabaseDocumentationCreateDatabaseRequestOptions{
73-
Owner: &testOwner,
72+
Name: testDatabaseName,
73+
Options: sqlserverflex.DatabaseDocumentationCreateDatabaseRequestOptions{
74+
Owner: testOwner,
7475
},
7576
}
7677
request = request.CreateDatabasePayload(payload)
@@ -203,7 +204,7 @@ func TestBuildRequest(t *testing.T) {
203204

204205
diff := cmp.Diff(request, tt.expectedRequest,
205206
cmp.AllowUnexported(tt.expectedRequest),
206-
cmpopts.EquateComparable(testCtx),
207+
cmpopts.EquateComparable(testCtx, sqlserverflex.DefaultAPIService{}),
207208
)
208209
if diff != "" {
209210
t.Fatalf("Data does not match: %s", diff)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
1717

1818
"github.com/spf13/cobra"
19-
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
19+
sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
2020
)
2121

2222
const (
@@ -107,6 +107,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
107107
}
108108

109109
func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverflex.APIClient) sqlserverflex.ApiDeleteDatabaseRequest {
110-
req := apiClient.DeleteDatabase(ctx, model.ProjectId, model.InstanceId, model.DatabaseName, model.Region)
110+
req := apiClient.DefaultAPI.DeleteDatabase(ctx, model.ProjectId, model.InstanceId, model.DatabaseName, model.Region)
111111
return req
112112
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
7+
sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
88

99
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1010
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
@@ -17,7 +17,8 @@ import (
1717
type testCtxKey struct{}
1818

1919
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
20-
var testClient = &sqlserverflex.APIClient{}
20+
var testClient = &sqlserverflex.APIClient{DefaultAPI: &sqlserverflex.DefaultAPIService{}}
21+
2122
var testProjectId = uuid.NewString()
2223
var testInstanceId = uuid.NewString()
2324
var testDatabaseName = "my-database"
@@ -62,7 +63,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6263
}
6364

6465
func fixtureRequest(mods ...func(request *sqlserverflex.ApiDeleteDatabaseRequest)) sqlserverflex.ApiDeleteDatabaseRequest {
65-
request := testClient.DeleteDatabase(testCtx, testProjectId, testInstanceId, testDatabaseName, testRegion)
66+
request := testClient.DefaultAPI.DeleteDatabase(testCtx, testProjectId, testInstanceId, testDatabaseName, testRegion)
6667
for _, mod := range mods {
6768
mod(&request)
6869
}
@@ -184,7 +185,7 @@ func TestBuildRequest(t *testing.T) {
184185

185186
diff := cmp.Diff(request, tt.expectedRequest,
186187
cmp.AllowUnexported(tt.expectedRequest),
187-
cmpopts.EquateComparable(testCtx),
188+
cmpopts.EquateComparable(testCtx, sqlserverflex.DefaultAPIService{}),
188189
)
189190
if diff != "" {
190191
t.Fatalf("Data does not match: %s", diff)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
88

99
"github.com/spf13/cobra"
10-
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
10+
sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
1111

1212
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1313
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -98,7 +98,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
9898
}
9999

100100
func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverflex.APIClient) sqlserverflex.ApiGetDatabaseRequest {
101-
req := apiClient.GetDatabase(ctx, model.ProjectId, model.InstanceId, model.DatabaseName, model.Region)
101+
req := apiClient.DefaultAPI.GetDatabase(ctx, model.ProjectId, model.InstanceId, model.DatabaseName, model.Region)
102102
return req
103103
}
104104

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/google/go-cmp/cmp"
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/google/uuid"
10-
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
10+
sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
1111

1212
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
1313

@@ -18,7 +18,8 @@ import (
1818
type testCtxKey struct{}
1919

2020
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
21-
var testClient = &sqlserverflex.APIClient{}
21+
var testClient = &sqlserverflex.APIClient{DefaultAPI: &sqlserverflex.DefaultAPIService{}}
22+
2223
var testProjectId = uuid.NewString()
2324
var testInstanceId = uuid.NewString()
2425
var testDatabaseName = "my-database"
@@ -63,7 +64,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6364
}
6465

6566
func fixtureRequest(mods ...func(request *sqlserverflex.ApiGetDatabaseRequest)) sqlserverflex.ApiGetDatabaseRequest {
66-
request := testClient.GetDatabase(testCtx, testProjectId, testInstanceId, testDatabaseName, testRegion)
67+
request := testClient.DefaultAPI.GetDatabase(testCtx, testProjectId, testInstanceId, testDatabaseName, testRegion)
6768
for _, mod := range mods {
6869
mod(&request)
6970
}
@@ -185,7 +186,7 @@ func TestBuildRequest(t *testing.T) {
185186

186187
diff := cmp.Diff(request, tt.expectedRequest,
187188
cmp.AllowUnexported(tt.expectedRequest),
188-
cmpopts.EquateComparable(testCtx),
189+
cmpopts.EquateComparable(testCtx, sqlserverflex.DefaultAPIService{}),
189190
)
190191
if diff != "" {
191192
t.Fatalf("Data does not match: %s", diff)

‎internal/cmd/beta/sqlserverflex/database/list/list.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
88

99
"github.com/spf13/cobra"
10-
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
10+
sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
1111

1212
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1313
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -122,7 +122,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
122122
}
123123

124124
func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverflex.APIClient) sqlserverflex.ApiListDatabasesRequest {
125-
req := apiClient.ListDatabases(ctx, model.ProjectId, model.InstanceId, model.Region)
125+
req := apiClient.DefaultAPI.ListDatabases(ctx, model.ProjectId, model.InstanceId, model.Region)
126126
return req
127127
}
128128

‎internal/cmd/beta/sqlserverflex/database/list/list_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/google/go-cmp/cmp"
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/google/uuid"
10-
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
10+
sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
1111

1212
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
1313

@@ -19,7 +19,8 @@ import (
1919
type testCtxKey struct{}
2020

2121
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
22-
var testClient = &sqlserverflex.APIClient{}
22+
var testClient = &sqlserverflex.APIClient{DefaultAPI: &sqlserverflex.DefaultAPIService{}}
23+
2324
var testProjectId = uuid.NewString()
2425
var testInstanceId = uuid.NewString()
2526

@@ -55,7 +56,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5556
}
5657

5758
func fixtureRequest(mods ...func(request *sqlserverflex.ApiListDatabasesRequest)) sqlserverflex.ApiListDatabasesRequest {
58-
request := testClient.ListDatabases(testCtx, testProjectId, testInstanceId, testRegion)
59+
request := testClient.DefaultAPI.ListDatabases(testCtx, testProjectId, testInstanceId, testRegion)
5960
for _, mod := range mods {
6061
mod(&request)
6162
}
@@ -165,7 +166,7 @@ func TestBuildRequest(t *testing.T) {
165166

166167
diff := cmp.Diff(request, tt.expectedRequest,
167168
cmp.AllowUnexported(tt.expectedRequest),
168-
cmpopts.EquateComparable(testCtx),
169+
cmpopts.EquateComparable(testCtx, sqlserverflex.DefaultAPIService{}),
169170
)
170171
if diff != "" {
171172
t.Fatalf("Data does not match: %s", diff)

0 commit comments

Comments
 (0)