Skip to content

Commit 642ed2e

Browse files
committed
review changes 2
1 parent 1a6aca2 commit 642ed2e

File tree

2 files changed

+25
-9
lines changed

2 files changed

+25
-9
lines changed

internal/cmd/routingtable/update/update.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ func configureFlags(cmd *cobra.Command) {
117117
cmd.Flags().Bool(systemRoutesFlag, false, "If set to false, disables routes for project-to-project communication.")
118118
cmd.Flags().Var(flags.UUIDFlag(), organizationIdFlag, "Organization ID")
119119

120-
err := flags.MarkFlagsRequired(cmd, organizationIdFlag, networkAreaIdFlag, dynamicRoutesFlag, systemRoutesFlag, nameFlag)
120+
err := flags.MarkFlagsRequired(cmd, organizationIdFlag, networkAreaIdFlag)
121+
cmd.MarkFlagsOneRequired(dynamicRoutesFlag, systemRoutesFlag, nameFlag, descriptionFlag, labelFlag)
121122
cobra.CheckErr(err)
122123
}
123124

internal/cmd/routingtable/update/update_test.go

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,28 +168,43 @@ func TestParseInput(t *testing.T) {
168168
isValid: false,
169169
},
170170
{
171-
description: "dynamic-route-flag missing",
172-
argValues: []string{testRoutingTableId},
171+
description: "org-id missing",
172+
argValues: fixtureArgValues(),
173173
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
174-
delete(flagValues, dynamicRoutesFlag)
174+
delete(flagValues, organizationIdFlag)
175175
}),
176176
isValid: false,
177177
},
178178
{
179-
description: "system-routes-flag missing",
179+
description: "all required flags missing",
180180
argValues: []string{testRoutingTableId},
181181
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
182+
delete(flagValues, dynamicRoutesFlag)
182183
delete(flagValues, systemRoutesFlag)
184+
delete(flagValues, nameFlag)
185+
delete(flagValues, labelFlag)
186+
delete(flagValues, descriptionFlag)
183187
}),
184188
isValid: false,
185189
},
186190
{
187-
description: "org-id missing",
188-
argValues: fixtureArgValues(),
191+
description: "all except one required flag missing (description flag)",
192+
argValues: []string{testRoutingTableId},
189193
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
190-
delete(flagValues, organizationIdFlag)
194+
delete(flagValues, dynamicRoutesFlag)
195+
delete(flagValues, systemRoutesFlag)
196+
delete(flagValues, nameFlag)
197+
delete(flagValues, labelFlag)
191198
}),
192-
isValid: false,
199+
expectedModel: fixtureInputModel(func(model *inputModel) {
200+
model.RoutingTableId = testRoutingTableId
201+
model.DynamicRoutes = nil
202+
model.SystemRoutes = nil
203+
model.Labels = nil
204+
model.Name = nil
205+
model.Description = utils.Ptr(testRoutingTableDescription)
206+
}),
207+
isValid: true,
193208
},
194209
{
195210
description: "arg value missing",

0 commit comments

Comments
 (0)