Skip to content

Commit 47e434d

Browse files
authored
Improve error message when --json flag is specified (#933)
## Changes Improve error message when --json input is provided ## Tests ``` cli % databricks model-registry create-model mymodel --json @./input.json Error: when --json flag is specified, no positional arguments are required. Provide NAME in your JSON input ```
1 parent e68a88e commit 47e434d

File tree

28 files changed

+438
-142
lines changed

28 files changed

+438
-142
lines changed

.codegen/service.go.tmpl

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,20 @@ func new{{.PascalName}}() *cobra.Command {
141141
cmd.Annotations = make(map[string]string)
142142
{{if $hasRequiredArgs }}
143143
cmd.Args = func(cmd *cobra.Command, args []string) error {
144-
check := cobra.ExactArgs({{len .Request.RequiredFields}})
145144
{{- if and .CanUseJson .Request.HasRequiredRequestBodyFields }}
146145
if cmd.Flags().Changed("json") {
147-
check = cobra.ExactArgs({{len .Request.RequiredPathFields}})
146+
err := cobra.ExactArgs({{len .Request.RequiredPathFields}})(cmd, args)
147+
if err != nil {
148+
{{- if eq 0 (len .Request.RequiredPathFields) }}
149+
return fmt.Errorf("when --json flag is specified, no positional arguments are required. Provide{{- range $index, $field := .Request.RequiredFields}}{{if $index}},{{end}} '{{$field.Name}}'{{end}} in your JSON input")
150+
{{- else }}
151+
return fmt.Errorf("when --json flag is specified, provide only{{- range $index, $field := .Request.RequiredPathFields}}{{if $index}},{{end}} {{$field.ConstantName}}{{end}} as positional arguments. Provide{{- range $index, $field := .Request.RequiredRequestBodyFields}}{{if $index}},{{end}} '{{$field.Name}}'{{end}} in your JSON input")
152+
{{- end }}
153+
}
154+
return nil
148155
}
149156
{{- end }}
157+
check := cobra.ExactArgs({{len .Request.RequiredFields}})
150158
return check(cmd, args)
151159
}
152160
{{end}}

cmd/account/log-delivery/log-delivery.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/account/networks/networks.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/account/private-access/private-access.go

Lines changed: 12 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/account/vpc-endpoints/vpc-endpoints.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/account/workspaces/workspaces.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/workspace/catalogs/catalogs.go

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/workspace/cluster-policies/cluster-policies.go

Lines changed: 12 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/workspace/clusters/clusters.go

Lines changed: 18 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)