Skip to content

Commit 810c018

Browse files
committed
feature: fix review comments
1 parent 8fef499 commit 810c018

File tree

3 files changed

+28
-22
lines changed

3 files changed

+28
-22
lines changed

internal/cmd/beta/security-group/create/create.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
108108
for _, label := range flags.FlagToStringSliceValue(p, cmd, labelsFlag) {
109109
parts := strings.Split(label, "=")
110110
if len(parts) != 2 {
111-
return nil, &errors.ArgValidationError{
112-
Arg: labelsFlag,
111+
return nil, &errors.FlagValidationError{
112+
Flag: labelsFlag,
113113
Details: "invalid label declaration. Must be in the form <key>=<value>",
114114
}
115115
}

internal/cmd/beta/security-group/update/update.go

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ type inputModel struct {
2828

2929
const argNameGroupId = "GROUP_ID"
3030

31+
const (
32+
nameArg = "name"
33+
descriptionArg = "description"
34+
labelsArg = "labels"
35+
)
36+
3137
func NewCmd(p *print.Printer) *cobra.Command {
3238
cmd := &cobra.Command{
3339
Use: "update",
@@ -75,9 +81,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
7581
}
7682

7783
func configureFlags(cmd *cobra.Command) {
78-
cmd.Flags().String("name", "", "the name of the security group. Must be <= 63 chars")
79-
cmd.Flags().String("description", "", "an optional description of the security group. Must be <= 127 chars")
80-
cmd.Flags().StringSlice("labels", nil, "Labels are key-value string pairs which can be attached to a network-interface. E.g. '--labels key1=value1,key2=value2,...'")
84+
cmd.Flags().String(nameArg, "", "the name of the security group. Must be <= 63 chars")
85+
cmd.Flags().String(descriptionArg, "", "an optional description of the security group. Must be <= 127 chars")
86+
cmd.Flags().StringSlice(labelsArg, nil, "Labels are key-value string pairs which can be attached to a network-interface. E.g. '--labels key1=value1,key2=value2,...'")
8187
}
8288

8389
func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputModel, error) {
@@ -104,27 +110,27 @@ func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputM
104110
}
105111
model.SecurityGroupId = cliArgs[0]
106112

107-
if cmd.Flags().Lookup("name").Changed {
108-
name := flags.FlagToStringValue(p, cmd, "name")
113+
if cmd.Flags().Lookup(nameArg).Changed {
114+
name := flags.FlagToStringValue(p, cmd, nameArg)
109115
model.Name = &name
110116
}
111117

112-
if cmd.Flags().Lookup("labels").Changed {
118+
if cmd.Flags().Lookup(labelsArg).Changed {
113119
labels := make(map[string]any)
114-
for _, label := range flags.FlagToStringSliceValue(p, cmd, "labels") {
120+
for _, label := range flags.FlagToStringSliceValue(p, cmd, labelsArg) {
115121
parts := strings.Split(label, "=")
116122
if len(parts) != 2 {
117123
return nil, &errors.ArgValidationError{
118-
Arg: "labels",
124+
Arg: labelsArg,
119125
Details: "invalid label declaration. Must be in the form <key>=<value>",
120126
}
121127
}
122128
labels[parts[0]] = parts[1]
123129
}
124130
model.Labels = &labels
125131
}
126-
if cmd.Flags().Lookup("description").Changed {
127-
description := flags.FlagToStringValue(p, cmd, "description")
132+
if cmd.Flags().Lookup(descriptionArg).Changed {
133+
description := flags.FlagToStringValue(p, cmd, descriptionArg)
128134
model.Description = &description
129135
}
130136

internal/cmd/beta/security-group/update/update_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ var (
3333

3434
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3535
flagValues := map[string]string{
36-
projectIdFlag: testProjectId,
37-
"description": testDescription,
38-
"labels": "fooKey=fooValue,barKey=barValue,bazKey=bazValue",
39-
"name": testName,
36+
projectIdFlag: testProjectId,
37+
descriptionArg: testDescription,
38+
labelsArg: "fooKey=fooValue,barKey=barValue,bazKey=bazValue",
39+
nameArg: testName,
4040
}
4141
for _, mod := range mods {
4242
mod(flagValues)
@@ -126,7 +126,7 @@ func TestParseInput(t *testing.T) {
126126
{
127127
description: "no name passed",
128128
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
129-
delete(flagValues, "name")
129+
delete(flagValues, nameArg)
130130
}),
131131
args: testGroupId,
132132
expectedModel: fixtureInputModel(func(model *inputModel) {
@@ -137,7 +137,7 @@ func TestParseInput(t *testing.T) {
137137
{
138138
description: "no description passed",
139139
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
140-
delete(flagValues, "description")
140+
delete(flagValues, descriptionArg)
141141
}),
142142
args: testGroupId,
143143
expectedModel: fixtureInputModel(func(model *inputModel) {
@@ -148,7 +148,7 @@ func TestParseInput(t *testing.T) {
148148
{
149149
description: "no labels",
150150
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
151-
delete(flagValues, "labels")
151+
delete(flagValues, labelsArg)
152152
}),
153153
args: testGroupId,
154154
expectedModel: fixtureInputModel(func(model *inputModel) {
@@ -159,7 +159,7 @@ func TestParseInput(t *testing.T) {
159159
{
160160
description: "single label",
161161
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
162-
flagValues["labels"] = "foo=bar"
162+
flagValues[labelsArg] = "foo=bar"
163163
}),
164164
args: testGroupId,
165165
isValid: true,
@@ -172,15 +172,15 @@ func TestParseInput(t *testing.T) {
172172
{
173173
description: "malformed labels 1",
174174
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
175-
flagValues["labels"] = "foo=bar=baz"
175+
flagValues[labelsArg] = "foo=bar=baz"
176176
}),
177177
args: testGroupId,
178178
isValid: false,
179179
},
180180
{
181181
description: "malformed labels 2",
182182
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
183-
flagValues["labels"] = "foobarbaz"
183+
flagValues[labelsArg] = "foobarbaz"
184184
}),
185185
args: testGroupId,
186186
isValid: false,

0 commit comments

Comments
 (0)