Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce time until the prompt is shown for bundle run #1727

Merged
merged 4 commits into from
Sep 21, 2024
Merged

Reduce time until the prompt is shown for bundle run #1727

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cff5b92
Default to cached state for the bundle run command
lennartkats-db Aug 24, 2024
08413e0
Merge remote-tracking branch 'databricks/main' into bundle-run-cache
lennartkats-db Aug 29, 2024
01c381f
Hoist state loading below prompt
lennartkats-db Sep 9, 2024
b92f1e8
Add missing conditional
lennartkats-db Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions cmd/bundle/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ package bundle

import (
"encoding/json"
"errors"
"fmt"
"os"
"path/filepath"

"github.com/databricks/cli/bundle"
"github.com/databricks/cli/bundle/deploy/terraform"
Expand Down Expand Up @@ -40,6 +43,9 @@ task or a Python wheel task, the second example applies.
`,
}

var forcePull bool
cmd.Flags().BoolVar(&forcePull, "force-pull", false, "Skip local cache and load the state from the remote workspace")
lennartkats-db marked this conversation as resolved.
Show resolved Hide resolved

var runOptions run.Options
runOptions.Define(cmd)

Expand All @@ -55,17 +61,30 @@ task or a Python wheel task, the second example applies.
return diags.Error()
}

diags = bundle.Apply(ctx, b, bundle.Seq(
phases.Initialize(),
terraform.Interpolate(),
terraform.Write(),
terraform.StatePull(),
terraform.Load(terraform.ErrorOnEmptyState),
lennartkats-db marked this conversation as resolved.
Show resolved Hide resolved
))
diags = bundle.Apply(ctx, b, phases.Initialize())
if err := diags.Error(); err != nil {
return err
}

cacheDir, err := terraform.Dir(ctx, b)
if err != nil {
return err
}
_, stateFileErr := os.Stat(filepath.Join(cacheDir, terraform.TerraformStateFileName))
_, configFileErr := os.Stat(filepath.Join(cacheDir, terraform.TerraformConfigFileName))
noCache := errors.Is(stateFileErr, os.ErrNotExist) || errors.Is(configFileErr, os.ErrNotExist)

if forcePull || noCache {
diags = bundle.Apply(ctx, b, bundle.Seq(
terraform.StatePull(),
terraform.Interpolate(),
terraform.Write(),
))
if err := diags.Error(); err != nil {
return err
}
}

// If no arguments are specified, prompt the user to select something to run.
if len(args) == 0 && cmdio.IsPromptSupported(ctx) {
// Invert completions from KEY -> NAME, to NAME -> KEY.
Expand Down