Skip to content

Commit 1e4db53

Browse files
authored
chore(serviceenablement): switch to new sdk structure (#1487)
relates to STACKITCLI-354
1 parent 749be04 commit 1e4db53

14 files changed

Lines changed: 88 additions & 76 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8
3535
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2
3636
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0
37-
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7
37+
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0
3838
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0
3939
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0
4040
github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,8 +644,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2 h1:6C/iTPoYP
644644
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2/go.mod h1:/OHYZXQb9KXDdZK5J9C2YS6DJUD2i6ednZ1rK7zpDZ0=
645645
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0 h1:l1EDIlXce2C8JcbBDHVa6nZ4SjPTqmnALTgrhms+NKI=
646646
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0/go.mod h1:EXq8/J7t9p8zPmdIq+atuxyAbnQwxrQT18fI+Qpv98k=
647-
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7 h1:M2PYLF8k3zmAwYWSKfUiCTNTXr7ROGuJganVVEQA3YI=
648-
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7/go.mod h1:jitkQuP2K/SH63Qor0C4pcqz1GDCy/lK2H4t8/VDse4=
647+
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0 h1:TNZHrunhsXRbuqZcucLs2Gqy1sEyvabufM7pB5Tscmo=
648+
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0/go.mod h1:fXq3TmVLb4JMSve989NFFViMFoYa83s7M3hJWgN6mdQ=
649649
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0 h1:JWAFnskRbNKT8x62pZcAMCC+p5hyTEkAyxqFwy39jFA=
650650
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0/go.mod h1:jMlBoXqrPNX5nXbo6oT7exalqilw1jiLPoIp4Cn0CdI=
651651
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0 h1:QoKyQPe8FqDqJLNgE5uRlZ/y1c1GUxjV1DDLu5QEBD8=

internal/cmd/ske/cluster/create/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
9999
exists, err := skeUtils.ClusterExists(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.ClusterName)
100100
if err != nil {
101101
// Check if the project is enabled
102-
enabled, enabledErr := serviceEnablementUtils.ProjectEnabled(ctx, serviceEnablementApiClient, model.ProjectId, model.Region)
102+
enabled, enabledErr := serviceEnablementUtils.ProjectEnabled(ctx, serviceEnablementApiClient.DefaultAPI, model.ProjectId, model.Region)
103103
if enabledErr != nil {
104104
return fmt.Errorf("check if project is enabled failed: %w", enabledErr)
105105
}

internal/cmd/ske/cluster/list/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
7373
resp, err := req.Execute()
7474
if err != nil {
7575
// Check if SKE is enabled for this project
76-
enabled, enabledErr := serviceEnablementUtils.ProjectEnabled(ctx, serviceEnablementApiClient, model.ProjectId, model.Region)
76+
enabled, enabledErr := serviceEnablementUtils.ProjectEnabled(ctx, serviceEnablementApiClient.DefaultAPI, model.ProjectId, model.Region)
7777
if enabledErr != nil {
7878
return fmt.Errorf("check if project is enabled failed: %w", enabledErr)
7979
}

internal/cmd/ske/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/serviceenablement"
10+
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
1111

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

7777
func buildRequest(ctx context.Context, model *inputModel, apiClient *serviceenablement.APIClient) serviceenablement.ApiGetServiceStatusRegionalRequest {
78-
req := apiClient.GetServiceStatusRegional(ctx, model.Region, model.ProjectId, skeUtils.SKEServiceId)
78+
req := apiClient.DefaultAPI.GetServiceStatusRegional(ctx, model.Region, model.ProjectId, skeUtils.SKEServiceId)
7979
return req
8080
}
8181

internal/cmd/ske/describe/describe_test.go

Lines changed: 6 additions & 5 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/serviceenablement"
7+
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
88

99
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1010
serviceEnablementUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/utils"
@@ -19,9 +19,10 @@ import (
1919
type testCtxKey struct{}
2020

2121
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
22-
var testClient = &serviceenablement.APIClient{}
22+
var testClient = &serviceenablement.APIClient{DefaultAPI: &serviceenablement.DefaultAPIService{}}
2323
var testProjectId = uuid.NewString()
24-
var testRegion = "eu01"
24+
25+
const testRegion = "eu01"
2526

2627
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2728
flagValues := map[string]string{
@@ -49,7 +50,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4950
}
5051

5152
func fixtureRequest(mods ...func(request *serviceenablement.ApiGetServiceStatusRegionalRequest)) serviceenablement.ApiGetServiceStatusRegionalRequest {
52-
request := testClient.GetServiceStatusRegional(testCtx, testRegion, testProjectId, serviceEnablementUtils.SKEServiceId) //nolint:staticcheck //command will be removed in a later update
53+
request := testClient.DefaultAPI.GetServiceStatusRegional(testCtx, testRegion, testProjectId, serviceEnablementUtils.SKEServiceId) //nolint:staticcheck //command will be removed in a later update
5354
for _, mod := range mods {
5455
mod(&request)
5556
}
@@ -125,7 +126,7 @@ func TestBuildRequest(t *testing.T) {
125126

126127
diff := cmp.Diff(request, tt.expectedRequest,
127128
cmp.AllowUnexported(tt.expectedRequest),
128-
cmpopts.EquateComparable(testCtx),
129+
cmpopts.EquateComparable(testCtx, serviceenablement.DefaultAPIService{}),
129130
)
130131
if diff != "" {
131132
t.Fatalf("Data does not match: %s", diff)

internal/cmd/ske/disable/disable.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
1818

1919
"github.com/spf13/cobra"
20-
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
21-
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait"
20+
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
21+
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait"
2222
)
2323

2424
type inputModel struct {
@@ -71,7 +71,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
7171
// Wait for async operation, if async mode not enabled
7272
if !model.Async {
7373
err := spinner.Run(params.Printer, "Disabling SKE", func() error {
74-
_, err = wait.DisableServiceWaitHandler(ctx, apiClient, model.Region, model.ProjectId, utils.SKEServiceId).WaitWithContext(ctx)
74+
_, err = wait.DisableServiceWaitHandler(ctx, apiClient.DefaultAPI, model.Region, model.ProjectId, utils.SKEServiceId).WaitWithContext(ctx)
7575
return err
7676
})
7777
if err != nil {
@@ -105,6 +105,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
105105
}
106106

107107
func buildRequest(ctx context.Context, model *inputModel, apiClient *serviceenablement.APIClient) serviceenablement.ApiDisableServiceRegionalRequest {
108-
req := apiClient.DisableServiceRegional(ctx, model.Region, model.ProjectId, utils.SKEServiceId)
108+
req := apiClient.DefaultAPI.DisableServiceRegional(ctx, model.Region, model.ProjectId, utils.SKEServiceId)
109109
return req
110110
}

internal/cmd/ske/disable/disable_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ import (
1111
"github.com/google/go-cmp/cmp"
1212
"github.com/google/go-cmp/cmp/cmpopts"
1313
"github.com/google/uuid"
14-
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
14+
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
1515
)
1616

1717
type testCtxKey struct{}
1818

1919
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
20-
var testClient = &serviceenablement.APIClient{}
20+
var testClient = &serviceenablement.APIClient{DefaultAPI: &serviceenablement.DefaultAPIService{}}
2121
var testProjectId = uuid.NewString()
22-
var testRegion = "eu01"
22+
23+
const testRegion = "eu01"
2324

2425
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2526
flagValues := map[string]string{
@@ -47,7 +48,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4748
}
4849

4950
func fixtureRequest(mods ...func(request *serviceenablement.ApiDisableServiceRegionalRequest)) serviceenablement.ApiDisableServiceRegionalRequest {
50-
request := testClient.DisableServiceRegional(testCtx, testRegion, testProjectId, utils.SKEServiceId)
51+
request := testClient.DefaultAPI.DisableServiceRegional(testCtx, testRegion, testProjectId, utils.SKEServiceId)
5152
for _, mod := range mods {
5253
mod(&request)
5354
}
@@ -122,7 +123,7 @@ func TestBuildRequest(t *testing.T) {
122123

123124
diff := cmp.Diff(request, tt.expectedRequest,
124125
cmp.AllowUnexported(tt.expectedRequest),
125-
cmpopts.EquateComparable(testCtx),
126+
cmpopts.EquateComparable(testCtx, serviceenablement.DefaultAPIService{}),
126127
)
127128
if diff != "" {
128129
t.Fatalf("Data does not match: %s", diff)

internal/cmd/ske/enable/enable.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
1818

1919
"github.com/spf13/cobra"
20-
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
21-
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait"
20+
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
21+
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait"
2222
)
2323

2424
type inputModel struct {
@@ -71,7 +71,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
7171
// Wait for async operation, if async mode not enabled
7272
if !model.Async {
7373
err := spinner.Run(params.Printer, "Enabling SKE", func() error {
74-
_, err = wait.EnableServiceWaitHandler(ctx, apiClient, model.Region, model.ProjectId, utils.SKEServiceId).WaitWithContext(ctx)
74+
_, err = wait.EnableServiceWaitHandler(ctx, apiClient.DefaultAPI, model.Region, model.ProjectId, utils.SKEServiceId).WaitWithContext(ctx)
7575
return err
7676
})
7777
if err != nil {
@@ -105,6 +105,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
105105
}
106106

107107
func buildRequest(ctx context.Context, model *inputModel, apiClient *serviceenablement.APIClient) serviceenablement.ApiEnableServiceRegionalRequest {
108-
req := apiClient.EnableServiceRegional(ctx, model.Region, model.ProjectId, utils.SKEServiceId)
108+
req := apiClient.DefaultAPI.EnableServiceRegional(ctx, model.Region, model.ProjectId, utils.SKEServiceId)
109109
return req
110110
}

internal/cmd/ske/enable/enable_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ import (
1111
"github.com/google/go-cmp/cmp"
1212
"github.com/google/go-cmp/cmp/cmpopts"
1313
"github.com/google/uuid"
14-
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
14+
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
1515
)
1616

1717
type testCtxKey struct{}
1818

1919
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
20-
var testClient = &serviceenablement.APIClient{}
20+
var testClient = &serviceenablement.APIClient{DefaultAPI: &serviceenablement.DefaultAPIService{}}
2121
var testProjectId = uuid.NewString()
22-
var testRegion = "eu01"
22+
23+
const testRegion = "eu01"
2324

2425
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2526
flagValues := map[string]string{
@@ -47,7 +48,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4748
}
4849

4950
func fixtureRequest(mods ...func(request *serviceenablement.ApiEnableServiceRegionalRequest)) serviceenablement.ApiEnableServiceRegionalRequest {
50-
request := testClient.EnableServiceRegional(testCtx, testRegion, testProjectId, utils.SKEServiceId)
51+
request := testClient.DefaultAPI.EnableServiceRegional(testCtx, testRegion, testProjectId, utils.SKEServiceId)
5152
for _, mod := range mods {
5253
mod(&request)
5354
}
@@ -122,7 +123,7 @@ func TestBuildRequest(t *testing.T) {
122123

123124
diff := cmp.Diff(request, tt.expectedRequest,
124125
cmp.AllowUnexported(tt.expectedRequest),
125-
cmpopts.EquateComparable(testCtx),
126+
cmpopts.EquateComparable(testCtx, serviceenablement.DefaultAPIService{}),
126127
)
127128
if diff != "" {
128129
t.Fatalf("Data does not match: %s", diff)

0 commit comments

Comments
 (0)