Skip to content

Commit 2e4275e

Browse files
SerseusWasTakenSerseusWasTaken
committed
fix(scf): apply review suggestions
1 parent 1f35a1f commit 2e4275e

10 files changed

Lines changed: 35 additions & 38 deletions

File tree

‎internal/cmd/beta/scf/organization/create/create.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func NewCmd(p *types.CmdParams) *cobra.Command {
6969
}
7070

7171
// Call API
72-
req := buildRequest(ctx, model, apiClient)
72+
req := buildRequest(ctx, model, apiClient.DefaultAPI)
7373
resp, err := req.Execute()
7474
if err != nil {
7575
return fmt.Errorf("create STACKIT Cloud Foundry organization: %w", err)
@@ -106,13 +106,13 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
106106
return &model, nil
107107
}
108108

109-
func buildRequest(ctx context.Context, model *inputModel, apiClient *scf.APIClient) scf.ApiCreateOrganizationRequest {
109+
func buildRequest(ctx context.Context, model *inputModel, apiClient scf.DefaultAPI) scf.ApiCreateOrganizationRequest {
110110
payload := scf.CreateOrganizationPayload{
111111
Name: *model.Name,
112112
PlatformId: model.PlatformId,
113113
}
114114

115-
req := apiClient.DefaultAPI.CreateOrganization(ctx, model.ProjectId, model.Region)
115+
req := apiClient.CreateOrganization(ctx, model.ProjectId, model.Region)
116116
return req.CreateOrganizationPayload(payload)
117117
}
118118

‎internal/cmd/beta/scf/organization/create/create_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1616
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1717
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
18-
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1918
)
2019

