Skip to content

acc: extract common repls; support order for repls #2972

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions acceptance/acceptance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"github.com/databricks/cli/internal/testutil"
"github.com/databricks/cli/libs/auth"
"github.com/databricks/cli/libs/testdiff"
"github.com/databricks/cli/libs/testserver"
"github.com/databricks/cli/libs/utils"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -472,12 +471,6 @@ func runTest(t *testing.T,
// User replacements:
repls.Repls = append(repls.Repls, config.Repls...)

// Apply these after user replacements in case user replacement capture something like "Job \d+"
for offset := range 5 {
repls.Set(strconv.Itoa(testserver.TestJobID+offset), fmt.Sprintf("[TEST_JOB_ID+%d]", offset))
repls.Set(strconv.Itoa(testserver.TestRunID+offset), fmt.Sprintf("[TEST_RUN_ID+%d]", offset))
}

// 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)
Expand Down
52 changes: 26 additions & 26 deletions acceptance/bundle/artifacts/whl_dynamic/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,29 @@

>>> [CLI] bundle deploy
Building my_test_code...
Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
Uploading .databricks/bundle/default/patched_wheels/my_test_code_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/default/files...
Deploying resources...
Updating deployment state...
Deployment complete!

=== There are 2 original wheels and 2 patched ones
>>> find.py --expect 4 whl
.databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl
.databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl
.databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl
.databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl
my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
prebuilt/other_test_code-0.0.1-py3-none-any.whl

=== Verify contents of the zip file
>>> find.py --expect 1 .databricks/.*my_test_code.*whl
src/__init__.py
src/__main__.py
my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/METADATA
my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/WHEEL
my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/entry_points.txt
my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/top_level.txt
my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/METADATA
my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/WHEEL
my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/entry_points.txt
my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/top_level.txt
my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD

=== Expecting 2 patched wheels in libraries section in /jobs/create
>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
Expand All @@ -64,7 +64,7 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
"existing_cluster_id": "0717-132531-5opeqon1",
"libraries": [
{
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
}
],
"python_wheel_task": {
Expand All @@ -76,10 +76,10 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
},
"libraries": [
{
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
},
{
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
}
],
"python_wheel_task": {
Expand All @@ -92,16 +92,16 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD

=== Expecting 2 patched wheels to be uploaded
>>> jq .path
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/prebuilt/other_test_code-0.0.1-py3-none-any.whl"

=== Updating the local wheel and deploying again
>>> [CLI] bundle deploy
Building my_test_code...
Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
Uploading .databricks/bundle/default/patched_wheels/my_test_code_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/default/files...
Deploying resources...
Updating deployment state...
Expand All @@ -112,11 +112,11 @@ Deployment complete!
src/__init__.py
src/__main__.py
src/new_module.py
my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/METADATA
my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/WHEEL
my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/entry_points.txt
my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/top_level.txt
my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/METADATA
my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/WHEEL
my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/entry_points.txt
my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/top_level.txt
my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD

=== Expecting 2 patched wheels in libraries section in /jobs/reset
>>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks out.requests.txt
Expand All @@ -137,7 +137,7 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
"existing_cluster_id": "0717-132531-5opeqon1",
"libraries": [
{
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
}
],
"python_wheel_task": {
Expand All @@ -149,10 +149,10 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
},
"libraries": [
{
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
},
{
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
}
],
"python_wheel_task": {
Expand All @@ -165,6 +165,6 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD

=== Expecting 2 pached wheels to be uploaded (Bad: it is currently uploaded twice)
>>> jq .path
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@

>>> errcode [CLI] bundle deploy
Uploading this_dab/.databricks/bundle/default/patched_wheels/art1_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
Uploading this_dab/.databricks/bundle/default/patched_wheels/art2_other_test_code/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
Uploading this_dab/.databricks/bundle/default/patched_wheels/art1_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
Uploading this_dab/.databricks/bundle/default/patched_wheels/art2_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files...
Deploying resources...
Updating deployment state...
Deployment complete!

=== Expecting to find two patched wheels in current directory
>>> find.py --expect 2 whl
.databricks/bundle/default/patched_wheels/art1_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl
.databricks/bundle/default/patched_wheels/art2_other_test_code/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl
.databricks/bundle/default/patched_wheels/art1_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl
.databricks/bundle/default/patched_wheels/art2_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl

=== Expecting 2 wheels in libraries section in /jobs/create
>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
Expand All @@ -27,10 +27,10 @@ Deployment complete!
"existing_cluster_id": "0717-132531-5opeqon1",
"libraries": [
{
"whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
},
{
"whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
}
],
"python_wheel_task": {
Expand All @@ -48,14 +48,14 @@ Deployment complete!
"spec": {
"client": "1",
"dependencies": [
"/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl",
"/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl",
"/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
]
}
}
]

=== Expecting 2 wheels to be uploaded
>>> jq .path
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
2 changes: 1 addition & 1 deletion acceptance/bundle/deploy/experimental-python/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Deployment complete!
>>> [CLI] jobs list --output json
[
{
"job_id": [TEST_JOB_ID+0],
"job_id": [NUMID],
"settings": {
"deployment": {
"kind": "BUNDLE",
Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/deploy/fail-on-active-runs/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Updating deployment state...
Deployment complete!

>>> errcode [CLI] bundle deploy --fail-on-active-runs
Error: job [TEST_JOB_ID+0] is running
Error: job [NUMID] is running


Exit code: 1
Expand Down
4 changes: 0 additions & 4 deletions acceptance/bundle/deploy/jobs/check-metadata/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,3 @@ Ignore = [
# C:/Program Files/Git/Users/$username/UNIQUE_NAME before passing it to the CLI
# Setting this environment variable prevents that conversion on windows.
MSYS_NO_PATHCONV = "1"

[[Repls]]
Old = "[0-9]{12,}"
New = "[NUMID]"
4 changes: 0 additions & 4 deletions acceptance/bundle/deploy/mlops-stacks/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ Ignore = [
"config.json"
]

[[Repls]]
Old = "[0-9]{12,}"
New = "[NUMID]"

[[Repls]]
Old = '\\'
New = '/'
4 changes: 0 additions & 4 deletions acceptance/bundle/deploy/pipeline/auto-approve/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,3 @@ Cloud = true
Ignore = [
"databricks.yml"
]

[[Repls]]
Old = "[0-9]{3,}"
New = "[NUMID]"
2 changes: 1 addition & 1 deletion acceptance/bundle/deploy/python-notebook/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Deployment complete!
>>> [CLI] jobs list --output json
[
{
"job_id": [TEST_JOB_ID+0],
"job_id": [NUMID],
"settings": {
"deployment": {
"kind": "BUNDLE",
Expand Down
4 changes: 0 additions & 4 deletions acceptance/bundle/deployment/bind/experiment/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ Local = true
Cloud = true
BundleConfigTarget = "databricks.yml"

[[Repls]]
Old = "[0-9]{3,}"
New = "[NUMID]"

[[Server]]
Pattern = "POST /api/2.0/mlflow/experiments/create"
Response.Body = '''
Expand Down
3 changes: 1 addition & 2 deletions acceptance/bundle/destroy/jobs-and-pipeline/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ Updating deployment state...
Deployment complete!

=== Assert the snapshot file exists
>>> ls .databricks/bundle/default/sync-snapshots
[ALPHANUMID].json
>>> find.py --expect 1 ^.databricks/bundle/default/sync-snapshots/[a-z0-9]+\.json

=== Assert bundle deployment path is created
>>> [CLI] workspace get-status //Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]
Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/destroy/jobs-and-pipeline/script
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fi
trace $CLI bundle deploy

title "Assert the snapshot file exists"
trace ls .databricks/bundle/default/sync-snapshots
trace find.py --expect 1 '^.databricks/bundle/default/sync-snapshots/[a-z0-9]+\.json' > /dev/null

title "Assert bundle deployment path is created"
trace $CLI workspace get-status "${DEPLOYMENT_PATH}" | jq '{path, object_type}'
Expand Down
8 changes: 0 additions & 8 deletions acceptance/bundle/destroy/jobs-and-pipeline/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,3 @@ Ignore = [
"resources.yml",
".databricks/"
]

[[Repls]]
Old = "[0-9]{10,}"
New = "[NUMID]"

[[Repls]]
Old = "[0-9a-z]{12,}"
New = "[ALPHANUMID]"
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

>>> [CLI] bundle deploy
Building python_artifact...
Uploading .databricks/bundle/default/patched_wheels/python_artifact_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
Uploading .databricks/bundle/default/patched_wheels/python_artifact_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
Deploying resources...
Updating deployment state...
Expand All @@ -19,7 +19,7 @@ Got arguments:
=== Make a change to code without version change and run the job again
>>> [CLI] bundle deploy
Building python_artifact...
Uploading .databricks/bundle/default/patched_wheels/python_artifact_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
Uploading .databricks/bundle/default/patched_wheels/python_artifact_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
Deploying resources...
Updating deployment state...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

>>> [CLI] bundle deploy
Building my_test_code...
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
Deploying resources...
Updating deployment state...
Expand All @@ -21,7 +21,7 @@ Got arguments:
=== Make a change to code without version change and run the job again
>>> [CLI] bundle deploy
Building my_test_code...
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
Deploying resources...
Updating deployment state...
Expand Down
8 changes: 0 additions & 8 deletions acceptance/bundle/integration_whl/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,3 @@ Ignore = [
"python_wheel_wrapper.yml",
"empty.yml",
]

[[Repls]]
Old = '2\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d'
New = "[TIMESTAMP]"

[[Repls]]
Old = '\d{5,}'
New = "[NUMID]"
6 changes: 3 additions & 3 deletions acceptance/bundle/resources/jobs/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Deployment complete!
"method": "POST",
"path": "/api/2.2/jobs/create"
}
jobs foo id='[TEST_JOB_ID+0]' name='foo'
jobs foo id='[NUMID]' name='foo'

=== Update trigger.periodic.unit and re-deploy
>>> update_file.py databricks.yml DAYS HOURS
Expand All @@ -53,7 +53,7 @@ Deployment complete!
>>> print_requests
{
"body": {
"job_id": [TEST_JOB_ID+0],
"job_id": [NUMID],
"new_settings": {
"deployment": {
"kind": "BUNDLE",
Expand Down Expand Up @@ -87,4 +87,4 @@ Deployment complete!
"method": "POST",
"path": "/api/2.2/jobs/reset"
}
jobs foo id='[TEST_JOB_ID+0]' name='foo'
jobs foo id='[NUMID]' name='foo'
2 changes: 1 addition & 1 deletion acceptance/bundle/resources/pipelines/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ pipelines my id='[UUID]' name='test-pipeline-[UNIQUE_NAME]'
>>> [CLI] pipelines get [UUID]
{
"creator_user_name":"[USERNAME]",
"last_modified":[TIMESTAMP_MS],
"last_modified":[UNIX_TIME_MILLIS],
"name":"test-pipeline-[UNIQUE_NAME]",
"pipeline_id":"[UUID]",
"run_as_user_name":"[USERNAME]",
Expand Down
4 changes: 0 additions & 4 deletions acceptance/bundle/resources/pipelines/test.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
Cloud = true
Ignore = ["bar.py", "foo.py"]

[[Repls]]
Old = '174\d{10}'
New = '[TIMESTAMP_MS]'
Loading
Loading