From d94a37c925144a60f14e38fb4845361df3b865bb Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Fri, 9 Jan 2026 15:09:19 +0100 Subject: [PATCH 1/5] acc: Remove DASHBOARD_ID regex with replace_ids.py --- acceptance/bundle/deployment/bind/dashboard/output.txt | 8 ++++---- .../deployment/bind/dashboard/recreation/output.txt | 6 +++--- .../bundle/deployment/bind/dashboard/recreation/script | 1 + acceptance/bundle/deployment/bind/dashboard/script | 1 + acceptance/bundle/deployment/bind/dashboard/test.toml | 4 ---- acceptance/bundle/generate/dashboard-inplace/output.txt | 4 ++-- acceptance/bundle/generate/dashboard-inplace/script | 1 + acceptance/bundle/generate/dashboard-inplace/test.toml | 8 -------- acceptance/bundle/generate/dashboard/script | 1 + acceptance/bundle/generate/dashboard/test.toml | 4 ---- 10 files changed, 13 insertions(+), 25 deletions(-) delete mode 100644 acceptance/bundle/generate/dashboard-inplace/test.toml diff --git a/acceptance/bundle/deployment/bind/dashboard/output.txt b/acceptance/bundle/deployment/bind/dashboard/output.txt index 3926b8f1f9..172b4dccb3 100644 --- a/acceptance/bundle/deployment/bind/dashboard/output.txt +++ b/acceptance/bundle/deployment/bind/dashboard/output.txt @@ -1,7 +1,7 @@ ->>> [CLI] bundle deployment bind dashboard1 [DASHBOARD_ID] --auto-approve +>>> [CLI] bundle deployment bind dashboard1 [DASHBOARD1_ID] --auto-approve Updating deployment state... -Successfully bound dashboard with an id '[DASHBOARD_ID]' +Successfully bound dashboard with an id '[DASHBOARD1_ID]' Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy @@ -10,7 +10,7 @@ Deploying resources... Updating deployment state... Deployment complete! ->>> [CLI] lakeview get [DASHBOARD_ID] +>>> [CLI] lakeview get [DASHBOARD1_ID] { "display_name": "test dashboard [UUID]", "lifecycle_state": "ACTIVE", @@ -36,7 +36,7 @@ All files and directories at the following location will be deleted: /Workspace/ Deleting files... Destroy complete! ->>> [CLI] lakeview get [DASHBOARD_ID] +>>> [CLI] lakeview get [DASHBOARD1_ID] { "display_name": "test dashboard [UUID]", "lifecycle_state": "ACTIVE", diff --git a/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt b/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt index f6ec933add..2446717b98 100644 --- a/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt +++ b/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt @@ -1,7 +1,7 @@ ->>> [CLI] bundle deployment bind dashboard1 [DASHBOARD_ID] --auto-approve +>>> [CLI] bundle deployment bind dashboard1 [DASHBOARD1_ID] --auto-approve Updating deployment state... -Successfully bound dashboard with an id '[DASHBOARD_ID]' +Successfully bound dashboard with an id '[DASHBOARD1_ID]' Run 'bundle deploy' to deploy changes to your workspace >>> errcode [CLI] bundle deploy @@ -24,7 +24,7 @@ Deploying resources... Updating deployment state... Deployment complete! ->>> [CLI] lakeview get [DASHBOARD_ID] +>>> [CLI] lakeview get [DASHBOARD1_ID] { "display_name": "test dashboard [UUID]", "lifecycle_state": "ACTIVE" diff --git a/acceptance/bundle/deployment/bind/dashboard/recreation/script b/acceptance/bundle/deployment/bind/dashboard/recreation/script index 8fc4825323..4e71df1cfe 100644 --- a/acceptance/bundle/deployment/bind/dashboard/recreation/script +++ b/acceptance/bundle/deployment/bind/dashboard/recreation/script @@ -18,6 +18,7 @@ trap cleanupRemoveDashboard EXIT trace $CLI bundle deployment bind dashboard1 "${DASHBOARD_ID}" --auto-approve trace errcode $CLI bundle deploy +replace_ids.py trace $CLI bundle deployment unbind dashboard1 diff --git a/acceptance/bundle/deployment/bind/dashboard/script b/acceptance/bundle/deployment/bind/dashboard/script index ac15fdb1fd..5786325827 100644 --- a/acceptance/bundle/deployment/bind/dashboard/script +++ b/acceptance/bundle/deployment/bind/dashboard/script @@ -18,6 +18,7 @@ trap cleanupRemoveDashboard EXIT trace $CLI bundle deployment bind dashboard1 "${DASHBOARD_ID}" --auto-approve trace $CLI bundle deploy +replace_ids.py trace $CLI lakeview get "${DASHBOARD_ID}" | jq '{display_name, lifecycle_state, path, parent_path, serialized_dashboard} | .serialized_dashboard |= fromjson' diff --git a/acceptance/bundle/deployment/bind/dashboard/test.toml b/acceptance/bundle/deployment/bind/dashboard/test.toml index d9167c2183..2a6db5720d 100644 --- a/acceptance/bundle/deployment/bind/dashboard/test.toml +++ b/acceptance/bundle/deployment/bind/dashboard/test.toml @@ -6,10 +6,6 @@ Ignore = [ "databricks.yml", ] -[[Repls]] -Old = "[0-9a-f]{32}" -New = "[DASHBOARD_ID]" - [[Server]] Pattern = "POST /api/2.0/lakeview/dashboards" Response.Body = ''' diff --git a/acceptance/bundle/generate/dashboard-inplace/output.txt b/acceptance/bundle/generate/dashboard-inplace/output.txt index ca173508e3..bd80c98a05 100644 --- a/acceptance/bundle/generate/dashboard-inplace/output.txt +++ b/acceptance/bundle/generate/dashboard-inplace/output.txt @@ -10,10 +10,10 @@ Updating deployment state... Deployment complete! === update the dashboard ->>> [CLI] lakeview update [DASHBOARD_ID] --serialized-dashboard {"a":"b"} +>>> [CLI] lakeview update [TEST_DASHBOARD_ID] --serialized-dashboard {"a":"b"} { "create_time":"[TIMESTAMP]", - "dashboard_id":"[DASHBOARD_ID]", + "dashboard_id":"[TEST_DASHBOARD_ID]", "display_name":"test dashboard", "etag":"[NUMID]", "lifecycle_state":"ACTIVE", diff --git a/acceptance/bundle/generate/dashboard-inplace/script b/acceptance/bundle/generate/dashboard-inplace/script index f11a56da3c..9f4738e627 100644 --- a/acceptance/bundle/generate/dashboard-inplace/script +++ b/acceptance/bundle/generate/dashboard-inplace/script @@ -2,6 +2,7 @@ trace cat dash.lvdash.json title "deploy initial dashboard" trace $CLI bundle deploy +replace_ids.py dashboard_id=$($CLI bundle summary --output json | jq -r '.resources.dashboards.test_dashboard.id') title "update the dashboard" diff --git a/acceptance/bundle/generate/dashboard-inplace/test.toml b/acceptance/bundle/generate/dashboard-inplace/test.toml deleted file mode 100644 index d5511c1556..0000000000 --- a/acceptance/bundle/generate/dashboard-inplace/test.toml +++ /dev/null @@ -1,8 +0,0 @@ -[[Repls]] -Old = "[0-9a-f]{32}" -New = "[DASHBOARD_ID]" - -[[Repls]] -Old = '2\d\d\d-\d\d-\d\d(T| )\d\d:\d\d:\d\d(\.\d+(Z|\+\d\d:\d\d)?)?Z' -New = "[TIMESTAMP]" -Order = 9 diff --git a/acceptance/bundle/generate/dashboard/script b/acceptance/bundle/generate/dashboard/script index a982ef547d..adddd9f5ef 100644 --- a/acceptance/bundle/generate/dashboard/script +++ b/acceptance/bundle/generate/dashboard/script @@ -3,6 +3,7 @@ trace $CLI workspace mkdirs /Workspace/test-$UNIQUE_NAME # create a dashboard to import envsubst < dashboard.json.tmpl > dashboard.json dashboard_id=$($CLI lakeview create --json @dashboard.json | jq -r '.dashboard_id') +add_repl.py $dashboard_id DASHBOARD_ID rm dashboard.json trace $CLI bundle generate dashboard --existing-id $dashboard_id --dashboard-dir out/dashboard --resource-dir out/resource diff --git a/acceptance/bundle/generate/dashboard/test.toml b/acceptance/bundle/generate/dashboard/test.toml index 2d2380d647..2e404bc29f 100644 --- a/acceptance/bundle/generate/dashboard/test.toml +++ b/acceptance/bundle/generate/dashboard/test.toml @@ -2,9 +2,5 @@ Old = '\\\\' New = '/' -[[Repls]] -Old = "[0-9a-f]{32}" -New = "[DASHBOARD_ID]" - [Env] MSYS_NO_PATHCONV = "1" From 9f47f0c6b137e3eea1fefb5cfa0f53bfcdc77414 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Fri, 9 Jan 2026 15:34:03 +0100 Subject: [PATCH 2/5] tweak --- acceptance/bundle/generate/dashboard/output.txt | 2 ++ acceptance/bundle/generate/dashboard/script | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/acceptance/bundle/generate/dashboard/output.txt b/acceptance/bundle/generate/dashboard/output.txt index 2b65d37a7e..e96354be7b 100644 --- a/acceptance/bundle/generate/dashboard/output.txt +++ b/acceptance/bundle/generate/dashboard/output.txt @@ -1,6 +1,8 @@ >>> [CLI] workspace mkdirs /Workspace/test-[UNIQUE_NAME] +>>> add_repl.py [DASHBOARD_ID] DASHBOARD_ID + >>> [CLI] bundle generate dashboard --existing-id [DASHBOARD_ID] --dashboard-dir out/dashboard --resource-dir out/resource Writing dashboard to "out/dashboard/test_dashboard.lvdash.json" Writing configuration to "out/resource/test_dashboard.dashboard.yml" diff --git a/acceptance/bundle/generate/dashboard/script b/acceptance/bundle/generate/dashboard/script index adddd9f5ef..e464d9c065 100644 --- a/acceptance/bundle/generate/dashboard/script +++ b/acceptance/bundle/generate/dashboard/script @@ -3,7 +3,8 @@ trace $CLI workspace mkdirs /Workspace/test-$UNIQUE_NAME # create a dashboard to import envsubst < dashboard.json.tmpl > dashboard.json dashboard_id=$($CLI lakeview create --json @dashboard.json | jq -r '.dashboard_id') -add_repl.py $dashboard_id DASHBOARD_ID rm dashboard.json +trace add_repl.py $dashboard_id DASHBOARD_ID + trace $CLI bundle generate dashboard --existing-id $dashboard_id --dashboard-dir out/dashboard --resource-dir out/resource From 2a6abc07396bdc0b461f4b07964b6c669511514d Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Fri, 9 Jan 2026 16:58:03 +0100 Subject: [PATCH 3/5] tweak --- acceptance/bundle/generate/dashboard/output.txt | 2 -- acceptance/bundle/generate/dashboard/script | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/acceptance/bundle/generate/dashboard/output.txt b/acceptance/bundle/generate/dashboard/output.txt index e96354be7b..2b65d37a7e 100644 --- a/acceptance/bundle/generate/dashboard/output.txt +++ b/acceptance/bundle/generate/dashboard/output.txt @@ -1,8 +1,6 @@ >>> [CLI] workspace mkdirs /Workspace/test-[UNIQUE_NAME] ->>> add_repl.py [DASHBOARD_ID] DASHBOARD_ID - >>> [CLI] bundle generate dashboard --existing-id [DASHBOARD_ID] --dashboard-dir out/dashboard --resource-dir out/resource Writing dashboard to "out/dashboard/test_dashboard.lvdash.json" Writing configuration to "out/resource/test_dashboard.dashboard.yml" diff --git a/acceptance/bundle/generate/dashboard/script b/acceptance/bundle/generate/dashboard/script index e464d9c065..865014ac99 100644 --- a/acceptance/bundle/generate/dashboard/script +++ b/acceptance/bundle/generate/dashboard/script @@ -5,6 +5,6 @@ envsubst < dashboard.json.tmpl > dashboard.json dashboard_id=$($CLI lakeview create --json @dashboard.json | jq -r '.dashboard_id') rm dashboard.json -trace add_repl.py $dashboard_id DASHBOARD_ID +add_repl.py $dashboard_id DASHBOARD_ID trace $CLI bundle generate dashboard --existing-id $dashboard_id --dashboard-dir out/dashboard --resource-dir out/resource From 2897f7e9ab679e774918b1d54facfa4b7dd40b00 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Fri, 9 Jan 2026 17:15:49 +0100 Subject: [PATCH 4/5] rm MSYS_NO_PATHCONV --- acceptance/bundle/generate/dashboard/test.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/acceptance/bundle/generate/dashboard/test.toml b/acceptance/bundle/generate/dashboard/test.toml index 2e404bc29f..9cf9b33eca 100644 --- a/acceptance/bundle/generate/dashboard/test.toml +++ b/acceptance/bundle/generate/dashboard/test.toml @@ -1,6 +1,3 @@ [[Repls]] Old = '\\\\' New = '/' - -[Env] -MSYS_NO_PATHCONV = "1" From 1782b4399e80321afb988a22df24bc5ca098a4b0 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Fri, 9 Jan 2026 17:33:02 +0100 Subject: [PATCH 5/5] // --- acceptance/bundle/generate/dashboard/script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/bundle/generate/dashboard/script b/acceptance/bundle/generate/dashboard/script index 865014ac99..3f242d19c6 100644 --- a/acceptance/bundle/generate/dashboard/script +++ b/acceptance/bundle/generate/dashboard/script @@ -1,4 +1,4 @@ -trace $CLI workspace mkdirs /Workspace/test-$UNIQUE_NAME +trace $CLI workspace mkdirs //Workspace/test-$UNIQUE_NAME # create a dashboard to import envsubst < dashboard.json.tmpl > dashboard.json