acc: merge identical terraform/direct request goldens into single files

acceptance/bundle/deployment/bind/pipelines/recreate/script

@@ -9,7 +9,7 @@ trace musterr $CLI bundle deployment bind foo $NEW_PIPELINE_ID &> out.bind-fail.
 print_requests.py '^//import-file/' '^//workspace/'
 
 rm -f out.requests.txt
-trace $CLI bundle deployment bind foo $NEW_PIPELINE_ID --auto-approve &> out.bind-success.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle deployment bind foo $NEW_PIPELINE_ID --auto-approve &> out.bind-success.txt
 trace print_requests.py '^//import-file/' '^//workspace/'
 
 trace $CLI bundle summary -o json | jq .resources > out.summary.json

acceptance/bundle/deployment/bind/pipelines/update/script

@@ -6,7 +6,7 @@ trace musterr $CLI bundle deployment bind foo $NEW_PIPELINE_ID &> out.bind-fail.
 print_requests.py '^//import-file/' '^//workspace/delete'
 
 rm -f out.requests.txt
-trace $CLI bundle deployment bind foo $NEW_PIPELINE_ID --auto-approve &> out.bind-success.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle deployment bind foo $NEW_PIPELINE_ID --auto-approve &> out.bind-success.txt
 print_requests.py '^//import-file/' '^//workspace/delete'
 
 trace $CLI bundle summary -o json > out.summary.json

acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script

@@ -8,11 +8,11 @@ trace print_requests.py --sort //jobs
 replace_ids.py
 
 # Sanity check plan after deploy
-trace $CLI bundle plan > out.plan_sanity.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle plan > out.plan_sanity.txt
 
 title "Delete all via empty.yml"
 cp empty.yml databricks.yml
-trace $CLI bundle plan > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle plan > out.plan_delete.txt
 trace $CLI bundle deploy
 
 trace $CLI bundle destroy --auto-approve

acceptance/bundle/resource_deps/job_id_big_graph/destroy/script

@@ -7,7 +7,7 @@ trace print_requests.py --sort //jobs
 replace_ids.py
 
 # Sanity check plan after deploy
-trace $CLI bundle plan > out.plan_sanity.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle plan > out.plan_sanity.txt
 
 title "Destroy all via bundle destroy"
 trace $CLI bundle destroy --auto-approve

acceptance/bundle/resource_deps/volume_path_contains_id/script

@@ -1,14 +1,14 @@
 cleanup() {
-    $CLI bundle destroy --auto-approve &> out.destroy.$DATABRICKS_BUNDLE_ENGINE.txt
-    print_requests.py --sort --get //unity &> out.destroy_requests.$DATABRICKS_BUNDLE_ENGINE.json
+    $CLI bundle destroy --auto-approve &> out.destroy.txt
+    print_requests.py --sort --get //unity &> out.destroy_requests.json
 }
 
 trace $CLI bundle validate -o json | jq .resources
 trace $CLI bundle plan
 $CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
 trap cleanup EXIT
-trace errcode $CLI bundle deploy &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt
+trace errcode $CLI bundle deploy &> out.deploy.txt
 
 # bar.name is created from baz.id (resolved during deploy), and foo.comment is
 # created with bar.volume_path, whose embedded baz.id reference also resolves

acceptance/bundle/resources/dashboards/change-parent-path/script

@@ -38,4 +38,4 @@ cat out.requests.txt | \
  jq 'select( (.path | contains("/api/2.0/lakeview/dashboards")) or ((.path == "/api/2.0/workspace/mkdirs") and (.body.path | contains("/default/resources"))))' \
  > out.dashboardrequests.txt
 
-$CLI bundle plan > out.plan_after_deploy.$DATABRICKS_BUNDLE_ENGINE.txt
+$CLI bundle plan > out.plan_after_deploy.txt

acceptance/bundle/resources/dashboards/dataset-catalog-schema/script

@@ -48,4 +48,4 @@ cat out.requests.txt | \
  jq 'select(.method == "POST")' | \
  jq 'select(.path | contains("/api/2.0/lakeview/dashboards"))' | \
  jq 'select(.path | contains("/published") | not)' \
- > out.post.requests.$DATABRICKS_BUNDLE_ENGINE.txt
+ > out.post.requests.txt

acceptance/bundle/resources/grants/schemas/duplicate_privileges/script

@@ -9,4 +9,4 @@ trap cleanup EXIT
 # Same privilege listed twice for the same principal in a single entry.
 trace $CLI bundle deploy
 print_requests.py --get //permissions --keep > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt
-trace $CLI bundle plan > out.plan.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
+trace $CLI bundle plan > out.plan.txt 2>&1

acceptance/bundle/resources/grants/schemas/remove_principal/script

@@ -12,7 +12,7 @@ trace $CLI grants get schema main.schema_remove_principal_$UNIQUE_NAME | gron.py
 grep -v 'TO_REMOVE' databricks.yml > tmp.yml && mv tmp.yml databricks.yml
 
 trace $CLI bundle deploy
