steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bundle run when run interactively (#1880) 

## Changes

The commit where resource lookup was factored out into a separate
package (#1858) didn't take into account the use of `args` further down
in the code.

This change fixes that oversight by returning the tail arguments when
determining which resource to run. The later call no longer has to index
the `args` slice.

## Tests

Manually confirmed that the command works when being prompted for the
resource to run.
This commit is contained in:
Pieter Noordhuis 2024-11-05 10:30:11 +01:00 committed by GitHub
parent dd506e2372
commit edff68c763
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/bundle/run.go
View File

@ -35,17 +35,23 @@ func promptRunArgument(ctx context.Context, b *bundle.Bundle) (string, error) {
return key, nil return key, nil
} }
func resolveRunArgument(ctx context.Context, b *bundle.Bundle, args []string) (string, error) { // resolveRunArgument resolves the resource key to run.
// It returns the remaining arguments to pass to the runner, if applicable.
func resolveRunArgument(ctx context.Context, b *bundle.Bundle, args []string) (string, []string, error) {
// If no arguments are specified, prompt the user to select something to run. // If no arguments are specified, prompt the user to select something to run.
if len(args) == 0 && cmdio.IsPromptSupported(ctx) { if len(args) == 0 && cmdio.IsPromptSupported(ctx) {
return promptRunArgument(ctx, b) key, err := promptRunArgument(ctx, b)
if err != nil {
return "", nil, err
}
return key, args, nil
} }
if len(args) < 1 { if len(args) < 1 {
return "", fmt.Errorf("expected a KEY of the resource to run") return "", nil, fmt.Errorf("expected a KEY of the resource to run")
} }
return args[0], nil return args[0], args[1:], nil
} }
func keyToRunner(b *bundle.Bundle, arg string) (run.Runner, error) { func keyToRunner(b *bundle.Bundle, arg string) (run.Runner, error) {
@ -109,7 +115,7 @@ task or a Python wheel task, the second example applies.
return err return err
} }
arg, err := resolveRunArgument(ctx, b, args) key, args, err := resolveRunArgument(ctx, b, args)
if err != nil { if err != nil {
return err return err
} }
@ -124,13 +130,13 @@ task or a Python wheel task, the second example applies.
return err return err
} }
runner, err := keyToRunner(b, arg) runner, err := keyToRunner(b, key)
if err != nil { if err != nil {
return err return err
} }
// Parse additional positional arguments. // Parse additional positional arguments.
err = runner.ParseArgs(args[1:], &runOptions) err = runner.ParseArgs(args, &runOptions)
if err != nil { if err != nil {
return err return err
} }