Skip to content

Commit 51281a1

Browse files
denikdenik
authored
Rename "bundle debug plan" to "bundle plan -o json" (#3919)
1 parent 51df18a commit 51281a1

File tree

51 files changed

+107
-163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+107
-163
lines changed

‎acceptance/bundle/artifacts/whl_dynamic/script‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cp -r $TESTDIR/../whl_prebuilt_multiple/dist/lib/other_test_code-0.0.1-py3-none-
66

77
trace $CLI bundle validate -o json | jq .artifacts
88

9-
$CLI bundle debug plan > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
9+
$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
1010
trace $CLI bundle deploy
1111

1212
title "There are 2 original wheels and 2 patched ones"
@@ -25,7 +25,7 @@ rm out.requests.txt
2525

2626
title "Updating the local wheel and deploying again\n"
2727
touch my_test_code/src/new_module.py
28-
$CLI bundle debug plan > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
28+
$CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
2929
trace $CLI bundle deploy
3030

3131
title "Verify contents, it should now have new_module.py"

‎acceptance/bundle/debug/output.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ Usage:
44
databricks bundle debug [command]
55

66
Available Commands:
7-
plan Show deployment plan in JSON format (experimental)
87
refschema Dump all relevant fields all bundle resources
98
states Show available state files
109

‎acceptance/bundle/resource_deps/id_chain/script‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ print_requests_short() {
1616
trace $CLI bundle plan
1717
trace print_requests
1818

19-
$CLI bundle debug plan > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
19+
$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
2020
trace print_requests
2121

2222
trace $CLI bundle deploy
@@ -25,7 +25,7 @@ trace print_requests_short
2525
trace update_file.py databricks.yml aa_desc aa_new_desc
2626
trace update_file.py databricks.yml prefix new_prefix
2727

28-
$CLI bundle debug plan > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
28+
$CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
2929
trace print_requests
3030

3131
trace $CLI bundle plan
@@ -34,5 +34,5 @@ trace print_requests
3434
trace $CLI bundle deploy
3535
trace print_requests_short
3636

37-
$CLI bundle debug plan > out.plan_skip.$DATABRICKS_BUNDLE_ENGINE.json
37+
$CLI bundle plan -o json > out.plan_skip.$DATABRICKS_BUNDLE_ENGINE.json
3838
trace print_requests

‎acceptance/bundle/resource_deps/id_star/script‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
$CLI bundle debug plan > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
1+
$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json

‎acceptance/bundle/resource_deps/job_id/output.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ create jobs.foo
55

66
Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
77

8-
>>> [CLI] bundle debug plan
8+
>>> [CLI] bundle plan -o json
99

1010
>>> [CLI] bundle deploy
1111
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
@@ -57,7 +57,7 @@ Deployment complete!
5757
}
5858
}
5959

60-
>>> [CLI] bundle debug plan
60+
>>> [CLI] bundle plan -o json
6161

6262
>>> [CLI] bundle deploy
6363
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...

‎acceptance/bundle/resource_deps/job_id/script‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
trace $CLI bundle plan
3-
trace $CLI bundle debug plan > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
3+
trace $CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
44
trace $CLI bundle deploy
55
trace print_requests.py //jobs
66

@@ -11,7 +11,7 @@ bar_id=`read_id.py jobs bar`
1111
echo "$bar_id:BAR_ID" >> ACC_REPLS
1212

1313
cp empty.yml databricks.yml
14-
trace $CLI bundle debug plan > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.json
14+
trace $CLI bundle plan -o json > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.json
1515
trace $CLI bundle deploy
1616
# TODO sorting requests should not be needed one we persist depends_on in state
1717
trace print_requests.py --sort //jobs

‎acceptance/bundle/resource_deps/jobs_update_remote/script‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
echo "*" > .gitignore
2-
$CLI bundle debug plan > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
2+
$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
33
trace $CLI bundle deploy
44
trace print_requests.py //jobs
55

@@ -13,7 +13,7 @@ echo "$bar_id:BAR_ID" >> ACC_REPLS
1313
title "Update trigger.periodic.unit remotely and re-deploy; jobs.bar is unchanged"
1414
trace envsubst < job_update.json > tmp.json && mv tmp.json job_update.json
1515
trace $CLI jobs reset --json @job_update.json
16-
$CLI bundle debug plan > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
16+
$CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
1717

1818
trace $CLI bundle destroy --auto-approve
1919
# Sort, because the order of requests is different. TODO: remember deps in order to delete in reverse deployment order.

‎acceptance/bundle/resource_deps/pipelines_recreate/script‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
echo "*" > .gitignore
33
trace $CLI bundle plan
4-
$CLI bundle debug plan > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
4+
$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
55
trace $CLI bundle deploy
66
trace print_requests.py //jobs //pipelines > out.create.requests.json
77

@@ -16,7 +16,7 @@ trace $CLI bundle plan # empty
1616
title "Update catalog, triggering recreate for pipeline; this means updating downstream deps"
1717
trace update_file.py databricks.yml mycatalog mynewcatalog
1818
trace $CLI bundle plan
19-
$CLI bundle debug plan > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
19+
$CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
2020
trace $CLI bundle deploy --auto-approve
2121
trace print_requests.py //jobs //pipelines > out.update.requests.$DATABRICKS_BUNDLE_ENGINE.json
2222

@@ -32,7 +32,7 @@ rm out.requests.txt
3232

3333
title "Follow up plan & deploy do nothing"
3434
trace $CLI bundle plan
35-
$CLI bundle debug plan > out.plan_noop.$DATABRICKS_BUNDLE_ENGINE.json
35+
$CLI bundle plan -o json > out.plan_noop.$DATABRICKS_BUNDLE_ENGINE.json
3636
trace $CLI bundle deploy
3737
trace print_requests.py //jobs //pipelines
3838

‎acceptance/bundle/resource_deps/remote_pipeline/script‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ print_requests() {
33
rm out.requests.txt
44
}
55

6-
$CLI bundle debug plan > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
6+
$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
77
trace $CLI bundle deploy
88
trace print_requests
9-
$CLI bundle debug plan > out.plan_skip.$DATABRICKS_BUNDLE_ENGINE.json
9+
$CLI bundle plan -o json > out.plan_skip.$DATABRICKS_BUNDLE_ENGINE.json
1010
trace print_requests

‎acceptance/bundle/resource_deps/resources_var/script‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
trace $CLI bundle validate -t dev -o json | jq .resources
2-
$CLI bundle debug plan > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
2+
$CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
33
trace errcode $CLI bundle deploy -t dev &> out.deploy.txt
44
trace jq -s '.[] | select(.path=="/api/2.0/pipelines") | .body.name' out.requests.txt
55
trace print_telemetry_bool_values

0 commit comments

Comments
 (0)