2120
type testCtxKey struct{}
@@ -56,8 +55,8 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5655
Region: testRegion,
5756
Verbosity: globalflags.VerbosityDefault,
5857
},
59-
Name: utils.Ptr(testName),
60-
PlatformId: utils.Ptr(testPlatformId),
58+
Name: new(testName),
59+
PlatformId: new(testPlatformId),
6160
}
6261
for _, mod := range mods {
6362
mod(model)
@@ -69,7 +68,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6968
func fixtureCreatePayload(mods ...func(payload *scf.CreateOrganizationPayload)) scf.CreateOrganizationPayload {
7069
payload := scf.CreateOrganizationPayload{
7170
Name: testName,
72-
PlatformId: utils.Ptr(testPlatformId),
71+
PlatformId: new(testPlatformId),
7372
}
7473
for _, mod := range mods {
7574
mod(&payload)
@@ -175,7 +174,7 @@ func TestBuildRequest(t *testing.T) {
175174

176175
for _, tt := range tests {
177176
t.Run(tt.description, func(t *testing.T) {
178-
request := buildRequest(testCtx, tt.model, testClient)
177+
request := buildRequest(testCtx, tt.model, testClient.DefaultAPI)
179178
diff := cmp.Diff(request, tt.expectedRequest,
180179
cmp.AllowUnexported(tt.expectedRequest),
181180
cmpopts.EquateComparable(testCtx),

‎internal/cmd/beta/scf/organization/delete/delete.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func NewCmd(p *types.CmdParams) *cobra.Command {
5959
}
6060

6161
// Call API
62-
req := buildRequest(ctx, model, apiClient)
62+
req := buildRequest(ctx, model, apiClient.DefaultAPI)
6363
if _, err = req.Execute(); err != nil {
6464
return fmt.Errorf("delete STACKIT Cloud Foundry organization: %w", err)
6565
}
@@ -79,7 +79,7 @@ func NewCmd(p *types.CmdParams) *cobra.Command {
7979
if model.Async {
8080
operationState = "Triggered deletion of"
8181
}
82-
p.Printer.Outputf("%s STACKIT Cloud Foundry organization %s\n", operationState, model.OrganizationId)
82+
p.Printer.Info("%s STACKIT Cloud Foundry organization %s\n", operationState, model.OrganizationId)
8383

8484
return nil
8585
},
@@ -106,6 +106,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
106106
}
107107

108108
// buildRequest creates the API request to delete a STACKIT Cloud Foundry organization
109-
func buildRequest(ctx context.Context, model *inputModel, apiClient *scf.APIClient) scf.ApiDeleteOrganizationRequest {
110-
return apiClient.DefaultAPI.DeleteOrganization(ctx, model.ProjectId, model.Region, model.OrganizationId)
109+
func buildRequest(ctx context.Context, model *inputModel, apiClient scf.DefaultAPI) scf.ApiDeleteOrganizationRequest {
110+
return apiClient.DeleteOrganization(ctx, model.ProjectId, model.Region, model.OrganizationId)
111111
}

‎internal/cmd/beta/scf/organization/delete/delete_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func TestBuildRequest(t *testing.T) {
137137

138138
for _, tt := range tests {
139139
t.Run(tt.description, func(t *testing.T) {
140-
request := buildRequest(testCtx, tt.model, testClient)
140+
request := buildRequest(testCtx, tt.model, testClient.DefaultAPI)
141141

142142
diff := cmp.Diff(request, tt.expectedRequest,
143143
cmp.AllowUnexported(tt.expectedRequest),

‎internal/cmd/beta/scf/organization/describe/describe.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func NewCmd(p *types.CmdParams) *cobra.Command {
5656
}
5757

5858
// Call API
59-
req := buildRequest(ctx, model, apiClient)
59+
req := buildRequest(ctx, model, apiClient.DefaultAPI)
6060
resp, err := req.Execute()
6161
if err != nil {
6262
return fmt.Errorf("get STACKIT Cloud Foundry organization: %w", err)
@@ -85,8 +85,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
8585
return &model, nil
8686
}
8787

88-
func buildRequest(ctx context.Context, model *inputModel, apiClient *scf.APIClient) scf.ApiGetOrganizationRequest {
89-
return apiClient.DefaultAPI.GetOrganization(ctx, model.ProjectId, model.Region, model.OrganizationId)
88+
func buildRequest(ctx context.Context, model *inputModel, apiClient scf.DefaultAPI) scf.ApiGetOrganizationRequest {
89+
return apiClient.GetOrganization(ctx, model.ProjectId, model.Region, model.OrganizationId)
9090
}
9191

9292
func outputResult(p *print.Printer, outputFormat string, organization *scf.Organization) error {

‎internal/cmd/beta/scf/organization/describe/describe_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func TestBuildRequest(t *testing.T) {
141141

142142
for _, tt := range tests {
143143
t.Run(tt.description, func(t *testing.T) {
144-
request := buildRequest(testCtx, tt.model, testClient)
144+
request := buildRequest(testCtx, tt.model, testClient.DefaultAPI)
145145

146146
diff := cmp.Diff(request, tt.expectedRequest,
147147
cmp.AllowUnexported(tt.expectedRequest),

‎internal/cmd/beta/scf/organization/list/list.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
109109
return &model, nil
110110
}
111111

112-
func buildRequest(ctx context.Context, model *inputModel, apiClient *scf.APIClient, page, perPage int64) scf.ApiListOrganizationsRequest {
113-
return apiClient.DefaultAPI.ListOrganizations(ctx, model.ProjectId, model.Region).WithDetails(true).Page(page).PerPage(perPage)
112+
func buildRequest(ctx context.Context, model *inputModel, apiClient scf.DefaultAPI, page, perPage int64) scf.ApiListOrganizationsRequest {
113+
return apiClient.ListOrganizations(ctx, model.ProjectId, model.Region).WithDetails(true).Page(page).PerPage(perPage)
114114
}
115115

116116
// fetchOrganizations pages through the organizations. The API pages by offset (page * perPage),
@@ -124,7 +124,7 @@ func fetchOrganizations(ctx context.Context, model *inputModel, apiClient *scf.A
124124

125125
organizations := []scf.OrganizationsListItem{}
126126
for page := int64(1); ; page++ {
127-
resp, err := buildRequest(ctx, model, apiClient, page, perPage).Execute()
127+
resp, err := buildRequest(ctx, model, apiClient.DefaultAPI, page, perPage).Execute()
128128
if err != nil {
129129
return nil, fmt.Errorf("list STACKIT Cloud Foundry organizations: %w", err)
130130
}

‎internal/cmd/beta/scf/organization/list/list_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
2020
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
2121
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
22-
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
2322
)
2423

2524
type testCtxKey struct{}
@@ -55,7 +54,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5554
Region: testRegion,
5655
Verbosity: globalflags.VerbosityDefault,
5756
},
58-
Limit: utils.Ptr(testLimit),
57+
Limit: new(testLimit),
5958
}
6059
for _, mod := range mods {
6160
mod(model)
@@ -141,7 +140,7 @@ func TestBuildRequest(t *testing.T) {
141140
}
142141
for _, tt := range tests {
143142
t.Run(tt.description, func(t *testing.T) {
144-
request := buildRequest(testCtx, tt.model, testClient, 1, testLimit)
143+
request := buildRequest(testCtx, tt.model, testClient.DefaultAPI, 1, testLimit)
145144

146145
diff := cmp.Diff(request, tt.expectedRequest,
147146
cmp.AllowUnexported(tt.expectedRequest, scf.DefaultAPIService{}),
@@ -188,21 +187,21 @@ func TestFetchOrganizations(t *testing.T) {
188187
},
189188
{
190189
description: "stops at totalPages",
191-
responses: []scf.OrganizationsList{fixturePage(100, utils.Ptr(int64(1)))},
190+
responses: []scf.OrganizationsList{fixturePage(100, new(int64(1)))},
192191
expectedCount: 100,
193192
expectedRequests: []string{"page=1 perPage=100"},
194193
},
195194
{
196195
description: "limit below page size",
197-
limit: utils.Ptr(int64(10)),
196+
limit: new(int64(10)),
198197
responses: []scf.OrganizationsList{fixturePage(10, nil)},
199198
expectedCount: 10,
200199
expectedRequests: []string{"page=1 perPage=10"},
201200
},
202201
{
203202
// perPage must not shrink on the last page, the API pages by offset
204203
description: "limit across pages",
205-
limit: utils.Ptr(int64(150)),
204+
limit: new(int64(150)),
206205
responses: []scf.OrganizationsList{
207206
fixturePage(100, nil),
208207
fixturePage(100, nil),
@@ -314,9 +313,9 @@ func TestOutputResult(t *testing.T) {
314313
organizations: []scf.OrganizationsListItem{
315314
{
316315
Guid: testOrganization,
317-
Name: utils.Ptr("my-org"),
316+
Name: new("my-org"),
318317
Status: "active",
319-
CreatedAt: utils.Ptr(time.Now()),
318+
CreatedAt: new(time.Now()),
320319
},
321320
},
322321
},

‎internal/cmd/beta/scf/organization/update/update.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func NewCmd(p *types.CmdParams) *cobra.Command {
7474
return err
7575
}
7676
// Call API
77-
req := buildRequest(ctx, model, apiClient)
77+
req := buildRequest(ctx, model, apiClient.DefaultAPI)
7878
resp, err := req.Execute()
7979
if err != nil {
8080
return fmt.Errorf("update STACKIT Cloud Foundry organization: %w", err)
@@ -115,13 +115,13 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
115115
return model, nil
116116
}
117117

118-
func buildRequest(ctx context.Context, model *inputModel, apiClient *scf.APIClient) scf.ApiUpdateOrganizationRequest {
118+
func buildRequest(ctx context.Context, model *inputModel, apiClient scf.DefaultAPI) scf.ApiUpdateOrganizationRequest {
119119
payload := scf.UpdateOrganizationPayload{
120120
Name: model.Name,
121121
Suspended: model.Suspended,
122122
}
123123

124-
req := apiClient.DefaultAPI.UpdateOrganization(ctx, model.ProjectId, model.Region, model.OrganizationId)
124+
req := apiClient.UpdateOrganization(ctx, model.ProjectId, model.Region, model.OrganizationId)
125125
return req.UpdateOrganizationPayload(payload)
126126
}
127127

‎internal/cmd/beta/scf/organization/update/update_test.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1616
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
17-
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1817
)
1918

2019
type testCtxKey struct{}
@@ -64,8 +63,8 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6463
Verbosity: globalflags.VerbosityDefault,
6564
},
6665
OrganizationId: testOrganizationId,
67-
Name: utils.Ptr(testName),
68-
Suspended: utils.Ptr(true),
66+
Name: new(testName),
67+
Suspended: new(true),
6968
}
7069
for _, mod := range mods {
7170
mod(model)
@@ -75,8 +74,8 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
7574

7675
func fixtureUpdatePayload(mods ...func(payload *scf.UpdateOrganizationPayload)) scf.UpdateOrganizationPayload {
7776
payload := scf.UpdateOrganizationPayload{
78-
Name: utils.Ptr(testName),
79-
Suspended: utils.Ptr(true),
77+
Name: new(testName),
78+
Suspended: new(true),
8079
}
8180
for _, mod := range mods {
8281
mod(&payload)
@@ -159,7 +158,7 @@ func TestParseInput(t *testing.T) {
159158
isValid: true,
160159
expectedModel: fixtureInputModel(func(model *inputModel) {
161160
model.Name = nil
162-
model.Suspended = utils.Ptr(false)
161+
model.Suspended = new(false)
163162
}),
164163
},
165164
{
@@ -217,7 +216,7 @@ func TestBuildRequest(t *testing.T) {
217216

218217
for _, tt := range tests {
219218
t.Run(tt.description, func(t *testing.T) {
220-
request := buildRequest(testCtx, tt.model, testClient)
219+
request := buildRequest(testCtx, tt.model, testClient.DefaultAPI)
221220
diff := cmp.Diff(request, tt.expectedRequest,
222221
cmp.AllowUnexported(tt.expectedRequest),
223222
cmpopts.EquateComparable(testCtx),

0 commit comments

Comments
 (0)