Skip to content

Commit bf514b9

Browse files
rubenhoenlerubenhoenle
committed
chore(serviceaccount): migrate to new sdk structure
relates to STACKITCLI-354
1 parent 6a648d0 commit bf514b9

28 files changed

Lines changed: 161 additions & 161 deletions

File tree

‎docs/stackit_service-account_token_create.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ stackit service-account token create [flags]
2525
### Options
2626

2727
```
28-
-e, --email string Service account email
29-
-h, --help Help for "stackit service-account token create"
30-
--ttl-days int How long (in days) the new access token is valid (default 90)
28+
-e, --email string Service account email
29+
-h, --help Help for "stackit service-account token create"
30+
--ttl-days int32 How long (in days) the new access token is valid (default 90)
3131
```
3232

3333
### Options inherited from parent commands

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.18.1
3434
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.7.0
3535
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2
36-
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0
36+
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.20.0
3737
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.16.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,8 +642,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.7.0 h1:U3bm+RVHD
642642
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.7.0/go.mod h1:BJeafbecuocdirGCAJ2Vz/rPSK/LRrB5lPBEacqd1eU=
643643
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2 h1:6C/iTPoYPCrZOc3JMmvyDNs4hm+JR5p9O3DIfFGgnbo=
644644
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2/go.mod h1:/OHYZXQb9KXDdZK5J9C2YS6DJUD2i6ednZ1rK7zpDZ0=
645-
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0 h1:l1EDIlXce2C8JcbBDHVa6nZ4SjPTqmnALTgrhms+NKI=
646-
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0/go.mod h1:EXq8/J7t9p8zPmdIq+atuxyAbnQwxrQT18fI+Qpv98k=
645+
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.20.0 h1:4/xfpcqHLkKkaVS/HOOIWa3n7Z/O0DysPc+/+FVSltE=
646+
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.20.0/go.mod h1:xJNa86o89czK2o60+s46vz8+NSKDTbQduFGFaztJnsA=
647647
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0 h1:TNZHrunhsXRbuqZcucLs2Gqy1sEyvabufM7pB5Tscmo=
648648
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=

‎internal/cmd/service-account/create/create.go‎

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

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

9+
"github.com/spf13/cobra"
10+
serviceaccount "github.com/stackitcloud/stackit-sdk-go/services/serviceaccount/v2api"
11+
912
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1013
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1114
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
@@ -14,10 +17,6 @@ import (
1417
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1518
"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
1619
"github.com/stackitcloud/stackit-cli/internal/pkg/services/service-account/client"
17-
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
18-
19-
"github.com/spf13/cobra"
20-
"github.com/stackitcloud/stackit-sdk-go/services/serviceaccount"
2120
)
2221

2322
const (
@@ -26,7 +25,7 @@ const (
2625

2726
type inputModel struct {
2827
*globalflags.GlobalFlagModel
29-
Name *string
28+
Name string
3029
}
3130

3231
func NewCmd(params *types.CmdParams) *cobra.Command {
@@ -94,15 +93,15 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
9493

9594
model := inputModel{
9695
GlobalFlagModel: globalFlags,
97-
Name: flags.FlagToStringPointer(p, cmd, nameFlag),
96+
Name: flags.FlagToStringValue(p, cmd, nameFlag),
9897
}
9998

10099
p.DebugInputModel(model)
101100
return &model, nil
102101
}
103102

104103
func buildRequest(ctx context.Context, model *inputModel, apiClient *serviceaccount.APIClient) serviceaccount.ApiCreateServiceAccountRequest {
105-
req := apiClient.CreateServiceAccount(ctx, model.ProjectId)
104+
req := apiClient.DefaultAPI.CreateServiceAccount(ctx, model.ProjectId)
106105
req = req.CreateServiceAccountPayload(serviceaccount.CreateServiceAccountPayload{
107106
Name: model.Name,
108107
})
@@ -115,7 +114,7 @@ func outputResult(p *print.Printer, outputFormat, projectLabel string, serviceAc
115114
}
116115

117116
return p.OutputResult(outputFormat, serviceAccount, func() error {
118-
p.Outputf("Created service account for project %q. Email: %s\n", projectLabel, utils.PtrString(serviceAccount.Email))
117+
p.Outputf("Created service account for project %q. Email: %s\n", projectLabel, serviceAccount.Email)
119118
return nil
120119
})
121120
}

‎internal/cmd/service-account/create/create_test.go‎

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

7-
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
8-
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
9-
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
10-
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
11-
127
"github.com/google/go-cmp/cmp"
138
"github.com/google/go-cmp/cmp/cmpopts"
149
"github.com/google/uuid"
15-
"github.com/stackitcloud/stackit-sdk-go/services/serviceaccount"
10+
serviceaccount "github.com/stackitcloud/stackit-sdk-go/services/serviceaccount/v2api"
11+
12+
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
13+
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
14+
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
1615
)
1716

1817
var projectIdFlag = globalflags.ProjectIdFlag
1918

2019
type testCtxKey struct{}
2120

2221
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
23-
var testClient = &serviceaccount.APIClient{}
22+
var testClient = &serviceaccount.APIClient{DefaultAPI: &serviceaccount.DefaultAPIService{}}
2423
var testProjectId = uuid.NewString()
2524

2625
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
@@ -40,7 +39,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4039
ProjectId: testProjectId,
4140
Verbosity: globalflags.VerbosityDefault,
4241
},
43-
Name: utils.Ptr("example"),
42+
Name: "example",
4443
}
4544
for _, mod := range mods {
4645
mod(model)
@@ -49,9 +48,9 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4948
}
5049

