diff --git a/acceptance/bundle/generate/auto-bind/out.test.toml b/acceptance/bundle/generate/auto-bind/out.test.toml index f68b4a89c36..0f167effef1 100644 --- a/acceptance/bundle/generate/auto-bind/out.test.toml +++ b/acceptance/bundle/generate/auto-bind/out.test.toml @@ -1,2 +1,2 @@ Cloud = true -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/generate/auto-bind/test.toml b/acceptance/bundle/generate/auto-bind/test.toml index a318fc61ddd..24e699e3716 100644 --- a/acceptance/bundle/generate/auto-bind/test.toml +++ b/acceptance/bundle/generate/auto-bind/test.toml @@ -11,6 +11,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. Env.MSYS_NO_PATHCONV = "1" - -# bind is unsupported with deployment-history recording; pin DMS off so it runs on the plain cell. -EnvMatrix.DMS = [""] diff --git a/acceptance/bundle/generate/dashboard-inplace/output.txt b/acceptance/bundle/generate/dashboard-inplace/output.txt index 52e5822e308..76f6dc6195b 100644 --- a/acceptance/bundle/generate/dashboard-inplace/output.txt +++ b/acceptance/bundle/generate/dashboard-inplace/output.txt @@ -24,6 +24,8 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged "warehouse_id": "" } +>>> fault.py GET /api/2.0/bundle/deployments/* 403 0 1 PERMISSION_DENIED + === update the dashboard file using bundle generate >>> [CLI] bundle generate dashboard --resource test_dashboard --force Writing dashboard to dash.lvdash.json @@ -32,3 +34,5 @@ Writing dashboard to dash.lvdash.json { "a": "b" } + +>>> print_requests.py --dms //api/2.0/bundle --get --oneline diff --git a/acceptance/bundle/generate/dashboard-inplace/script b/acceptance/bundle/generate/dashboard-inplace/script index f11a56da3cf..d44453642f2 100644 --- a/acceptance/bundle/generate/dashboard-inplace/script +++ b/acceptance/bundle/generate/dashboard-inplace/script @@ -7,7 +7,13 @@ dashboard_id=$($CLI bundle summary --output json | jq -r '.resources.dashboards. title "update the dashboard" trace $CLI lakeview update $dashboard_id --serialized-dashboard '{"a":"b"}' +# Generating from file-backed state must not depend on the history service. +rm -f "$OUT_REQUESTS" +trace fault.py "GET /api/2.0/bundle/deployments/*" 403 0 1 PERMISSION_DENIED + title "update the dashboard file using bundle generate" trace $CLI bundle generate dashboard --resource test_dashboard --force trace cat dash.lvdash.json + +trace print_requests.py --dms //api/2.0/bundle --get --oneline diff --git a/acceptance/bundle/generate/dashboard-inplace/test.toml b/acceptance/bundle/generate/dashboard-inplace/test.toml index d5511c15564..174e025a055 100644 --- a/acceptance/bundle/generate/dashboard-inplace/test.toml +++ b/acceptance/bundle/generate/dashboard-inplace/test.toml @@ -1,3 +1,6 @@ +RecordRequests = true +Ignore = [".databricks"] + [[Repls]] Old = "[0-9a-f]{32}" New = "[DASHBOARD_ID]" diff --git a/acceptance/bundle/generate/genie_space_inplace/output.txt b/acceptance/bundle/generate/genie_space_inplace/output.txt index 13b0736ee12..45b7eb0ab89 100644 --- a/acceptance/bundle/generate/genie_space_inplace/output.txt +++ b/acceptance/bundle/generate/genie_space_inplace/output.txt @@ -20,6 +20,8 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged "warehouse_id": "my-warehouse-1234" } +>>> fault.py GET /api/2.0/bundle/deployments/* 403 0 1 PERMISSION_DENIED + === update the genie space file using bundle generate >>> [CLI] bundle generate genie-space --resource test_genie_space --force Writing genie space to space.geniespace.json @@ -28,3 +30,5 @@ Writing genie space to space.geniespace.json { "a": "b" } + +>>> print_requests.py --dms //api/2.0/bundle --get --oneline diff --git a/acceptance/bundle/generate/genie_space_inplace/script b/acceptance/bundle/generate/genie_space_inplace/script index 18ca58d2986..6830a9ae1ed 100644 --- a/acceptance/bundle/generate/genie_space_inplace/script +++ b/acceptance/bundle/generate/genie_space_inplace/script @@ -7,7 +7,13 @@ genie_space_id=$($CLI bundle summary --output json | jq -r '.resources.genie_spa title "update the genie space" trace $CLI genie update-space $genie_space_id --serialized-space '{"a":"b"}' +# Generating from file-backed state must not depend on the history service. +rm -f "$OUT_REQUESTS" +trace fault.py "GET /api/2.0/bundle/deployments/*" 403 0 1 PERMISSION_DENIED + title "update the genie space file using bundle generate" trace $CLI bundle generate genie-space --resource test_genie_space --force trace cat space.geniespace.json + +trace print_requests.py --dms //api/2.0/bundle --get --oneline diff --git a/acceptance/bundle/generate/genie_space_inplace/test.toml b/acceptance/bundle/generate/genie_space_inplace/test.toml index cdaa88d84ec..950fc94657a 100644 --- a/acceptance/bundle/generate/genie_space_inplace/test.toml +++ b/acceptance/bundle/generate/genie_space_inplace/test.toml @@ -1,3 +1,6 @@ +RecordRequests = true +Ignore = [".databricks"] + # Genie spaces are only deployed via the direct deployment engine. [[Repls]] diff --git a/cmd/bundle/utils/process.go b/cmd/bundle/utils/process.go index b1a832d5223..68798a4bb01 100644 --- a/cmd/bundle/utils/process.go +++ b/cmd/bundle/utils/process.go @@ -693,11 +693,6 @@ func OpenDirectStateForRead(ctx context.Context, b *bundle.Bundle, stateDesc *st if err := b.DeploymentBundle.StateDB.Open(ctx, localPath, dstate.ReadingFile, dstate.WithRecovery(true), dstate.OpenDmsArgs{}); err != nil { return err } - if configuresDeploymentHistory(ctx, b) { - if _, err := prepareDeploymentHistoryShadow(ctx, b); err != nil { - log.Warnf(ctx, "Could not read deployment history: %s", err) - } - } return nil }