Skip to content

Commit af5b8fb

Browse files
committed
fix: add review findings
1 parent e038ed8 commit af5b8fb

File tree

4 files changed

+31
-25
lines changed

4 files changed

+31
-25
lines changed

internal/cmd/project/create/create.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
9595
return fmt.Errorf("create project: %w", err)
9696
}
9797

98-
return outputResult(p, model.OutputFormat, *model, resp)
98+
return outputResult(p, *model, resp)
9999
},
100100
}
101101
configureFlags(cmd)
@@ -212,11 +212,14 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *resourceman
212212
return req, nil
213213
}
214214

215-
func outputResult(p *print.Printer, outputFormat string, model inputModel, resp *resourcemanager.Project) error {
215+
func outputResult(p *print.Printer, model inputModel, resp *resourcemanager.Project) error {
216216
if resp == nil {
217217
return fmt.Errorf("response is empty")
218218
}
219-
switch outputFormat {
219+
if model.GlobalFlagModel == nil {
220+
return fmt.Errorf("globalflags are empty")
221+
}
222+
switch model.OutputFormat {
220223
case print.JSONOutputFormat:
221224
details, err := json.MarshalIndent(resp, "", " ")
222225
if err != nil {

internal/cmd/project/create/create_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -361,24 +361,23 @@ func TestBuildRequest(t *testing.T) {
361361

362362
func Test_outputResult(t *testing.T) {
363363
type args struct {
364-
outputFormat string
365-
model inputModel
366-
resp *resourcemanager.Project
364+
model inputModel
365+
resp *resourcemanager.Project
367366
}
368367
tests := []struct {
369368
name string
370369
args args
371370
wantErr bool
372371
}{
373-
{"empty", args{}, true},
374-
{"base", args{"", inputModel{}, &resourcemanager.Project{}}, false},
372+
{"empty", args{model: inputModel{GlobalFlagModel: &globalflags.GlobalFlagModel{}}}, true},
373+
{"base", args{inputModel{GlobalFlagModel: &globalflags.GlobalFlagModel{}}, &resourcemanager.Project{}}, false},
375374
}
376375

377376
p := print.NewPrinter()
378377
p.Cmd = NewCmd(p)
379378
for _, tt := range tests {
380379
t.Run(tt.name, func(t *testing.T) {
381-
if err := outputResult(p, tt.args.outputFormat, tt.args.model, tt.args.resp); (err != nil) != tt.wantErr {
380+
if err := outputResult(p, tt.args.model, tt.args.resp); (err != nil) != tt.wantErr {
382381
t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
383382
}
384383
})

internal/cmd/project/member/list/list.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
8989
members = members[:*model.Limit]
9090
}
9191

92-
return outputResult(p, model.OutputFormat, *model, members)
92+
return outputResult(p, *model, members)
9393
},
9494
}
9595
configureFlags(cmd)
@@ -145,7 +145,10 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *authorizati
145145
return req
146146
}
147147

148-
func outputResult(p *print.Printer, outputFormat string, model inputModel, members []authorization.Member) error {
148+
func outputResult(p *print.Printer, model inputModel, members []authorization.Member) error {
149+
if model.GlobalFlagModel == nil {
150+
return fmt.Errorf("globalflags are empty")
151+
}
149152
sortFn := func(i, j int) bool {
150153
switch model.SortBy {
151154
case "subject":
@@ -158,7 +161,7 @@ func outputResult(p *print.Printer, outputFormat string, model inputModel, membe
158161
}
159162
sort.SliceStable(members, sortFn)
160163

161-
switch outputFormat {
164+
switch model.OutputFormat {
162165
case print.JSONOutputFormat:
163166
// Show details
164167
details, err := json.MarshalIndent(members, "", " ")

internal/cmd/project/member/list/list_test.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -211,25 +211,26 @@ func TestBuildRequest(t *testing.T) {
211211

212212
func Test_outputResult(t *testing.T) {
213213
type args struct {
214-
outputFormat string
215-
model inputModel
216-
members []authorization.Member
214+
model inputModel
215+
members []authorization.Member
217216
}
218217
tests := []struct {
219218
name string
220219
args args
221220
wantErr bool
222221
}{
223-
{"empty", args{}, false},
224-
{"base", args{"", inputModel{
225-
Subject: utils.Ptr("subject"),
226-
Limit: nil,
227-
SortBy: "",
222+
{"empty", args{model: inputModel{GlobalFlagModel: &globalflags.GlobalFlagModel{}}}, false},
223+
{"base", args{inputModel{
224+
GlobalFlagModel: &globalflags.GlobalFlagModel{},
225+
Subject: utils.Ptr("subject"),
226+
Limit: nil,
227+
SortBy: "",
228228
}, nil}, false},
229-
{"complete", args{"", inputModel{
230-
Subject: utils.Ptr("subject"),
231-
Limit: nil,
232-
SortBy: "",
229+
{"complete", args{inputModel{
230+
GlobalFlagModel: &globalflags.GlobalFlagModel{},
231+
Subject: utils.Ptr("subject"),
232+
Limit: nil,
233+
SortBy: "",
233234
},
234235
[]authorization.Member{
235236
{Role: utils.Ptr("role1"), Subject: utils.Ptr("subject1")},
@@ -242,7 +243,7 @@ func Test_outputResult(t *testing.T) {
242243
p.Cmd = NewCmd(p)
243244
for _, tt := range tests {
244245
t.Run(tt.name, func(t *testing.T) {
245-
if err := outputResult(p, tt.args.outputFormat, tt.args.model, tt.args.members); (err != nil) != tt.wantErr {
246+
if err := outputResult(p, tt.args.model, tt.args.members); (err != nil) != tt.wantErr {
246247
t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
247248
}
248249
})

0 commit comments

Comments
 (0)