diff --git a/.agents/rules/testing.md b/.agents/rules/testing.md index 698b69671ce..e3c8dfa70f8 100644 --- a/.agents/rules/testing.md +++ b/.agents/rules/testing.md @@ -154,7 +154,7 @@ GOOD: ```bash trace $CLI bundle plan | contains.py "Plan: 0 to add, 0 to delete, 1 to update" trace print_requests.py //api/2.0/apps -echo "$deployment_id:DEPLOYMENT_ID" >> ACC_REPLS +add_repl "$deployment_id" DEPLOYMENT_ID ``` BAD: @@ -169,7 +169,7 @@ Available on `PATH` during test execution (from `acceptance/bin/`): - `print_requests.py //path [^//exclude] [--get] [--sort] [--unique] [--oneline] [--keep]`: print recorded HTTP requests matching path filters. Requires `RecordRequests = true` in `test.toml`. Excludes GET by default (`--get` includes them); clears `out.requests.txt` afterwards (`--keep` retains it). `^` prefix excludes a path; multiple positive filters are OR'd together. `--sort` orders output deterministically (use when the request set is order-independent), `--unique` collapses consecutive duplicates (e.g. repeated polls), `--oneline` prints one request per line. - `replace_ids.py [-t TARGET]`: read deployment state and add `[NAME_ID]` replacements for all resource IDs. - `read_id.py [-t TARGET] NAME`: read ID of a single resource from state, print it, and add a `[NAME_ID]` replacement. -- `add_repl.py VALUE REPLACEMENT`: add a custom replacement (VALUE will be replaced with `[REPLACEMENT]` in output). +- `add_repl VALUE REPLACEMENT`: add a custom replacement (VALUE will be replaced with `[REPLACEMENT]` in output). Wraps `add_repl.py`, which appends a JSON line to `$ACC_REPLS` — the file holding every replacement applied to the output, read back by the harness and by `diff.py` / `sort_lines.py --repl`. Always go through the helper; do not write `$ACC_REPLS` from a script. - `update_file.py FILENAME OLD NEW`: replace all occurrences of OLD with NEW in FILENAME. Errors if OLD is not found. Cannot be used on `output.txt`. - `find.py REGEX [--expect N]`: find files matching regex in current directory. `--expect N` asserts an exact count. - `diff.py DIR1 DIR2` or `diff.py FILE1 FILE2`: recursive diff with test replacements applied. diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go index 16fd53a4785..6b11e812763 100644 --- a/acceptance/acceptance_test.go +++ b/acceptance/acceptance_test.go @@ -10,7 +10,6 @@ import ( "flag" "fmt" "io" - "io/fs" "maps" "math/rand/v2" "net/http" @@ -93,8 +92,6 @@ const ( CleanupScript = "script.cleanup" PrepareScript = "script.prepare" MaxFileSize = 1_000_000 - // Filename to save replacements to (used by diff.py) - ReplsFile = "repls.json" // Filename for materialized config (used as golden file) MaterializedConfigFile = "out.test.toml" @@ -103,11 +100,19 @@ const ( // The tests the don't set SERVERLESS variable or set to empty string will also be run. EnvFilterVar = "ENVFILTER" - // File where scripts can output custom replacements - // export $job_id=100200300 - // $ echo "$job_id:MY_JOB" >> ACC_REPLS # This will replace 100200300 with [MY_JOB] in the output - // TODO: this should be merged with repls.json functionality, currently these replacements are not parsed by diff.py - userReplacementsFilename = "ACC_REPLS" + // Env var with the path to the file holding all replacements applied to the output. + // It is kept outside of the test directory, otherwise "bundle deploy" uploads it. + // + // Every line is one replacement encoded as a JSON object: "Old" is a regular expression + // (written by the harness), "Literal" is a value to replace verbatim (appended by + // add_repl.py). The harness writes its own replacements first, then the scripts add theirs: + // + // $ job_id=100200300 + // $ add_repl "$job_id" MY_JOB # replaces 100200300 with [MY_JOB] in the output + // + // The file is read back here (see loadScriptReplacements) and by the python helpers + // (see bin/repls.py). + ReplsEnvVar = "ACC_REPLS" ) var ApplyCITimeoutMultipler = os.Getenv("GITHUB_WORKFLOW") != "" @@ -125,11 +130,6 @@ var Scripts = map[string]bool{ PrepareScript: true, } -var Ignored = map[string]bool{ - ReplsFile: true, - userReplacementsFilename: true, -} - func TestAccept(t *testing.T) { testAccept(t, InprocessMode, "") } @@ -888,6 +888,9 @@ func runTest(t *testing.T, cmd.Env = append(cmd.Env, "UNIQUE_NAME="+uniqueName) cmd.Env = append(cmd.Env, "TEST_TMP_DIR="+tmpDir) + replsPath := filepath.Join(t.TempDir(), ReplsEnvVar) + cmd.Env = append(cmd.Env, ReplsEnvVar+"="+replsPath) + // populate CLOUD_ENV_BASE envBase := getCloudEnvBase(cloudEnv) cmd.Env = append(cmd.Env, "CLOUD_ENV_BASE="+envBase) @@ -898,10 +901,17 @@ func runTest(t *testing.T, // User replacements: repls.Repls = append(repls.Repls, config.Repls...) - // Save replacements to temp test directory so that it can be read by diff.py - replsJson, err := json.MarshalIndent(repls.Repls, "", " ") - require.NoError(t, err) - testutil.WriteFile(t, filepath.Join(tmpDir, ReplsFile), string(replsJson)) + // Save replacements so that they can be read by the scripts (diff.py, sort_lines.py). + // One JSON object per line, because scripts append their own replacements to this file. + var replsLines strings.Builder + for _, repl := range repls.Repls { + line, err := json.Marshal(repl) + require.NoError(t, err) + replsLines.Write(line) + replsLines.WriteByte('\n') + } + testutil.WriteFile(t, replsPath, replsLines.String()) + replsWritten := len(repls.Repls) if coverDir != "" { // Creating individual coverage directory for each test, because writing to the same one @@ -1003,7 +1013,7 @@ func runTest(t *testing.T, formatOutput(out, err) require.NoError(t, out.Close()) - loadUserReplacements(t, &repls, tmpDir) + loadScriptReplacements(t, &repls, replsPath, replsWritten) printedRepls := false @@ -1028,9 +1038,6 @@ func runTest(t *testing.T, if _, ok := outputs[relPath]; ok { continue } - if _, ok := Ignored[relPath]; ok { - continue - } if config.CompiledIgnoreObject.MatchesPath(relPath) && !strings.HasPrefix(relPath, "out") { continue } @@ -1810,26 +1817,32 @@ func setupTerraform(t *testing.T, cwd, buildDir string, repls *testdiff.Replacem repls.SetPath(terraformExecPath, "[TERRAFORM]") } -func loadUserReplacements(t *testing.T, repls *testdiff.ReplacementsContext, tmpDir string) { - b, err := os.ReadFile(filepath.Join(tmpDir, userReplacementsFilename)) - if errors.Is(err, fs.ErrNotExist) { - return - } +// loadScriptReplacements adds the replacements appended to replsPath by the scripts. +// The first offset lines were written by the harness itself and are already in repls. +func loadScriptReplacements(t *testing.T, repls *testdiff.ReplacementsContext, replsPath string, offset int) { + b, err := os.ReadFile(replsPath) require.NoError(t, err) - lines := strings.SplitSeq(string(b), "\n") - for line := range lines { + lines := strings.Split(string(b), "\n") + for _, line := range lines[min(offset, len(lines)):] { line = strings.TrimSpace(line) if len(line) == 0 { continue } - items := strings.Split(line, ":") - if len(items) <= 1 { - t.Errorf("Error parsing %s: %#v", userReplacementsFilename, line) + // Scripts only add literal replacements; regular expressions come from the harness. + var entry struct { + Literal string + New string + Order int + } + if err := json.Unmarshal([]byte(line), &entry); err != nil { + t.Errorf("Error parsing %s: %#v: %s", ReplsEnvVar, line, err) + continue + } + if entry.Literal == "" || entry.New == "" { + t.Errorf("Incomplete entry in %s: %#v", ReplsEnvVar, line) continue } - repl := items[len(items)-1] - old := line[:len(line)-len(repl)-1] - repls.SetWithOrder(old, "["+repl+"]", -100) + repls.SetWithOrder(entry.Literal, entry.New, entry.Order) } } diff --git a/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt b/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt index fc22c7debd6..41b3407e518 100644 --- a/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt +++ b/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt @@ -3,7 +3,7 @@ Deploying project... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created apps.myapp -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged ✓ Getting the status of the app myapp ✓ App is in UNAVAILABLE state diff --git a/acceptance/apps/deploy/bundle-no-args/output.txt b/acceptance/apps/deploy/bundle-no-args/output.txt index 4824cff8d82..5a9942a8d6b 100644 --- a/acceptance/apps/deploy/bundle-no-args/output.txt +++ b/acceptance/apps/deploy/bundle-no-args/output.txt @@ -3,7 +3,7 @@ Deploying project... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created apps.myapp -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged ✓ Getting the status of the app myapp ✓ App is in UNAVAILABLE state diff --git a/acceptance/bin/add_repl.py b/acceptance/bin/add_repl.py index b772584e532..4b5df5c530e 100755 --- a/acceptance/bin/add_repl.py +++ b/acceptance/bin/add_repl.py @@ -6,19 +6,20 @@ """ import argparse +import json import os +import sys from pathlib import Path -ACC_REPLS = Path(os.environ["TEST_TMP_DIR"]) / "ACC_REPLS" +sys.path.insert(0, str(Path(__file__).parent)) +from repls import USER_ORDER, read_entries + +ACC_REPLS = Path(os.environ["ACC_REPLS"]) def get_repls(): - result = {} - if ACC_REPLS.exists(): - for line in ACC_REPLS.open(): - value, repl = line.strip().rsplit(":", 1) - result[repl] = value - return result + # Only the literal entries are added here, so only those can collide. + return {item["New"] for item in read_entries() if item.get("Literal") is not None} def add_repl(value, repl): @@ -28,10 +29,11 @@ def add_repl(value, repl): r = f"{repl}_{extra}" else: r = repl - if r in existing: + if f"[{r}]" in existing: continue with ACC_REPLS.open("a") as fobj: - fobj.write(f"{value}:{r}\n") + json.dump({"Literal": value, "New": f"[{r}]", "Order": USER_ORDER}, fobj) + fobj.write("\n") break diff --git a/acceptance/bin/diff.py b/acceptance/bin/diff.py index 84b2cdde5a6..93c75ef882b 100755 --- a/acceptance/bin/diff.py +++ b/acceptance/bin/diff.py @@ -2,33 +2,18 @@ """This script implements "diff -r -U2 dir1 dir2" but applies replacements first""" import difflib -import json -import os -import re import sys from pathlib import Path - -def replaceAll(patterns, s): - for comp, new in patterns: - s = comp.sub(new, s) - return s +sys.path.insert(0, str(Path(__file__).parent)) +from repls import compile_repls, replace_all def main(): d1, d2 = sys.argv[1:] d1, d2 = Path(d1), Path(d2) - repls_json = Path(os.environ["TEST_TMP_DIR"]) / "repls.json" - repls = json.loads(repls_json.read_text()) - - patterns = [] - for r in repls: - try: - c = re.compile(r["Old"]) - patterns.append((c, r["New"])) - except re.error as e: - print(f"Regex error for pattern {r}: {e}", file=sys.stderr) + patterns = compile_repls() if d1.is_dir() and d2.is_dir(): files1 = [str(p.relative_to(d1)) for p in d1.rglob("*") if p.is_file() and not p.name.startswith("LOG")] @@ -54,8 +39,8 @@ def main(): def diff_files(patterns, p1, p2): - a = replaceAll(patterns, p1.read_text()).splitlines(True) - b = replaceAll(patterns, p2.read_text()).splitlines(True) + a = replace_all(patterns, p1.read_text()).splitlines(True) + b = replace_all(patterns, p2.read_text()).splitlines(True) if a != b: p1_str = p1.as_posix() p2_str = p2.as_posix() diff --git a/acceptance/bin/read_id.py b/acceptance/bin/read_id.py index 27b98c8192f..87cd2954bdf 100755 --- a/acceptance/bin/read_id.py +++ b/acceptance/bin/read_id.py @@ -3,7 +3,7 @@ Print id of the resource from the state. Update ACC_REPLS for a given ID. Example: read_id.py foo - Output job_id, e.g. "5555" and update ACC_REPLS with record "5555:FOO_ID" + Output job_id, e.g. "5555" and update ACC_REPLS to replace "5555" with [FOO_ID] Usage: [attr...] """ diff --git a/acceptance/bin/repls.py b/acceptance/bin/repls.py new file mode 100644 index 00000000000..1fffe2c949f --- /dev/null +++ b/acceptance/bin/repls.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python3 +""" +Read the replacements applied to the test output from $ACC_REPLS. + +Every line is one replacement encoded as a JSON object: "Old" is a regular expression +(written by the test harness), "Literal" is a value to replace verbatim (appended by +add_repl.py). "New" is the replacement, "Order" defines the order they are applied in. +""" + +import json +import os +import re +import sys +from pathlib import Path + +# Order of the replacements added by the scripts, so that they are applied before the ones +# from the harness: a job id must become [MY_JOB] rather than [NUMID]. +USER_ORDER = -100 + + +def read_entries(): + """Return the raw entries of $ACC_REPLS.""" + result = [] + for line in Path(os.environ["ACC_REPLS"]).read_text().splitlines(): + line = line.strip() + if line: + result.append(json.loads(line)) + return result + + +def read_repls(): + """Return (pattern, replacement) pairs in the order they must be applied.""" + entries = [] + + for item in read_entries(): + order = item.get("Order", 0) + new = item["New"] + literal = item.get("Literal") + + if literal is None: + # "Distinct" is not honoured here; unlike the harness, we do not number the matches. + entries.append((order, item["Old"], new)) + continue + + # Set() in libs/testdiff also registers the JSON-encoded form of the value, so that + # values with quotes or backslashes are replaced inside JSON output as well. + encoded = json.dumps(literal, ensure_ascii=False)[1:-1] + if encoded != literal: + entries.append((order, re.escape(encoded), new)) + entries.append((order, re.escape(literal), new)) + + # Stable sort: replacements with the same order are applied in the order they were added. + entries.sort(key=lambda entry: entry[0]) + + return [(old, new) for _, old, new in entries] + + +def compile_repls(): + """Same as read_repls(), with patterns compiled. Invalid patterns are reported and skipped.""" + result = [] + for old, new in read_repls(): + try: + result.append((re.compile(old), new)) + except re.error as e: + print(f"Regex error for pattern {old}: {e}", file=sys.stderr) + return result + + +def replace_all(patterns, s): + for comp, new in patterns: + s = comp.sub(new, s) + return s diff --git a/acceptance/bin/sort_lines.py b/acceptance/bin/sort_lines.py index f75e53a661c..9644068b46c 100755 --- a/acceptance/bin/sort_lines.py +++ b/acceptance/bin/sort_lines.py @@ -1,34 +1,22 @@ #!/usr/bin/env python3 """ Helper to sort lines in text file. Similar to 'sort' but no dependence on locale or presence of 'sort' in PATH. -With --repl, applies TEST_TMP_DIR/repls.json replacements as sort key for stable output across different environments. +With --repl, applies the test replacements ($ACC_REPLS) as sort key for stable output across different environments. """ -import json -import os -import re import sys from pathlib import Path +sys.path.insert(0, str(Path(__file__).parent)) +from repls import compile_repls, replace_all + use_repl = "--repl" in sys.argv[1:] lines = sys.stdin.readlines() if use_repl: - repls = json.loads((Path(os.environ["TEST_TMP_DIR"]) / "repls.json").read_text()) - patterns = [] - for r in repls: - try: - patterns.append((re.compile(r["Old"]), r["New"])) - except re.error as e: - print(f"Regex error for pattern {r}: {e}", file=sys.stderr) - - def sort_key(line): - for comp, new in patterns: - line = comp.sub(new, line) - return line - - lines.sort(key=sort_key) + patterns = compile_repls() + lines.sort(key=lambda line: replace_all(patterns, line)) else: lines.sort() diff --git a/acceptance/bundle/ai_runtime_task/local_code_source/output.txt b/acceptance/bundle/ai_runtime_task/local_code_source/output.txt index 584fa164d52..768955bc2b2 100644 --- a/acceptance/bundle/ai_runtime_task/local_code_source/output.txt +++ b/acceptance/bundle/ai_runtime_task/local_code_source/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/ai-runtime-test/default/files... Created jobs.train -Files: 14 uploaded, 0 deleted +Files: 13 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === each task's tarball holds only synced files (both under the repo root .air_snapshots) diff --git a/acceptance/bundle/apps/app_yaml/output.txt b/acceptance/bundle/apps/app_yaml/output.txt index 20e033c1971..53429bbbb4c 100644 --- a/acceptance/bundle/apps/app_yaml/output.txt +++ b/acceptance/bundle/apps/app_yaml/output.txt @@ -16,7 +16,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created apps.myapp -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> jq select(.path | test("app.yml")) out.requests.txt diff --git a/acceptance/bundle/apps/compute_size/output.txt b/acceptance/bundle/apps/compute_size/output.txt index 297bf99dbd7..ea71df156b3 100644 --- a/acceptance/bundle/apps/compute_size/output.txt +++ b/acceptance/bundle/apps/compute_size/output.txt @@ -3,7 +3,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-compute-size-[UNIQUE_NAME]/files... Created apps.my_app -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Update compute size and redeploy diff --git a/acceptance/bundle/apps/git_source/output.txt b/acceptance/bundle/apps/git_source/output.txt index 4fbf089f0b5..c7bce16a663 100644 --- a/acceptance/bundle/apps/git_source/output.txt +++ b/acceptance/bundle/apps/git_source/output.txt @@ -19,7 +19,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-git-source-[UNIQUE_NAME]/files... Created apps.my_app -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run my_app @@ -61,7 +61,7 @@ You can access the app at [APP_NAME]-123.cloud.databricksapps.com === Update git_source branch and redeploy >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-git-source-[UNIQUE_NAME]/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged === Verify config update was applied diff --git a/acceptance/bundle/apps/git_source/script b/acceptance/bundle/apps/git_source/script index c33cf091fa3..f9d90c84a53 100644 --- a/acceptance/bundle/apps/git_source/script +++ b/acceptance/bundle/apps/git_source/script @@ -21,7 +21,7 @@ trace $CLI bundle run my_app title "Get app details and verify git_source configuration" app_name=$(trace $CLI bundle summary --output json | jq -r '.resources.apps.my_app.name') -echo "$app_name:APP_NAME" >> ACC_REPLS +add_repl "$app_name" APP_NAME trace $CLI apps get $app_name --output json | jq '{name, description, git_repository, git_source}' diff --git a/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt b/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt index 4126f6f251f..d384cc5190d 100644 --- a/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt +++ b/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt @@ -4,7 +4,7 @@ Building code_source... Uploading code.tgz... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting code_source_path rewritten to the uploaded artifact remote path diff --git a/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt b/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt index a4c4982cd32..cf539c84438 100644 --- a/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt +++ b/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt @@ -3,7 +3,7 @@ Uploading whl/source.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting 2 wheels in libraries section in /jobs/create diff --git a/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt b/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt index 85ab6e9ccb6..452a913bffa 100644 --- a/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt +++ b/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt @@ -3,7 +3,7 @@ Uploading whl/source.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting 2 wheels in libraries section in /jobs/create diff --git a/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt b/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt index 9c8b5617190..1072fffd3bd 100644 --- a/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt +++ b/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading whl/source.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === Expecting wheel to be uploaded diff --git a/acceptance/bundle/artifacts/build_and_files_whl/output.txt b/acceptance/bundle/artifacts/build_and_files_whl/output.txt index be0be958c94..a37019f5ada 100644 --- a/acceptance/bundle/artifacts/build_and_files_whl/output.txt +++ b/acceptance/bundle/artifacts/build_and_files_whl/output.txt @@ -12,5 +12,5 @@ Validation OK! Building artifact_with_custom_dist... Uploading mydist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Files: 17 uploaded, 0 deleted +Files: 16 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/glob_exact_whl/output.txt b/acceptance/bundle/artifacts/glob_exact_whl/output.txt index b16cac59eed..30efca0e06a 100644 --- a/acceptance/bundle/artifacts/glob_exact_whl/output.txt +++ b/acceptance/bundle/artifacts/glob_exact_whl/output.txt @@ -16,5 +16,5 @@ Uploading prebuilt/other_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/issue_3109/output.txt b/acceptance/bundle/artifacts/issue_3109/output.txt index 3c9b88daeef..6d84a5ec8b5 100644 --- a/acceptance/bundle/artifacts/issue_3109/output.txt +++ b/acceptance/bundle/artifacts/issue_3109/output.txt @@ -6,5 +6,5 @@ Building wheels... Uploading dist/my_default_python-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files... Created jobs.job1 -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/shell/bash/output.txt b/acceptance/bundle/artifacts/shell/bash/output.txt index a5881e42dc2..2ff671d28ac 100644 --- a/acceptance/bundle/artifacts/shell/bash/output.txt +++ b/acceptance/bundle/artifacts/shell/bash/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Building my_artifact... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-bash/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/shell/basic/output.txt b/acceptance/bundle/artifacts/shell/basic/output.txt index 6dd323fe46c..2fd0ac1d308 100644 --- a/acceptance/bundle/artifacts/shell/basic/output.txt +++ b/acceptance/bundle/artifacts/shell/basic/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Building my_artifact... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-basic/default/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/shell/default/output.txt b/acceptance/bundle/artifacts/shell/default/output.txt index a5881e42dc2..2ff671d28ac 100644 --- a/acceptance/bundle/artifacts/shell/default/output.txt +++ b/acceptance/bundle/artifacts/shell/default/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Building my_artifact... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-bash/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/shell/sh/output.txt b/acceptance/bundle/artifacts/shell/sh/output.txt index 358324c6ffd..90b9a3081d0 100644 --- a/acceptance/bundle/artifacts/shell/sh/output.txt +++ b/acceptance/bundle/artifacts/shell/sh/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Building my_artifact... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-sh/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/unique_name_libraries/output.txt b/acceptance/bundle/artifacts/unique_name_libraries/output.txt index 4306e96f09b..cbcbd2bf29e 100644 --- a/acceptance/bundle/artifacts/unique_name_libraries/output.txt +++ b/acceptance/bundle/artifacts/unique_name_libraries/output.txt @@ -6,5 +6,5 @@ Uploading whl1/dist/my_package-0.0.1-py3-none-any.whl... Uploading whl2/dist/my_other_package-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test -Files: 29 uploaded, 0 deleted +Files: 28 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt b/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt index 5e22def8b11..90c4730c1ab 100644 --- a/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt +++ b/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt @@ -6,7 +6,7 @@ Uploading whl/source3.whl... Uploading whl/source4.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting 5 wheels in libraries section in /jobs/create diff --git a/acceptance/bundle/artifacts/whl_change_version/output.txt b/acceptance/bundle/artifacts/whl_change_version/output.txt index 4903e437183..5c76f9ae00e 100644 --- a/acceptance/bundle/artifacts/whl_change_version/output.txt +++ b/acceptance/bundle/artifacts/whl_change_version/output.txt @@ -4,7 +4,7 @@ Building python_artifact... Uploading dist/my_test_code-0.1.0-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 11 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl @@ -38,7 +38,6 @@ dist/my_test_code-0.1.0-py3-none-any.whl "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/__main__.py" "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/out.requests.txt" "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/output.txt" -"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/repls.json" "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/script" "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/setup.py" "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/test.toml" diff --git a/acceptance/bundle/artifacts/whl_dbfs/output.txt b/acceptance/bundle/artifacts/whl_dbfs/output.txt index 2c8ab5f407b..3ebe5c59872 100644 --- a/acceptance/bundle/artifacts/whl_dbfs/output.txt +++ b/acceptance/bundle/artifacts/whl_dbfs/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting to find no wheels diff --git a/acceptance/bundle/artifacts/whl_dynamic/output.txt b/acceptance/bundle/artifacts/whl_dynamic/output.txt index dbce23d3a36..eae8cd91f5f 100644 --- a/acceptance/bundle/artifacts/whl_dynamic/output.txt +++ b/acceptance/bundle/artifacts/whl_dynamic/output.txt @@ -31,7 +31,7 @@ Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_c Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 20 uploaded, 0 deleted +Files: 19 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === There are 2 original wheels and 2 patched ones diff --git a/acceptance/bundle/artifacts/whl_explicit/output.txt b/acceptance/bundle/artifacts/whl_explicit/output.txt index fc493f3f917..239ffa6f82b 100644 --- a/acceptance/bundle/artifacts/whl_explicit/output.txt +++ b/acceptance/bundle/artifacts/whl_explicit/output.txt @@ -4,7 +4,7 @@ Building my_test_code... Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl diff --git a/acceptance/bundle/artifacts/whl_implicit/output.txt b/acceptance/bundle/artifacts/whl_implicit/output.txt index d8b85371f1b..b70acc109e6 100644 --- a/acceptance/bundle/artifacts/whl_implicit/output.txt +++ b/acceptance/bundle/artifacts/whl_implicit/output.txt @@ -4,7 +4,7 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl diff --git a/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt b/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt index 76bb994774c..835ab7c3413 100644 --- a/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt +++ b/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt @@ -3,7 +3,7 @@ Uploading package/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl diff --git a/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt b/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt index 3d4006c39d3..bab8fe2a99d 100644 --- a/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt +++ b/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt @@ -4,7 +4,7 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 11 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl diff --git a/acceptance/bundle/artifacts/whl_multiple/output.txt b/acceptance/bundle/artifacts/whl_multiple/output.txt index 3b486f7db47..a6eeab1b952 100644 --- a/acceptance/bundle/artifacts/whl_multiple/output.txt +++ b/acceptance/bundle/artifacts/whl_multiple/output.txt @@ -6,7 +6,7 @@ Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl... Uploading my_test_code/dist/my_test_code_2-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 12 uploaded, 0 deleted +Files: 11 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 2 whl diff --git a/acceptance/bundle/artifacts/whl_no_cleanup/output.txt b/acceptance/bundle/artifacts/whl_no_cleanup/output.txt index 20d1a1e3ef0..e9573230b06 100644 --- a/acceptance/bundle/artifacts/whl_no_cleanup/output.txt +++ b/acceptance/bundle/artifacts/whl_no_cleanup/output.txt @@ -4,7 +4,7 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl diff --git a/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt b/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt index 6218560dcc1..560a1b1ad43 100644 --- a/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt +++ b/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt @@ -8,7 +8,7 @@ Uploading dist/lib/other_test_code-0.0.1-py3-none-any.whl... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting to find 2 wheels, same as initially provided diff --git a/acceptance/bundle/artifacts/whl_via_environment_key/output.txt b/acceptance/bundle/artifacts/whl_via_environment_key/output.txt index 67ed6cc53e0..e0cb8bcb22b 100644 --- a/acceptance/bundle/artifacts/whl_via_environment_key/output.txt +++ b/acceptance/bundle/artifacts/whl_via_environment_key/output.txt @@ -4,7 +4,7 @@ Building my_test_code... Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl diff --git a/acceptance/bundle/bundle_tag/id/output.txt b/acceptance/bundle/bundle_tag/id/output.txt index 8885e824bbf..6feadfe6ad9 100644 --- a/acceptance/bundle/bundle_tag/id/output.txt +++ b/acceptance/bundle/bundle_tag/id/output.txt @@ -36,7 +36,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs diff --git a/acceptance/bundle/bundle_tag/url/output.txt b/acceptance/bundle/bundle_tag/url/output.txt index b67dac6a4ef..a86aec5254d 100644 --- a/acceptance/bundle/bundle_tag/url/output.txt +++ b/acceptance/bundle/bundle_tag/url/output.txt @@ -36,7 +36,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs diff --git a/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt b/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt index 50c3e802edd..4de72fd5e43 100644 --- a/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt +++ b/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt @@ -4,5 +4,5 @@ Warning: "resources.jobs.foo.url": Terraform-only field; this reference will not Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.bar Created jobs.foo -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/config-remote-sync/cli_defaults/output.txt b/acceptance/bundle/config-remote-sync/cli_defaults/output.txt index f8edf431945..21f517c910c 100644 --- a/acceptance/bundle/config-remote-sync/cli_defaults/output.txt +++ b/acceptance/bundle/config-remote-sync/cli_defaults/output.txt @@ -2,7 +2,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQU Created jobs.job1 Created jobs.job2 Created pipelines.pipeline1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged === Modify jobs diff --git a/acceptance/bundle/config-remote-sync/config_edits/output.txt b/acceptance/bundle/config-remote-sync/config_edits/output.txt index b364ed757c6..981bf7d1032 100644 --- a/acceptance/bundle/config-remote-sync/config_edits/output.txt +++ b/acceptance/bundle/config-remote-sync/config_edits/output.txt @@ -1,7 +1,7 @@ Uploading dummy.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.my_job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Case 1: Added locally, updated remotely with different value diff --git a/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt b/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt index e2cf93d8333..121bce1d9ff 100644 --- a/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt +++ b/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created dashboards.my_dashboard -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Modify the dashboard out of band to bump its remote etag diff --git a/acceptance/bundle/config-remote-sync/flushed_cache/output.txt b/acceptance/bundle/config-remote-sync/flushed_cache/output.txt index b7910beab89..1c545626279 100644 --- a/acceptance/bundle/config-remote-sync/flushed_cache/output.txt +++ b/acceptance/bundle/config-remote-sync/flushed_cache/output.txt @@ -2,7 +2,7 @@ === Deploy bundle Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.test_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Get job ID and modify remote resource diff --git a/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt b/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt index 0123261d626..d79a5be5527 100644 --- a/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt +++ b/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.my_job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Modify max_concurrent_runs, description, and add timeout diff --git a/acceptance/bundle/config-remote-sync/job_fields/output.txt b/acceptance/bundle/config-remote-sync/job_fields/output.txt index ffdefaf5dda..afd0d45778e 100644 --- a/acceptance/bundle/config-remote-sync/job_fields/output.txt +++ b/acceptance/bundle/config-remote-sync/job_fields/output.txt @@ -1,7 +1,7 @@ Uploading dummy.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.my_job -Files: 9 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Modify job fields remotely @@ -64,7 +64,7 @@ Resource: resources.jobs.my_job - - job_cluster_key: test_cluster + - job_cluster_key: test_cluster_renamed new_cluster: - spark_version: [[DEFAULT_SPARK_VERSION]] + spark_version: [DEFAULT_SPARK_VERSION] @@ -34,5 +40,5 @@ notebook_task: notebook_path: /Users/{{workspace_user_name}}/notebook @@ -73,7 +73,7 @@ Resource: resources.jobs.my_job - task_key: inline_cluster_task notebook_task: @@ -41,5 +47,7 @@ - spark_version: [[DEFAULT_SPARK_VERSION]] + spark_version: [DEFAULT_SPARK_VERSION] node_type_id: [NODE_TYPE_ID] - num_workers: 1 + num_workers: 2 diff --git a/acceptance/bundle/config-remote-sync/job_fields/script b/acceptance/bundle/config-remote-sync/job_fields/script index ed2d6dd93ea..c667e273b21 100755 --- a/acceptance/bundle/config-remote-sync/job_fields/script +++ b/acceptance/bundle/config-remote-sync/job_fields/script @@ -1,8 +1,8 @@ #!/bin/bash envsubst < databricks.yml.tmpl > databricks.yml -add_repl.py "$DEFAULT_SPARK_VERSION" "[DEFAULT_SPARK_VERSION]" -add_repl.py "$NODE_TYPE_ID" "[NODE_TYPE_ID]" +add_repl "$DEFAULT_SPARK_VERSION" DEFAULT_SPARK_VERSION +add_repl "$NODE_TYPE_ID" NODE_TYPE_ID cleanup() { trace $CLI bundle destroy --auto-approve diff --git a/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt b/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt index b4af2341cc0..f9e195fd11f 100644 --- a/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt +++ b/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt @@ -2,7 +2,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQU Created jobs.my_job Created jobs.no_tasks_job Created jobs.rename_task_job -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged === Modify c_task, remove d_task, add e_task diff --git a/acceptance/bundle/config-remote-sync/job_params_variables/output.txt b/acceptance/bundle/config-remote-sync/job_params_variables/output.txt index 9de17b128a8..08d5483a2aa 100644 --- a/acceptance/bundle/config-remote-sync/job_params_variables/output.txt +++ b/acceptance/bundle/config-remote-sync/job_params_variables/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.my_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Add new parameter remotely diff --git a/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt b/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt index b7a714f77d2..8775f22de5b 100644 --- a/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt +++ b/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.my_job Created pipelines.my_pipeline -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Modify pipeline_task full_refresh to True diff --git a/acceptance/bundle/config-remote-sync/multiple_files/output.txt b/acceptance/bundle/config-remote-sync/multiple_files/output.txt index 8b05414a0c7..cae1d0d39b7 100644 --- a/acceptance/bundle/config-remote-sync/multiple_files/output.txt +++ b/acceptance/bundle/config-remote-sync/multiple_files/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... Created jobs.job_one Created jobs.job_two -Files: 12 uploaded, 0 deleted +Files: 11 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Modify job_one: max_concurrent_runs, rename c_task diff --git a/acceptance/bundle/config-remote-sync/multiple_resources/output.txt b/acceptance/bundle/config-remote-sync/multiple_resources/output.txt index 003474d0fbc..b09808f177e 100644 --- a/acceptance/bundle/config-remote-sync/multiple_resources/output.txt +++ b/acceptance/bundle/config-remote-sync/multiple_resources/output.txt @@ -6,7 +6,7 @@ Created jobs.job_two Created registered_models.test_model Created sql_warehouses.test_warehouse Created volumes.test_volume -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 7 created, 0 changed, 0 deleted, 0 unchanged === Modify both jobs diff --git a/acceptance/bundle/config-remote-sync/multiple_resources/script b/acceptance/bundle/config-remote-sync/multiple_resources/script index ae3b4c486fa..7a89c168d69 100755 --- a/acceptance/bundle/config-remote-sync/multiple_resources/script +++ b/acceptance/bundle/config-remote-sync/multiple_resources/script @@ -17,8 +17,8 @@ job_one_id="$(read_id.py job_one)" job_two_id="$(read_id.py job_two)" # Add replacements for dynamic values that appear in server-side defaults -add_repl.py "$($CLI current-user me | jq -r .id)" "USER_ID" -add_repl.py "$($CLI metastores current | jq -r .metastore_id)" "METASTORE_ID" +add_repl "$($CLI current-user me | jq -r .id)" "USER_ID" +add_repl "$($CLI metastores current | jq -r .metastore_id)" "METASTORE_ID" title "Modify both jobs" edit_resource.py jobs $job_one_id < zzz and beta (target block) -> aaa, bodies identical diff --git a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt index 0166fa256af..5aab462c96f 100644 --- a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt +++ b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.ambiguous_single_block_job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Rename alpha -> zzz and beta -> aaa, and point gamma at the new keys diff --git a/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt b/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt index f6c206b667b..22d19607451 100644 --- a/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt +++ b/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... Created jobs.two_removes_job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Two identical tasks, one in each block; DELETE one (remote), RENAME the other diff --git a/acceptance/bundle/config-remote-sync/split/target_variable/output.txt b/acceptance/bundle/config-remote-sync/split/target_variable/output.txt index c98ee7a3dc0..f8e56c51fdb 100644 --- a/acceptance/bundle/config-remote-sync/split/target_variable/output.txt +++ b/acceptance/bundle/config-remote-sync/split/target_variable/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... Created jobs.var_job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Rename the notebook inside a target-block field that uses a variable diff --git a/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt b/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt index 1a99523b717..054ec3fc099 100644 --- a/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt +++ b/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.file_order_job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Edit aaa, whose file position differs from its merged position diff --git a/acceptance/bundle/config-remote-sync/target_override/output.txt b/acceptance/bundle/config-remote-sync/target_override/output.txt index 0ae30a20ab8..3fc95ddbd76 100644 --- a/acceptance/bundle/config-remote-sync/target_override/output.txt +++ b/acceptance/bundle/config-remote-sync/target_override/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... Created jobs.my_job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Modify fields in target override diff --git a/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt b/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt index 681a885d397..a12c957f86a 100644 --- a/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt +++ b/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.sample_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Rename task to new_task_2 remotely diff --git a/acceptance/bundle/config-remote-sync/validation_errors/output.txt b/acceptance/bundle/config-remote-sync/validation_errors/output.txt index d5850d0455b..ebbb667b85a 100644 --- a/acceptance/bundle/config-remote-sync/validation_errors/output.txt +++ b/acceptance/bundle/config-remote-sync/validation_errors/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.my_job Created pipelines.my_pipeline -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Set correct paths and add git info remotely diff --git a/acceptance/bundle/deploy/empty-bundle/output.txt b/acceptance/bundle/deploy/empty-bundle/output.txt index 8716a80e3f7..f0f54303479 100644 --- a/acceptance/bundle/deploy/empty-bundle/output.txt +++ b/acceptance/bundle/deploy/empty-bundle/output.txt @@ -1,7 +1,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/deploy/fail-on-active-runs/output.txt b/acceptance/bundle/deploy/fail-on-active-runs/output.txt index 9c10a1e7485..e92bc0e92f1 100644 --- a/acceptance/bundle/deploy/fail-on-active-runs/output.txt +++ b/acceptance/bundle/deploy/fail-on-active-runs/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.my_job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> errcode [CLI] bundle deploy --fail-on-active-runs diff --git a/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt b/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt index ce0f2f59ace..b17cf0f620a 100644 --- a/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt +++ b/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.foo -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Check that test file is in workspace @@ -44,7 +44,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Files: 8 uploaded, 2 deleted +Files: 7 uploaded, 2 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged === Check that removed files are not in the workspace anymore diff --git a/acceptance/bundle/deploy/files/out-of-band-delete/output.txt b/acceptance/bundle/deploy/files/out-of-band-delete/output.txt index 65a6c603fd6..fa773f68557 100644 --- a/acceptance/bundle/deploy/files/out-of-band-delete/output.txt +++ b/acceptance/bundle/deploy/files/out-of-band-delete/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files... Created jobs.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === After the initial deploy the python_file exists @@ -29,7 +29,7 @@ Error: Path (/Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/file >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] workspace get-status /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files/hello_world.py diff --git a/acceptance/bundle/deploy/force-lock-config/output.txt b/acceptance/bundle/deploy/force-lock-config/output.txt index cbff83f8baa..c74a02c31a6 100644 --- a/acceptance/bundle/deploy/force-lock-config/output.txt +++ b/acceptance/bundle/deploy/force-lock-config/output.txt @@ -6,5 +6,5 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-force-lock/default/files... Created jobs.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt b/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt index bb125634e90..36d57ffdbfa 100644 --- a/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt +++ b/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt @@ -8,7 +8,7 @@ HTTP Status: 403 Forbidden API error_code: INJECTED API message: Fault injected by test. -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/deploy/pipeline-config-dots/output.txt b/acceptance/bundle/deploy/pipeline-config-dots/output.txt index 01804f02186..4692d68e2d9 100644 --- a/acceptance/bundle/deploy/pipeline-config-dots/output.txt +++ b/acceptance/bundle/deploy/pipeline-config-dots/output.txt @@ -12,7 +12,7 @@ Validation OK! Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created pipelines.my_pipeline Created schemas.my_schema -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/deploy/readplan/basic/output.txt b/acceptance/bundle/deploy/readplan/basic/output.txt index 090efef56b3..5211ba04b57 100644 --- a/acceptance/bundle/deploy/readplan/basic/output.txt +++ b/acceptance/bundle/deploy/readplan/basic/output.txt @@ -6,7 +6,7 @@ >>> [CLI] bundle deploy --plan out.plan_create.json Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --get //jobs diff --git a/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt b/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt index a20a3149cb1..7d6f07a44cd 100644 --- a/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt +++ b/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt @@ -5,7 +5,7 @@ Warn: Plan was created with CLI version 1.2.3 but current version is [CLI_VERSION] Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "method": "POST", diff --git a/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt b/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt index d4023da04eb..68a8439c550 100644 --- a/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt +++ b/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created schemas.myschema Created schemas.myschema.grants -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity-catalog/permissions --sort diff --git a/acceptance/bundle/deploy/readplan/postgres_role/output.txt b/acceptance/bundle/deploy/readplan/postgres_role/output.txt index e6079ee49cd..5a422d8e993 100644 --- a/acceptance/bundle/deploy/readplan/postgres_role/output.txt +++ b/acceptance/bundle/deploy/readplan/postgres_role/output.txt @@ -8,7 +8,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul Created postgres_branches.branch Created postgres_projects.project Created postgres_roles.role -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //roles diff --git a/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt b/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt index a2f28170b58..02c4439f2eb 100644 --- a/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt +++ b/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json diff --git a/acceptance/bundle/deploy/spark-jar-task/output.txt b/acceptance/bundle/deploy/spark-jar-task/output.txt index af6b78b8227..34360cc0b49 100644 --- a/acceptance/bundle/deploy/spark-jar-task/output.txt +++ b/acceptance/bundle/deploy/spark-jar-task/output.txt @@ -4,7 +4,7 @@ Building my_java_code... Uploading myjar/PrintArgs.jar... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/spark-jar-task-[UNIQUE_NAME]/default/files... Created jobs.jar_job -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run jar_job diff --git a/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt b/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt index 81f0e5090b1..e9762bf4cb6 100644 --- a/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt +++ b/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt @@ -11,7 +11,7 @@ Warn: Saved 1 corrupted WAL entries to [TEST_TMP_DIR]/.databricks/bundle/default Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-corrupted-test/default/files... Created jobs.another_valid Created jobs.valid_job -Files: 8 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary diff --git a/acceptance/bundle/deploy/wal/corrupted-wal-entry/script b/acceptance/bundle/deploy/wal/corrupted-wal-entry/script index d6f151a29c6..3245bbdc377 100644 --- a/acceptance/bundle/deploy/wal/corrupted-wal-entry/script +++ b/acceptance/bundle/deploy/wal/corrupted-wal-entry/script @@ -1,8 +1,8 @@ # Create pre-existing jobs in the testserver so WAL recovery triggers DoUpdate (reset) instead of DoCreate JOB1=$($CLI jobs create --json '{"name":"valid-job"}' | jq -r '.job_id') JOB2=$($CLI jobs create --json '{"name":"another-valid"}' | jq -r '.job_id') -echo "$JOB1:JOB1_ID" >> ACC_REPLS -echo "$JOB2:JOB2_ID" >> ACC_REPLS +add_repl "$JOB1" JOB1_ID +add_repl "$JOB2" JOB2_ID mkdir -p .databricks/bundle/default cp resources.json .databricks/bundle/default/ diff --git a/acceptance/bundle/deploy/wal/empty-wal/output.txt b/acceptance/bundle/deploy/wal/empty-wal/output.txt index 9f579981955..4ba404407ce 100644 --- a/acceptance/bundle/deploy/wal/empty-wal/output.txt +++ b/acceptance/bundle/deploy/wal/empty-wal/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-empty-test/default/files... Created jobs.test_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt b/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt index c7cac4b70ca..f2a61f5a23d 100644 --- a/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt +++ b/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt @@ -3,7 +3,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Deploy 2 (planning fails, must not leave a WAL) diff --git a/acceptance/bundle/deploy/wal/stale-wal/output.txt b/acceptance/bundle/deploy/wal/stale-wal/output.txt index eb66dfc8299..b02ec60c0ba 100644 --- a/acceptance/bundle/deploy/wal/stale-wal/output.txt +++ b/acceptance/bundle/deploy/wal/stale-wal/output.txt @@ -6,7 +6,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-stale-test/default/files... Updated jobs.test_job -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Checking WAL file after deploy === Stale WAL deleted (expected) diff --git a/acceptance/bundle/deploy/wal/wal-with-delete/output.txt b/acceptance/bundle/deploy/wal/wal-with-delete/output.txt index b5abe8a2e7b..74af6e61cbc 100644 --- a/acceptance/bundle/deploy/wal/wal-with-delete/output.txt +++ b/acceptance/bundle/deploy/wal/wal-with-delete/output.txt @@ -5,7 +5,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-delete-test/default/files... -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === Final state (should have no jobs) === diff --git a/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt b/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt index 227c86d4525..e348a4ec101 100644 --- a/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt +++ b/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/yaml-sync-empty-grants/default/files... Created schemas.schema1 -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/deployment/bind/alert/script b/acceptance/bundle/deployment/bind/alert/script index 88e12f15c34..9b6ae2f4085 100644 --- a/acceptance/bundle/deployment/bind/alert/script +++ b/acceptance/bundle/deployment/bind/alert/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml envsubst < alert.json.tmpl > alert.json alert_id=$(trace $CLI alerts-v2 create-alert --json @alert.json | jq -r '.id') -echo "$alert_id:ALERT_ID" >> ACC_REPLS +add_repl "$alert_id" ALERT_ID trace $CLI bundle deployment bind my_alert $alert_id --auto-approve trace $CLI bundle summary diff --git a/acceptance/bundle/deployment/bind/catalog/output.txt b/acceptance/bundle/deployment/bind/catalog/output.txt index 385a5f67b08..56576c70780 100644 --- a/acceptance/bundle/deployment/bind/catalog/output.txt +++ b/acceptance/bundle/deployment/bind/catalog/output.txt @@ -13,7 +13,7 @@ Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Updated catalogs.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] catalogs get test-catalog-[UNIQUE_NAME] diff --git a/acceptance/bundle/deployment/bind/dashboard/output.txt b/acceptance/bundle/deployment/bind/dashboard/output.txt index 1d6742cfbc8..6e6ded5fc83 100644 --- a/acceptance/bundle/deployment/bind/dashboard/output.txt +++ b/acceptance/bundle/deployment/bind/dashboard/output.txt @@ -4,7 +4,7 @@ Successfully bound dashboard with an id '[DASHBOARD_ID]' Run 'bundle deploy' to deploy changes to your workspace Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Updated dashboards.dashboard1 -Files: 14 uploaded, 0 deleted +Files: 13 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] lakeview get [DASHBOARD_ID] diff --git a/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt b/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt index f076ba2b12f..21ebc31d7dd 100644 --- a/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt +++ b/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt @@ -19,7 +19,7 @@ Error: the deployment requires destructive actions, but the current console does Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed. To proceed, use --auto-approve after reviewing the plan above. -Files: 9 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/deployment/bind/dashboard/recreation/script b/acceptance/bundle/deployment/bind/dashboard/recreation/script index 6ab9c0020d0..ce63de92924 100644 --- a/acceptance/bundle/deployment/bind/dashboard/recreation/script +++ b/acceptance/bundle/deployment/bind/dashboard/recreation/script @@ -5,7 +5,7 @@ envsubst < databricks.yml.tmpl > databricks.yml # Create a pre-defined dashboard: DASHBOARD_ID=$($CLI lakeview create --display-name "${DASHBOARD_DISPLAY_NAME}" --warehouse-id "${TEST_DEFAULT_WAREHOUSE_ID}" --serialized-dashboard '{"pages":[{"name":"02724bf2","displayName":"Untitled page"}]}' | jq -r '.dashboard_id') -echo "$DASHBOARD_ID:DASHBOARD_ID" >> ACC_REPLS +add_repl "$DASHBOARD_ID" DASHBOARD_ID cleanupRemoveDashboard() { $CLI lakeview trash "${DASHBOARD_ID}" @@ -16,7 +16,7 @@ trace $CLI bundle deployment bind dashboard1 "${DASHBOARD_ID}" --auto-approve trace print_state.py > out.state_after_bind.$DATABRICKS_BUNDLE_ENGINE.json ETAG=$(jq '.state["resources.dashboards.dashboard1"].state.etag // .resources[0].instances[0].attributes.etag // "no-etag"' < out.state_after_bind.$DATABRICKS_BUNDLE_ENGINE.json) echo $ETAG -add_repl.py $ETAG ETAG +add_repl $ETAG ETAG json_in_json_normalize.py out.state_after_bind.$DATABRICKS_BUNDLE_ENGINE.json trace $CLI bundle plan diff --git a/acceptance/bundle/deployment/bind/experiment/output.txt b/acceptance/bundle/deployment/bind/experiment/output.txt index 3b2f824a54a..acf9b03cb51 100644 --- a/acceptance/bundle/deployment/bind/experiment/output.txt +++ b/acceptance/bundle/deployment/bind/experiment/output.txt @@ -5,7 +5,7 @@ Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] experiments get-experiment [NUMID] diff --git a/acceptance/bundle/deployment/bind/external_location/output.txt b/acceptance/bundle/deployment/bind/external_location/output.txt index b4f6fc08d7b..b973aaf8340 100644 --- a/acceptance/bundle/deployment/bind/external_location/output.txt +++ b/acceptance/bundle/deployment/bind/external_location/output.txt @@ -14,7 +14,7 @@ Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Updated external_locations.test_location -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] external-locations get test-location-[UNIQUE_NAME] diff --git a/acceptance/bundle/deployment/bind/genie_space/output.txt b/acceptance/bundle/deployment/bind/genie_space/output.txt index 9393bba3ec1..0164a5131f7 100644 --- a/acceptance/bundle/deployment/bind/genie_space/output.txt +++ b/acceptance/bundle/deployment/bind/genie_space/output.txt @@ -8,7 +8,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] genie get-space [GENIE_SPACE_ID] diff --git a/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt b/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt index a06a15f8168..7faa15705b4 100644 --- a/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt +++ b/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... Created jobs.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs create --json {"name": "My Job"} diff --git a/acceptance/bundle/deployment/bind/job/already-managed-different/script b/acceptance/bundle/deployment/bind/job/already-managed-different/script index 0d2b5ada117..e36fdd856ad 100644 --- a/acceptance/bundle/deployment/bind/job/already-managed-different/script +++ b/acceptance/bundle/deployment/bind/job/already-managed-different/script @@ -3,6 +3,6 @@ trace $CLI bundle deploy replace_ids.py new_job_id=$(trace $CLI jobs create --json '{"name": "My Job"}' | jq -r '.job_id') -add_repl.py $new_job_id NEW_JOB_ID +add_repl $new_job_id NEW_JOB_ID trace musterr $CLI bundle deployment bind foo $new_job_id &> out.bind.$DATABRICKS_BUNDLE_ENGINE.txt diff --git a/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt b/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt index 11f70fb7c43..bcd1067762f 100644 --- a/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt +++ b/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... Created jobs.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan diff --git a/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt b/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt index 61304e69040..bb51f8af0ce 100644 --- a/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt +++ b/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/engine-from-config/default/files... Created jobs.job_1 -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === State files after deploy === .databricks/bundle/default/resources.json diff --git a/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt b/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt index 5bab49ee88e..84ce98e76ae 100644 --- a/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt +++ b/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt @@ -23,7 +23,7 @@ Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-generate-bind-[UNIQUE_NAME]/files... Updated jobs.test_job_key -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt b/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt index fe661797656..f3b7b7b44b3 100644 --- a/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt +++ b/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt @@ -13,7 +13,7 @@ Exit code: 1 >>> [CLI] bundle deploy --force-lock Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bind-job-[UNIQUE_NAME]/files... Created jobs.foo -Files: 7 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Check that job is not bound and not updated with config from bundle: diff --git a/acceptance/bundle/deployment/bind/job/job-abort-bind/script b/acceptance/bundle/deployment/bind/job/job-abort-bind/script index b0aed59093a..57a9c5e57d8 100644 --- a/acceptance/bundle/deployment/bind/job/job-abort-bind/script +++ b/acceptance/bundle/deployment/bind/job/job-abort-bind/script @@ -23,7 +23,7 @@ JOB_ID=$($CLI jobs create --json ' }' | jq -r '.job_id') echo "Created job with ID: $JOB_ID" -echo "$JOB_ID:JOB_ID" >> ACC_REPLS +add_repl "$JOB_ID" JOB_ID envsubst < $TESTDIR/../job-spark-python-task/databricks.yml.tmpl > databricks.yml diff --git a/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt b/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt index 2a28051981c..9f058496a7c 100644 --- a/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt +++ b/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt @@ -14,7 +14,7 @@ Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bind-job-[UNIQUE_NAME]/files... Updated jobs.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Read the pre-defined job: diff --git a/acceptance/bundle/deployment/bind/job/noop-job/output.txt b/acceptance/bundle/deployment/bind/job/noop-job/output.txt index c9c15e16051..00d5a8807b2 100644 --- a/acceptance/bundle/deployment/bind/job/noop-job/output.txt +++ b/acceptance/bundle/deployment/bind/job/noop-job/output.txt @@ -8,7 +8,7 @@ Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... Updated jobs.job_1 -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] jobs get [NUMID] --output json diff --git a/acceptance/bundle/deployment/bind/job/python-job/output.txt b/acceptance/bundle/deployment/bind/job/python-job/output.txt index 44b9f01fe1f..093435a89b1 100644 --- a/acceptance/bundle/deployment/bind/job/python-job/output.txt +++ b/acceptance/bundle/deployment/bind/job/python-job/output.txt @@ -8,7 +8,7 @@ Run 'bundle deploy' to deploy changes to your workspace >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... Updated jobs.job_1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] jobs get [NUMID] --output json diff --git a/acceptance/bundle/deployment/bind/job/stale-state/output.txt b/acceptance/bundle/deployment/bind/job/stale-state/output.txt index 2da9490586c..a41382543f4 100644 --- a/acceptance/bundle/deployment/bind/job/stale-state/output.txt +++ b/acceptance/bundle/deployment/bind/job/stale-state/output.txt @@ -3,7 +3,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/stale_state_test/default/files... Created jobs.job_1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Step 2: Save stale local state (has only job_1, serial=1) diff --git a/acceptance/bundle/deployment/bind/job/stale-state/script b/acceptance/bundle/deployment/bind/job/stale-state/script index 32a2d3fb47d..3aea8be1b65 100755 --- a/acceptance/bundle/deployment/bind/job/stale-state/script +++ b/acceptance/bundle/deployment/bind/job/stale-state/script @@ -22,6 +22,6 @@ cp stale_state.json "$state_file" title "Step 6: Create external job and try to bind (should fail: remote state already has job_2)\n" job_id=$($CLI jobs create --json '{"name": "External Job"}' | jq -r '.job_id') -add_repl.py "$job_id" EXTERNAL_JOB_ID +add_repl "$job_id" EXTERNAL_JOB_ID echo "External job ID: $job_id" trace errcode $CLI bundle deployment bind job_2 $job_id --auto-approve &> out.bind.$DATABRICKS_BUNDLE_ENGINE.txt diff --git a/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt b/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt index ea05d0aa948..59dff22488b 100644 --- a/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt +++ b/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt @@ -34,7 +34,7 @@ Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] serving-endpoints get test-endpoint-[UNIQUE_NAME] diff --git a/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt b/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt index 934f36e0ce9..32f89f53a1f 100644 --- a/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt +++ b/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt @@ -20,7 +20,7 @@ Error: the deployment requires destructive actions, but the current console does Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed. To proceed, use --auto-approve after reviewing the plan above. -Files: 14 uploaded, 0 deleted +Files: 12 uploaded, 0 deleted >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-recreate-[UNIQUE_NAME]/default/files... diff --git a/acceptance/bundle/deployment/bind/pipelines/recreate/script b/acceptance/bundle/deployment/bind/pipelines/recreate/script index aba4cfb97a6..fd2ef19d6c0 100644 --- a/acceptance/bundle/deployment/bind/pipelines/recreate/script +++ b/acceptance/bundle/deployment/bind/pipelines/recreate/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml envsubst < pipeline.json.tmpl > pipeline.json NEW_PIPELINE_ID=$($CLI pipelines create --json @pipeline.json | jq -r .pipeline_id) -add_repl.py $NEW_PIPELINE_ID NEW_PIPELINE_ID +add_repl $NEW_PIPELINE_ID NEW_PIPELINE_ID rm -f out.requests.txt trace musterr $CLI bundle deployment bind foo $NEW_PIPELINE_ID &> out.bind-fail.$DATABRICKS_BUNDLE_ENGINE.txt diff --git a/acceptance/bundle/deployment/bind/pipelines/update/output.txt b/acceptance/bundle/deployment/bind/pipelines/update/output.txt index 507bbb2e414..72de9c9187a 100644 --- a/acceptance/bundle/deployment/bind/pipelines/update/output.txt +++ b/acceptance/bundle/deployment/bind/pipelines/update/output.txt @@ -16,7 +16,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-recreate/default/files... Updated pipelines.foo -Files: 12 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py ^//import-file/ ^//workspace/delete ^//telemetry-ext diff --git a/acceptance/bundle/deployment/bind/pipelines/update/script b/acceptance/bundle/deployment/bind/pipelines/update/script index 5d2e487f10c..5277b53e30c 100644 --- a/acceptance/bundle/deployment/bind/pipelines/update/script +++ b/acceptance/bundle/deployment/bind/pipelines/update/script @@ -1,5 +1,5 @@ NEW_PIPELINE_ID=$($CLI pipelines create --json @pipeline.json | jq -r .pipeline_id) -add_repl.py $NEW_PIPELINE_ID NEW_PIPELINE_ID +add_repl $NEW_PIPELINE_ID NEW_PIPELINE_ID rm -f out.requests.txt trace musterr $CLI bundle deployment bind foo $NEW_PIPELINE_ID &> out.bind-fail.$DATABRICKS_BUNDLE_ENGINE.txt diff --git a/acceptance/bundle/deployment/bind/quality-monitor/output.txt b/acceptance/bundle/deployment/bind/quality-monitor/output.txt index 586d124b90a..117f211ce4e 100644 --- a/acceptance/bundle/deployment/bind/quality-monitor/output.txt +++ b/acceptance/bundle/deployment/bind/quality-monitor/output.txt @@ -18,5 +18,5 @@ Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-quality-monitor-test-localonly/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged diff --git a/acceptance/bundle/deployment/bind/registered-model/output.txt b/acceptance/bundle/deployment/bind/registered-model/output.txt index 64db58ffee2..a13f31aba74 100644 --- a/acceptance/bundle/deployment/bind/registered-model/output.txt +++ b/acceptance/bundle/deployment/bind/registered-model/output.txt @@ -20,7 +20,7 @@ Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] registered-models get main.test-schema-rmodel-[UNIQUE_NAME].test-registered-model-[UNIQUE_NAME] diff --git a/acceptance/bundle/deployment/bind/schema/output.txt b/acceptance/bundle/deployment/bind/schema/output.txt index 75c2f010766..d88bf960591 100644 --- a/acceptance/bundle/deployment/bind/schema/output.txt +++ b/acceptance/bundle/deployment/bind/schema/output.txt @@ -11,7 +11,7 @@ Run 'bundle deploy' to deploy changes to your workspace === Deploy bundle: Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Updated schemas.schema1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Read the pre-defined schema: { diff --git a/acceptance/bundle/deployment/bind/volume/output.txt b/acceptance/bundle/deployment/bind/volume/output.txt index 87e7402f6d6..5475e85facf 100644 --- a/acceptance/bundle/deployment/bind/volume/output.txt +++ b/acceptance/bundle/deployment/bind/volume/output.txt @@ -12,7 +12,7 @@ Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] volumes read main.test-schema-[UNIQUE_NAME].volume-[UNIQUE_NAME] diff --git a/acceptance/bundle/deployment/unbind/engine-from-config/output.txt b/acceptance/bundle/deployment/unbind/engine-from-config/output.txt index a7c528d65d7..f1668120e66 100644 --- a/acceptance/bundle/deployment/unbind/engine-from-config/output.txt +++ b/acceptance/bundle/deployment/unbind/engine-from-config/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/engine-from-config/default/files... Created jobs.job_1 -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === State files after deploy === .databricks/bundle/default/resources.json diff --git a/acceptance/bundle/deployment/unbind/grants/output.txt b/acceptance/bundle/deployment/unbind/grants/output.txt index f62fd3f659f..191681970c1 100644 --- a/acceptance/bundle/deployment/unbind/grants/output.txt +++ b/acceptance/bundle/deployment/unbind/grants/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created schemas.schema_1 Created schemas.schema_1.grants -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] grants get schema main.test-schema-[UNIQUE_NAME] --output json diff --git a/acceptance/bundle/deployment/unbind/job/output.txt b/acceptance/bundle/deployment/unbind/job/output.txt index 3df3d38f8a2..99fd2b6b161 100644 --- a/acceptance/bundle/deployment/unbind/job/output.txt +++ b/acceptance/bundle/deployment/unbind/job/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy --var job_name=My Job Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... Created jobs.job_1 -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary --var job_name=My Job --output json diff --git a/acceptance/bundle/deployment/unbind/permissions/output.txt b/acceptance/bundle/deployment/unbind/permissions/output.txt index 0db01b55355..ee5587fdeca 100644 --- a/acceptance/bundle/deployment/unbind/permissions/output.txt +++ b/acceptance/bundle/deployment/unbind/permissions/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.job_1 Created jobs.job_1.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary --output json diff --git a/acceptance/bundle/deployment/unbind/python-job/output.txt b/acceptance/bundle/deployment/unbind/python-job/output.txt index 2959b91c2e3..c96d3d11110 100644 --- a/acceptance/bundle/deployment/unbind/python-job/output.txt +++ b/acceptance/bundle/deployment/unbind/python-job/output.txt @@ -2,7 +2,7 @@ >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle deploy --var job_name=My Job Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... Created jobs.job_1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle summary --var job_name=My Job --output json diff --git a/acceptance/bundle/destroy/all-resources/output.txt b/acceptance/bundle/destroy/all-resources/output.txt index 1cd64f1d522..f8eb4d90e0d 100644 --- a/acceptance/bundle/destroy/all-resources/output.txt +++ b/acceptance/bundle/destroy/all-resources/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created pipelines.my_pipeline Created schemas.my_schema -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/destroy/force-lock-node-limit/output.txt b/acceptance/bundle/destroy/force-lock-node-limit/output.txt index 899fcebd2a5..97a2a8bda56 100644 --- a/acceptance/bundle/destroy/force-lock-node-limit/output.txt +++ b/acceptance/bundle/destroy/force-lock-node-limit/output.txt @@ -3,7 +3,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === destroy without --force-lock (lock write hits the node limit: aborts) diff --git a/acceptance/bundle/destroy/jobs-and-pipeline/output.txt b/acceptance/bundle/destroy/jobs-and-pipeline/output.txt index e1d1e59a230..ceb94eee711 100644 --- a/acceptance/bundle/destroy/jobs-and-pipeline/output.txt +++ b/acceptance/bundle/destroy/jobs-and-pipeline/output.txt @@ -6,7 +6,7 @@ Directory does not exist Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.foo Created pipelines.bar -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the snapshot file exists diff --git a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt index 819ffdddbda..cd5a4ff7df6 100644 --- a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt +++ b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lineage-mismatch-after-redeploy/default/files... Created jobs.test_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve @@ -20,7 +20,7 @@ Destroy: 1 deleted >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lineage-mismatch-after-redeploy/default/files... Created jobs.test_job -Files: 7 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Machine A: any command that pulls remote state now fails diff --git a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/script b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/script index 62a64358329..fb89d480852 100644 --- a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/script +++ b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/script @@ -13,7 +13,7 @@ trace $CLI bundle destroy --auto-approve # Mask machine A's (local) lineage so the golden output is stable. LINEAGE_A=$(print_state.py | jq -r .lineage) -add_repl.py "$LINEAGE_A" LINEAGE_A +add_repl "$LINEAGE_A" LINEAGE_A # Stash A's local state and wipe it so the next deploy behaves like a fresh machine. cp -r .databricks .databricks.machineA @@ -24,7 +24,7 @@ trace $CLI bundle deploy # Mask machine B's (remote) lineage. LINEAGE_B=$(print_state.py | jq -r .lineage) -add_repl.py "$LINEAGE_B" LINEAGE_B +add_repl "$LINEAGE_B" LINEAGE_B # Back on machine A: restore the stale local state that still carries L1. rm -rf .databricks diff --git a/acceptance/bundle/empty_string_dropped/output.txt b/acceptance/bundle/empty_string_dropped/output.txt index a9de43c20b3..5afa6b8f51d 100644 --- a/acceptance/bundle/empty_string_dropped/output.txt +++ b/acceptance/bundle/empty_string_dropped/output.txt @@ -12,7 +12,7 @@ Created registered_models.my_registered_model Created schemas.my_schema Created sql_warehouses.my_warehouse Created volumes.my_volume -Files: 12 uploaded, 0 deleted +Files: 11 uploaded, 0 deleted Resources: 11 created, 0 changed, 0 deleted, 0 unchanged >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy -t direct @@ -28,5 +28,5 @@ Created registered_models.my_registered_model Created schemas.my_schema Created sql_warehouses.my_warehouse Created volumes.my_volume -Files: 13 uploaded, 0 deleted +Files: 12 uploaded, 0 deleted Resources: 11 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/environments/dependencies/output.txt b/acceptance/bundle/environments/dependencies/output.txt index 3a8eb3452cd..598b8dd1948 100644 --- a/acceptance/bundle/environments/dependencies/output.txt +++ b/acceptance/bundle/environments/dependencies/output.txt @@ -13,7 +13,7 @@ Uploading dist/test.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dependencies/default/files... Created jobs.test_job Created pipelines.test_pipeline -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments out.requests.txt diff --git a/acceptance/bundle/generate/alert/script b/acceptance/bundle/generate/alert/script index ed533cdf933..1d5e4b165d5 100644 --- a/acceptance/bundle/generate/alert/script +++ b/acceptance/bundle/generate/alert/script @@ -3,7 +3,7 @@ trace $CLI workspace mkdirs /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAM # create an alert to import envsubst < alert.json.tmpl > alert.json alert_id=$($CLI alerts-v2 create-alert --json @alert.json | jq -r '.id') -echo "$alert_id:ALERT_ID" >> ACC_REPLS +add_repl "$alert_id" ALERT_ID rm alert.json trace $CLI bundle generate alert --existing-id $alert_id --source-dir out/alert --config-dir out/resource diff --git a/acceptance/bundle/generate/auto-bind/output.txt b/acceptance/bundle/generate/auto-bind/output.txt index f66522ca705..6126b186d14 100644 --- a/acceptance/bundle/generate/auto-bind/output.txt +++ b/acceptance/bundle/generate/auto-bind/output.txt @@ -22,7 +22,7 @@ test.py >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/auto-bind-test-[UNIQUE_NAME]/files... Updated jobs.test_job -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Destroy the bundle: diff --git a/acceptance/bundle/generate/dashboard-inplace/output.txt b/acceptance/bundle/generate/dashboard-inplace/output.txt index 97b3ef61b8b..f2ec5b8806c 100644 --- a/acceptance/bundle/generate/dashboard-inplace/output.txt +++ b/acceptance/bundle/generate/dashboard-inplace/output.txt @@ -6,7 +6,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dashboard update inplace/default/files... Created dashboards.test_dashboard -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === update the dashboard diff --git a/acceptance/bundle/generate/genie_space_inplace/output.txt b/acceptance/bundle/generate/genie_space_inplace/output.txt index 4b2fc1b5939..195662216b1 100644 --- a/acceptance/bundle/generate/genie_space_inplace/output.txt +++ b/acceptance/bundle/generate/genie_space_inplace/output.txt @@ -6,7 +6,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie space update inplace/default/files... Created genie_spaces.test_genie_space -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === update the genie space diff --git a/acceptance/bundle/generate/pipeline_and_deploy/output.txt b/acceptance/bundle/generate/pipeline_and_deploy/output.txt index 976cc03721a..c081ef6b1af 100644 --- a/acceptance/bundle/generate/pipeline_and_deploy/output.txt +++ b/acceptance/bundle/generate/pipeline_and_deploy/output.txt @@ -22,7 +22,7 @@ include: === Deploy the generated bundle >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline_and_deploy-[UNIQUE_NAME]/default/files... -Files: 12 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === Destroy the deployed bundle diff --git a/acceptance/bundle/generate/pipeline_and_deploy/script b/acceptance/bundle/generate/pipeline_and_deploy/script index 9f8a82bd265..32d4cbcbc4a 100644 --- a/acceptance/bundle/generate/pipeline_and_deploy/script +++ b/acceptance/bundle/generate/pipeline_and_deploy/script @@ -24,7 +24,7 @@ PIPELINE_ID=$($CLI pipelines create --json '{ ] }' | jq -r '.pipeline_id') echo "Created pipeline" -env -u MSYS_NO_PATHCONV add_repl.py "$PIPELINE_ID" PIPELINE_ID +add_repl "$PIPELINE_ID" PIPELINE_ID cleanup() { title "Cleanup: delete the original pipeline and files" diff --git a/acceptance/bundle/generate/python_job_and_deploy/output.txt b/acceptance/bundle/generate/python_job_and_deploy/output.txt index a25b365b14f..61dd0678fbd 100644 --- a/acceptance/bundle/generate/python_job_and_deploy/output.txt +++ b/acceptance/bundle/generate/python_job_and_deploy/output.txt @@ -21,7 +21,7 @@ include: === Deploy the generated bundle >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python_job_and_deploy-[UNIQUE_NAME]/default/files... -Files: 10 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === Destroy the deployed bundle diff --git a/acceptance/bundle/generate/python_job_and_deploy/script b/acceptance/bundle/generate/python_job_and_deploy/script index 1501374ca3a..f9629bf8e7f 100644 --- a/acceptance/bundle/generate/python_job_and_deploy/script +++ b/acceptance/bundle/generate/python_job_and_deploy/script @@ -28,7 +28,7 @@ JOB_ID=$($CLI jobs create --json '{ echo "Created job" # Disable MSYS_NO_PATHCONV when invoking python scripts: with it set, Git Bash on Windows # fails to translate the script path so the python interpreter can't find the file. -env -u MSYS_NO_PATHCONV add_repl.py "$JOB_ID" JOB_ID +add_repl "$JOB_ID" JOB_ID cleanup() { title "Cleanup: delete the original job and notebook" diff --git a/acceptance/bundle/integration_whl/base/output.txt b/acceptance/bundle/integration_whl/base/output.txt index 2d962e3a4f8..719ca009f95 100644 --- a/acceptance/bundle/integration_whl/base/output.txt +++ b/acceptance/bundle/integration_whl/base/output.txt @@ -35,7 +35,7 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.some_other_job -Files: 20 uploaded, 0 deleted +Files: 19 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job @@ -52,7 +52,7 @@ Got arguments: Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Files: 11 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] bundle run some_other_job diff --git a/acceptance/bundle/integration_whl/custom_params/output.txt b/acceptance/bundle/integration_whl/custom_params/output.txt index b0b445fe504..279e3f4c6d9 100644 --- a/acceptance/bundle/integration_whl/custom_params/output.txt +++ b/acceptance/bundle/integration_whl/custom_params/output.txt @@ -35,7 +35,7 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.some_other_job -Files: 17 uploaded, 0 deleted +Files: 16 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job --python-params param1,param2 diff --git a/acceptance/bundle/integration_whl/interactive_cluster/output.txt b/acceptance/bundle/integration_whl/interactive_cluster/output.txt index f5fc5e41c88..8273d81d88a 100644 --- a/acceptance/bundle/integration_whl/interactive_cluster/output.txt +++ b/acceptance/bundle/integration_whl/interactive_cluster/output.txt @@ -36,7 +36,7 @@ Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created clusters.test_cluster Created jobs.some_other_job -Files: 17 uploaded, 0 deleted +Files: 16 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job @@ -53,7 +53,7 @@ Got arguments: Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Files: 11 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 2 unchanged >>> [CLI] bundle run some_other_job diff --git a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt index e0449c97a7c..3eaade58cd5 100644 --- a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt +++ b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt @@ -5,7 +5,7 @@ Uploading .databricks/bundle/default/patched_wheels/python_artifact_my_test_code Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created clusters.test_cluster Created jobs.some_other_job -Files: 17 uploaded, 0 deleted +Files: 16 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job diff --git a/acceptance/bundle/integration_whl/interactive_single_user/output.txt b/acceptance/bundle/integration_whl/interactive_single_user/output.txt index e40282aed07..b2d63a874dd 100644 --- a/acceptance/bundle/integration_whl/interactive_single_user/output.txt +++ b/acceptance/bundle/integration_whl/interactive_single_user/output.txt @@ -36,7 +36,7 @@ Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created clusters.test_cluster Created jobs.some_other_job -Files: 16 uploaded, 0 deleted +Files: 15 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job diff --git a/acceptance/bundle/integration_whl/serverless/output.txt b/acceptance/bundle/integration_whl/serverless/output.txt index 32d83db0134..50d2b6fc479 100644 --- a/acceptance/bundle/integration_whl/serverless/output.txt +++ b/acceptance/bundle/integration_whl/serverless/output.txt @@ -6,7 +6,7 @@ Building my_test_code... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.some_other_job -Files: 18 uploaded, 0 deleted +Files: 17 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job @@ -23,7 +23,7 @@ Got arguments: Building my_test_code... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Files: 11 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] bundle run some_other_job diff --git a/acceptance/bundle/integration_whl/serverless_custom_params/output.txt b/acceptance/bundle/integration_whl/serverless_custom_params/output.txt index 402f949266a..8b11a9ff6e1 100644 --- a/acceptance/bundle/integration_whl/serverless_custom_params/output.txt +++ b/acceptance/bundle/integration_whl/serverless_custom_params/output.txt @@ -4,7 +4,7 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.some_other_job -Files: 18 uploaded, 0 deleted +Files: 17 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job diff --git a/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt b/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt index 7f52d374817..14e9b5dc2c8 100644 --- a/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt +++ b/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt @@ -6,7 +6,7 @@ Building my_test_code... Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.some_other_job -Files: 18 uploaded, 0 deleted +Files: 17 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job @@ -24,7 +24,7 @@ Building my_test_code... Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Updated jobs.some_other_job -Files: 11 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job diff --git a/acceptance/bundle/integration_whl/wrapper/output.txt b/acceptance/bundle/integration_whl/wrapper/output.txt index b5fe844c78d..18a3af3b426 100644 --- a/acceptance/bundle/integration_whl/wrapper/output.txt +++ b/acceptance/bundle/integration_whl/wrapper/output.txt @@ -35,7 +35,7 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.some_other_job -Files: 19 uploaded, 0 deleted +Files: 18 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job diff --git a/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt b/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt index 5d0e298c9d6..1e44f101659 100644 --- a/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt +++ b/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt @@ -35,7 +35,7 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.some_other_job -Files: 19 uploaded, 0 deleted +Files: 18 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job --python-params param1,param2 diff --git a/acceptance/bundle/libraries/maven/output.txt b/acceptance/bundle/libraries/maven/output.txt index a80e8ad6d3f..41a77848321 100644 --- a/acceptance/bundle/libraries/maven/output.txt +++ b/acceptance/bundle/libraries/maven/output.txt @@ -11,5 +11,5 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/maven/default/files... Created jobs.testjob -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/libraries/pypi/output.txt b/acceptance/bundle/libraries/pypi/output.txt index 8e4140baf4e..936194367af 100644 --- a/acceptance/bundle/libraries/pypi/output.txt +++ b/acceptance/bundle/libraries/pypi/output.txt @@ -11,5 +11,5 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pypi/default/files... Created jobs.testjob -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/lifecycle/prevent-destroy/output.txt b/acceptance/bundle/lifecycle/prevent-destroy/output.txt index a56b188331f..0ec25336cc8 100644 --- a/acceptance/bundle/lifecycle/prevent-destroy/output.txt +++ b/acceptance/bundle/lifecycle/prevent-destroy/output.txt @@ -12,7 +12,7 @@ Validation OK! Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/prevent-destroy/default/files... Created pipelines.my_pipelines Created schemas.my_schema -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> errcode [CLI] bundle plan diff --git a/acceptance/bundle/migrate/added-direct-only/output.txt b/acceptance/bundle/migrate/added-direct-only/output.txt index ed006cde9b0..d76d90eeeec 100644 --- a/acceptance/bundle/migrate/added-direct-only/output.txt +++ b/acceptance/bundle/migrate/added-direct-only/output.txt @@ -3,7 +3,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job_a -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Add a direct-only resource to the config without deploying it diff --git a/acceptance/bundle/migrate/added/output.txt b/acceptance/bundle/migrate/added/output.txt index 2df3c1e80f8..ab12bd15149 100644 --- a/acceptance/bundle/migrate/added/output.txt +++ b/acceptance/bundle/migrate/added/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-added-test/default/files... Created jobs.job_a -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate diff --git a/acceptance/bundle/migrate/auto-migrate-clean/output.txt b/acceptance/bundle/migrate/auto-migrate-clean/output.txt index 82dda059ce0..cd07b8b89c6 100644 --- a/acceptance/bundle/migrate/auto-migrate-clean/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-clean/output.txt @@ -3,7 +3,7 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_migration_telemetry diff --git a/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt b/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt index 0e5f017c92f..1254e8c2433 100644 --- a/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt @@ -3,7 +3,7 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job_a -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Add a direct-only resource to the config diff --git a/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt b/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt index 599be20b90d..0811eaca457 100644 --- a/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt @@ -3,7 +3,7 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job_a -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Add a direct-only resource and opt in to the direct engine via config diff --git a/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt b/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt index ce0b362847b..56061ed71c2 100644 --- a/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt @@ -4,7 +4,7 @@ Warn: Direct engine requested in bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11 but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Removing empty terraform state; direct engine will be used on the next deploy (opted in via bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11)... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === Terraform state is renamed to .backup; no resources.json (empty state, nothing to persist) @@ -25,7 +25,6 @@ direct_migrated_via_config true "POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/databricks.yml" "POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/out.requests.txt" "POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/output.txt" -"POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/repls.json" "POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/script" "POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deploy.lock" "POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deploy.lock" diff --git a/acceptance/bundle/migrate/auto-migrate-envvar/output.txt b/acceptance/bundle/migrate/auto-migrate-envvar/output.txt index 95b12551347..8e6b0cc136c 100644 --- a/acceptance/bundle/migrate/auto-migrate-envvar/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-envvar/output.txt @@ -3,7 +3,7 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_migration_telemetry diff --git a/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt b/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt index e71ee7bcd1d..74412d94a92 100644 --- a/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt @@ -3,7 +3,7 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_migration_telemetry diff --git a/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt b/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt index 2a930de6271..19980cd3060 100644 --- a/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt @@ -3,7 +3,7 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_migration_telemetry diff --git a/acceptance/bundle/migrate/basic/output.txt b/acceptance/bundle/migrate/basic/output.txt index 4ba0f0052e7..dee4ec58a49 100644 --- a/acceptance/bundle/migrate/basic/output.txt +++ b/acceptance/bundle/migrate/basic/output.txt @@ -9,7 +9,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test Created jobs.test_job Created pipelines.test_pipeline Created volumes.test_volume -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate @@ -122,7 +122,7 @@ Created jobs.test_job Created pipelines.test_pipeline Created schemas.test_schema Created volumes.test_volume -Files: 11 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle debug states -t prod diff --git a/acceptance/bundle/migrate/dashboards/output.txt b/acceptance/bundle/migrate/dashboards/output.txt index f57eaf9b01d..369abfa9346 100644 --- a/acceptance/bundle/migrate/dashboards/output.txt +++ b/acceptance/bundle/migrate/dashboards/output.txt @@ -2,7 +2,7 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created dashboards.dashboard1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate @@ -20,7 +20,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle plan diff --git a/acceptance/bundle/migrate/grants/output.txt b/acceptance/bundle/migrate/grants/output.txt index e1884751982..7c461a78076 100644 --- a/acceptance/bundle/migrate/grants/output.txt +++ b/acceptance/bundle/migrate/grants/output.txt @@ -7,7 +7,7 @@ Created schemas.my_schema Created schemas.my_schema.grants Created volumes.my_volume Created volumes.my_volume.grants -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 6 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate diff --git a/acceptance/bundle/migrate/permissions/output.txt b/acceptance/bundle/migrate/permissions/output.txt index 1c932cfa5d9..c6a83b57ba7 100644 --- a/acceptance/bundle/migrate/permissions/output.txt +++ b/acceptance/bundle/migrate/permissions/output.txt @@ -5,7 +5,7 @@ Created jobs.test_job Created jobs.test_job.permissions Created pipelines.test_pipeline Created pipelines.test_pipeline.permissions -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate diff --git a/acceptance/bundle/migrate/profile_arg/output.txt b/acceptance/bundle/migrate/profile_arg/output.txt index b4c88854cec..732a04c7311 100644 --- a/acceptance/bundle/migrate/profile_arg/output.txt +++ b/acceptance/bundle/migrate/profile_arg/output.txt @@ -2,7 +2,7 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/dev/files... Created jobs.test_job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate -p non_existent321 @@ -19,7 +19,7 @@ To undo the migration, remove [TEST_TMP_DIR]/.databricks/bundle/dev/resources.js Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/prod/files... Created jobs.test_job Created schemas.test_schema -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate -p non_existent321 -t prod diff --git a/acceptance/bundle/migrate/removed/output.txt b/acceptance/bundle/migrate/removed/output.txt index 56f7d77cb70..8c9eb4a764b 100644 --- a/acceptance/bundle/migrate/removed/output.txt +++ b/acceptance/bundle/migrate/removed/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-removed-test/default/files... Created jobs.job_a Created jobs.job_b -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate diff --git a/acceptance/bundle/migrate/runas/output.txt b/acceptance/bundle/migrate/runas/output.txt index 68f59bfddf2..fd710079fba 100644 --- a/acceptance/bundle/migrate/runas/output.txt +++ b/acceptance/bundle/migrate/runas/output.txt @@ -33,7 +33,7 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dabs_revenue-[UNIQUE_NAME]/production/files... Created pipelines.foo Created pipelines.foo.permissions -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //pipelines diff --git a/acceptance/bundle/migrate/var_arg/output.txt b/acceptance/bundle/migrate/var_arg/output.txt index f607a2d30a3..f3647efb91a 100644 --- a/acceptance/bundle/migrate/var_arg/output.txt +++ b/acceptance/bundle/migrate/var_arg/output.txt @@ -2,7 +2,7 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy --var=job_name=Custom Job Name Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-var-test/dev/files... Created jobs.test_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate --var=job_name=Custom Job Name @@ -32,7 +32,7 @@ Destroy: 1 deleted >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy --var job_name=Custom Job Name Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-var-test/dev/files... Created jobs.test_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate --var job_name=Custom Job Name diff --git a/acceptance/bundle/open/output.txt b/acceptance/bundle/open/output.txt index ca78fa926b2..4faf4514925 100644 --- a/acceptance/bundle/open/output.txt +++ b/acceptance/bundle/open/output.txt @@ -14,7 +14,7 @@ Exit code: 1 >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/caterpillar/default/files... Created jobs.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Use a fake browser that just prints the URL it would have opened diff --git a/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt b/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt index 47a15e81023..51001423f17 100644 --- a/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt +++ b/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt @@ -9,5 +9,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created pipelines.my_pipeline Created pipelines.my_pipeline.permissions -Files: 10 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/python/script.prepare b/acceptance/bundle/python/script.prepare index 1f31f0116f2..0e5ba9bb79f 100644 --- a/acceptance/bundle/python/script.prepare +++ b/acceptance/bundle/python/script.prepare @@ -7,4 +7,4 @@ if [ "$PYDAB_VERSION" = "current" ]; then else UV_ARGS="--with databricks-bundles==$PYDAB_VERSION" fi -add_repl.py "$UV_ARGS" UV_ARGS +add_repl "$UV_ARGS" UV_ARGS diff --git a/acceptance/bundle/quiet-levels/output.txt b/acceptance/bundle/quiet-levels/output.txt index 56fcf5f0e5c..bd445ed09d0 100644 --- a/acceptance/bundle/quiet-levels/output.txt +++ b/acceptance/bundle/quiet-levels/output.txt @@ -16,7 +16,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created experiments.my_experiment -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve -qq @@ -24,7 +24,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === deploy -q: summary only, no per-resource lines >>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve -qq diff --git a/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt b/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt index 57eae9eebc0..b8cb27e1dae 100644 --- a/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created volumes.bar Created volumes.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged Unexpected success diff --git a/acceptance/bundle/resource_deps/duplicate_ref/output.txt b/acceptance/bundle/resource_deps/duplicate_ref/output.txt index 1469021a201..13b21a998a3 100644 --- a/acceptance/bundle/resource_deps/duplicate_ref/output.txt +++ b/acceptance/bundle/resource_deps/duplicate_ref/output.txt @@ -44,7 +44,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul Created pipelines.bar Created pipelines.baz Created pipelines.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s [.[] | select(.path=="/api/2.0/pipelines" and .method=="POST") | .body.name] | sort out.requests.txt diff --git a/acceptance/bundle/resource_deps/grant_ref/output.txt b/acceptance/bundle/resource_deps/grant_ref/output.txt index 3439c7c5a14..efc644e00a3 100644 --- a/acceptance/bundle/resource_deps/grant_ref/output.txt +++ b/acceptance/bundle/resource_deps/grant_ref/output.txt @@ -15,5 +15,5 @@ Created schemas.schema_a Created schemas.schema_a.grants Created schemas.schema_b Created schemas.schema_b.grants -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 4 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/id_chain/output.txt b/acceptance/bundle/resource_deps/id_chain/output.txt index 3169979dbb2..56eaf6f3968 100644 --- a/acceptance/bundle/resource_deps/id_chain/output.txt +++ b/acceptance/bundle/resource_deps/id_chain/output.txt @@ -19,7 +19,7 @@ Created jobs.b Created jobs.c Created jobs.d Created jobs.e -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 5 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests_short diff --git a/acceptance/bundle/resource_deps/immutable_field_ref/output.txt b/acceptance/bundle/resource_deps/immutable_field_ref/output.txt index 12f0eb065b4..cfae591ab30 100644 --- a/acceptance/bundle/resource_deps/immutable_field_ref/output.txt +++ b/acceptance/bundle/resource_deps/immutable_field_ref/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul Created jobs.bar Created schemas.schema Created volumes.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> update_file.py databricks.yml comment1 comment2 diff --git a/acceptance/bundle/resource_deps/job_id/output.txt b/acceptance/bundle/resource_deps/job_id/output.txt index 13cb7dcd842..c85c9d22d83 100644 --- a/acceptance/bundle/resource_deps/job_id/output.txt +++ b/acceptance/bundle/resource_deps/job_id/output.txt @@ -11,7 +11,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.bar Created jobs.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs @@ -64,7 +64,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Deleted jobs.bar Deleted jobs.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 2 deleted, 0 unchanged >>> print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/job_tasks/output.txt b/acceptance/bundle/resource_deps/job_tasks/output.txt index 475f011a04b..bc5cf891c1b 100644 --- a/acceptance/bundle/resource_deps/job_tasks/output.txt +++ b/acceptance/bundle/resource_deps/job_tasks/output.txt @@ -4,7 +4,7 @@ Uploading hello.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo Created jobs.test_job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values diff --git a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt index 82828082ccd..2af634b343b 100644 --- a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt @@ -1,4 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Error: cycle detected: resources.jobs.foo refers to resources.jobs.bar via ${resources.jobs.bar.id} which refers to resources.jobs.foo via ${resources.jobs.foo.id} -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt index 49083a83364..95a56092383 100644 --- a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt @@ -5,4 +5,4 @@ Error: Cycle: databricks_job.foo, databricks_job.bar -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt b/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt index f2b2279ff86..c01fcf47812 100644 --- a/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt @@ -1,4 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Error: cycle detected: resources.jobs.foo refers to itself via ${resources.jobs.foo.id} -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt index cc92844a624..e85210b2b35 100644 --- a/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt @@ -16,4 +16,4 @@ Error: Self-referential block Configuration for databricks_job.foo may not refer to itself. -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt index dcde9fa1799..b99c41ca46b 100644 --- a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Error: cannot create resources.pipelines.bar: cannot resolve "${resources.pipelines.foo.ingestion_definition.connection_name}": ingestion_definition: cannot access nil value -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt index 0b0e79267be..deb757ec10c 100644 --- a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt @@ -12,6 +12,6 @@ The given key does not identify an element in this collection value: the collection has no elements. -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt index e270503c5e3..fe12fac4f34 100644 --- a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt @@ -1,4 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/state/default/files... Error: cannot create resources.jobs.bar: cannot resolve "${resources.jobs.test.tasks[0].new_cluster.custom_tags.missing_tag}": tasks[0].new_cluster.custom_tags.missing_tag: key "missing_tag" not found in map -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt index 915f19c7883..c5225434073 100644 --- a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt @@ -11,4 +11,4 @@ Error: Missing map element This map does not have an element with the key "missing_tag". -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/missing_string_field/output.txt b/acceptance/bundle/resource_deps/missing_string_field/output.txt index 460fe265a18..83cab91e4e3 100644 --- a/acceptance/bundle/resource_deps/missing_string_field/output.txt +++ b/acceptance/bundle/resource_deps/missing_string_field/output.txt @@ -34,7 +34,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created pipelines.bar Created pipelines.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //pipeline diff --git a/acceptance/bundle/resource_deps/model_id_ref/output.txt b/acceptance/bundle/resource_deps/model_id_ref/output.txt index e8927308176..7372902f990 100644 --- a/acceptance/bundle/resource_deps/model_id_ref/output.txt +++ b/acceptance/bundle/resource_deps/model_id_ref/output.txt @@ -11,7 +11,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.consumer Created models.my_model -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //mlflow/registered-models/create //jobs/create --sort diff --git a/acceptance/bundle/resource_deps/model_id_ref/script b/acceptance/bundle/resource_deps/model_id_ref/script index 35dfa5beed1..58375a71476 100644 --- a/acceptance/bundle/resource_deps/model_id_ref/script +++ b/acceptance/bundle/resource_deps/model_id_ref/script @@ -8,6 +8,6 @@ trace $CLI bundle deploy # precisely rather than by the broad [NUMID] pattern. The id comes from the API (independent # of the deploy engine), so terraform and direct must both resolve to this exact value. model_id=$($CLI model-registry get-model my-model | jq -r '.registered_model_databricks.id') -add_repl.py "$model_id" MY_MODEL_ID +add_repl "$model_id" MY_MODEL_ID trace print_requests.py //mlflow/registered-models/create //jobs/create --sort diff --git a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt index df616964628..0a4722f468d 100644 --- a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt @@ -3,4 +3,4 @@ Error: cannot plan resources.volumes.foo: cannot resolve "${resources.volumes.ba Error: planning failed -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt index e6395be1220..3ecba7e01e9 100644 --- a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt @@ -10,4 +10,4 @@ This object has no argument, nested block, or exported attribute named "non_existent". -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/permission_ref/output.txt b/acceptance/bundle/resource_deps/permission_ref/output.txt index 098650dae0a..e4d08a379f5 100644 --- a/acceptance/bundle/resource_deps/permission_ref/output.txt +++ b/acceptance/bundle/resource_deps/permission_ref/output.txt @@ -15,5 +15,5 @@ Created jobs.job_a Created jobs.job_a.permissions Created jobs.job_b Created jobs.job_b.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 4 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt index 20c9e6a23aa..9d45d1cf11d 100644 --- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt @@ -4,5 +4,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE Created schemas.my Created volumes.bar Created volumes.foo -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt index 60a10d9b195..9add1d046ef 100644 --- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt @@ -15,6 +15,6 @@ This is a bug in the provider, which should be reported in the provider's own issue tracker. -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resource_deps/remote_pipeline/output.txt b/acceptance/bundle/resource_deps/remote_pipeline/output.txt index f3f62827075..94f793be5f1 100644 --- a/acceptance/bundle/resource_deps/remote_pipeline/output.txt +++ b/acceptance/bundle/resource_deps/remote_pipeline/output.txt @@ -5,7 +5,7 @@ Created pipelines.foo1 Created pipelines.foo2 Created pipelines.foo3 Created pipelines.foo4 -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests diff --git a/acceptance/bundle/resource_deps/resources_var/out.deploy.txt b/acceptance/bundle/resource_deps/resources_var/out.deploy.txt index 6b5d0c86b46..445e6f93e40 100644 --- a/acceptance/bundle/resource_deps/resources_var/out.deploy.txt +++ b/acceptance/bundle/resource_deps/resources_var/out.deploy.txt @@ -4,5 +4,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/fi Created pipelines.mypipeline Created volumes.bar Created volumes.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/resources_var_presets/output.txt b/acceptance/bundle/resource_deps/resources_var_presets/output.txt index 7d3b3eb0e4a..1c4232ec581 100644 --- a/acceptance/bundle/resource_deps/resources_var_presets/output.txt +++ b/acceptance/bundle/resource_deps/resources_var_presets/output.txt @@ -33,7 +33,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/fi Created pipelines.mypipeline Created schemas.bar Created schemas.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.0/pipelines") | .body.name out.requests.txt diff --git a/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt b/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt index 3afabb9bc98..677ffa25bb9 100644 --- a/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt +++ b/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt @@ -38,7 +38,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/fi Created pipelines.mypipeline Created schemas.bar Created volumes.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.0/pipelines") | .body.name out.requests.txt diff --git a/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt index 53f91a853eb..fa9cca5c6d6 100644 --- a/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt @@ -4,5 +4,5 @@ Warning: "resources.jobs.src.always_running": Terraform-only field; this referen Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.dst Created jobs.src -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/tf_path_renames/output.txt b/acceptance/bundle/resource_deps/tf_path_renames/output.txt index 670784a2c3d..62e6b7d4d1d 100644 --- a/acceptance/bundle/resource_deps/tf_path_renames/output.txt +++ b/acceptance/bundle/resource_deps/tf_path_renames/output.txt @@ -9,7 +9,7 @@ Created jobs.dst_tasks Created jobs.src_git Created jobs.src_tasks Created pipelines.src_pipeline -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 6 created, 0 changed, 0 deleted, 0 unchanged /path/to/wheel.whl main diff --git a/acceptance/bundle/resource_deps/unicode_reference/output.txt b/acceptance/bundle/resource_deps/unicode_reference/output.txt index d8cc2a87a64..360f979c010 100644 --- a/acceptance/bundle/resource_deps/unicode_reference/output.txt +++ b/acceptance/bundle/resource_deps/unicode_reference/output.txt @@ -19,7 +19,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo Created jobs.变量 -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.direct.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.direct.txt index 2baedf814d5..5549d223f29 100644 --- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.direct.txt @@ -4,5 +4,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul Created volumes.bar Created volumes.baz Created volumes.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt index 2baedf814d5..5549d223f29 100644 --- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt @@ -4,5 +4,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul Created volumes.bar Created volumes.baz Created volumes.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt b/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt index 545d759b84a..fa3c638622e 100644 --- a/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt @@ -4,5 +4,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE Created jobs.foo Created jobs.process Created volumes.data -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/alerts/basic/output.txt b/acceptance/bundle/resources/alerts/basic/output.txt index 51adf5c18a9..94c81a531c8 100644 --- a/acceptance/bundle/resources/alerts/basic/output.txt +++ b/acceptance/bundle/resources/alerts/basic/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/alerts-basic-[UNIQUE_NAME]/default/files... Created alerts.myalert Created alerts.myalert.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] alerts-v2 get-alert [ALERT_ID] diff --git a/acceptance/bundle/resources/alerts/basic/script b/acceptance/bundle/resources/alerts/basic/script index e8e4427e261..e47c734d1bd 100644 --- a/acceptance/bundle/resources/alerts/basic/script +++ b/acceptance/bundle/resources/alerts/basic/script @@ -4,7 +4,7 @@ trace $CLI bundle deploy alert_id=$($CLI bundle summary --output json | jq -r '.resources.alerts.myalert.id') -echo "$alert_id:ALERT_ID" >> ACC_REPLS +add_repl "$alert_id" ALERT_ID trace $CLI alerts-v2 get-alert $alert_id | jq '{display_name, lifecycle_state, custom_summary, evaluation, query_text, schedule, warehouse_id}' diff --git a/acceptance/bundle/resources/alerts/with_file/output.txt b/acceptance/bundle/resources/alerts/with_file/output.txt index 311db9a476d..b01e7b7b145 100644 --- a/acceptance/bundle/resources/alerts/with_file/output.txt +++ b/acceptance/bundle/resources/alerts/with_file/output.txt @@ -34,7 +34,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/alerts-with-file-[UNIQUE_NAME]/default/files... Created alerts.myalert -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] alerts-v2 get-alert [ALERT_ID] diff --git a/acceptance/bundle/resources/alerts/with_file/script b/acceptance/bundle/resources/alerts/with_file/script index d77dcadc44f..02a51e6d2cb 100755 --- a/acceptance/bundle/resources/alerts/with_file/script +++ b/acceptance/bundle/resources/alerts/with_file/script @@ -12,7 +12,7 @@ trace $CLI bundle deploy alert_id=$($CLI bundle summary --output json | jq -r '.resources.alerts.myalert.id') -echo "$alert_id:ALERT_ID" >> ACC_REPLS +add_repl "$alert_id" ALERT_ID trace $CLI alerts-v2 get-alert $alert_id | jq '{display_name, lifecycle_state, custom_summary, evaluation, query_text, schedule, warehouse_id}' diff --git a/acceptance/bundle/resources/apps/config-drift-stopped/output.txt b/acceptance/bundle/resources/apps/config-drift-stopped/output.txt index 0453689386c..1a33d51a6f6 100644 --- a/acceptance/bundle/resources/apps/config-drift-stopped/output.txt +++ b/acceptance/bundle/resources/apps/config-drift-stopped/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-drift-stopped-[UNIQUE_NAME]/default/files... ✓ Deployment succeeded Created apps.myapp -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Change config while running: drift is detected (active deployment present) diff --git a/acceptance/bundle/resources/apps/config-drift/output.txt b/acceptance/bundle/resources/apps/config-drift/output.txt index 5cab6a0a0be..16e41652081 100644 --- a/acceptance/bundle/resources/apps/config-drift/output.txt +++ b/acceptance/bundle/resources/apps/config-drift/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-drift-[UNIQUE_NAME]/default/files... Created apps.myapp -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Verify no drift after deploy diff --git a/acceptance/bundle/resources/apps/create_already_exists/output.txt b/acceptance/bundle/resources/apps/create_already_exists/output.txt index a0cef829192..2e7f067fe1f 100644 --- a/acceptance/bundle/resources/apps/create_already_exists/output.txt +++ b/acceptance/bundle/resources/apps/create_already_exists/output.txt @@ -36,7 +36,7 @@ HTTP Status: 409 Conflict API error_code: RESOURCE_ALREADY_EXISTS API message: An app with the same name already exists: test-app-already-exists -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted >>> [CLI] apps delete test-app-already-exists { diff --git a/acceptance/bundle/resources/apps/default_description/output.txt b/acceptance/bundle/resources/apps/default_description/output.txt index 4dc01f110b9..1f78fb9801d 100644 --- a/acceptance/bundle/resources/apps/default_description/output.txt +++ b/acceptance/bundle/resources/apps/default_description/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created apps.mykey -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //apps diff --git a/acceptance/bundle/resources/apps/inline_config/output.txt b/acceptance/bundle/resources/apps/inline_config/output.txt index 1aa82a88dc1..8a82bbec897 100644 --- a/acceptance/bundle/resources/apps/inline_config/output.txt +++ b/acceptance/bundle/resources/apps/inline_config/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-inline-config-[UNIQUE_NAME]/default/files... Created apps.myapp -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] apps get-deployment [UNIQUE_NAME] [DEPLOYMENT_ID] diff --git a/acceptance/bundle/resources/apps/inline_config/script b/acceptance/bundle/resources/apps/inline_config/script index ec2af098e13..764ab0bc99b 100755 --- a/acceptance/bundle/resources/apps/inline_config/script +++ b/acceptance/bundle/resources/apps/inline_config/script @@ -12,6 +12,6 @@ APP_NAME=$($CLI bundle summary -o json | jq -r '.resources.apps.myapp.name') $CLI bundle run myapp > /dev/null 2>&1 DEPLOYMENT_ID=$($CLI apps get "$APP_NAME" | jq -r '.active_deployment.deployment_id') -echo $DEPLOYMENT_ID:DEPLOYMENT_ID >> ACC_REPLS +add_repl "$DEPLOYMENT_ID" DEPLOYMENT_ID trace $CLI apps get-deployment "$APP_NAME" "$DEPLOYMENT_ID" | jq '{command, env_vars}' diff --git a/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt b/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt index 7809cfb4e18..abe37f235f8 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt @@ -3,7 +3,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default/files... Created apps.mykey -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_app_requests diff --git a/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt index 37fd111532d..ef03a4541d9 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt @@ -3,7 +3,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-toggle-[UNIQUE_NAME]/default/files... Created apps.mykey -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_app_requests diff --git a/acceptance/bundle/resources/apps/lifecycle-started/output.txt b/acceptance/bundle/resources/apps/lifecycle-started/output.txt index 7f81bd5d6c5..07fe53a2735 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started/output.txt @@ -3,7 +3,7 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default/files... Created apps.myapp -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //apps diff --git a/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt b/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt index 0909a007e3b..1677b668672 100644 --- a/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt +++ b/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt @@ -3,7 +3,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created apps.myapp -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //apps/myapp/start diff --git a/acceptance/bundle/resources/apps/resource-refs/output.txt b/acceptance/bundle/resources/apps/resource-refs/output.txt index 3a03367812f..14fcdcb0972 100644 --- a/acceptance/bundle/resources/apps/resource-refs/output.txt +++ b/acceptance/bundle/resources/apps/resource-refs/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/resource-refs/defa Created apps.data_app Created jobs.example_job Created schemas.example -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run data_app diff --git a/acceptance/bundle/resources/apps/update/output.txt b/acceptance/bundle/resources/apps/update/output.txt index 2b8920020a9..406295a6b07 100644 --- a/acceptance/bundle/resources/apps/update/output.txt +++ b/acceptance/bundle/resources/apps/update/output.txt @@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created apps.mykey -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests diff --git a/acceptance/bundle/resources/catalogs/auto-approve/output.txt b/acceptance/bundle/resources/catalogs/auto-approve/output.txt index eaf7c8034a0..bf16801b4a4 100644 --- a/acceptance/bundle/resources/catalogs/auto-approve/output.txt +++ b/acceptance/bundle/resources/catalogs/auto-approve/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created catalogs.bar Created schemas.foo -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the catalog is created diff --git a/acceptance/bundle/resources/catalogs/basic/output.txt b/acceptance/bundle/resources/catalogs/basic/output.txt index c9d91075034..c4d144b3666 100644 --- a/acceptance/bundle/resources/catalogs/basic/output.txt +++ b/acceptance/bundle/resources/catalogs/basic/output.txt @@ -3,7 +3,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created catalogs.test_catalog -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Assert the catalog is created diff --git a/acceptance/bundle/resources/catalogs/empty-name/output.txt b/acceptance/bundle/resources/catalogs/empty-name/output.txt index 3a2434e87c7..51b04630435 100644 --- a/acceptance/bundle/resources/catalogs/empty-name/output.txt +++ b/acceptance/bundle/resources/catalogs/empty-name/output.txt @@ -8,4 +8,4 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: Invalid input: RPC CreateCatalog Field managedcatalog.CatalogInfo.name: name "" is not a valid name. Valid names cannot contain spaces, periods, forward slashes, or control characters. -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/catalogs/with-schemas/output.txt b/acceptance/bundle/resources/catalogs/with-schemas/output.txt index b3d6c8f0041..22037eb01b8 100644 --- a/acceptance/bundle/resources/catalogs/with-schemas/output.txt +++ b/acceptance/bundle/resources/catalogs/with-schemas/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created catalogs.test_catalog Created schemas.test_schema -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the catalog is created diff --git a/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt b/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt index b42e273b7f2..2703994609c 100644 --- a/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created clusters.test_cluster -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt b/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt index 86b455b44cb..5cffdc78da1 100644 --- a/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluste Created clusters.cluster1 Created clusters.cluster2 Created clusters.cluster3 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/create diff --git a/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt b/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt index 95b69c22eac..d0b68dae46a 100644 --- a/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt @@ -2,7 +2,7 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluster-instance-pool/default/files... Created clusters.cluster1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/create diff --git a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt index 8ca1aa5b3ff..1042e292508 100644 --- a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-ssd-count-0-[UNIQUE_NAME]/default/files... Created clusters.test_cluster -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Cluster should exist after bundle deployment: diff --git a/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt b/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt index e5244efc726..dafe1cac085 100644 --- a/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluster-num-workers-absent/default/files... Created clusters.cluster1 Created clusters.cluster2 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/create diff --git a/acceptance/bundle/resources/clusters/deploy/simple/output.txt b/acceptance/bundle/resources/clusters/deploy/simple/output.txt index 78d604a8b6e..3c51a254649 100644 --- a/acceptance/bundle/resources/clusters/deploy/simple/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/simple/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created clusters.test_cluster Created jobs.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Cluster should exist after bundle deployment: diff --git a/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt b/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt index f0b51f72104..13f32c2df7f 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created clusters.test_cluster -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Cluster should exist after bundle deployment: diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt index 89f5656cc94..ced0bc3994a 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt @@ -1,7 +1,7 @@ >>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Cluster should exist with num_workers after bundle deployment: @@ -20,7 +20,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) out.requests.txt diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script index 2acfdbefa55..02dcebeb3f3 100755 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script @@ -15,7 +15,7 @@ trace $CLI bundle deploy -q title "Cluster should exist with num_workers after bundle deployment:\n" CLUSTER_ID=$($CLI bundle summary -o json | jq -r '.resources.clusters.test_cluster.id') -echo "$CLUSTER_ID:CLUSTER_ID" >> ACC_REPLS +add_repl "$CLUSTER_ID" CLUSTER_ID $CLI clusters get "${CLUSTER_ID}" | jq '{cluster_name,num_workers,autoscale}' title "Terminating the cluster\n" diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt b/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt index 1bd3827f220..104baa1797b 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt @@ -1,7 +1,7 @@ >>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Cluster should exist after bundle deployment: @@ -14,7 +14,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) out.requests.txt diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize/script b/acceptance/bundle/resources/clusters/deploy/update-and-resize/script index b81605b92e1..7d007495c3d 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize/script +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize/script @@ -15,7 +15,7 @@ trace $CLI bundle deploy -q title "Cluster should exist after bundle deployment:\n" CLUSTER_ID=$($CLI bundle summary -o json | jq -r '.resources.clusters.test_cluster.id') -echo "$CLUSTER_ID:CLUSTER_ID" >> ACC_REPLS +add_repl "$CLUSTER_ID" CLUSTER_ID $CLI clusters get "${CLUSTER_ID}" | jq '{cluster_name,num_workers}' title "Changing num_workers should call update API on stopped cluster\n" diff --git a/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt b/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt index 3ed9703bcbe..1dccf7b20dc 100644 --- a/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt @@ -2,7 +2,7 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluster-workload-type/default/files... Created clusters.cluster1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/create diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt index edcea9477b6..4ece922a78e 100644 --- a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt +++ b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt @@ -3,7 +3,7 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created clusters.mycluster -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters diff --git a/acceptance/bundle/resources/clusters/lifecycle-started/output.txt b/acceptance/bundle/resources/clusters/lifecycle-started/output.txt index 63d2d81a9fa..d902c63731d 100644 --- a/acceptance/bundle/resources/clusters/lifecycle-started/output.txt +++ b/acceptance/bundle/resources/clusters/lifecycle-started/output.txt @@ -3,7 +3,7 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created clusters.mycluster -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters diff --git a/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt b/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt index 35408ddaa4a..cee977be92d 100644 --- a/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt +++ b/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt @@ -3,7 +3,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created clusters.mycluster -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/start diff --git a/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt b/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt index c2e82e86635..5bcd056b2c9 100644 --- a/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt +++ b/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created clusters.test_cluster -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Create a plan while cluster is running: should show resize @@ -23,7 +23,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy --plan plan.json Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Resized clusters.test_cluster -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/resize //clusters/edit diff --git a/acceptance/bundle/resources/clusters/resize-terminated-fallback/script b/acceptance/bundle/resources/clusters/resize-terminated-fallback/script index 258d8e8d37f..eff7c541b94 100644 --- a/acceptance/bundle/resources/clusters/resize-terminated-fallback/script +++ b/acceptance/bundle/resources/clusters/resize-terminated-fallback/script @@ -9,7 +9,7 @@ trap cleanup EXIT trace $CLI bundle deploy CLUSTER_ID=$($CLI bundle summary -o json | jq -r '.resources.clusters.test_cluster.id') -echo "$CLUSTER_ID:CLUSTER_ID" >> ACC_REPLS +add_repl "$CLUSTER_ID" CLUSTER_ID title "Create a plan while cluster is running: should show resize\n" update_file.py databricks.yml "num_workers: 2" "num_workers: 3" diff --git a/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt b/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt index 6432efdf050..111c7ca711b 100644 --- a/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt +++ b/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt @@ -7,7 +7,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created clusters.test_cluster Created jobs.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run foo diff --git a/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt b/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt index 530bd99e144..f0c44299a8c 100644 --- a/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt +++ b/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt @@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-embed-credentials-[UNIQUE_NAME]/default/files... Created dashboards.my_dashboard -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "display_name": "test dashboard", @@ -32,7 +32,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-embed-credentials-[UNIQUE_NAME]/default/files... Updated dashboards.my_dashboard -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged { "display_name": "test dashboard", diff --git a/acceptance/bundle/resources/dashboards/change-embed-credentials/script b/acceptance/bundle/resources/dashboards/change-embed-credentials/script index bfc3c9a4ad2..75046150329 100755 --- a/acceptance/bundle/resources/dashboards/change-embed-credentials/script +++ b/acceptance/bundle/resources/dashboards/change-embed-credentials/script @@ -16,8 +16,8 @@ deploy_dashboard() { dashboard_id=$($CLI bundle summary --output json | jq -r '.resources.dashboards.my_dashboard.id') DASHBOARD=$(retry $CLI lakeview get $dashboard_id) - echo "$dashboard_id:DASHBOARD_ID" >> ACC_REPLS - echo "$(echo "$DASHBOARD" | jq -r '.etag'):ETAG" >> ACC_REPLS + add_repl "$dashboard_id" DASHBOARD_ID + add_repl "$(echo "$DASHBOARD" | jq -r '.etag')" ETAG echo "$DASHBOARD" | jq "{display_name, lifecycle_state, parent_path, path, serialized_dashboard, warehouse_id}" trace $CLI lakeview get-published $dashboard_id | jq "{warehouse_id, embed_credentials}" } diff --git a/acceptance/bundle/resources/dashboards/change-name/output.txt b/acceptance/bundle/resources/dashboards/change-name/output.txt index d0df918de66..4d83d9bc3b7 100644 --- a/acceptance/bundle/resources/dashboards/change-name/output.txt +++ b/acceptance/bundle/resources/dashboards/change-name/output.txt @@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-name-[UNIQUE_NAME]/default/files... Created dashboards.my_dashboard -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "display_name": "dashboard1", @@ -26,7 +26,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-name-[UNIQUE_NAME]/default/files... Updated dashboards.my_dashboard -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged { "display_name": "dashboard2", diff --git a/acceptance/bundle/resources/dashboards/change-name/script b/acceptance/bundle/resources/dashboards/change-name/script index 374452ed84d..f361ed4417f 100644 --- a/acceptance/bundle/resources/dashboards/change-name/script +++ b/acceptance/bundle/resources/dashboards/change-name/script @@ -23,8 +23,8 @@ deploy_dashboard # Capture the dashboard ID as a replacement. dashboard_id=$($CLI bundle summary --output json | jq -r '.resources.dashboards.my_dashboard.id') -echo "$dashboard_id:DASHBOARD_ID" >> ACC_REPLS -echo "$(echo "$DASHBOARD" | jq -r '.etag'):ETAG" >> ACC_REPLS +add_repl "$dashboard_id" DASHBOARD_ID +add_repl "$(echo "$DASHBOARD" | jq -r '.etag')" ETAG # Change the name export NAME="dashboard2" diff --git a/acceptance/bundle/resources/dashboards/change-parent-path/output.txt b/acceptance/bundle/resources/dashboards/change-parent-path/output.txt index cc8d44a5902..e1627105be5 100644 --- a/acceptance/bundle/resources/dashboards/change-parent-path/output.txt +++ b/acceptance/bundle/resources/dashboards/change-parent-path/output.txt @@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-parent-path-[UNIQUE_NAME]/default/files... Created dashboards.my_dashboard -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> retry [CLI] lakeview get [ORIGINAL_DASHBOARD_ID] @@ -32,7 +32,7 @@ This action will result in the deletion or recreation of the following dashboard This will result in changed IDs and permanent URLs of the dashboards that will be recreated: recreate resources.dashboards.my_dashboard Recreated dashboards.my_dashboard -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> retry [CLI] lakeview get [NEW_DASHBOARD_ID] diff --git a/acceptance/bundle/resources/dashboards/change-parent-path/script b/acceptance/bundle/resources/dashboards/change-parent-path/script index 664c6867044..8f059e33b58 100755 --- a/acceptance/bundle/resources/dashboards/change-parent-path/script +++ b/acceptance/bundle/resources/dashboards/change-parent-path/script @@ -22,7 +22,7 @@ deploy_dashboard # Capture the dashboard ID as a replacement. dashboard_id=$($CLI bundle summary --output json | jq -r '.resources.dashboards.my_dashboard.id') -echo "$dashboard_id:ORIGINAL_DASHBOARD_ID" >> ACC_REPLS +add_repl "$dashboard_id" ORIGINAL_DASHBOARD_ID # Change the parent_path - this should trigger a recreate (delete + create) export PARENT_PATH=" /Users/$USERNAME/.bundle/change-parent-path-$UNIQUE_NAME/default/resources2" @@ -30,7 +30,7 @@ deploy_dashboard # Capture the new dashboard ID as a replacement. new_dashboard_id=$($CLI bundle summary --output json | jq -r '.resources.dashboards.my_dashboard.id') -echo "$new_dashboard_id:NEW_DASHBOARD_ID" >> ACC_REPLS +add_repl "$new_dashboard_id" NEW_DASHBOARD_ID # Print API requests made to create parent_path or create / update / delete the dashboard. cat out.requests.txt | \ diff --git a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt index ad227d4c799..525a432aabb 100644 --- a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt +++ b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt @@ -5,7 +5,7 @@ create dashboards.my_dashboard Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-serialized-dashboard-[UNIQUE_NAME]/default/files... Created dashboards.my_dashboard -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "display_name": "test dashboard", @@ -26,7 +26,7 @@ update dashboards.my_dashboard Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-serialized-dashboard-[UNIQUE_NAME]/default/files... Updated dashboards.my_dashboard -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged { "display_name": "test dashboard", diff --git a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script index bcbecd86613..43327a7ff19 100755 --- a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script +++ b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script @@ -26,7 +26,7 @@ deploy_dashboard # Capture the dashboard ID as a replacement. dashboard_id=$($CLI bundle summary --output json | jq -r '.resources.dashboards.my_dashboard.id') -echo "$dashboard_id:DASHBOARD_ID" >> ACC_REPLS +add_repl "$dashboard_id" DASHBOARD_ID # Change the serialized_dashboard content - this should trigger an update (not recreate) export PAGE_NAME="name2" diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt index c924ff8fdc1..5260bb9b490 100644 --- a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt +++ b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-dataset-test-[UNIQUE_NAME]/default/files... Created dashboards.dashboard1 -Files: 9 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "lifecycle_state": "ACTIVE", diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script index b147e47f32c..3e729767a06 100755 --- a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script +++ b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script @@ -2,7 +2,7 @@ DASHBOARD_DISPLAY_NAME="test bundle-deploy-dashboard-dataset $(uuid)" if [ -z "$CLOUD_ENV" ]; then export TEST_DEFAULT_WAREHOUSE_ID="warehouse-1234" - echo "warehouse-1234:TEST_DEFAULT_WAREHOUSE_ID" >> ACC_REPLS + add_repl "warehouse-1234" TEST_DEFAULT_WAREHOUSE_ID fi export DASHBOARD_DISPLAY_NAME @@ -18,9 +18,9 @@ trace $CLI bundle deploy DASHBOARD_ID=$($CLI bundle summary --output json | jq -r '.resources.dashboards.dashboard1.id') # Capture the dashboard ID as a replacement. -echo "$DASHBOARD_ID:DASHBOARD_ID" >> ACC_REPLS +add_repl "$DASHBOARD_ID" DASHBOARD_ID DASHBOARD=$(retry $CLI lakeview get $DASHBOARD_ID) -echo "$(echo "$DASHBOARD" | jq -r '.etag'):ETAG" >> ACC_REPLS +add_repl "$(echo "$DASHBOARD" | jq -r '.etag')" ETAG echo "$DASHBOARD" | jq '{lifecycle_state, parent_path, path}' diff --git a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt index f960675080a..10c55b9831c 100644 --- a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt +++ b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/delete-trashed-out-of-band-[UNIQUE_NAME]/default/files... Created dashboards.dashboard1 -Files: 8 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "lifecycle_state": "ACTIVE", diff --git a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/script b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/script index 648ee0dd0b7..2c1396ac618 100755 --- a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/script +++ b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/script @@ -2,7 +2,7 @@ export DASHBOARD_DISPLAY_NAME="test bundle-deploy-dashboard $UNIQUE_NAME)" if [ -z "$CLOUD_ENV" ]; then export TEST_DEFAULT_WAREHOUSE_ID="warehouse-1234" - echo "warehouse-1234:TEST_DEFAULT_WAREHOUSE_ID" >> ACC_REPLS + add_repl "warehouse-1234" TEST_DEFAULT_WAREHOUSE_ID fi envsubst < databricks.yml.tmpl > databricks.yml @@ -12,9 +12,9 @@ trace $CLI bundle deploy DASHBOARD_ID=$($CLI bundle summary --output json | jq -r '.resources.dashboards.dashboard1.id') # Capture the dashboard ID as a replacement. -echo "$DASHBOARD_ID:DASHBOARD_ID" >> ACC_REPLS +add_repl "$DASHBOARD_ID" DASHBOARD_ID DASHBOARD=$(retry $CLI lakeview get $DASHBOARD_ID) -echo "$(echo "$DASHBOARD" | jq -r '.etag'):ETAG" >> ACC_REPLS +add_repl "$(echo "$DASHBOARD" | jq -r '.etag')" ETAG # Verify dashboard was deployed echo "$DASHBOARD" | jq '{lifecycle_state, parent_path}' diff --git a/acceptance/bundle/resources/dashboards/destroy/output.txt b/acceptance/bundle/resources/dashboards/destroy/output.txt index 15d387546d1..525941139c3 100644 --- a/acceptance/bundle/resources/dashboards/destroy/output.txt +++ b/acceptance/bundle/resources/dashboards/destroy/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/destroy-dashboard-[UNIQUE_NAME]/default/files... Created dashboards.dashboard1 -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> retry [CLI] lakeview get [DASHBOARD_ID] diff --git a/acceptance/bundle/resources/dashboards/destroy/script b/acceptance/bundle/resources/dashboards/destroy/script index 3ddb222cbdf..e0419b0507e 100755 --- a/acceptance/bundle/resources/dashboards/destroy/script +++ b/acceptance/bundle/resources/dashboards/destroy/script @@ -11,7 +11,7 @@ trace $CLI bundle deploy DASHBOARD_ID=$($CLI bundle summary --output json | jq -r '.resources.dashboards.dashboard1.id') # Capture the dashboard ID as a replacement. -echo "$DASHBOARD_ID:DASHBOARD_ID" >> ACC_REPLS +add_repl "$DASHBOARD_ID" DASHBOARD_ID # Verify dashboard was deployed trace retry $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path}' diff --git a/acceptance/bundle/resources/dashboards/detect-change/output.txt b/acceptance/bundle/resources/dashboards/detect-change/output.txt index 7f9a778a308..1641d352758 100644 --- a/acceptance/bundle/resources/dashboards/detect-change/output.txt +++ b/acceptance/bundle/resources/dashboards/detect-change/output.txt @@ -13,7 +13,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created dashboards.file_reference -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Assert that the dashboard exists at the expected path and is, indeed, a dashboard: @@ -103,7 +103,7 @@ Exit code: 1 >>> errcode [CLI] bundle deploy --force Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Updated dashboards.file_reference -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/dashboards/detect-change/script b/acceptance/bundle/resources/dashboards/detect-change/script index 98ab4cc93b7..2b4966fd87d 100644 --- a/acceptance/bundle/resources/dashboards/detect-change/script +++ b/acceptance/bundle/resources/dashboards/detect-change/script @@ -21,9 +21,9 @@ trace cat out.summary.json DASHBOARD_ID=$(jq -r '.id' out.summary.json) # Capture the dashboard ID as a replacement. -echo "$DASHBOARD_ID:DASHBOARD_ID" >> ACC_REPLS +add_repl "$DASHBOARD_ID" DASHBOARD_ID DASHBOARD=$(retry $CLI lakeview get "$DASHBOARD_ID") -echo "$(echo "$DASHBOARD" | jq -r '.etag'):ETAG_1" >> ACC_REPLS +add_repl "$(echo "$DASHBOARD" | jq -r '.etag')" ETAG_1 rm out.summary.json title "Load the dashboard by its ID and confirm its display name: " @@ -34,7 +34,7 @@ RESOURCE_ID=$($CLI workspace get-status "${DASHBOARD_PATH}" | jq -r '.resource_i DASHBOARD_JSON="{\"serialized_dashboard\": \"{}\", \"warehouse_id\": \"$TEST_DEFAULT_WAREHOUSE_ID\"}" UPDATE_RESP=$($CLI lakeview update "${RESOURCE_ID}" --json "${DASHBOARD_JSON}") echo "$UPDATE_RESP" | jq '{lifecycle_state}' -echo "$(echo "$UPDATE_RESP" | jq -r '.etag'):ETAG_2" >> ACC_REPLS +add_repl "$(echo "$UPDATE_RESP" | jq -r '.etag')" ETAG_2 title "Try to redeploy the bundle and confirm that the out of band modification is detected:" trace $CLI bundle plan diff --git a/acceptance/bundle/resources/dashboards/generate_inplace/output.txt b/acceptance/bundle/resources/dashboards/generate_inplace/output.txt index 29fed483346..a1e52a4b293 100644 --- a/acceptance/bundle/resources/dashboards/generate_inplace/output.txt +++ b/acceptance/bundle/resources/dashboards/generate_inplace/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dashboard-replace-[UNIQUE_NAME]/default/files... Created dashboards.already_exists -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Get current dashboard diff --git a/acceptance/bundle/resources/dashboards/nested-folders/output.txt b/acceptance/bundle/resources/dashboards/nested-folders/output.txt index 7fc15e4439b..26c1181a0cf 100644 --- a/acceptance/bundle/resources/dashboards/nested-folders/output.txt +++ b/acceptance/bundle/resources/dashboards/nested-folders/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-nested-folders-[UNIQUE_NAME]/default/files... Created dashboards.dashboard1 -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> retry [CLI] lakeview get [DASHBOARD_ID] diff --git a/acceptance/bundle/resources/dashboards/nested-folders/script b/acceptance/bundle/resources/dashboards/nested-folders/script index 19ec3b03188..c5004f3d6a2 100644 --- a/acceptance/bundle/resources/dashboards/nested-folders/script +++ b/acceptance/bundle/resources/dashboards/nested-folders/script @@ -17,6 +17,6 @@ $CLI bundle deploy $(readplanarg tmp.plan.json) DASHBOARD_ID=$($CLI bundle summary --output json | jq -r '.resources.dashboards.dashboard1.id') # Capture the dashboard ID as a replacement. -echo "$DASHBOARD_ID:DASHBOARD_ID" >> ACC_REPLS +add_repl "$DASHBOARD_ID" DASHBOARD_ID trace retry $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path, path, serialized_dashboard: (.serialized_dashboard | fromjson | {pages: (.pages | map({name, displayName, pageType}))})}' diff --git a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt index c8659f4cdb5..b1f4510ca36 100644 --- a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt +++ b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt @@ -6,6 +6,6 @@ HTTP Status: 400 Bad Request API error_code: RESOURCE_DOES_NOT_EXIST API message: Warehouse doesnotexist does not exist -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt index 0acd6cd56f1..e6da6ec72c7 100644 --- a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt @@ -9,6 +9,6 @@ Error: cannot create dashboard: Warehouse doesnotexist does not exist -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt index a9fdc3929d8..d8daf7b8a0c 100644 --- a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt +++ b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-publish-failure-stale-content/default/files... Created dashboards.dashboard1 -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "display_name": "my dashboard", @@ -32,7 +32,7 @@ HTTP Status: 400 Bad Request API error_code: INJECTED API message: Fault injected by test. -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Exit code: 1 @@ -126,7 +126,7 @@ Exit code: 1 >>> [CLI] bundle deploy --force Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-publish-failure-stale-content/default/files... Updated dashboards.dashboard1 -Files: 3 uploaded, 0 deleted +Files: 2 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //lakeview/dashboards diff --git a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script index 2fb37909fa7..41022465670 100644 --- a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script +++ b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script @@ -13,7 +13,7 @@ trace $CLI bundle deploy DASHBOARD_ID=$(read_id.py dashboard1) DASHBOARD=$(retry $CLI lakeview get $DASHBOARD_ID) ETAG_1=$(echo "$DASHBOARD" | jq -r '.etag') -add_repl.py "$ETAG_1" ETAG_1 +add_repl "$ETAG_1" ETAG_1 echo "$DASHBOARD" | jq '{display_name, etag}' trace $CLI lakeview get-published $DASHBOARD_ID | jq '{display_name}' trace $CLI bundle plan -o json | gron.py | grep -E "etag|published" @@ -31,7 +31,7 @@ errcode trace $CLI bundle deploy trace print_requests.py //lakeview/dashboards # The PATCH bumped the remote etag to ETAG_2; retry until it is visible (eventual consistency). ETAG_2=$(retry --until-not "$ETAG_1" $CLI lakeview get $DASHBOARD_ID | jq -r '.etag') -add_repl.py "$ETAG_2" ETAG_2 +add_repl "$ETAG_2" ETAG_2 trace $CLI lakeview get $DASHBOARD_ID | jq '{display_name, etag}' trace $CLI lakeview get-published $DASHBOARD_ID | jq '{display_name}' trace $CLI bundle plan -o json | gron.py | grep -E "etag|published" @@ -50,7 +50,7 @@ trace $CLI bundle deploy --force trace print_requests.py //lakeview/dashboards # --force did another PATCH; retry until the new etag is visible (eventual consistency). ETAG_3=$(retry --until-not "$ETAG_2" $CLI lakeview get $DASHBOARD_ID | jq -r '.etag') -add_repl.py "$ETAG_3" ETAG_3 +add_repl "$ETAG_3" ETAG_3 trace $CLI lakeview get $DASHBOARD_ID | jq '{display_name, etag}' trace $CLI lakeview get-published $DASHBOARD_ID | jq '{display_name}' trace $CLI bundle plan diff --git a/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt b/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt index 55e2aa4df44..1fe4e418ebc 100644 --- a/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt +++ b/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created dashboards.dashboard1 -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan right after deploy -- published is current, no change: diff --git a/acceptance/bundle/resources/dashboards/simple/output.txt b/acceptance/bundle/resources/dashboards/simple/output.txt index 797ebd3411f..12a9c3f2042 100644 --- a/acceptance/bundle/resources/dashboards/simple/output.txt +++ b/acceptance/bundle/resources/dashboards/simple/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-test-[UNIQUE_NAME]/default/files... Created dashboards.dashboard1 -Files: 8 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "lifecycle_state": "ACTIVE", diff --git a/acceptance/bundle/resources/dashboards/simple/script b/acceptance/bundle/resources/dashboards/simple/script index 71e7335c569..4c8b9b55ace 100644 --- a/acceptance/bundle/resources/dashboards/simple/script +++ b/acceptance/bundle/resources/dashboards/simple/script @@ -1,7 +1,7 @@ DASHBOARD_DISPLAY_NAME="test bundle-deploy-dashboard $(uuid)" if [ -z "$CLOUD_ENV" ]; then export TEST_DEFAULT_WAREHOUSE_ID="warehouse-1234" - echo "warehouse-1234:TEST_DEFAULT_WAREHOUSE_ID" >> ACC_REPLS + add_repl "warehouse-1234" TEST_DEFAULT_WAREHOUSE_ID fi export DASHBOARD_DISPLAY_NAME @@ -16,9 +16,9 @@ trace $CLI bundle deploy DASHBOARD_ID=$($CLI bundle summary --output json | jq -r '.resources.dashboards.dashboard1.id') # Capture the dashboard ID as a replacement. -echo "$DASHBOARD_ID:DASHBOARD_ID" >> ACC_REPLS +add_repl "$DASHBOARD_ID" DASHBOARD_ID DASHBOARD=$(retry $CLI lakeview get $DASHBOARD_ID) -echo "$(echo "$DASHBOARD" | jq -r '.etag'):ETAG" >> ACC_REPLS +add_repl "$(echo "$DASHBOARD" | jq -r '.etag')" ETAG echo "$DASHBOARD" | jq '{lifecycle_state, parent_path, path, serialized_dashboard}' diff --git a/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/script b/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/script index 09a3d9f0eaf..f1c1ae527f0 100644 --- a/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/script +++ b/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/script @@ -16,6 +16,6 @@ trace $CLI bundle deploy DASHBOARD_ID=$($CLI bundle summary --output json | jq -r '.resources.dashboards.dashboard1.id') # Capture the dashboard ID as a replacement. -echo "$DASHBOARD_ID:DASHBOARD_ID" >> ACC_REPLS +add_repl "$DASHBOARD_ID" DASHBOARD_ID trace retry $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path, path, serialized_dashboard}' diff --git a/acceptance/bundle/resources/dashboards/simple_syncroot/script b/acceptance/bundle/resources/dashboards/simple_syncroot/script index e6bb69c04c6..a93701b6c2d 100644 --- a/acceptance/bundle/resources/dashboards/simple_syncroot/script +++ b/acceptance/bundle/resources/dashboards/simple_syncroot/script @@ -17,6 +17,6 @@ trace $CLI bundle deploy DASHBOARD_ID=$($CLI bundle summary --output json | jq -r '.resources.dashboards.dashboard1.id') # Capture the dashboard ID as a replacement. -echo "$DASHBOARD_ID:DASHBOARD_ID" >> ACC_REPLS +add_repl "$DASHBOARD_ID" DASHBOARD_ID trace retry $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path, path, serialized_dashboard}' diff --git a/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script b/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script index 6a1a11e4236..c50acadaf24 100644 --- a/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script +++ b/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script @@ -11,7 +11,7 @@ trace $CLI bundle plan -o json > out.plan_initial.$DATABRICKS_BUNDLE_ENGINE.json # Deploy the dashboard trace $CLI bundle deploy -qq DASHBOARD_ID=$(read_id.py dashboard1) -add_repl.py "$(retry $CLI lakeview get $DASHBOARD_ID | jq -r '.etag')" ETAG +add_repl "$(retry $CLI lakeview get $DASHBOARD_ID | jq -r '.etag')" ETAG trace print_state.py | grep publish > out.state.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/database_catalogs/basic/output.txt b/acceptance/bundle/resources/database_catalogs/basic/output.txt index f2322862be1..73164574d89 100644 --- a/acceptance/bundle/resources/database_catalogs/basic/output.txt +++ b/acceptance/bundle/resources/database_catalogs/basic/output.txt @@ -26,7 +26,7 @@ Resources: Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-[UNIQUE_NAME]/default/files... Created database_catalogs.my_catalog Created database_instances.my_instance -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary diff --git a/acceptance/bundle/resources/database_catalogs/recreate/output.txt b/acceptance/bundle/resources/database_catalogs/recreate/output.txt index ffa21ef2223..3af23a6caad 100644 --- a/acceptance/bundle/resources/database_catalogs/recreate/output.txt +++ b/acceptance/bundle/resources/database_catalogs/recreate/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-recreate-[UNIQUE_NAME]/default/files... Created database_catalogs.my_catalog Created database_instances.my_instance -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Change an immutable catalog field: no update API, so the plan recreates it diff --git a/acceptance/bundle/resources/database_instances/single-instance/output.txt b/acceptance/bundle/resources/database_instances/single-instance/output.txt index 08f7d0f3fb6..95b9e492938 100644 --- a/acceptance/bundle/resources/database_instances/single-instance/output.txt +++ b/acceptance/bundle/resources/database_instances/single-instance/output.txt @@ -23,7 +23,7 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-single-instance-[UNIQUE_NAME]/default/files... Created database_instances.my_database -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] database get-database-instance test-db-instance-single-[UNIQUE_NAME] diff --git a/acceptance/bundle/resources/external_locations/output.txt b/acceptance/bundle/resources/external_locations/output.txt index ef682987c5c..6a6b8253eab 100644 --- a/acceptance/bundle/resources/external_locations/output.txt +++ b/acceptance/bundle/resources/external_locations/output.txt @@ -14,7 +14,7 @@ Created catalogs.test_catalog Created catalogs.test_catalog.grants Created external_locations.test_location Created external_locations.test_location.grants -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 4 created, 0 changed, 0 deleted, 0 unchanged === Assert the catalog is created with grants diff --git a/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt b/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt index f90cdbaee1b..a1a00972860 100644 --- a/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt +++ b/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie-delete-warning-[UNIQUE_NAME]/default/files... Created genie_spaces.sales_analytics -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Deploying without the genie space warns before deleting it (chat history loss) diff --git a/acceptance/bundle/resources/genie_spaces/inline/output.txt b/acceptance/bundle/resources/genie_spaces/inline/output.txt index b7b0feebfc8..d7539b973b9 100644 --- a/acceptance/bundle/resources/genie_spaces/inline/output.txt +++ b/acceptance/bundle/resources/genie_spaces/inline/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-inline-[UNIQUE_NAME]/default/files... Created genie_spaces.sales_analytics -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json diff --git a/acceptance/bundle/resources/genie_spaces/inline/script b/acceptance/bundle/resources/genie_spaces/inline/script index 8f2f625b7b0..812cfb9abd4 100644 --- a/acceptance/bundle/resources/genie_spaces/inline/script +++ b/acceptance/bundle/resources/genie_spaces/inline/script @@ -9,7 +9,7 @@ trace $CLI bundle deploy GENIE_SPACE_ID=$($CLI bundle summary --output json | jq -r '.resources.genie_spaces.sales_analytics.id') # Capture the genie space ID as a replacement. -echo "$GENIE_SPACE_ID:GENIE_SPACE_ID" >> ACC_REPLS +add_repl "$GENIE_SPACE_ID" GENIE_SPACE_ID # Plan after deploy must be drift-free aside from input_only fields. # Without normalization the inline serialized_space leaves a map in the diff --git a/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt b/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt index 7174106dd97..bc2024c6bdd 100644 --- a/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt +++ b/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-genie-space-[UNIQUE_NAME]/default/files... Created genie_spaces.update_target -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan after changing parent_path should show update diff --git a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt index 70d963e4829..e5621c9677d 100644 --- a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt +++ b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-gone-genie-space-[UNIQUE_NAME]/default/files... Created genie_spaces.sales_analytics -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] genie trash-space [GENIE_SPACE_ID] diff --git a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/script b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/script index 7d8a3be80d2..0ccb456f1cf 100644 --- a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/script +++ b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/script @@ -7,7 +7,7 @@ trap cleanup EXIT trace $CLI bundle deploy GENIE_SPACE_ID=$($CLI bundle summary --output json | jq -r '.resources.genie_spaces.sales_analytics.id') -echo "$GENIE_SPACE_ID:GENIE_SPACE_ID" >> ACC_REPLS +add_repl "$GENIE_SPACE_ID" GENIE_SPACE_ID # Delete the space out-of-band, simulating a UI deletion. The GET API then # returns 404, which the plan treats as "gone" so it recreates the space diff --git a/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt b/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt index 300832361f5..702c283f5a0 100644 --- a/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt +++ b/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie-serialized-space-[UNIQUE_NAME]/default/files... Created genie_spaces.from_file Created genie_spaces.from_inline -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/genie_spaces/simple/output.txt b/acceptance/bundle/resources/genie_spaces/simple/output.txt index 87f1d84a66c..129ab135efd 100644 --- a/acceptance/bundle/resources/genie_spaces/simple/output.txt +++ b/acceptance/bundle/resources/genie_spaces/simple/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-test-[UNIQUE_NAME]/default/files... Created genie_spaces.sales_analytics -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] genie get-space [GENIE_SPACE_ID] diff --git a/acceptance/bundle/resources/genie_spaces/simple/script b/acceptance/bundle/resources/genie_spaces/simple/script index 6a632da4232..6ad76a8ab24 100644 --- a/acceptance/bundle/resources/genie_spaces/simple/script +++ b/acceptance/bundle/resources/genie_spaces/simple/script @@ -9,7 +9,7 @@ trace $CLI bundle deploy GENIE_SPACE_ID=$($CLI bundle summary --output json | jq -r '.resources.genie_spaces.sales_analytics.id') # Capture the genie space ID as a replacement. -echo "$GENIE_SPACE_ID:GENIE_SPACE_ID" >> ACC_REPLS +add_repl "$GENIE_SPACE_ID" GENIE_SPACE_ID trace $CLI genie get-space $GENIE_SPACE_ID | jq '{title, description, warehouse_id}' diff --git a/acceptance/bundle/resources/genie_spaces/version_migration/output.txt b/acceptance/bundle/resources/genie_spaces/version_migration/output.txt index 02726ea439a..1842d77156f 100644 --- a/acceptance/bundle/resources/genie_spaces/version_migration/output.txt +++ b/acceptance/bundle/resources/genie_spaces/version_migration/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie-version-migration-[UNIQUE_NAME]/default/files... Created genie_spaces.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan after deploy is drift-free despite the version 1 -> version 2 migration diff --git a/acceptance/bundle/resources/grants/catalogs/output.txt b/acceptance/bundle/resources/grants/catalogs/output.txt index 9c690083eba..ede2dfee69a 100644 --- a/acceptance/bundle/resources/grants/catalogs/output.txt +++ b/acceptance/bundle/resources/grants/catalogs/output.txt @@ -13,7 +13,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/catalog-grants-[UNIQUE_NAME]/default/files... Created catalogs.grants_catalog Created catalogs.grants_catalog.grants -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/grants/registered_models/output.txt b/acceptance/bundle/resources/grants/registered_models/output.txt index 7fcd4c9ae19..ae9684ad527 100644 --- a/acceptance/bundle/resources/grants/registered_models/output.txt +++ b/acceptance/bundle/resources/grants/registered_models/output.txt @@ -8,7 +8,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered- Created registered_models.my_registered_model Created registered_models.my_registered_model.grants Created schemas.my_schema -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt b/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt index 7184e32d03c..125974790a5 100644 --- a/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt +++ b/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default/files... Created schemas.apps_schema Created schemas.apps_schema.grants -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt index 187d4976248..a81692e99ec 100644 --- a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt +++ b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-all-privileges-coexist-[UNIQUE_NAME]/default/files... Created schemas.grants_schema Created schemas.grants_schema.grants -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] grants update schema main.schema_all_priv_coexist_[UNIQUE_NAME] --json @update.resolved.json diff --git a/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt b/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt index 476c73c3a87..371eeb7eaa3 100644 --- a/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt +++ b/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt @@ -13,7 +13,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default/files... Created schemas.grants_schema Created schemas.grants_schema.grants -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt b/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt index 45783da8081..afba2d08be5 100644 --- a/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt +++ b/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default/files... Created schemas.apps_schema Created schemas.apps_schema.grants -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt index 507d3a3d83c..d503d211362 100644 --- a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt +++ b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default/files... Created schemas.apps_schema Created schemas.apps_schema.grants -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt index 357f48273ba..0d253209caa 100644 --- a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt +++ b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-out-of-band-principal-[UNIQUE_NAME]/default/files... Created schemas.grants_schema Created schemas.grants_schema.grants -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] grants update schema main.schema_out_of_band_principal_[UNIQUE_NAME] --json @update.json diff --git a/acceptance/bundle/resources/grants/schemas/remove_all/output.txt b/acceptance/bundle/resources/grants/schemas/remove_all/output.txt index cf9b411eb62..2236e37e274 100644 --- a/acceptance/bundle/resources/grants/schemas/remove_all/output.txt +++ b/acceptance/bundle/resources/grants/schemas/remove_all/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-all-[UNIQUE_NAME]/default/files... Created schemas.grants_schema Created schemas.grants_schema.grants -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] grants get schema main.schema_remove_all_[UNIQUE_NAME] diff --git a/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt b/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt index 2b6750d4145..0f2c26acf6c 100644 --- a/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt +++ b/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-principal-[UNIQUE_NAME]/default/files... Created schemas.grants_schema Created schemas.grants_schema.grants -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] grants get schema main.schema_remove_principal_[UNIQUE_NAME] diff --git a/acceptance/bundle/resources/grants/volumes/output.txt b/acceptance/bundle/resources/grants/volumes/output.txt index 9dd4d184402..ef31432f8b0 100644 --- a/acceptance/bundle/resources/grants/volumes/output.txt +++ b/acceptance/bundle/resources/grants/volumes/output.txt @@ -6,7 +6,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNI Created schemas.grants_schema Created volumes.grants_volume Created volumes.grants_volume.grants -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/independent/output.txt b/acceptance/bundle/resources/independent/output.txt index c8e08dc9191..dc9ba046b56 100644 --- a/acceptance/bundle/resources/independent/output.txt +++ b/acceptance/bundle/resources/independent/output.txt @@ -2,5 +2,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul Created jobs.foo Created pipelines.my Created volumes.volume1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/instance_pools/output.txt b/acceptance/bundle/resources/instance_pools/output.txt index b21953f0f40..ac7a7d4ce92 100644 --- a/acceptance/bundle/resources/instance_pools/output.txt +++ b/acceptance/bundle/resources/instance_pools/output.txt @@ -34,7 +34,7 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_instance_pool/default/files... Created instance_pools.test_instance_pool -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Verify the create request diff --git a/acceptance/bundle/resources/job_runs/basic/output.txt b/acceptance/bundle/resources/job_runs/basic/output.txt index d34d8d0f3c7..eb1b1461eda 100644 --- a/acceptance/bundle/resources/job_runs/basic/output.txt +++ b/acceptance/bundle/resources/job_runs/basic/output.txt @@ -37,7 +37,7 @@ job run [MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID] job run [MY_RUN_ID]: SUCCESS Created job_runs.my_run Created jobs.my_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy diff --git a/acceptance/bundle/resources/job_runs/failed_run/output.txt b/acceptance/bundle/resources/job_runs/failed_run/output.txt index 8535abcc6e9..2af3848b099 100644 --- a/acceptance/bundle/resources/job_runs/failed_run/output.txt +++ b/acceptance/bundle/resources/job_runs/failed_run/output.txt @@ -9,7 +9,7 @@ run page: [RUN_URL] Error: cannot create resources.jobs.downstream_job: dependency failed: resources.job_runs.my_run -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted === the failed run is recorded, and not having succeeded is drift >>> read_id.py my_run @@ -63,7 +63,7 @@ run page: [RUN_URL] Error: cannot create resources.jobs.downstream_job: dependency failed: resources.job_runs.my_run -Files: 3 uploaded, 0 deleted +Files: 2 uploaded, 0 deleted === run-now was issued once per deploy, and the recreate deleted the failed run >>> print_requests.py --keep //jobs/run-now diff --git a/acceptance/bundle/resources/job_runs/interrupted_run/output.txt b/acceptance/bundle/resources/job_runs/interrupted_run/output.txt index b77471cb56f..3c58c5472ce 100644 --- a/acceptance/bundle/resources/job_runs/interrupted_run/output.txt +++ b/acceptance/bundle/resources/job_runs/interrupted_run/output.txt @@ -9,7 +9,7 @@ HTTP Status: 403 Forbidden API error_code: INJECTED API message: Fault injected by test. -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Exit code: 1 @@ -71,7 +71,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-interrupt job run [MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID]?o=[NUMID] job run [MY_RUN_ID]: SUCCESS Updated job_runs.my_run -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 1 unchanged === the same run finished, and nothing was cancelled, deleted or triggered diff --git a/acceptance/bundle/resources/job_runs/job_parameters/output.txt b/acceptance/bundle/resources/job_runs/job_parameters/output.txt index 2520c8c4f11..64016f7356b 100644 --- a/acceptance/bundle/resources/job_runs/job_parameters/output.txt +++ b/acceptance/bundle/resources/job_runs/job_parameters/output.txt @@ -6,7 +6,7 @@ job run [MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID] job run [MY_RUN_ID]: SUCCESS Created job_runs.my_run Created jobs.my_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs/run-now diff --git a/acceptance/bundle/resources/job_runs/redeploy/output.txt b/acceptance/bundle/resources/job_runs/redeploy/output.txt index ae0babb43cf..7f3c1fcf664 100644 --- a/acceptance/bundle/resources/job_runs/redeploy/output.txt +++ b/acceptance/bundle/resources/job_runs/redeploy/output.txt @@ -6,7 +6,7 @@ job run [MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID] job run [MY_RUN_ID]: SUCCESS Created job_runs.my_run Created jobs.my_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary @@ -99,7 +99,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-redeploy/ job run [MY_RUN_ID_2]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID_2]?o=[NUMID] job run [MY_RUN_ID_2]: SUCCESS Recreated job_runs.my_run -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 1 created, 0 changed, 1 deleted, 1 unchanged >>> [CLI] bundle summary diff --git a/acceptance/bundle/resources/job_runs/retried_run_now/output.txt b/acceptance/bundle/resources/job_runs/retried_run_now/output.txt index b529da143c5..6dab994cca0 100644 --- a/acceptance/bundle/resources/job_runs/retried_run_now/output.txt +++ b/acceptance/bundle/resources/job_runs/retried_run_now/output.txt @@ -6,7 +6,7 @@ job run [MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID] job run [MY_RUN_ID]: SUCCESS Created job_runs.my_run Created jobs.my_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === run-now was sent twice, both times with the same token diff --git a/acceptance/bundle/resources/job_runs/wait/output.txt b/acceptance/bundle/resources/job_runs/wait/output.txt index ba32e44a2e0..bd5d2a904b0 100644 --- a/acceptance/bundle/resources/job_runs/wait/output.txt +++ b/acceptance/bundle/resources/job_runs/wait/output.txt @@ -7,7 +7,7 @@ job run [MY_RUN_ID]: SUCCESS Created job_runs.my_run Created jobs.downstream_job Created jobs.my_job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> read_id.py my_run @@ -25,7 +25,7 @@ resources.jobs.my_job skip >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Files: 2 uploaded, 0 deleted +Files: 1 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 3 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/jobs/alert-task/output.txt b/acceptance/bundle/resources/jobs/alert-task/output.txt index 34109f22369..3b01790e4cc 100644 --- a/acceptance/bundle/resources/jobs/alert-task/output.txt +++ b/acceptance/bundle/resources/jobs/alert-task/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/alert-task-[UNIQUE_NAME]/default/files... Created jobs.my_job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs get [JOB_ID] diff --git a/acceptance/bundle/resources/jobs/alert-task/script b/acceptance/bundle/resources/jobs/alert-task/script index f2d3d0fc9b2..1dcc1d37a0b 100644 --- a/acceptance/bundle/resources/jobs/alert-task/script +++ b/acceptance/bundle/resources/jobs/alert-task/script @@ -8,6 +8,6 @@ trap cleanup EXIT trace $CLI bundle deploy job_id=$($CLI bundle summary -o json | jq -r '.resources.jobs.my_job.id') -echo "$job_id:JOB_ID" >> ACC_REPLS +add_repl "$job_id" JOB_ID trace $CLI jobs get $job_id | jq '.settings.tasks[0].alert_task' diff --git a/acceptance/bundle/resources/jobs/big_id/output.txt b/acceptance/bundle/resources/jobs/big_id/output.txt index 37f1306a3bd..25b292ca868 100644 --- a/acceptance/bundle/resources/jobs/big_id/output.txt +++ b/acceptance/bundle/resources/jobs/big_id/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle plan -o json Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs diff --git a/acceptance/bundle/resources/jobs/check-metadata/output.txt b/acceptance/bundle/resources/jobs/check-metadata/output.txt index 999e0488115..cda7d2c87de 100644 --- a/acceptance/bundle/resources/jobs/check-metadata/output.txt +++ b/acceptance/bundle/resources/jobs/check-metadata/output.txt @@ -10,7 +10,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.bar Created jobs.foo -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Second summary, should have id and modified status should be absent diff --git a/acceptance/bundle/resources/jobs/check-metadata/script b/acceptance/bundle/resources/jobs/check-metadata/script index 0445fa0bf84..a486009c74c 100644 --- a/acceptance/bundle/resources/jobs/check-metadata/script +++ b/acceptance/bundle/resources/jobs/check-metadata/script @@ -14,14 +14,14 @@ title "Second summary, should have id and modified status should be absent" trace $CLI bundle summary -o json | jq '.resources.jobs.foo | {id, modified_status}' > out.summary.json trace cat out.summary.json JOB_1_ID=$(jq -r '.id' out.summary.json) -echo "$JOB_1_ID:JOB_1_ID" >> ACC_REPLS +add_repl "$JOB_1_ID" JOB_1_ID rm out.summary.json title "Assert job 1 is created\n" $CLI jobs get "${JOB_1_ID}" | jq '{name: .settings.name}' title "Assert job 2 is created\n" JOB_2_ID=$($CLI bundle summary -o json | jq -r '.resources.jobs.bar.id') -echo "$JOB_2_ID:JOB_2_ID" >> ACC_REPLS +add_repl "$JOB_2_ID" JOB_2_ID $CLI jobs get "${JOB_2_ID}" | jq '{name: .settings.name}' title "Read metadata object from the workspace" diff --git a/acceptance/bundle/resources/jobs/create-error/output.txt b/acceptance/bundle/resources/jobs/create-error/output.txt index 706898ae668..bad8cede5d2 100644 --- a/acceptance/bundle/resources/jobs/create-error/output.txt +++ b/acceptance/bundle/resources/jobs/create-error/output.txt @@ -8,7 +8,7 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: Shared job cluster feature is only supported in multi-task jobs. -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted >>> musterr [CLI] bundle deploy --force-lock -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... diff --git a/acceptance/bundle/resources/jobs/delete_job/output.txt b/acceptance/bundle/resources/jobs/delete_job/output.txt index ec1b5e362bd..2dd69e51883 100644 --- a/acceptance/bundle/resources/jobs/delete_job/output.txt +++ b/acceptance/bundle/resources/jobs/delete_job/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy diff --git a/acceptance/bundle/resources/jobs/delete_task/output.txt b/acceptance/bundle/resources/jobs/delete_task/output.txt index 6f00835b839..50c5346d6e9 100644 --- a/acceptance/bundle/resources/jobs/delete_task/output.txt +++ b/acceptance/bundle/resources/jobs/delete_task/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> cat databricks.yml diff --git a/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt b/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt index 4b2f476c950..a92373777fb 100644 --- a/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt +++ b/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt @@ -12,7 +12,7 @@ Validation OK! Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-test-[UNIQUE_NAME]/default/files... Created jobs.foo Created jobs.foo__bar -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt b/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt index fc3b869b5b0..0dc4f29667b 100644 --- a/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt +++ b/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt @@ -12,14 +12,14 @@ Validation OK! >>> [CLI] bundle deploy --fail-on-active-runs Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-active-runs-test-[UNIQUE_NAME]/default/files... Created jobs.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Remove .databricks directory to simulate a fresh deployment === deploy empty bundle again >>> [CLI] bundle deploy --fail-on-active-runs Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-active-runs-test-[UNIQUE_NAME]/default/files... -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt b/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt index 41965d66f5a..944f1f79e84 100644 --- a/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt +++ b/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt @@ -44,7 +44,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.some_other_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt diff --git a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt index fd3b20ce920..a6e1fef22f3 100644 --- a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt +++ b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt @@ -12,6 +12,6 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: git_source.git_provider must be one of: github,gitlab,bitbucketcloud,gitlabenterpriseedition,bitbucketserver,azuredevopsservices,githubenterprise,awscodecommit -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt index 48676c3316a..fd005af59d8 100644 --- a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt @@ -6,5 +6,5 @@ Warning: required field "git_provider" is not set Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/jobs/num_workers/output.txt b/acceptance/bundle/resources/jobs/num_workers/output.txt index 7677cd915ac..ebdd907399e 100644 --- a/acceptance/bundle/resources/jobs/num_workers/output.txt +++ b/acceptance/bundle/resources/jobs/num_workers/output.txt @@ -18,7 +18,7 @@ are correctly set in the cluster specification: Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.sample_job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs diff --git a/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt b/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt index 0a38ee5c4d6..23f7a8266da 100644 --- a/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt +++ b/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt @@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/usage_logs/dev/files... Created jobs.refresh_usage_logs -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json diff --git a/acceptance/bundle/resources/jobs/remote_add_tag/output.txt b/acceptance/bundle/resources/jobs/remote_add_tag/output.txt index db2552423d7..2f81cf00cf6 100644 --- a/acceptance/bundle/resources/jobs/remote_add_tag/output.txt +++ b/acceptance/bundle/resources/jobs/remote_add_tag/output.txt @@ -4,7 +4,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged Uploading hello.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged update jobs.foo diff --git a/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt b/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt index dfe215771ba..62d5ea05c1e 100644 --- a/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt +++ b/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt @@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs delete [NUMID] diff --git a/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt b/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt index 889244cc637..dcf1fd91bc4 100644 --- a/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt +++ b/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt @@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs delete [NUMID] diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt index 4ea192744cd..2e67a3c5de3 100644 --- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt +++ b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo Created pipelines.bar -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs delete [NUMID] diff --git a/acceptance/bundle/resources/jobs/remote_matches_config/output.txt b/acceptance/bundle/resources/jobs/remote_matches_config/output.txt index 260235a0500..3f6f402fa89 100644 --- a/acceptance/bundle/resources/jobs/remote_matches_config/output.txt +++ b/acceptance/bundle/resources/jobs/remote_matches_config/output.txt @@ -5,7 +5,7 @@ create jobs.my_job Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.my_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan @@ -19,7 +19,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //jobs diff --git a/acceptance/bundle/resources/jobs/shared-root-path/output.txt b/acceptance/bundle/resources/jobs/shared-root-path/output.txt index c702b9beb23..28dee8868cd 100644 --- a/acceptance/bundle/resources/jobs/shared-root-path/output.txt +++ b/acceptance/bundle/resources/jobs/shared-root-path/output.txt @@ -6,7 +6,7 @@ The bundle is configured to use /Workspace/Shared, which will give read/write ac Uploading bundle files to /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy -q diff --git a/acceptance/bundle/resources/jobs/tags_empty_map/output.txt b/acceptance/bundle/resources/jobs/tags_empty_map/output.txt index efc81dd6961..2621c0f462d 100644 --- a/acceptance/bundle/resources/jobs/tags_empty_map/output.txt +++ b/acceptance/bundle/resources/jobs/tags_empty_map/output.txt @@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/tags_empty_map/default/files... Created jobs.test_job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json diff --git a/acceptance/bundle/resources/jobs/task-source/output.txt b/acceptance/bundle/resources/jobs/task-source/output.txt index f3dcc71e32b..dba271ee0d8 100644 --- a/acceptance/bundle/resources/jobs/task-source/output.txt +++ b/acceptance/bundle/resources/jobs/task-source/output.txt @@ -7,7 +7,7 @@ Warning: invalid value "github" for enum field. Valid values are [awsCodeCommit Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/task-source/default/files... Created jobs.git_job Created jobs.workspace_job -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="git_job") | .body out.requests.txt diff --git a/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt b/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt index 56f4171b15b..7ad52bc6a45 100644 --- a/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt +++ b/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt @@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt b/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt index 4106d022cda..be2801ace32 100644 --- a/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt +++ b/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt @@ -6,5 +6,5 @@ Warning: unknown field: autotermination_minutes in databricks.yml:14:13 Created jobs.job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt b/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt index bab472fefff..d1caade8098 100644 --- a/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt +++ b/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt @@ -5,7 +5,7 @@ create jobs.my_job Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.my_job -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/script b/acceptance/bundle/resources/model_serving_endpoints/basic/script index 5fb845ccfd1..7f0752142b8 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/basic/script +++ b/acceptance/bundle/resources/model_serving_endpoints/basic/script @@ -21,12 +21,12 @@ trace $CLI bundle deploy -qq # SP and the real cloud SP. Sorting makes the recorded request stable across both. print_requests.py //serving-endpoints | gron.py --sort-arrays access_control_list > out.first-requests.$DATABRICKS_BUNDLE_ENGINE.txt -echo "$ENDPOINT_NAME:ENDPOINT_NAME_1" >> ACC_REPLS +add_repl "$ENDPOINT_NAME" ENDPOINT_NAME_1 # Record the endpoint ID for the first endpoint get_output=$($CLI serving-endpoints get $ENDPOINT_NAME) endpoint_id=$(echo "$get_output" | jq -r '.id') -echo "$endpoint_id:ENDPOINT_ID_1" >> ACC_REPLS +add_repl "$endpoint_id" ENDPOINT_ID_1 title "Print the GET endpoint details\n" echo "$get_output" | jq '{name, creator}' @@ -37,12 +37,12 @@ trace $CLI bundle plan -o json | gron.py --sort-arrays __embed__ > out.second-pl trace $CLI bundle deploy -qq print_requests.py //serving-endpoints | gron.py --sort-arrays access_control_list > out.second-requests.$DATABRICKS_BUNDLE_ENGINE.txt -echo "$ENDPOINT_NAME:ENDPOINT_NAME_2" >> ACC_REPLS +add_repl "$ENDPOINT_NAME" ENDPOINT_NAME_2 # Record the endpoint ID for the second endpoint get_output=$($CLI serving-endpoints get $ENDPOINT_NAME) endpoint_id=$(echo "$get_output" | jq -r '.id') -echo "$endpoint_id:ENDPOINT_ID_2" >> ACC_REPLS +add_repl "$endpoint_id" ENDPOINT_ID_2 title "Print the GET endpoint details\n" echo "$get_output" | jq '{name, creator}' diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script index 9f764d7914e..3f26d4a0738 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script +++ b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script @@ -12,7 +12,7 @@ title "Initial deployment" trace $CLI bundle deploy original_endpoint_id=$($CLI serving-endpoints get "${endpoint_name}" | jq -r '.id') -add_repl.py "$original_endpoint_id" "ORIGINAL_ENDPOINT_ID" +add_repl "$original_endpoint_id" "ORIGINAL_ENDPOINT_ID" trace $CLI serving-endpoints get "${endpoint_name}" | jq '{name, creator}' title "Delete and recreate remotely with the same name" @@ -20,7 +20,7 @@ trace $CLI serving-endpoints delete "${endpoint_name}" trace $CLI serving-endpoints create "${endpoint_name}" --no-wait | jq '{name, creator}' remote_recreated_endpoint_id=$($CLI serving-endpoints get "${endpoint_name}" | jq -r '.id') -add_repl.py "$remote_recreated_endpoint_id" "REMOTE_RECREATED_ENDPOINT_ID" +add_repl "$remote_recreated_endpoint_id" "REMOTE_RECREATED_ENDPOINT_ID" trace $CLI serving-endpoints get "${endpoint_name}" | jq '{name, creator}' printf "Original endpoint id: %s\n" "$original_endpoint_id" diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt index dda08054a22..cb9328d9655 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created model_serving_endpoints.test_endpoint -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints @@ -46,7 +46,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Recreated model_serving_endpoints.test_endpoint -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //serving-endpoints diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script index 90e71bb338d..919470c4ca4 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script @@ -12,7 +12,7 @@ trace $CLI bundle deploy trace print_requests.py //serving-endpoints ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$ENDPOINT_ID:ORIGINAL_ENDPOINT_ID" >> ACC_REPLS +add_repl "$ENDPOINT_ID" ORIGINAL_ENDPOINT_ID trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '.config.auto_capture_config.catalog_name' trace update_file.py databricks.yml "catalog_name: main" "catalog_name: other_catalog" @@ -22,5 +22,5 @@ trace $CLI bundle deploy trace print_requests.py //serving-endpoints NEW_ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$NEW_ENDPOINT_ID:NEW_ENDPOINT_ID" >> ACC_REPLS +add_repl "$NEW_ENDPOINT_ID" NEW_ENDPOINT_ID trace $CLI serving-endpoints get "${NEW_ENDPOINT_ID}" | jq '.config.auto_capture_config.catalog_name' diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt index 7f6da2ad58c..c855f542373 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created model_serving_endpoints.test_endpoint -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints @@ -41,7 +41,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Recreated model_serving_endpoints.test_endpoint -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //serving-endpoints diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script index d772069d397..d48a60c0ace 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script @@ -12,7 +12,7 @@ trace $CLI bundle deploy trace print_requests.py //serving-endpoints ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$ENDPOINT_ID:ORIGINAL_ENDPOINT_ID" >> ACC_REPLS +add_repl "$ENDPOINT_ID" ORIGINAL_ENDPOINT_ID trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '.name' trace update_file.py databricks.yml "name: test-endpoint-$UNIQUE_NAME" "name: test-endpoint-2-$UNIQUE_NAME" @@ -22,5 +22,5 @@ trace $CLI bundle deploy trace print_requests.py //serving-endpoints NEW_ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$NEW_ENDPOINT_ID:NEW_ENDPOINT_ID" >> ACC_REPLS +add_repl "$NEW_ENDPOINT_ID" NEW_ENDPOINT_ID trace $CLI serving-endpoints get "${NEW_ENDPOINT_ID}" | jq '.name' diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt index 1e38b644e6a..752eb18837b 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created model_serving_endpoints.test_endpoint -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ORIGINAL_ENDPOINT_ID] @@ -16,7 +16,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Recreated model_serving_endpoints.test_endpoint -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //serving-endpoints diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script index fec000b7e18..1df74506afe 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script @@ -10,7 +10,7 @@ trace $CLI bundle plan -o json > out.first-plan.$DATABRICKS_BUNDLE_ENGINE.json trace $CLI bundle deploy ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$ENDPOINT_ID:ORIGINAL_ENDPOINT_ID" >> ACC_REPLS +add_repl "$ENDPOINT_ID" ORIGINAL_ENDPOINT_ID trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '{route_optimized, id}' > out.first-get.$DATABRICKS_BUNDLE_ENGINE.json print_requests.py //serving-endpoints > out.first-requests.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt index 373e3c9bf3f..091953cdf41 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created model_serving_endpoints.test_endpoint -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints @@ -46,7 +46,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Recreated model_serving_endpoints.test_endpoint -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //serving-endpoints diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script index e02abe9aa71..0e31f7a4848 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script @@ -12,7 +12,7 @@ trace $CLI bundle deploy trace print_requests.py //serving-endpoints ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$ENDPOINT_ID:ORIGINAL_ENDPOINT_ID" >> ACC_REPLS +add_repl "$ENDPOINT_ID" ORIGINAL_ENDPOINT_ID trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '.config.auto_capture_config.schema_name' trace update_file.py databricks.yml "schema_name: default" "schema_name: other_schema" @@ -22,5 +22,5 @@ trace $CLI bundle deploy trace print_requests.py //serving-endpoints NEW_ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$NEW_ENDPOINT_ID:NEW_ENDPOINT_ID" >> ACC_REPLS +add_repl "$NEW_ENDPOINT_ID" NEW_ENDPOINT_ID trace $CLI serving-endpoints get "${NEW_ENDPOINT_ID}" | jq '.config.auto_capture_config.schema_name' diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt index 0f71b028159..276441b47fb 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created model_serving_endpoints.test_endpoint -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints @@ -46,7 +46,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Recreated model_serving_endpoints.test_endpoint -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //serving-endpoints diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script index 7a41b3bfcb7..7f915920ba1 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script @@ -12,7 +12,7 @@ trace $CLI bundle deploy trace print_requests.py //serving-endpoints ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$ENDPOINT_ID:ORIGINAL_ENDPOINT_ID" >> ACC_REPLS +add_repl "$ENDPOINT_ID" ORIGINAL_ENDPOINT_ID trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '.config.auto_capture_config.table_name_prefix' trace update_file.py databricks.yml "table_name_prefix: my_table" "table_name_prefix: other_table" @@ -22,5 +22,5 @@ trace $CLI bundle deploy trace print_requests.py //serving-endpoints NEW_ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$NEW_ENDPOINT_ID:NEW_ENDPOINT_ID" >> ACC_REPLS +add_repl "$NEW_ENDPOINT_ID" NEW_ENDPOINT_ID trace $CLI serving-endpoints get "${NEW_ENDPOINT_ID}" | jq '.config.auto_capture_config.table_name_prefix' diff --git a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt index 520e9642008..5eecef109d8 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files... Created model_serving_endpoints.my_endpoint -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt index 9fb1ea87ae5..bc1d02d6c92 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created model_serving_endpoints.test_endpoint -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ENDPOINT_ID] @@ -19,7 +19,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Updated model_serving_endpoints.test_endpoint -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script index 89877faef63..6e556d2b1ab 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script +++ b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script @@ -10,7 +10,7 @@ trap cleanup EXIT trace $CLI bundle deploy ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$ENDPOINT_ID:ENDPOINT_ID" >> ACC_REPLS +add_repl "$ENDPOINT_ID" ENDPOINT_ID trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '.ai_gateway' trace update_file.py databricks.yml 'catalog_name: "first-inference-catalog"' 'catalog_name: "second-inference-catalog"' diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt index 0fda89bf636..5fb46febcba 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created model_serving_endpoints.test_endpoint -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ENDPOINT_ID] @@ -40,7 +40,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Updated model_serving_endpoints.test_endpoint -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script index d0743fbfb73..763379ad9a6 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script +++ b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script @@ -10,7 +10,7 @@ trap cleanup EXIT trace $CLI bundle deploy ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$ENDPOINT_ID:ENDPOINT_ID" >> ACC_REPLS +add_repl "$ENDPOINT_ID" ENDPOINT_ID trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '.config' # Update two fields. The patch request should be called for both. diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt index fd0104efb0f..28797ce10c4 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created model_serving_endpoints.test_endpoint -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ENDPOINT_ID] @@ -37,7 +37,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Updated model_serving_endpoints.test_endpoint -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/config/script b/acceptance/bundle/resources/model_serving_endpoints/update/config/script index 3f28edc8438..3a28d1dcda2 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/update/config/script +++ b/acceptance/bundle/resources/model_serving_endpoints/update/config/script @@ -10,7 +10,7 @@ trap cleanup EXIT trace $CLI bundle deploy ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$ENDPOINT_ID:ENDPOINT_ID" >> ACC_REPLS +add_repl "$ENDPOINT_ID" ENDPOINT_ID trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '.config' trace update_file.py databricks.yml "name: gpt-4o-mini" "name: gpt-5o-mini" diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt index df2c35e9a68..077c27ab917 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created model_serving_endpoints.test_endpoint -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ENDPOINT_ID] @@ -19,7 +19,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Updated model_serving_endpoints.test_endpoint -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === There a bug in TF where it does not actually update the email notifications for a serving endpoint. diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script index 15b43b4ffda..391d369d686 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script +++ b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script @@ -10,7 +10,7 @@ trap cleanup EXIT trace $CLI bundle deploy ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$ENDPOINT_ID:ENDPOINT_ID" >> ACC_REPLS +add_repl "$ENDPOINT_ID" ENDPOINT_ID trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '.email_notifications' # Update email_notifications - change the email address diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt index bd895436e0b..410fd39eabf 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created model_serving_endpoints.test_endpoint -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ENDPOINT_ID] @@ -20,7 +20,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Updated model_serving_endpoints.test_endpoint -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/tags/script b/acceptance/bundle/resources/model_serving_endpoints/update/tags/script index cb1286e3aaf..6f69dc2f063 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/update/tags/script +++ b/acceptance/bundle/resources/model_serving_endpoints/update/tags/script @@ -10,7 +10,7 @@ trap cleanup EXIT trace $CLI bundle deploy ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id') -echo "$ENDPOINT_ID:ENDPOINT_ID" >> ACC_REPLS +add_repl "$ENDPOINT_ID" ENDPOINT_ID trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '.tags' trace update_file.py databricks.yml "value: my-team-one" "value: my-team-two" diff --git a/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt b/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt index debee2b5a89..50232dbed92 100644 --- a/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt +++ b/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt @@ -8,4 +8,4 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: Got an invalid name ''. Registered Model names cannot be empty strings. -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt b/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt index f6ab2b9c11f..adb61687bf8 100644 --- a/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt @@ -11,4 +11,4 @@ Error: cannot create mlflow model: Got an invalid name ''. Registered Model name -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/models/readplan-permissions/output.txt b/acceptance/bundle/resources/models/readplan-permissions/output.txt index 9ff1818524c..e65f9b2a560 100644 --- a/acceptance/bundle/resources/models/readplan-permissions/output.txt +++ b/acceptance/bundle/resources/models/readplan-permissions/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created models.mymodel Created models.mymodel.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions/registered-models @@ -32,7 +32,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Remove manager permission and description, deploy from planUploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Updated models.mymodel Updated models.mymodel.permissions -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 2 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions/registered-models diff --git a/acceptance/bundle/resources/models/readplan-permissions/script b/acceptance/bundle/resources/models/readplan-permissions/script index 52d8975afe5..f8be26409e3 100644 --- a/acceptance/bundle/resources/models/readplan-permissions/script +++ b/acceptance/bundle/resources/models/readplan-permissions/script @@ -7,7 +7,7 @@ trap cleanup EXIT register_model_id() { # Register the model's numeric ID so it appears as [MODEL_ID] in output MODEL_ID=$($CLI model-registry get-model test-model | jq -r '.registered_model_databricks.id') - add_repl.py "$MODEL_ID" "MODEL_ID" + add_repl "$MODEL_ID" "MODEL_ID" } title "Initial deploy: model created with permissions" diff --git a/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt index 32d70c57a68..7ecf5f62063 100644 --- a/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created apps.foo Created apps.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt b/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt index 32d70c57a68..7ecf5f62063 100644 --- a/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created apps.foo Created apps.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt index b466f6d2c90..a8c9eca4124 100644 --- a/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created clusters.foo Created clusters.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/clusters/target/output.txt b/acceptance/bundle/resources/permissions/clusters/target/output.txt index 8145a604191..f470559fb9f 100644 --- a/acceptance/bundle/resources/permissions/clusters/target/output.txt +++ b/acceptance/bundle/resources/permissions/clusters/target/output.txt @@ -61,7 +61,7 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files... Created clusters.cluster1 Created clusters.cluster1.permissions -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters diff --git a/acceptance/bundle/resources/permissions/dashboards/create/output.txt b/acceptance/bundle/resources/permissions/dashboards/create/output.txt index 61a664570e5..d2faac5a681 100644 --- a/acceptance/bundle/resources/permissions/dashboards/create/output.txt +++ b/acceptance/bundle/resources/permissions/dashboards/create/output.txt @@ -15,7 +15,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dashboard-perm-[UNIQUE_NAME]/default/files... Created dashboards.foo Created dashboards.foo.permissions -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt index 24e30c0166c..bb4ee4bc75c 100644 --- a/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt @@ -47,7 +47,7 @@ Warning: unknown field: instance_profile_arn Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created database_instances.foo Created database_instances.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt index 4582b2969ee..aa0d4a3b608 100644 --- a/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created experiments.foo Created experiments.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/factcheck/output.txt b/acceptance/bundle/resources/permissions/factcheck/output.txt index ef910ba70f5..ae6df5bd275 100644 --- a/acceptance/bundle/resources/permissions/factcheck/output.txt +++ b/acceptance/bundle/resources/permissions/factcheck/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_bundle_[UNIQUE_NAME]/default/files... Created jobs.job Created sql_warehouses.warehouse -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Permissions API simply takes the latest level in the request for a given principal diff --git a/acceptance/bundle/resources/permissions/factcheck/script b/acceptance/bundle/resources/permissions/factcheck/script index 9b17c99cb4a..cbddce58087 100644 --- a/acceptance/bundle/resources/permissions/factcheck/script +++ b/acceptance/bundle/resources/permissions/factcheck/script @@ -9,10 +9,10 @@ trap cleanup EXIT trace $CLI bundle deploy job_id=$($CLI bundle summary --output json | jq -r '.resources.jobs.job.id') -echo "$job_id:JOB_ID" >> ACC_REPLS +add_repl "$job_id" JOB_ID sql_warehouse_id=$($CLI bundle summary --output json | jq -r '.resources.sql_warehouses.warehouse.id') -echo "$sql_warehouse_id:SQL_WAREHOUSE_ID" >> ACC_REPLS +add_repl "$sql_warehouse_id" SQL_WAREHOUSE_ID user=deco-test-user@databricks.com diff --git a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt index bffd772765f..0ad7954092b 100644 --- a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created genie_spaces.foo Created genie_spaces.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt index 81d435189da..ec85eecf2b4 100644 --- a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt +++ b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created genie_spaces.foo Created genie_spaces.foo.permissions -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Permissions are set on the live space diff --git a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/script b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/script index 861e23300ab..30130e75885 100644 --- a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/script +++ b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/script @@ -5,7 +5,7 @@ trap cleanup EXIT trace $CLI bundle deploy SID=$($CLI bundle summary --output json | jq -r '.resources.genie_spaces.foo.id') -echo "$SID:GENIE_SPACE_ID" >> ACC_REPLS +add_repl "$SID" GENIE_SPACE_ID title "Permissions are set on the live space" trace $CLI api get /api/2.0/permissions/genie/$SID | jq '{object_type, access_control_list}' diff --git a/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt b/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt index 575ff097ee1..c5b7cc5cc71 100644 --- a/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt @@ -9,7 +9,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job_with_permissions Created jobs.job_with_permissions.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan @@ -115,7 +115,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Updated jobs.job_with_permissions.permissions -Files: 3 uploaded, 0 deleted +Files: 2 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt index df4aecbf495..ff2a662c903 100644 --- a/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo Created jobs.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt b/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt index d9809ba8dc5..769795fe908 100644 --- a/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt @@ -28,7 +28,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/green/files... Created jobs.interim_gold_layer_job Created jobs.interim_gold_layer_job.permissions -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json -t green diff --git a/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt b/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt index a29eb495cbf..e4db99624a0 100644 --- a/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt @@ -11,7 +11,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo Created jobs.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt b/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt index 60754b83910..0a09e858c7e 100644 --- a/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt @@ -5,7 +5,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.job_with_permissions Created jobs.job_with_permissions.permissions -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan @@ -16,7 +16,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Updated jobs.job_with_permissions.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> errcode [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt index 97dd0f4aae8..861c6f7cd21 100644 --- a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt @@ -5,7 +5,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-deleted-remotely/default/files... Created jobs.job_with_permissions Created jobs.job_with_permissions.permissions -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs/ @@ -109,7 +109,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-deleted-remotely/default/files... Updated jobs.job_with_permissions.permissions -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //jobs/ diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt index bdcc12f9893..1e2f44ad666 100644 --- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt @@ -14,7 +14,7 @@ No active deployment found to destroy! Uploading bundle files to /Workspace/Users/[TEST_SP_APPLICATION_ID]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.foo Created jobs.foo.permissions -Files: 9 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] permissions set jobs [NUMID] --json @take_ownership.json diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/script b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/script index 0bfb065a862..a7ec688100b 100644 --- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/script +++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/script @@ -5,7 +5,7 @@ if [ -z "${TEST_SP_APPLICATION_ID:-}" ]; then fi # Mask the test SP's application_id (its userName) to a dedicated placeholder so # the assertion is env-independent instead of collapsing into the generic [UUID]. -echo "$TEST_SP_APPLICATION_ID:TEST_SP_APPLICATION_ID" >> ACC_REPLS +add_repl "$TEST_SP_APPLICATION_ID" TEST_SP_APPLICATION_ID envsubst < databricks.yml.tmpl > databricks.yml # Locally DATABRICKS_CLIENT_ID is unset; fall back to the current identity so the diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt index fb8537a0faf..ec72e5c3aeb 100644 --- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt @@ -13,7 +13,7 @@ No active deployment found to destroy! >>> as-test-sp [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[TEST_SP_APPLICATION_ID]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created jobs.foo -Files: 9 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] permissions set jobs [NUMID] --json @take_ownership.json diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/script b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/script index 0bfb065a862..a7ec688100b 100644 --- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/script +++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/script @@ -5,7 +5,7 @@ if [ -z "${TEST_SP_APPLICATION_ID:-}" ]; then fi # Mask the test SP's application_id (its userName) to a dedicated placeholder so # the assertion is env-independent instead of collapsing into the generic [UUID]. -echo "$TEST_SP_APPLICATION_ID:TEST_SP_APPLICATION_ID" >> ACC_REPLS +add_repl "$TEST_SP_APPLICATION_ID" TEST_SP_APPLICATION_ID envsubst < databricks.yml.tmpl > databricks.yml # Locally DATABRICKS_CLIENT_ID is unset; fall back to the current identity so the diff --git a/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt b/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt index 0028bfe6fbc..4a1625e9921 100644 --- a/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt @@ -5,7 +5,7 @@ null >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt b/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt index df4aecbf495..ff2a662c903 100644 --- a/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo Created jobs.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt b/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt index d355595bf6e..3c44c1366e1 100644 --- a/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt @@ -32,7 +32,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/green/files... Created jobs.interim_gold_layer_job Created jobs.interim_gold_layer_job.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> errcode [CLI] bundle destroy -t green --auto-approve diff --git a/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt b/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt index c23e777f8dd..00f7d225cc9 100644 --- a/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt @@ -15,7 +15,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo Created jobs.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt b/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt index 623b149bacb..4b638d3689d 100644 --- a/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo Created jobs.foo.permissions -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt b/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt index adaa6c3ee68..69a74214c05 100644 --- a/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo Created jobs.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/permissions/jobs/update/output.txt b/acceptance/bundle/resources/permissions/jobs/update/output.txt index b1adcc8b6dc..23ddca160af 100644 --- a/acceptance/bundle/resources/permissions/jobs/update/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/update/output.txt @@ -11,7 +11,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files... Created jobs.job_with_permissions Created jobs.job_with_permissions.permissions -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs/ @@ -77,7 +77,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files... Updated jobs.job_with_permissions.permissions -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //jobs/ diff --git a/acceptance/bundle/resources/permissions/jobs/viewers/output.txt b/acceptance/bundle/resources/permissions/jobs/viewers/output.txt index 2c3084c7e67..69ab0ef32a4 100644 --- a/acceptance/bundle/resources/permissions/jobs/viewers/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/viewers/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo Created jobs.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt b/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt index 1e5e92acc14..df6d261f19f 100644 --- a/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt +++ b/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt @@ -3,5 +3,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created models.foo Created models.foo.permissions -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/permissions/models/current_can_manage/script b/acceptance/bundle/resources/permissions/models/current_can_manage/script index 9ac6f2cd41a..0ade9d8934b 100644 --- a/acceptance/bundle/resources/permissions/models/current_can_manage/script +++ b/acceptance/bundle/resources/permissions/models/current_can_manage/script @@ -9,7 +9,7 @@ trace errcode $CLI bundle deploy &> out.deploy.txt # Register the model's numeric ID for output replacement. # The permissions API uses the numeric ID, not the model name. MODEL_ID=$($CLI model-registry get-model test-model | jq -r '.registered_model_databricks.id') -add_repl.py "$MODEL_ID" "FOO_MODEL_ID" +add_repl "$MODEL_ID" "FOO_MODEL_ID" print_requests.py //permissions > out.requests.deploy.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt b/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt index c7207d98b64..a38fa993af1 100644 --- a/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt @@ -2,7 +2,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul Warn: deploying resources.pipelines.foo.permissions: retrying after 504 Gateway Timeout from PUT /api/2.0/permissions/pipelines/[UUID] Created pipelines.foo Created pipelines.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //api/2.0/permissions/pipelines diff --git a/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt b/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt index f1e0a780be7..4d502728ab0 100644 --- a/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created pipelines.foo Created pipelines.foo.permissions -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt b/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt index d95062bb47a..c5d3e763110 100644 --- a/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created pipelines.foo Created pipelines.foo.permissions -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy diff --git a/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt index 736f0ca95ee..a836e2e62db 100644 --- a/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created pipelines.foo Created pipelines.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt b/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt index 53126dd76a0..ddf2d97edce 100644 --- a/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt @@ -11,7 +11,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created pipelines.foo Created pipelines.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt b/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt index 8140ffb6aaa..7ebaf7080a7 100644 --- a/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt @@ -5,7 +5,7 @@ null >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created pipelines.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt b/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt index 736f0ca95ee..a836e2e62db 100644 --- a/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created pipelines.foo Created pipelines.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt b/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt index 0207f067ae0..d32158fc54b 100644 --- a/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt @@ -15,7 +15,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created pipelines.foo Created pipelines.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/pipelines/update/output.txt b/acceptance/bundle/resources/permissions/pipelines/update/output.txt index 5c48f2d4203..dbccf317c7f 100644 --- a/acceptance/bundle/resources/permissions/pipelines/update/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/update/output.txt @@ -5,7 +5,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files... Created pipelines.foo Created pipelines.foo.permissions -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //pipeline @@ -57,7 +57,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files... Updated pipelines.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //pipeline diff --git a/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt index 41200518b78..297ee552f4e 100644 --- a/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created postgres_projects.foo Created postgres_projects.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt index fca933a501a..4c31dc64d27 100644 --- a/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created sql_warehouses.foo Created sql_warehouses.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/target_permissions/output.txt b/acceptance/bundle/resources/permissions/target_permissions/output.txt index f6d1a9a4424..b5e9c911998 100644 --- a/acceptance/bundle/resources/permissions/target_permissions/output.txt +++ b/acceptance/bundle/resources/permissions/target_permissions/output.txt @@ -9,7 +9,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/test-bundle/files... Created jobs.foo Created jobs.foo.permissions -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt index 7a6fb05a4bc..bfd8ce6a288 100644 --- a/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt @@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created vector_search_endpoints.foo Created vector_search_endpoints.foo.permissions -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt b/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt index da135a4525e..e10e04e6b44 100644 --- a/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt +++ b/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-bundle-deploy-pipeline-duplicate-names-[UNIQUE_NAME]/default/files... Created pipelines.pipeline_one -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //pipelines diff --git a/acceptance/bundle/resources/pipelines/auto-approve/output.txt b/acceptance/bundle/resources/pipelines/auto-approve/output.txt index 45542945a99..0b6b9441db5 100644 --- a/acceptance/bundle/resources/pipelines/auto-approve/output.txt +++ b/acceptance/bundle/resources/pipelines/auto-approve/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.foo Created pipelines.bar -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the pipeline is created diff --git a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt index a88997ac09c..8c25edb6b9e 100644 --- a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt +++ b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt @@ -11,7 +11,7 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-lakeflow-pipeline-[UNIQUE_NAME]/default/files... Created pipelines.foo -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.0/pipelines" and .method == "POST") | .body out.requests.txt diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.direct.txt b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.direct.txt index 02520cda18e..039a1ce989c 100644 --- a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.direct.txt +++ b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.direct.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/num-workers-zero/default/files... Created pipelines.my -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt index 02520cda18e..039a1ce989c 100644 --- a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/num-workers-zero/default/files... Created pipelines.my -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/pipelines/photon-true/output.txt b/acceptance/bundle/resources/pipelines/photon-true/output.txt index fc51f9dcef8..4dd3f036c63 100644 --- a/acceptance/bundle/resources/pipelines/photon-true/output.txt +++ b/acceptance/bundle/resources/pipelines/photon-true/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/photon-true/default/files... Created pipelines.my -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "method": "POST", diff --git a/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt b/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt index d3f6d3984cf..4f4aa021dfa 100644 --- a/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt +++ b/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt @@ -22,7 +22,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files... Created pipelines.my -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests @@ -69,7 +69,7 @@ restore the defined STs and MVs through full refresh. Note that recreation is ne properties such as the 'catalog' or 'storage' are changed: recreate resources.pipelines.my Recreated pipelines.my -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests diff --git a/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt b/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt index 488e525377c..2c470d41f1a 100644 --- a/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt +++ b/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt @@ -22,7 +22,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files... Created pipelines.my -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests @@ -64,7 +64,7 @@ restore the defined STs and MVs through full refresh. Note that recreation is ne properties such as the 'catalog' or 'storage' are changed: recreate resources.pipelines.my Recreated pipelines.my -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests diff --git a/acceptance/bundle/resources/pipelines/recreate/output.txt b/acceptance/bundle/resources/pipelines/recreate/output.txt index b6d9c59bdb1..993909f9db3 100644 --- a/acceptance/bundle/resources/pipelines/recreate/output.txt +++ b/acceptance/bundle/resources/pipelines/recreate/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created pipelines.foo Created schemas.bar -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the pipeline is created with catalog diff --git a/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt b/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt index 3007b241b1e..9974f540860 100644 --- a/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt +++ b/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created pipelines.my_pipeline -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Make local change: run_as user -> changed@example.test diff --git a/acceptance/bundle/resources/pipelines/update/output.txt b/acceptance/bundle/resources/pipelines/update/output.txt index 46283c46a28..7fdaa732497 100644 --- a/acceptance/bundle/resources/pipelines/update/output.txt +++ b/acceptance/bundle/resources/pipelines/update/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files... Created pipelines.my -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests diff --git a/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt b/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt index c694b8f6e68..c3199af2d35 100644 --- a/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt +++ b/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/zero-value-fields/default/files... Created pipelines.my -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt b/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt index 75b330950c9..1731a30ca11 100644 --- a/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt +++ b/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt @@ -17,7 +17,7 @@ Table main.qm_test_[UNIQUE_NAME].test_table is now visible (catalog_name=main) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... Created quality_monitors.monitor1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt index b9a97693857..16289c061a8 100644 --- a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt +++ b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt @@ -17,7 +17,7 @@ Table main.qm_test_[UNIQUE_NAME].test_table is now visible (catalog_name=main) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... Created quality_monitors.monitor1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt b/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt index 64f792fe194..a6d3f78f881 100644 --- a/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt +++ b/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt @@ -17,7 +17,7 @@ Table main.qm_test_[UNIQUE_NAME].test_table_2 is now visible (catalog_name=main) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... Created quality_monitors.monitor1 -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/quality_monitors/create/out.deploy.direct.txt b/acceptance/bundle/resources/quality_monitors/create/out.deploy.direct.txt index 4a3d2df0a38..dbddf27fb68 100644 --- a/acceptance/bundle/resources/quality_monitors/create/out.deploy.direct.txt +++ b/acceptance/bundle/resources/quality_monitors/create/out.deploy.direct.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... Created quality_monitors.monitor1 -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt b/acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt index 4a3d2df0a38..dbddf27fb68 100644 --- a/acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... Created quality_monitors.monitor1 -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/registered_models/basic/output.txt b/acceptance/bundle/resources/registered_models/basic/output.txt index 987a05bf42e..b6173728333 100644 --- a/acceptance/bundle/resources/registered_models/basic/output.txt +++ b/acceptance/bundle/resources/registered_models/basic/output.txt @@ -27,7 +27,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files... Created registered_models.my_registered_model -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] registered-models get main.default.my-registered-model-[UNIQUE_NAME] diff --git a/acceptance/bundle/resources/schemas/auto-approve/output.txt b/acceptance/bundle/resources/schemas/auto-approve/output.txt index d8329158bbf..0cf3d6fe0de 100644 --- a/acceptance/bundle/resources/schemas/auto-approve/output.txt +++ b/acceptance/bundle/resources/schemas/auto-approve/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created pipelines.foo Created schemas.bar -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the schema is created diff --git a/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt b/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt index 097a997b839..2bb8eb57dcc 100644 --- a/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt +++ b/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt @@ -6,7 +6,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/secret-scope-collapse-[UNIQUE_NAME]/default/files... Created secret_scopes.my_scope Created secret_scopes.my_scope.permissions -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] secrets list-scopes -o json diff --git a/acceptance/bundle/resources/secret_scopes/permissions/script b/acceptance/bundle/resources/secret_scopes/permissions/script index 86dcc53e9ff..ad5d2a518f1 100755 --- a/acceptance/bundle/resources/secret_scopes/permissions/script +++ b/acceptance/bundle/resources/secret_scopes/permissions/script @@ -2,7 +2,7 @@ if [ -z "$CLOUD_ENV" ]; then export TEST_SP_APPLICATION_ID="22222222-2222-2222-2222-222222222222" fi -echo "$TEST_SP_APPLICATION_ID:TEST_SP_APPLICATION_ID" >> ACC_REPLS +add_repl "$TEST_SP_APPLICATION_ID" TEST_SP_APPLICATION_ID export SECRET_SCOPE_NAME="test-scope-permissions-$UNIQUE_NAME" diff --git a/acceptance/bundle/resources/secrets/basic/output.txt b/acceptance/bundle/resources/secrets/basic/output.txt index 06bb48daf11..95fd4f5b1b0 100644 --- a/acceptance/bundle/resources/secrets/basic/output.txt +++ b/acceptance/bundle/resources/secrets/basic/output.txt @@ -35,7 +35,7 @@ Resources: >>> [CLI] bundle deploy --var secret_value=initial-secret-value Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... Created secrets.secret1 -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity-catalog diff --git a/acceptance/bundle/resources/secrets/update-value/output.txt b/acceptance/bundle/resources/secrets/update-value/output.txt index 74d1dbb4f8c..beadf6d46e4 100644 --- a/acceptance/bundle/resources/secrets/update-value/output.txt +++ b/acceptance/bundle/resources/secrets/update-value/output.txt @@ -22,7 +22,7 @@ >>> [CLI] bundle deploy --var secret_value=initial-secret-value Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created secrets.secret1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity-catalog diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt index da88ff1e116..d8ee64ccb42 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt @@ -3,7 +3,7 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created sql_warehouses.mywarehouse -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses @@ -34,7 +34,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Updated sql_warehouses.mywarehouse -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script index 3028a1f6afa..5d444c6e4e9 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script @@ -9,7 +9,7 @@ trap cleanup EXIT title "Deploy with started=false: warehouse created and then stopped" trace errcode $CLI bundle deploy WAREHOUSE_ID=$($CLI bundle summary -o json | jq -r '.resources.sql_warehouses.mywarehouse.id') -add_repl.py "$WAREHOUSE_ID" "WAREHOUSE_ID" +add_repl "$WAREHOUSE_ID" "WAREHOUSE_ID" trace print_requests.py //sql/warehouses rm -f out.requests.txt { trace errcode $CLI warehouses get "$WAREHOUSE_ID" | jq '.state'; } || true diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt index ff03140066a..cf5703f183d 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt @@ -3,7 +3,7 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created sql_warehouses.mywarehouse -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses @@ -34,7 +34,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Updated sql_warehouses.mywarehouse -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script index 46cf94bdcc2..c9e7b940f13 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script @@ -9,7 +9,7 @@ trap cleanup EXIT title "Deploy with started=false: warehouse created and then stopped" trace errcode $CLI bundle deploy WAREHOUSE_ID=$($CLI bundle summary -o json | jq -r '.resources.sql_warehouses.mywarehouse.id') -add_repl.py "$WAREHOUSE_ID" "WAREHOUSE_ID" +add_repl "$WAREHOUSE_ID" "WAREHOUSE_ID" trace print_requests.py //sql/warehouses rm -f out.requests.txt { trace errcode $CLI warehouses get "$WAREHOUSE_ID" | jq '.state'; } || true diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt index 704350d635e..7ccad8a5480 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt @@ -3,7 +3,7 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created sql_warehouses.mywarehouse -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses @@ -36,7 +36,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Updated sql_warehouses.mywarehouse -Files: 3 uploaded, 0 deleted +Files: 2 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script index 2033d4bb523..369839f4769 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script @@ -9,7 +9,7 @@ trap cleanup EXIT title "Deploy with started=true: warehouse created and running" trace errcode $CLI bundle deploy WAREHOUSE_ID=$($CLI bundle summary -o json | jq -r '.resources.sql_warehouses.mywarehouse.id') -add_repl.py "$WAREHOUSE_ID" "WAREHOUSE_ID" +add_repl "$WAREHOUSE_ID" "WAREHOUSE_ID" trace print_requests.py //sql/warehouses rm -f out.requests.txt diff --git a/acceptance/bundle/resources/sql_warehouses/output.txt b/acceptance/bundle/resources/sql_warehouses/output.txt index 79ac42b55f8..4b8141d0946 100644 --- a/acceptance/bundle/resources/sql_warehouses/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/output.txt @@ -37,7 +37,7 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_sql_warehouse/default/files... Created sql_warehouses.test_sql_warehouse -Files: 22 uploaded, 0 deleted +Files: 21 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Verify the create request diff --git a/acceptance/bundle/resources/synced_database_tables/basic/output.txt b/acceptance/bundle/resources/synced_database_tables/basic/output.txt index 5847369f118..13104690bbe 100644 --- a/acceptance/bundle/resources/synced_database_tables/basic/output.txt +++ b/acceptance/bundle/resources/synced_database_tables/basic/output.txt @@ -37,7 +37,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-sy Created database_catalogs.my_catalog Created database_instances.my_instance Created synced_database_tables.my_synced_table -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary diff --git a/acceptance/bundle/resources/synced_database_tables/recreate/output.txt b/acceptance/bundle/resources/synced_database_tables/recreate/output.txt index 3b82b6ac3f3..6b6a43e57c5 100644 --- a/acceptance/bundle/resources/synced_database_tables/recreate/output.txt +++ b/acceptance/bundle/resources/synced_database_tables/recreate/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-sy Created database_catalogs.my_catalog Created database_instances.my_instance Created synced_database_tables.my_synced_table -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged === Change an immutable synced-table field: no update API, so the plan recreates it diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script index dbef9250f28..9c834c66e55 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script +++ b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script @@ -12,7 +12,7 @@ title "Initial deployment" trace $CLI bundle deploy original_endpoint_uuid=$($CLI vector-search-endpoints get-endpoint "${endpoint_name}" | jq -r '.id') -add_repl.py "$original_endpoint_uuid" "ORIGINAL_ENDPOINT_UUID" +add_repl "$original_endpoint_uuid" "ORIGINAL_ENDPOINT_UUID" trace $CLI vector-search-endpoints get-endpoint "${endpoint_name}" | jq '{id, name, endpoint_type}' title "Delete and recreate remotely with the same name" @@ -20,7 +20,7 @@ trace $CLI vector-search-endpoints delete-endpoint "${endpoint_name}" trace $CLI vector-search-endpoints create-endpoint "${endpoint_name}" STANDARD | jq '{id, name, endpoint_type}' remote_recreated_endpoint_uuid=$($CLI vector-search-endpoints get-endpoint "${endpoint_name}" | jq -r '.id') -add_repl.py "$remote_recreated_endpoint_uuid" "REMOTE_RECREATED_ENDPOINT_UUID" +add_repl "$remote_recreated_endpoint_uuid" "REMOTE_RECREATED_ENDPOINT_UUID" trace $CLI vector-search-endpoints get-endpoint "${endpoint_name}" | jq '{id, name, endpoint_type}' printf "Original endpoint UUID: %s\n" "$original_endpoint_uuid" diff --git a/acceptance/bundle/resources/volumes/change-comment/output.txt b/acceptance/bundle/resources/volumes/change-comment/output.txt index a87fdf66b8d..ac715b86983 100644 --- a/acceptance/bundle/resources/volumes/change-comment/output.txt +++ b/acceptance/bundle/resources/volumes/change-comment/output.txt @@ -18,7 +18,7 @@ Error: Volume 'main.myschema.myvolume' does not exist. >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created volumes.volume1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity diff --git a/acceptance/bundle/resources/volumes/change-name/output.txt b/acceptance/bundle/resources/volumes/change-name/output.txt index cf299c15b8d..bb5fec8b623 100644 --- a/acceptance/bundle/resources/volumes/change-name/output.txt +++ b/acceptance/bundle/resources/volumes/change-name/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created volumes.volume1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity diff --git a/acceptance/bundle/resources/volumes/change-schema-name/output.txt b/acceptance/bundle/resources/volumes/change-schema-name/output.txt index c15f8562060..bfbd9d6ac9a 100644 --- a/acceptance/bundle/resources/volumes/change-schema-name/output.txt +++ b/acceptance/bundle/resources/volumes/change-schema-name/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created volumes.volume1 -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity diff --git a/acceptance/bundle/resources/volumes/remote-change-name/output.txt b/acceptance/bundle/resources/volumes/remote-change-name/output.txt index 94671d64c2a..e8b87fd9c29 100644 --- a/acceptance/bundle/resources/volumes/remote-change-name/output.txt +++ b/acceptance/bundle/resources/volumes/remote-change-name/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created volumes.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] volumes update mycatalog.myschema.myname --json {"new_name": "my_new_name"} diff --git a/acceptance/bundle/resources/volumes/remote-delete/output.txt b/acceptance/bundle/resources/volumes/remote-delete/output.txt index 9fd2391787f..e9517fd2cb1 100644 --- a/acceptance/bundle/resources/volumes/remote-delete/output.txt +++ b/acceptance/bundle/resources/volumes/remote-delete/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created volumes.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] volumes delete mycatalog.myschema.myname diff --git a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt index a71b01710a8..c5237fefbd5 100644 --- a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt +++ b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt @@ -8,4 +8,4 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: CreateVolume storage_location can not be provided. -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt index 6db0622e224..cfa2c2e608e 100644 --- a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt @@ -11,4 +11,4 @@ Error: cannot create volume: CreateVolume storage_location can not be provided. -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/run/app-with-job/output.txt b/acceptance/bundle/run/app-with-job/output.txt index c874e659243..718a16a873a 100644 --- a/acceptance/bundle/run/app-with-job/output.txt +++ b/acceptance/bundle/run/app-with-job/output.txt @@ -12,7 +12,7 @@ Validation OK! Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-with-job-[UNIQUE_NAME]/files... Created apps.test_app Created jobs.foo -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === App should exist after bundle deployment diff --git a/acceptance/bundle/run/basic/output.txt b/acceptance/bundle/run/basic/output.txt index 20a2758e4dd..28e3b226804 100644 --- a/acceptance/bundle/run/basic/output.txt +++ b/acceptance/bundle/run/basic/output.txt @@ -9,7 +9,7 @@ Exit code: 1 >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/caterpillar/default/files... Created jobs.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run foo diff --git a/acceptance/bundle/run/jobs/partial_run/output.txt b/acceptance/bundle/run/jobs/partial_run/output.txt index b2e120a5d2e..0733a4d88ce 100644 --- a/acceptance/bundle/run/jobs/partial_run/output.txt +++ b/acceptance/bundle/run/jobs/partial_run/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/partial_run/default/files... Created jobs.my_job -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run my_job --only task_1 diff --git a/acceptance/bundle/run/refresh-flags/output.txt b/acceptance/bundle/run/refresh-flags/output.txt index 107ac101006..6650e685574 100644 --- a/acceptance/bundle/run/refresh-flags/output.txt +++ b/acceptance/bundle/run/refresh-flags/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-run-flags/default/files... Created pipelines.my_pipeline -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Running pipeline with --refresh flag and specific tables diff --git a/acceptance/bundle/run/state-wiped/output.txt b/acceptance/bundle/run/state-wiped/output.txt index 8ed724f9980..d7300076144 100644 --- a/acceptance/bundle/run/state-wiped/output.txt +++ b/acceptance/bundle/run/state-wiped/output.txt @@ -6,7 +6,7 @@ Error: resource not found or not yet deployed. Did you forget to run 'databricks >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/caterpillar/default/files... Created jobs.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run foo diff --git a/acceptance/bundle/run_as/job_default/output.txt b/acceptance/bundle/run_as/job_default/output.txt index 1360ce1b1b8..fe5721893bc 100644 --- a/acceptance/bundle/run_as/job_default/output.txt +++ b/acceptance/bundle/run_as/job_default/output.txt @@ -3,7 +3,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as_job_default_[UNIQUE_NAME]/default/files... Created jobs.job_with_run_as -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs diff --git a/acceptance/bundle/run_as/pipelines/regular_user/output.txt b/acceptance/bundle/run_as/pipelines/regular_user/output.txt index 925fc155c23..7487332edfc 100644 --- a/acceptance/bundle/run_as/pipelines/regular_user/output.txt +++ b/acceptance/bundle/run_as/pipelines/regular_user/output.txt @@ -20,7 +20,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name/files... Created pipelines.nyc_taxi_pipeline Created pipelines.nyc_taxi_pipeline.permissions -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_user_name_different @@ -43,7 +43,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name_different/files... Created pipelines.nyc_taxi_pipeline Created pipelines.nyc_taxi_pipeline.permissions -Files: 9 uploaded, 0 deleted +Files: 8 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_service_principal_name @@ -66,7 +66,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name/files... Created pipelines.nyc_taxi_pipeline Created pipelines.nyc_taxi_pipeline.permissions -Files: 11 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_service_principal_name_different @@ -89,5 +89,5 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name_different/files... Created pipelines.nyc_taxi_pipeline Created pipelines.nyc_taxi_pipeline.permissions -Files: 13 uploaded, 0 deleted +Files: 12 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/run_as/pipelines/service_principal/output.txt b/acceptance/bundle/run_as/pipelines/service_principal/output.txt index b1e3ade10ab..925fc155c23 100644 --- a/acceptance/bundle/run_as/pipelines/service_principal/output.txt +++ b/acceptance/bundle/run_as/pipelines/service_principal/output.txt @@ -20,7 +20,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name/files... Created pipelines.nyc_taxi_pipeline Created pipelines.nyc_taxi_pipeline.permissions -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_user_name_different @@ -43,7 +43,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name_different/files... Created pipelines.nyc_taxi_pipeline Created pipelines.nyc_taxi_pipeline.permissions -Files: 10 uploaded, 0 deleted +Files: 9 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_service_principal_name @@ -66,7 +66,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name/files... Created pipelines.nyc_taxi_pipeline Created pipelines.nyc_taxi_pipeline.permissions -Files: 12 uploaded, 0 deleted +Files: 11 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_service_principal_name_different @@ -89,5 +89,5 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name_different/files... Created pipelines.nyc_taxi_pipeline Created pipelines.nyc_taxi_pipeline.permissions -Files: 14 uploaded, 0 deleted +Files: 13 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/scripts/output.txt b/acceptance/bundle/scripts/output.txt index e3ca4fd7d76..71da6fc33ab 100644 --- a/acceptance/bundle/scripts/output.txt +++ b/acceptance/bundle/scripts/output.txt @@ -46,7 +46,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/scripts/default/fi Executing 'postdeploy' script from myscript.py 0 postdeploy: hello stdout! from myscript.py 0 postdeploy: hello stderr! -Files: 12 uploaded, 0 deleted +Files: 11 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> EXITCODE=0 POSTDEPLOY_EXITCODE=1 errcode [CLI] bundle deploy diff --git a/acceptance/bundle/scripts/restricted-execution/output.txt b/acceptance/bundle/scripts/restricted-execution/output.txt index e54241bc90a..e4018b8416b 100644 --- a/acceptance/bundle/scripts/restricted-execution/output.txt +++ b/acceptance/bundle/scripts/restricted-execution/output.txt @@ -14,7 +14,7 @@ predeploy value_from_env Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/scripts_with_restricted_execution/default/files... Executing 'postdeploy' script postdeploy value_from_env -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === With DATABRICKS_BUNDLE_RESTRICTED_CODE_EXECUTION=1, no envs are accessible diff --git a/acceptance/bundle/select/basic/output.txt b/acceptance/bundle/select/basic/output.txt index dfd8beec3fd..0d84ac9c569 100644 --- a/acceptance/bundle/select/basic/output.txt +++ b/acceptance/bundle/select/basic/output.txt @@ -26,7 +26,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged, 1 not selected Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-[UNIQUE_NAME]/default/files... Created jobs.bar Created jobs.foo -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged, 1 not selected === Telemetry: diff --git a/acceptance/bundle/select/grants_permissions/output.txt b/acceptance/bundle/select/grants_permissions/output.txt index 45e993bed28..0912c16da8b 100644 --- a/acceptance/bundle/select/grants_permissions/output.txt +++ b/acceptance/bundle/select/grants_permissions/output.txt @@ -23,7 +23,7 @@ Error: no such resource: schemas.my_schema.grants Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-subnodes-[UNIQUE_NAME]/default/files... Created jobs.my_job Created jobs.my_job.permissions -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged, 2 not selected === bundle deploy --select schemas.my_schema diff --git a/acceptance/bundle/select/plan_file_survives_not_selected/output.txt b/acceptance/bundle/select/plan_file_survives_not_selected/output.txt index 4e6ce7d7c12..65005bdd6ec 100644 --- a/acceptance/bundle/select/plan_file_survives_not_selected/output.txt +++ b/acceptance/bundle/select/plan_file_survives_not_selected/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle deploy --plan plan.json Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-plan-[UNIQUE_NAME]/default/files... Created jobs.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged, 2 not selected >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/state/basic/output.txt b/acceptance/bundle/state/basic/output.txt index b6b1540e18c..eb014557b08 100644 --- a/acceptance/bundle/state/basic/output.txt +++ b/acceptance/bundle/state/basic/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/state/default/files... Created jobs.test -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy diff --git a/acceptance/bundle/state/engine_default/output.txt b/acceptance/bundle/state/engine_default/output.txt index a067f5658a0..ecdfc4d3658 100644 --- a/acceptance/bundle/state/engine_default/output.txt +++ b/acceptance/bundle/state/engine_default/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-engine-default/default/files... Created schemas.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //api/2.1/unity-catalog/schemas diff --git a/acceptance/bundle/state/feature_flags/output.txt b/acceptance/bundle/state/feature_flags/output.txt index fa2c94b058f..df55e7c6cee 100644 --- a/acceptance/bundle/state/feature_flags/output.txt +++ b/acceptance/bundle/state/feature_flags/output.txt @@ -15,7 +15,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.my_job -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> gron.py .databricks/bundle/default/resources.json diff --git a/acceptance/bundle/state/force_pull_commands/output.txt b/acceptance/bundle/state/force_pull_commands/output.txt index b1c245da77c..5a0a6712097 100644 --- a/acceptance/bundle/state/force_pull_commands/output.txt +++ b/acceptance/bundle/state/force_pull_commands/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/force-pull-commands/default/files... Created jobs.foo -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Use a fake browser that just prints the URL it would have opened diff --git a/acceptance/bundle/state/permission_level_migration/output.txt b/acceptance/bundle/state/permission_level_migration/output.txt index 8fabc1b1a46..c0729998f5a 100644 --- a/acceptance/bundle/state/permission_level_migration/output.txt +++ b/acceptance/bundle/state/permission_level_migration/output.txt @@ -7,7 +7,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.my_job Updated jobs.my_job.permissions -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 1 changed, 0 deleted, 0 unchanged === Print state after deploy diff --git a/acceptance/bundle/state/state_present/output.txt b/acceptance/bundle/state/state_present/output.txt index 6b524cb1730..60d2f22541d 100644 --- a/acceptance/bundle/state/state_present/output.txt +++ b/acceptance/bundle/state/state_present/output.txt @@ -4,7 +4,7 @@ >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created schemas.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //api/2.1/unity-catalog/schemas @@ -52,7 +52,7 @@ Destroy: 1 deleted >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created schemas.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //api/2.1/unity-catalog/schemas diff --git a/acceptance/bundle/summary/modified_status/output.txt b/acceptance/bundle/summary/modified_status/output.txt index 7f9656a20b3..9b767f45254 100644 --- a/acceptance/bundle/summary/modified_status/output.txt +++ b/acceptance/bundle/summary/modified_status/output.txt @@ -73,7 +73,7 @@ Created alerts.my_alert Created pipelines.my_pipeline Created schemas.my_schema Created sql_warehouses.my_sql_warehouse -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 4 created, 0 changed, 0 deleted, 0 unchanged === Post-deployment view of resources with id and without modified_status diff --git a/acceptance/bundle/sync/dryrun/script b/acceptance/bundle/sync/dryrun/script index 10b501d9de4..7012af83248 100644 --- a/acceptance/bundle/sync/dryrun/script +++ b/acceptance/bundle/sync/dryrun/script @@ -5,7 +5,6 @@ cat > .gitignore << EOF ignored-folder/ script output.txt -repls.json EOF cleanup() { diff --git a/acceptance/bundle/sync/script b/acceptance/bundle/sync/script index b3fb2a7d62a..828c3d11eab 100644 --- a/acceptance/bundle/sync/script +++ b/acceptance/bundle/sync/script @@ -5,7 +5,6 @@ cat > .gitignore << EOF ignored-folder/ script output.txt -repls.json EOF cleanup() { diff --git a/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt b/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt index d70237a828c..e672093a843 100644 --- a/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt +++ b/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-remote-sync-recreate/default/files... Created pipelines.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle config-remote-sync diff --git a/acceptance/bundle/telemetry/config-remote-sync-save/output.txt b/acceptance/bundle/telemetry/config-remote-sync-save/output.txt index ce93941675c..b5a8c39aa30 100644 --- a/acceptance/bundle/telemetry/config-remote-sync-save/output.txt +++ b/acceptance/bundle/telemetry/config-remote-sync-save/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-remote-sync-save/default/files... Created jobs.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle config-remote-sync --save diff --git a/acceptance/bundle/telemetry/config-remote-sync/output.txt b/acceptance/bundle/telemetry/config-remote-sync/output.txt index c8525b0f72d..a14ae698f6c 100644 --- a/acceptance/bundle/telemetry/config-remote-sync/output.txt +++ b/acceptance/bundle/telemetry/config-remote-sync/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-remote-sync-telemetry/default/files... Created jobs.foo -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle config-remote-sync diff --git a/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt b/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt index 4e31891f05d..038bb233e00 100644 --- a/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt +++ b/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt @@ -3,7 +3,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... ✓ Deployment succeeded Created apps.myapp -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt diff --git a/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt b/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt index b0f4bc0f69f..3bdb9f9a34a 100644 --- a/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt +++ b/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt @@ -1,12 +1,12 @@ >>> [CLI] bundle deploy -t one Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy -t two Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/two/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt diff --git a/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt b/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt index f8a336b0e05..0740e94664e 100644 --- a/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt +++ b/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt @@ -4,7 +4,7 @@ Building test_artifact... Uploading databricks.yml... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-artifacts-variables/dev/files... Created jobs.test-job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === No artifact metrics expected @@ -15,7 +15,7 @@ Building test_artifact... Uploading databricks.yml... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-artifacts-variables/prod/files... Created jobs.test-job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Artifact metrics expected diff --git a/acceptance/bundle/telemetry/deploy-compute-type/output.txt b/acceptance/bundle/telemetry/deploy-compute-type/output.txt index 39e5ea8516e..5bba6b50219 100644 --- a/acceptance/bundle/telemetry/deploy-compute-type/output.txt +++ b/acceptance/bundle/telemetry/deploy-compute-type/output.txt @@ -2,13 +2,13 @@ >>> [CLI] bundle deploy -t one Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-compute-type/one/files... Created jobs.my_job -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy -t two Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-compute-type/two/files... Created jobs.my_job -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values diff --git a/acceptance/bundle/telemetry/deploy-config-file-count/output.txt b/acceptance/bundle/telemetry/deploy-config-file-count/output.txt index d15ac847210..afa8730c60d 100644 --- a/acceptance/bundle/telemetry/deploy-config-file-count/output.txt +++ b/acceptance/bundle/telemetry/deploy-config-file-count/output.txt @@ -1,7 +1,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt diff --git a/acceptance/bundle/telemetry/deploy-experimental/output.txt b/acceptance/bundle/telemetry/deploy-experimental/output.txt index 7a0ea9086e6..3dab7aeee55 100644 --- a/acceptance/bundle/telemetry/deploy-experimental/output.txt +++ b/acceptance/bundle/telemetry/deploy-experimental/output.txt @@ -6,7 +6,7 @@ Warning: You are using the legacy mode of run_as. The support for this mode is e Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values diff --git a/acceptance/bundle/telemetry/deploy-mode/output.txt b/acceptance/bundle/telemetry/deploy-mode/output.txt index 28a34151103..2f6c4e10115 100644 --- a/acceptance/bundle/telemetry/deploy-mode/output.txt +++ b/acceptance/bundle/telemetry/deploy-mode/output.txt @@ -1,7 +1,7 @@ >>> [CLI] bundle deploy -t dev Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy -t prod @@ -12,7 +12,7 @@ A common practice is to use a username or principal name in this path, i.e. use root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target} Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/prod/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt diff --git a/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt b/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt index 676fbc2fe65..7b6a86612ac 100644 --- a/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt +++ b/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/custom-prefix/default/files... Created schemas.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values diff --git a/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt b/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt index c68ee2ed430..748e566b01b 100644 --- a/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt +++ b/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/development-prefix/development/files... Created schemas.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values diff --git a/acceptance/bundle/telemetry/deploy-no-uuid/output.txt b/acceptance/bundle/telemetry/deploy-no-uuid/output.txt index 5675d73cd58..504928739ce 100644 --- a/acceptance/bundle/telemetry/deploy-no-uuid/output.txt +++ b/acceptance/bundle/telemetry/deploy-no-uuid/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.job_one -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt diff --git a/acceptance/bundle/telemetry/deploy-run-as/output.txt b/acceptance/bundle/telemetry/deploy-run-as/output.txt index 9d9bc9cf7c5..b6644233011 100644 --- a/acceptance/bundle/telemetry/deploy-run-as/output.txt +++ b/acceptance/bundle/telemetry/deploy-run-as/output.txt @@ -2,7 +2,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Created jobs.test_job -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt diff --git a/acceptance/bundle/telemetry/deploy-target-count/output.txt b/acceptance/bundle/telemetry/deploy-target-count/output.txt index 67187dc8a3b..3e2a5d18036 100644 --- a/acceptance/bundle/telemetry/deploy-target-count/output.txt +++ b/acceptance/bundle/telemetry/deploy-target-count/output.txt @@ -1,7 +1,7 @@ >>> [CLI] bundle deploy -t one Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt diff --git a/acceptance/bundle/telemetry/deploy-variable-count/output.txt b/acceptance/bundle/telemetry/deploy-variable-count/output.txt index bacf52bf1e5..dee95ec234b 100644 --- a/acceptance/bundle/telemetry/deploy-variable-count/output.txt +++ b/acceptance/bundle/telemetry/deploy-variable-count/output.txt @@ -1,7 +1,7 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt diff --git a/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt b/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt index 2f23d2089da..17f2a710af8 100644 --- a/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt +++ b/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt @@ -3,14 +3,14 @@ Building test... Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files... -Files: 11 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy -t two Building test... Uploading .databricks/bundle/two/patched_wheels/test_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/two/files... -Files: 11 uploaded, 0 deleted +Files: 10 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values diff --git a/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt b/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt index 31ec43ca52b..647d4ad3084 100644 --- a/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt +++ b/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt @@ -1,7 +1,7 @@ >>> [CLI] bundle deploy -t no_permissions Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/no_permissions/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values @@ -18,7 +18,7 @@ state_path_other false >>> [CLI] bundle deploy -t user_declared Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/user_declared/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values @@ -47,7 +47,7 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more in databricks.yml:23:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/user_not_declared/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values @@ -64,7 +64,7 @@ state_path_other false >>> [CLI] bundle deploy -t other_user_not_declared Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/other_user_not_declared/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values @@ -81,7 +81,7 @@ state_path_other false >>> [CLI] bundle deploy -t workspace_other Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/workspace_other/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values @@ -110,7 +110,7 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more in databricks.yml:47:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/shared_users_can_manage/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values @@ -127,7 +127,7 @@ state_path_other false >>> [CLI] bundle deploy -t shared_not_declared Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/shared_not_declared/files... -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values diff --git a/acceptance/bundle/templates/record-deployment-history/script b/acceptance/bundle/templates/record-deployment-history/script index bad50ccad90..6a5762952ff 100644 --- a/acceptance/bundle/templates/record-deployment-history/script +++ b/acceptance/bundle/templates/record-deployment-history/script @@ -14,4 +14,4 @@ done # Keep one file in full to assert where the stanza lands in the document. mv output/default-python/my_default_python/databricks.yml out.default-python.databricks.yml -add_repl.py "$(grep -o 'uuid: .*' out.default-python.databricks.yml | cut -d ' ' -f2)" BUNDLE_UUID +add_repl "$(grep -o 'uuid: .*' out.default-python.databricks.yml | cut -d ' ' -f2)" BUNDLE_UUID diff --git a/acceptance/bundle/validate/immutable_workspace_paths/databricks.yml b/acceptance/bundle/validate/immutable_workspace_paths/databricks.yml index 001b2efbcc7..eec3c3e5158 100644 --- a/acceptance/bundle/validate/immutable_workspace_paths/databricks.yml +++ b/acceptance/bundle/validate/immutable_workspace_paths/databricks.yml @@ -7,8 +7,6 @@ experimental: sync: exclude: # Test framework files that are not part of the bundle source. - - "repls.json" - - "user_repls.json" - "script" - "*.toml" diff --git a/acceptance/bundle/validate/immutable_workspace_paths/output.txt b/acceptance/bundle/validate/immutable_workspace_paths/output.txt index fef8083634f..a41638ba774 100644 --- a/acceptance/bundle/validate/immutable_workspace_paths/output.txt +++ b/acceptance/bundle/validate/immutable_workspace_paths/output.txt @@ -1,9 +1,5 @@ >>> [CLI] bundle validate -o json -Warning: Pattern user_repls.json does not match any files - at sync.exclude[1] - in databricks.yml:11:7 - { "workspace": { "artifact_path": "/Workspace/Users/[USERNAME]/.bundle/my-bundle/default/artifacts", diff --git a/acceptance/bundle/validate/sync_patterns/output.txt b/acceptance/bundle/validate/sync_patterns/output.txt index 519ea366385..4c60cd567f3 100644 --- a/acceptance/bundle/validate/sync_patterns/output.txt +++ b/acceptance/bundle/validate/sync_patterns/output.txt @@ -23,5 +23,5 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/variables/lookup/script b/acceptance/bundle/variables/lookup/script index 462aefa4df4..58e451daaed 100644 --- a/acceptance/bundle/variables/lookup/script +++ b/acceptance/bundle/variables/lookup/script @@ -2,7 +2,7 @@ # provisioned in the cloud env, and we fall back to the name the local testserver # reports so the test passes in both. Mask it to a stable placeholder either way. export TEST_SP_DISPLAY_NAME="${TEST_SP_DISPLAY_NAME:-deco-test-spn}" -echo "$TEST_SP_DISPLAY_NAME:TEST_SP_DISPLAY_NAME" >> ACC_REPLS +add_repl "$TEST_SP_DISPLAY_NAME" TEST_SP_DISPLAY_NAME envsubst < databricks.yml.tmpl > databricks.yml trace $CLI bundle validate -o json | jq '.variables' diff --git a/acceptance/cache/simple/output.txt b/acceptance/cache/simple/output.txt index 7c707dfe0aa..4a7dfdc7e1d 100644 --- a/acceptance/cache/simple/output.txt +++ b/acceptance/cache/simple/output.txt @@ -17,7 +17,7 @@ >>> [CLI] bundle deploy -p dogfood Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/exploratory-cache-test/default/files... -Files: 8 uploaded, 0 deleted +Files: 7 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values diff --git a/acceptance/cmd/completion/script b/acceptance/cmd/completion/script index e5b0f324d65..d315d83839a 100644 --- a/acceptance/cmd/completion/script +++ b/acceptance/cmd/completion/script @@ -1,7 +1,7 @@ sethome "./home" # Track the home path for stable output across platforms. -add_repl.py "$HOME" HOME +add_repl "$HOME" HOME # Prevent Homebrew detection from affecting status output. export HOMEBREW_PREFIX=/nonexistent diff --git a/acceptance/cmd/sync-from-file/gitignore.test-fixture b/acceptance/cmd/sync-from-file/gitignore.test-fixture index eb483118609..48d52fd8cca 100644 --- a/acceptance/cmd/sync-from-file/gitignore.test-fixture +++ b/acceptance/cmd/sync-from-file/gitignore.test-fixture @@ -1,4 +1,3 @@ ignored-folder/ script output.txt -repls.json diff --git a/acceptance/cmd/sync/dryrun-missing-remote/script b/acceptance/cmd/sync/dryrun-missing-remote/script index 1cfd1e22215..65fb16ed000 100644 --- a/acceptance/cmd/sync/dryrun-missing-remote/script +++ b/acceptance/cmd/sync/dryrun-missing-remote/script @@ -5,7 +5,6 @@ script test.toml output.txt out.requests.txt -repls.json EOF # Use an ephemeral remote directory so concurrent test runs do not interfere. diff --git a/acceptance/cmd/sync/dryrun/script b/acceptance/cmd/sync/dryrun/script index e298c777b33..4018acf8872 100644 --- a/acceptance/cmd/sync/dryrun/script +++ b/acceptance/cmd/sync/dryrun/script @@ -9,7 +9,6 @@ cat > .gitignore << EOF ignored-folder/ script output.txt -repls.json EOF cleanup() { diff --git a/acceptance/cmd/sync/script b/acceptance/cmd/sync/script index 6d41a67b92f..67edd91facc 100644 --- a/acceptance/cmd/sync/script +++ b/acceptance/cmd/sync/script @@ -9,7 +9,6 @@ cat > .gitignore << EOF ignored-folder/ script output.txt -repls.json EOF cleanup() { diff --git a/acceptance/cmd/workspace/apps/run-local-node/script b/acceptance/cmd/workspace/apps/run-local-node/script index 58a139975b5..9749e979748 100755 --- a/acceptance/cmd/workspace/apps/run-local-node/script +++ b/acceptance/cmd/workspace/apps/run-local-node/script @@ -2,8 +2,8 @@ cd app # Ports are allocated per run so that tests in parallel worktrees do not collide. read -r APP_PORT PROXY_PORT DEBUG_PORT PREPARE_PORT <<< "$(free_port.py 4)" -add_repl.py "$PROXY_PORT" PROXY_PORT -add_repl.py "$DEBUG_PORT" DEBUG_PORT +add_repl "$PROXY_PORT" PROXY_PORT +add_repl "$DEBUG_PORT" DEBUG_PORT # The app and the proxy start asynchronously; allow up to 15s for them to come up. export RETRY_MAX_ATTEMPTS=30 diff --git a/acceptance/cmd/workspace/apps/run-local/script b/acceptance/cmd/workspace/apps/run-local/script index 2f293db29bb..fd8b8b3c23e 100755 --- a/acceptance/cmd/workspace/apps/run-local/script +++ b/acceptance/cmd/workspace/apps/run-local/script @@ -2,8 +2,8 @@ cd app # Ports are allocated per run so that tests in parallel worktrees do not collide. read -r APP_PORT PROXY_PORT ENTRY_POINT_PORT <<< "$(free_port.py 3)" -add_repl.py "$APP_PORT" APP_PORT -add_repl.py "$PROXY_PORT" PROXY_PORT +add_repl "$APP_PORT" APP_PORT +add_repl "$PROXY_PORT" PROXY_PORT # The app and the proxy start asynchronously; allow up to 15s for them to come up. export RETRY_MAX_ATTEMPTS=30 diff --git a/acceptance/pipelines/deploy/auto-approve/output.txt b/acceptance/pipelines/deploy/auto-approve/output.txt index 8daf35b0b58..2cf23854fa5 100644 --- a/acceptance/pipelines/deploy/auto-approve/output.txt +++ b/acceptance/pipelines/deploy/auto-approve/output.txt @@ -2,7 +2,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-auto-approve/default/files... Created pipelines.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/deploy/create-pipeline/output.txt b/acceptance/pipelines/deploy/create-pipeline/output.txt index cae62e4d516..d246bb34a32 100644 --- a/acceptance/pipelines/deploy/create-pipeline/output.txt +++ b/acceptance/pipelines/deploy/create-pipeline/output.txt @@ -2,7 +2,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-create-pipeline/default/files... Created pipelines.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/deploy/fail-on-active-runs/output.txt b/acceptance/pipelines/deploy/fail-on-active-runs/output.txt index 0c2ab19415c..d23ef8dc134 100644 --- a/acceptance/pipelines/deploy/fail-on-active-runs/output.txt +++ b/acceptance/pipelines/deploy/fail-on-active-runs/output.txt @@ -2,7 +2,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline-fail-on-active-runs/default/files... Created pipelines.my_pipeline -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/deploy/force-lock/output.txt b/acceptance/pipelines/deploy/force-lock/output.txt index 52b007c8928..fca48cb828e 100644 --- a/acceptance/pipelines/deploy/force-lock/output.txt +++ b/acceptance/pipelines/deploy/force-lock/output.txt @@ -18,6 +18,6 @@ Exit code: 1 >>> [CLI] pipelines deploy --force-lock Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-force-lock/default/files... Created pipelines.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt b/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt index a64595f5f54..ce9c23bcc49 100644 --- a/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt +++ b/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt @@ -6,7 +6,7 @@ Warning: unknown field: unknown_property Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/render-diagnostics-warning-pipeline/default/files... Created pipelines.test-pipeline -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline test-pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/deploy/var-flag/output.txt b/acceptance/pipelines/deploy/var-flag/output.txt index 5b44b3c5169..82c4220330f 100644 --- a/acceptance/pipelines/deploy/var-flag/output.txt +++ b/acceptance/pipelines/deploy/var-flag/output.txt @@ -3,7 +3,7 @@ >>> [CLI] pipelines deploy --var=catalog=custom_catalog --var=schema=custom_schema --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-var-flag/default/files... Created pipelines.foo -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/destroy/auto-approve/output.txt b/acceptance/pipelines/destroy/auto-approve/output.txt index e7ce7c81a1e..518ba08b816 100644 --- a/acceptance/pipelines/destroy/auto-approve/output.txt +++ b/acceptance/pipelines/destroy/auto-approve/output.txt @@ -3,7 +3,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy/default/files... Created pipelines.my_pipeline -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt b/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt index d6e07df900d..8eab6bf9bf6 100644 --- a/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt +++ b/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt @@ -3,7 +3,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade-divergence/default/files... Created pipelines.my_pipeline -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt b/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt index 39247ee62e4..16020a0b91b 100644 --- a/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt +++ b/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt @@ -3,7 +3,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade/default/files... Created pipelines.my_pipeline -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/destroy/destroy-pipeline/output.txt b/acceptance/pipelines/destroy/destroy-pipeline/output.txt index 6f5f4172629..25d35ff3d50 100644 --- a/acceptance/pipelines/destroy/destroy-pipeline/output.txt +++ b/acceptance/pipelines/destroy/destroy-pipeline/output.txt @@ -3,7 +3,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy/default/files... Created pipelines.my_pipeline -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/destroy/force-lock/output.txt b/acceptance/pipelines/destroy/force-lock/output.txt index 9eced6e8e48..2b58acb0ff1 100644 --- a/acceptance/pipelines/destroy/force-lock/output.txt +++ b/acceptance/pipelines/destroy/force-lock/output.txt @@ -2,7 +2,7 @@ >>> errcode [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-force-lock/default/files... Created pipelines.foo -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt b/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt index c2918e4a7fc..4393092f4e1 100644 --- a/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt +++ b/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt @@ -2,7 +2,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run/default/files... Created pipelines.my_pipeline -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/dry-run/no-wait/output.txt b/acceptance/pipelines/dry-run/no-wait/output.txt index 8944b38b7b7..0bbd6abd94f 100644 --- a/acceptance/pipelines/dry-run/no-wait/output.txt +++ b/acceptance/pipelines/dry-run/no-wait/output.txt @@ -2,7 +2,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files... Created pipelines.my_pipeline -Files: 4 uploaded, 0 deleted +Files: 3 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/dry-run/restart/output.txt b/acceptance/pipelines/dry-run/restart/output.txt index b58ce0cc3e4..c36de93072a 100644 --- a/acceptance/pipelines/dry-run/restart/output.txt +++ b/acceptance/pipelines/dry-run/restart/output.txt @@ -2,7 +2,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files... Created pipelines.my_pipeline -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/open/open-after-deployment/output.txt b/acceptance/pipelines/open/open-after-deployment/output.txt index e5000117d36..a6749fc73c9 100644 --- a/acceptance/pipelines/open/open-after-deployment/output.txt +++ b/acceptance/pipelines/open/open-after-deployment/output.txt @@ -8,7 +8,7 @@ Exit code: 1 >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipelines-open/default/files... Created pipelines.test-pipelines-open -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline test-pipelines-open here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/run/no-wait/output.txt b/acceptance/pipelines/run/no-wait/output.txt index 8bf97b32855..8b348f78f11 100644 --- a/acceptance/pipelines/run/no-wait/output.txt +++ b/acceptance/pipelines/run/no-wait/output.txt @@ -2,7 +2,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files... Created pipelines.my_pipeline -Files: 5 uploaded, 0 deleted +Files: 4 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/run/refresh-flags/output.txt b/acceptance/pipelines/run/refresh-flags/output.txt index 6181f2a9bce..c5ddaf2560f 100644 --- a/acceptance/pipelines/run/refresh-flags/output.txt +++ b/acceptance/pipelines/run/refresh-flags/output.txt @@ -2,7 +2,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files... Created pipelines.my_pipeline -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/run/restart/output.txt b/acceptance/pipelines/run/restart/output.txt index 4ad48265c8a..603377e20ca 100644 --- a/acceptance/pipelines/run/restart/output.txt +++ b/acceptance/pipelines/run/restart/output.txt @@ -2,7 +2,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files... Created pipelines.my_pipeline -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/run/run-info/output.txt b/acceptance/pipelines/run/run-info/output.txt index af7ae65fbfa..cd73b119258 100644 --- a/acceptance/pipelines/run/run-info/output.txt +++ b/acceptance/pipelines/run/run-info/output.txt @@ -2,7 +2,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run/default/files... Created pipelines.my_pipeline -Files: 6 uploaded, 0 deleted +Files: 5 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/stop/output.txt b/acceptance/pipelines/stop/output.txt index 85323e7dc27..959571effea 100644 --- a/acceptance/pipelines/stop/output.txt +++ b/acceptance/pipelines/stop/output.txt @@ -2,7 +2,7 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-stop/default/files... Created pipelines.my_pipeline -Files: 7 uploaded, 0 deleted +Files: 6 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/script.prepare b/acceptance/script.prepare index c5dc9612120..d71d37aae9b 100644 --- a/acceptance/script.prepare +++ b/acceptance/script.prepare @@ -109,6 +109,12 @@ retry() { env -u MSYS_NO_PATHCONV retry.py "$@" } +add_repl() { + # Same MSYS_NO_PATHCONV workaround as envsubst above: otherwise Python cannot + # find add_repl.py on Windows. + env -u MSYS_NO_PATHCONV add_repl.py "$@" +} + # The engine_terraform_* keys reflect the deployment engine opt-in; engine_terraform_env # in particular mirrors $DATABRICKS_BUNDLE_ENGINE, which the acceptance matrix sets per # variant, so it diverges across the matrix. Drop both here so this shared helper stays diff --git a/acceptance/selftest/acc_repls/output.txt b/acceptance/selftest/acc_repls/output.txt index a4a044b6387..1f0afec6e84 100644 --- a/acceptance/selftest/acc_repls/output.txt +++ b/acceptance/selftest/acc_repls/output.txt @@ -1,4 +1,5 @@ my job is [JOB_ID] -echo "$job_id:JOB_ID" >> ACC_REPLS -echo "[MY_TEXT]:MY_TEXT" >> ACC_REPLS -grep ACC_REPLS script +my text is [MY_TEXT] +my json is [CURLY] +my tricky value is [TRICKY] +{"value": "[TRICKY]"} diff --git a/acceptance/selftest/acc_repls/script b/acceptance/selftest/acc_repls/script index 871fa13ad23..2ed324a85b5 100644 --- a/acceptance/selftest/acc_repls/script +++ b/acceptance/selftest/acc_repls/script @@ -1,6 +1,15 @@ job_id=100200300 +add_repl "$job_id" JOB_ID + +# Values that cannot be encoded as plain text: a colon, a leading curly brace, quotes and backslashes. +add_repl "ABCD:EFG" MY_TEXT +add_repl '{"a": 1}' CURLY +add_repl 'back\slash "quoted"' TRICKY + echo "my job is $job_id" -echo "$job_id:JOB_ID" >> ACC_REPLS -echo "ABCD:EFG:MY_TEXT" >> ACC_REPLS +echo "my text is ABCD:EFG" +echo 'my json is {"a": 1}' +echo 'my tricky value is back\slash "quoted"' -grep ACC_REPLS script +# The JSON-encoded form of the value is replaced as well. +echo '{"value": "back\\slash \"quoted\""}' diff --git a/acceptance/workspace/lakeview/publish/script b/acceptance/workspace/lakeview/publish/script index 5bef1846f33..93b0044ecc1 100644 --- a/acceptance/workspace/lakeview/publish/script +++ b/acceptance/workspace/lakeview/publish/script @@ -3,5 +3,5 @@ trace $CLI workspace mkdirs /Users/tester@databricks.com trace $CLI lakeview create --json '{"display_name": "Test Dashboard", "parent_path": "/Users/tester@databricks.com", "warehouse_id": "test-warehouse"}' -o json > tmp.json dashboard_id=$(jq -r .dashboard_id < tmp.json) rm tmp.json -echo "$dashboard_id:DASHBOARD_ID" >> ACC_REPLS +add_repl "$dashboard_id" DASHBOARD_ID trace $CLI lakeview publish $dashboard_id