5150
func fixtureRequest(mods ...func(request *serviceaccount.ApiCreateServiceAccountRequest)) serviceaccount.ApiCreateServiceAccountRequest {
52-
request := testClient.CreateServiceAccount(testCtx, testProjectId)
51+
request := testClient.DefaultAPI.CreateServiceAccount(testCtx, testProjectId)
5352
request = request.CreateServiceAccountPayload(serviceaccount.CreateServiceAccountPayload{
54-
Name: utils.Ptr("example"),
53+
Name: "example",
5554
})
5655
for _, mod := range mods {
5756
mod(&request)
@@ -90,7 +89,7 @@ func TestParseInput(t *testing.T) {
9089
ProjectId: testProjectId,
9190
Verbosity: globalflags.VerbosityDefault,
9291
},
93-
Name: utils.Ptr(""),
92+
Name: "",
9493
},
9594
},
9695
{
@@ -142,7 +141,7 @@ func TestBuildRequest(t *testing.T) {
142141

143142
diff := cmp.Diff(request, tt.expectedRequest,
144143
cmp.AllowUnexported(tt.expectedRequest),
145-
cmpopts.EquateComparable(testCtx),
144+
cmpopts.EquateComparable(testCtx, serviceaccount.DefaultAPIService{}),
146145
)
147146
if diff != "" {
148147
t.Fatalf("Data does not match: %s", diff)

‎internal/cmd/service-account/delete/delete.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/stackitcloud/stackit-cli/internal/pkg/services/service-account/client"
1515

1616
"github.com/spf13/cobra"
17-
"github.com/stackitcloud/stackit-sdk-go/services/serviceaccount"
17+
serviceaccount "github.com/stackitcloud/stackit-sdk-go/services/serviceaccount/v2api"
1818
)
1919

2020
const (
@@ -91,6 +91,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
9191
}
9292

9393
func buildRequest(ctx context.Context, model *inputModel, apiClient *serviceaccount.APIClient) serviceaccount.ApiDeleteServiceAccountRequest {
94-
req := apiClient.DeleteServiceAccount(ctx, model.ProjectId, model.Email)
94+
req := apiClient.DefaultAPI.DeleteServiceAccount(ctx, model.ProjectId, model.Email)
9595
return req
9696
}

‎internal/cmd/service-account/delete/delete_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import (
1010
"github.com/google/go-cmp/cmp"
1111
"github.com/google/go-cmp/cmp/cmpopts"
1212
"github.com/google/uuid"
13-
"github.com/stackitcloud/stackit-sdk-go/services/serviceaccount"
13+
serviceaccount "github.com/stackitcloud/stackit-sdk-go/services/serviceaccount/v2api"
1414
)
1515

1616
var projectIdFlag = globalflags.ProjectIdFlag
1717

1818
type testCtxKey struct{}
1919

2020
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
21-
var testClient = &serviceaccount.APIClient{}
21+
var testClient = &serviceaccount.APIClient{DefaultAPI: &serviceaccount.DefaultAPIService{}}
2222
var testProjectId = uuid.NewString()
2323
var testEmail = "service-account-email-1234567@sa.stackit.cloud"
2424

@@ -57,7 +57,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5757
}
5858

5959
func fixtureRequest(mods ...func(request *serviceaccount.ApiDeleteServiceAccountRequest)) serviceaccount.ApiDeleteServiceAccountRequest {
60-
request := testClient.DeleteServiceAccount(testCtx, testProjectId, testEmail)
60+
request := testClient.DefaultAPI.DeleteServiceAccount(testCtx, testProjectId, testEmail)
6161
for _, mod := range mods {
6262
mod(&request)
6363
}
@@ -151,7 +151,7 @@ func TestBuildRequest(t *testing.T) {
151151

152152
diff := cmp.Diff(request, tt.expectedRequest,
153153
cmp.AllowUnexported(tt.expectedRequest),
154-
cmpopts.EquateComparable(testCtx),
154+
cmpopts.EquateComparable(testCtx, serviceaccount.DefaultAPIService{}),
155155
)
156156
if diff != "" {
157157
t.Fatalf("Data does not match: %s", diff)

‎internal/cmd/service-account/get-jwks/get_jwks.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/stackitcloud/stackit-cli/internal/pkg/services/service-account/client"
1414

1515
"github.com/spf13/cobra"
16-
"github.com/stackitcloud/stackit-sdk-go/services/serviceaccount"
16+
serviceaccount "github.com/stackitcloud/stackit-sdk-go/services/serviceaccount/v2api"
1717
)
1818

1919
const (
@@ -54,7 +54,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
5454
if err != nil {
5555
return fmt.Errorf("get JWKS: %w", err)
5656
}
57-
jwks := *resp.Keys
57+
jwks := resp.Keys
5858
if len(jwks) == 0 {
5959
params.Printer.Info("Empty JWKS for service account %s\n", model.Email)
6060
return nil
@@ -79,7 +79,7 @@ func parseInput(p *print.Printer, _ *cobra.Command, inputArgs []string) (*inputM
7979
}
8080

8181
func buildRequest(ctx context.Context, model *inputModel, apiClient *serviceaccount.APIClient) serviceaccount.ApiGetJWKSRequest {
82-
req := apiClient.GetJWKS(ctx, model.Email)
82+
req := apiClient.DefaultAPI.GetJWKS(ctx, model.Email)
8383
return req
8484
}
8585

‎internal/cmd/service-account/get-jwks/get_jwks_test.go‎

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

77
"github.com/google/go-cmp/cmp"
88
"github.com/google/go-cmp/cmp/cmpopts"
9-
"github.com/stackitcloud/stackit-sdk-go/services/serviceaccount"
9+
serviceaccount "github.com/stackitcloud/stackit-sdk-go/services/serviceaccount/v2api"
1010

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

@@ -16,7 +16,7 @@ import (
1616
type testCtxKey struct{}
1717

1818
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
19-
var testClient = &serviceaccount.APIClient{}
19+
var testClient = &serviceaccount.APIClient{DefaultAPI: &serviceaccount.DefaultAPIService{}}
2020
var testEmail = "service-account-email-1234567@sa.stackit.cloud"
2121

2222
func fixtureArgValues(mods ...func(argValues []string)) []string {
@@ -40,7 +40,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4040
}
4141

4242
func fixtureRequest(mods ...func(request *serviceaccount.ApiGetJWKSRequest)) serviceaccount.ApiGetJWKSRequest {
43-
request := testClient.GetJWKS(testCtx, testEmail)
43+
request := testClient.DefaultAPI.GetJWKS(testCtx, testEmail)
4444
for _, mod := range mods {
4545
mod(&request)
4646
}
@@ -130,7 +130,7 @@ func TestBuildRequest(t *testing.T) {
130130

131131
diff := cmp.Diff(request, tt.expectedRequest,
132132
cmp.AllowUnexported(tt.expectedRequest),
133-
cmpopts.EquateComparable(testCtx),
133+
cmpopts.EquateComparable(testCtx, serviceaccount.DefaultAPIService{}),
134134
)
135135
if diff != "" {
136136
t.Fatalf("Data does not match: %s", diff)

‎internal/cmd/service-account/key/create/create.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1919

2020
"github.com/spf13/cobra"
21-
"github.com/stackitcloud/stackit-sdk-go/services/serviceaccount"
21+
serviceaccount "github.com/stackitcloud/stackit-sdk-go/services/serviceaccount/v2api"
2222
)
2323

2424
const (
@@ -86,7 +86,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
8686
return fmt.Errorf("create service account key: %w", err)
8787
}
8888

89-
params.Printer.Info("Created key for service account %s with ID %q\n", model.ServiceAccountEmail, *resp.Id)
89+
params.Printer.Outputf("Created key for service account %s with ID %q\n", model.ServiceAccountEmail, resp.Id)
9090

9191
key, err := json.MarshalIndent(resp, "", " ")
9292
if err != nil {
@@ -144,7 +144,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
144144
}
145145

146146
func buildRequest(ctx context.Context, model *inputModel, apiClient *serviceaccount.APIClient, now time.Time) serviceaccount.ApiCreateServiceAccountKeyRequest {
147-
req := apiClient.CreateServiceAccountKey(ctx, model.ProjectId, model.ServiceAccountEmail)
147+
req := apiClient.DefaultAPI.CreateServiceAccountKey(ctx, model.ProjectId, model.ServiceAccountEmail)
148148

149149
var validUntil *time.Time
150150
validUntil = nil

0 commit comments

Comments
 (0)