-trace $CLI grants get schema main.schema_remove_principal_$UNIQUE_NAME | gron.py --noindex | sort_lines.py --repl | contains.py "$CURRENT_USER_NAME" '!deco-test-user@databricks.com' &> out.grants.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI grants get schema main.schema_remove_principal_$UNIQUE_NAME | gron.py --noindex | sort_lines.py --repl | contains.py "$CURRENT_USER_NAME" '!deco-test-user@databricks.com' &> out.grants.txt
 trace $CLI bundle plan
 trace $CLI bundle deploy
 trace $CLI bundle plan

acceptance/bundle/resources/jobs/remote_delete/destroy/script

@@ -2,4 +2,4 @@ trace $CLI bundle plan
 trace $CLI bundle deploy
 job_id=`$CLI bundle summary -o json | jq -r .resources.jobs.foo.id`
 trace $CLI jobs delete $job_id
-trace errcode $CLI bundle destroy --auto-approve &> out.destroy.$DATABRICKS_BUNDLE_ENGINE.txt
+trace errcode $CLI bundle destroy --auto-approve &> out.destroy.txt

acceptance/bundle/resources/jobs/remote_delete/removed_from_config/script

@@ -10,7 +10,7 @@ cp empty.yml databricks.yml
 # Drain requests recorded so far; only requests made after the config removal matter below.
 print_requests.py --get // &> LOG.requests_setup
 trace $CLI bundle plan &> out.plan_removed.$DATABRICKS_BUNDLE_ENGINE.txt
-trace $CLI bundle deploy --auto-approve &> out.deploy_removed.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle deploy --auto-approve &> out.deploy_removed.txt
 
 title "Plan and deploy again, then summary"
 trace $CLI bundle plan

acceptance/bundle/resources/model_serving_endpoints/basic/script

@@ -19,7 +19,7 @@ trace $CLI bundle deploy
 # Sort access_control_list: the terraform engine stores it as a set whose order
 # depends on the (unmasked) principal value, so it differs between the local fake
 # 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
+print_requests.py //serving-endpoints | gron.py --sort-arrays access_control_list > out.first-requests.txt
 
 echo "$ENDPOINT_NAME:ENDPOINT_NAME_1" >> ACC_REPLS
 

acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script

@@ -11,7 +11,7 @@ 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
-trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '{route_optimized, id}' > out.first-get.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '{route_optimized, id}' > out.first-get.json
 
 print_requests.py //serving-endpoints > out.first-requests.$DATABRICKS_BUNDLE_ENGINE.json
 

acceptance/bundle/resources/pipelines/num-workers-zero/script

@@ -1,3 +1,3 @@
-trace $CLI bundle deploy > out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
+trace $CLI bundle deploy > out.deploy.txt 2>&1
 trace errcode jq -s '.[] | select(.method == "POST" and (.path | contains("/pipelines")))' out.requests.txt > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
 rm out.requests.txt

acceptance/bundle/resources/postgres_branches/replace_existing/script

@@ -23,6 +23,6 @@ trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,
 # output is captured so regressions in either engine's destroy flow show
 # up in the diff.
 title "bundle destroy"
-$CLI bundle destroy --auto-approve > out.destroy.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1 || true
+$CLI bundle destroy --auto-approve > out.destroy.txt 2>&1 || true
 
 trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.destroy.$DATABRICKS_BUNDLE_ENGINE.json

acceptance/bundle/resources/postgres_endpoints/replace_existing/script

@@ -25,6 +25,6 @@ trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,
 # endpoint. Per-engine output is captured so regressions in either
 # engine's destroy flow show up in the diff.
 title "bundle destroy"
-$CLI bundle destroy --auto-approve > out.destroy.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1 || true
+$CLI bundle destroy --auto-approve > out.destroy.txt 2>&1 || true
 
 trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.destroy.$DATABRICKS_BUNDLE_ENGINE.json

acceptance/bundle/resources/quality_monitors/create/script

@@ -20,7 +20,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 trace $CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 
 rm out.requests.txt
-trace $CLI bundle deploy &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle deploy &> out.deploy.txt
 trace print_requests.py '^//import-file/' '^//workspace/' '^//telemetry-ext' > out.deploy.requests.json
 
 # store state to ensure we have table_name there

acceptance/bundle/telemetry/deploy-whl-artifacts/script

@@ -9,6 +9,6 @@ trace $CLI bundle deploy -t two
 # Common bool_values are engine-agnostic; the terraform-only direct_drymigrate_*
 # entries go to a per-engine file so output.txt stays shared.
 trace print_telemetry_bool_values | grep -v direct_drymigrate
-print_telemetry_bool_values | grep direct_drymigrate > out.drymigrate.$DATABRICKS_BUNDLE_ENGINE.txt || true
+print_telemetry_bool_values | grep direct_drymigrate > out.drymigrate.txt || true
 
 rm out.requests.txt