From 645be4a96284fad9d87f18acebbb19dfc5a3469c Mon Sep 17 00:00:00 2001
From: Shreyas Goenka <shreyas.goenka@databricks.com>
Date: Mon, 31 Aug 2026 00:49:20 +0000
Subject: [PATCH] acc: run the whole bundle suite with deployment history on

Recording is matrixed over every bundle test, so each one runs twice: once as before and
once with DATABRICKS_BUNDLE_RECORD_DEPLOYMENT_HISTORY set. That is what puts the recording
path under the deploy, redeploy, destroy and drift cases the suite already covers, rather
than only under the tests written for it.

Subtrees that cannot carry it opt out and say why: bind and unbind are not supported by the
service yet, a saved plan does not carry the deployment stamp, and the templates and
migrate trees assert output the second variant would duplicate.

The generated out.test.toml files move with it, since the matrix is inherited.

Co-authored-by: Isaac <no-reply@databricks.com>
---
 acceptance/bin/print_requests.py              | 18 ++++++++
 .../empty_code_source/out.test.toml           |  1 +
 .../local_code_source/out.test.toml           |  1 +
 .../local_code_source/output.txt              |  4 +-
 .../ai_runtime_task/local_code_source/script  |  6 +--
 acceptance/bundle/apps/app_yaml/out.test.toml |  1 +
 .../artifact_and_app_same_path/out.test.toml  |  1 +
 .../bundle/apps/compute_size/out.test.toml    |  1 +
 .../bundle/apps/delete_deleting/out.test.toml |  1 +
 .../bundle/apps/git_source/out.test.toml      |  1 +
 .../bundle/apps/job_permissions/out.test.toml |  1 +
 .../job_permissions_warning/out.test.toml     |  1 +
 .../apps/value_from_warning/out.test.toml     |  1 +
 .../ai_runtime_code_source/out.test.toml      |  1 +
 .../volume_doesnot_exist/out.test.toml        |  1 +
 .../volume_not_deployed/out.test.toml         |  1 +
 .../artifact_upload_for_volumes/out.test.toml |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../artifacts_dynamic_version/out.test.toml   |  1 +
 .../artifacts/build_and_files/out.test.toml   |  1 +
 .../build_and_files_whl/out.test.toml         |  1 +
 .../artifacts/glob_exact_whl/out.test.toml    |  1 +
 .../artifacts/globs_in_files/out.test.toml    |  1 +
 .../globs_in_files_in_include/out.test.toml   |  1 +
 .../artifacts/globs_invalid/out.test.toml     |  1 +
 .../bundle/artifacts/issue_3109/out.test.toml |  1 +
 .../artifacts/nil_artifacts/out.test.toml     |  1 +
 .../same_name_libraries/out.test.toml         |  1 +
 .../bundle/artifacts/shell/bash/out.test.toml |  1 +
 .../artifacts/shell/basic/out.test.toml       |  1 +
 .../bundle/artifacts/shell/cmd/out.test.toml  |  1 +
 .../artifacts/shell/default/out.test.toml     |  1 +
 .../artifacts/shell/err-bash/out.test.toml    |  1 +
 .../artifacts/shell/err-sh/out.test.toml      |  1 +
 .../artifacts/shell/invalid/out.test.toml     |  1 +
 .../bundle/artifacts/shell/sh/out.test.toml   |  1 +
 .../unique_name_libraries/out.test.toml       |  1 +
 .../upload_multiple_libraries/out.test.toml   |  1 +
 .../whl_change_version/out.test.toml          |  1 +
 .../bundle/artifacts/whl_dbfs/out.test.toml   |  1 +
 .../artifacts/whl_dynamic/out.test.toml       |  1 +
 .../bundle/artifacts/whl_dynamic/script       |  6 +--
 .../artifacts/whl_explicit/out.test.toml      |  1 +
 .../artifacts/whl_implicit/out.test.toml      |  1 +
 .../whl_implicit_custom_path/out.test.toml    |  1 +
 .../artifacts/whl_implicit_custom_path/script |  2 +-
 .../whl_implicit_notebook/out.test.toml       |  1 +
 .../artifacts/whl_multiple/out.test.toml      |  1 +
 .../artifacts/whl_no_cleanup/out.test.toml    |  1 +
 .../whl_prebuilt_multiple/out.test.toml       |  1 +
 .../whl_prebuilt_outside/out.test.toml        |  1 +
 .../out.test.toml                             |  1 +
 .../whl_via_environment_key/out.test.toml     |  1 +
 .../artifacts/whl_via_environment_key/script  |  2 +-
 .../out.test.toml                             |  1 +
 .../whl_via_environment_key_extras/script     |  2 +-
 .../bundle/benchmarks/deploy/out.test.toml    |  1 +
 .../bundle/benchmarks/plan/out.test.toml      |  1 +
 .../bundle/benchmarks/validate/out.test.toml  |  1 +
 acceptance/bundle/bundle_tag/id/out.test.toml |  1 +
 acceptance/bundle/bundle_tag/id/output.txt    |  4 +-
 acceptance/bundle/bundle_tag/id/script        |  6 +--
 .../bundle/bundle_tag/url/out.test.toml       |  1 +
 acceptance/bundle/bundle_tag/url/output.txt   |  4 +-
 acceptance/bundle/bundle_tag/url/script       |  6 +--
 .../bundle/bundle_tag/url_ref/out.test.toml   |  1 +
 .../cli_defaults/out.test.toml                |  1 +
 .../config_edits/out.test.toml                |  1 +
 .../dashboard_etag/out.test.toml              |  1 +
 .../flushed_cache/out.test.toml               |  1 +
 .../formatting_preserved/out.test.toml        |  1 +
 .../job_fields/out.test.toml                  |  1 +
 .../job_multiple_tasks/out.test.toml          |  1 +
 .../job_params_variables/out.test.toml        |  1 +
 .../job_pipeline_task/out.test.toml           |  1 +
 .../multiple_files/out.test.toml              |  1 +
 .../multiple_resources/out.test.toml          |  1 +
 .../output_json/out.test.toml                 |  1 +
 .../output_no_changes/out.test.toml           |  1 +
 .../pipeline_fields/out.test.toml             |  1 +
 .../out.test.toml                             |  1 +
 .../resolve_variables/out.test.toml           |  1 +
 .../select_basic/out.test.toml                |  1 +
 .../select_multiple/out.test.toml             |  1 +
 .../skip_permissions/out.test.toml            |  1 +
 .../cli_default_split_element/out.test.toml   |  1 +
 .../split/dotted_target/out.test.toml         |  1 +
 .../split/isolation/out.test.toml             |  1 +
 .../split/keyed_edit/out.test.toml            |  1 +
 .../split/keyed_remove/out.test.toml          |  1 +
 .../split/keyed_rename/out.test.toml          |  1 +
 .../split/keyed_twoblock/out.test.toml        |  1 +
 .../split/multifile/out.test.toml             |  1 +
 .../nested_add_split_parent/out.test.toml     |  1 +
 .../split/nested_sequence/out.test.toml       |  1 +
 .../split/positional/out.test.toml            |  1 +
 .../remove_field_both_blocks/out.test.toml    |  1 +
 .../remove_with_unrelated_add/out.test.toml   |  1 +
 .../rename_ambiguous_pairing/out.test.toml    |  1 +
 .../out.test.toml                             |  1 +
 .../rename_two_removes_one_add/out.test.toml  |  1 +
 .../split/target_variable/out.test.toml       |  1 +
 .../split/variable_file_order/out.test.toml   |  1 +
 .../target_override/out.test.toml             |  1 +
 .../task_rename_revert/out.test.toml          |  1 +
 .../validation_errors/out.test.toml           |  1 +
 .../variable_reference_parent/out.test.toml   |  1 +
 .../out.test.toml                             |  1 +
 .../debug/fetch-repository-info/out.test.toml |  1 +
 .../bundle/debug/list-targets/out.test.toml   |  1 +
 acceptance/bundle/debug/out.test.toml         |  1 +
 .../bundle/deploy/empty-bundle/out.test.toml  |  1 +
 .../deploy/experimental-python/out.test.toml  |  1 +
 .../bundle/deploy/experimental-python/script  |  2 +-
 .../deploy/fail-on-active-runs/out.test.toml  |  1 +
 .../files/no-snapshot-sync/out.test.toml      |  1 +
 .../files/out-of-band-delete/out.test.toml    |  1 +
 .../deploy/files/out-of-band-delete/test.toml |  1 +
 .../deploy/force-lock-config/out.test.toml    |  1 +
 .../immutable-no-artifacts/out.test.toml      |  1 +
 .../out.test.toml                             |  1 +
 .../bundle/deploy/immutable/out.test.toml     |  1 +
 .../bundle/deploy/mlops-stacks/out.test.toml  |  1 +
 .../out.test.toml                             |  1 +
 .../deploy/pipeline-config-dots/out.test.toml |  1 +
 .../deploy/python-notebook/out.test.toml      |  1 +
 .../bundle/deploy/python-notebook/script      |  2 +-
 .../deploy/readplan/basic/out.test.toml       |  1 +
 .../cli-version-mismatch/out.test.toml        |  1 +
 .../grants-remove-principal/out.test.toml     |  1 +
 .../readplan/invalid-plan/out.test.toml       |  1 +
 .../readplan/lineage-mismatch/out.test.toml   |  1 +
 .../readplan/plan-not-found/out.test.toml     |  1 +
 .../plan-version-mismatch/out.test.toml       |  1 +
 .../readplan/postgres_role/out.test.toml      |  1 +
 .../readplan/serial-mismatch/out.test.toml    |  1 +
 .../readplan/terraform-error/out.test.toml    |  1 +
 acceptance/bundle/deploy/readplan/test.toml   |  3 ++
 .../readplan/unknown-field/out.test.toml      |  1 +
 .../resource-max-wait-zero/out.test.toml      |  1 +
 .../deploy/resource-max-wait/out.test.toml    |  1 +
 .../deploy/snapshot-comparison/out.test.toml  |  1 +
 .../deploy/spark-jar-task/out.test.toml       |  1 +
 .../deploy/wal/chain-3-jobs/out.test.toml     |  1 +
 .../bundle/deploy/wal/chain-3-jobs/script     |  2 +-
 .../wal/corrupted-wal-entry/out.test.toml     |  1 +
 .../deploy/wal/corrupted-wal-entry/output.txt |  2 +-
 .../deploy/wal/corrupted-wal-entry/test.toml  |  4 ++
 .../wal/crash-after-create/out.test.toml      |  1 +
 .../deploy/wal/crash-after-create/script      |  2 +-
 .../bundle/deploy/wal/empty-wal/out.test.toml |  1 +
 .../wal/failed-plan-no-wal/out.test.toml      |  1 +
 .../wal/future-serial-wal/out.test.toml       |  1 +
 .../deploy/wal/header-only-wal/out.test.toml  |  1 +
 .../deploy/wal/lineage-mismatch/out.test.toml |  1 +
 .../bundle/deploy/wal/stale-wal/out.test.toml |  1 +
 .../bundle/deploy/wal/stale-wal/test.toml     |  1 +
 .../deploy/wal/wal-with-delete/out.test.toml  |  1 +
 .../yaml-sync-empty-grants/out.test.toml      |  1 +
 .../deployment/bind/alert/out.test.toml       |  1 +
 .../deployment/bind/catalog/out.test.toml     |  1 +
 .../deployment/bind/cluster/out.test.toml     |  1 +
 .../deployment/bind/dashboard/out.test.toml   |  1 +
 .../bind/dashboard/recreation/out.test.toml   |  1 +
 .../bind/database_instance/out.test.toml      |  1 +
 .../deployment/bind/experiment/out.test.toml  |  1 +
 .../bind/external_location/out.test.toml      |  1 +
 .../deployment/bind/genie_space/out.test.toml |  1 +
 .../already-managed-different/out.test.toml   |  1 +
 .../job/already-managed-same/out.test.toml    |  1 +
 .../bind/job/engine-from-config/out.test.toml |  1 +
 .../bind/job/generate-and-bind/out.test.toml  |  1 +
 .../bind/job/job-abort-bind/out.test.toml     |  1 +
 .../job/job-spark-python-task/out.test.toml   |  1 +
 .../bind/job/noop-job/out.test.toml           |  1 +
 .../bind/job/python-job/out.test.toml         |  1 +
 .../bind/job/stale-state/out.test.toml        |  1 +
 .../bind/model-serving-endpoint/out.test.toml |  1 +
 .../bind/pipelines/recreate/out.test.toml     |  1 +
 .../bind/pipelines/update/out.test.toml       |  1 +
 .../bind/postgres_database/out.test.toml      |  1 +
 .../bind/postgres_role/out.test.toml          |  1 +
 .../bind/quality-monitor/out.test.toml        |  1 +
 .../bind/registered-model/out.test.toml       |  1 +
 .../deployment/bind/schema/out.test.toml      |  1 +
 .../bind/secret-scope/out.test.toml           |  1 +
 .../bind/sql_warehouse/out.test.toml          |  1 +
 acceptance/bundle/deployment/bind/test.toml   |  2 +
 .../bind/vector_search_endpoint/out.test.toml |  1 +
 .../bind/vector_search_index/out.test.toml    |  1 +
 .../deployment/bind/volume/out.test.toml      |  1 +
 .../unbind/engine-from-config/out.test.toml   |  1 +
 .../deployment/unbind/grants/out.test.toml    |  1 +
 .../deployment/unbind/job/out.test.toml       |  1 +
 .../unbind/permissions/out.test.toml          |  1 +
 .../unbind/python-job/out.test.toml           |  1 +
 acceptance/bundle/deployment/unbind/test.toml |  2 +
 .../destroy/all-resources/out.test.toml       |  1 +
 .../force-lock-node-limit/out.test.toml       |  1 +
 .../destroy/jobs-and-pipeline/out.test.toml   |  1 +
 .../bundle/destroy/jobs-and-pipeline/script   |  2 +-
 .../out.test.toml                             |  1 +
 .../root-path-name-target/out.test.toml       |  1 +
 .../root-path-not-scoped/out.test.toml        |  1 +
 .../destroy/sibling-target/out.test.toml      |  1 +
 .../bundle/dms/declined-deploy/out.test.toml  |  1 +
 .../bundle/dms/depends-on/out.test.toml       |  1 +
 .../deployment-metadata-change/out.test.toml  |  1 +
 .../bundle/dms/emptied-resource/out.test.toml |  1 +
 .../bundle/dms/existing-state/out.test.toml   |  1 +
 .../bundle/dms/failed-delete/out.test.toml    |  1 +
 .../bundle/dms/failed-recreate/out.test.toml  |  1 +
 .../failed-update-permissions/out.test.toml   |  1 +
 .../bundle/dms/failed-update/out.test.toml    |  1 +
 .../dms/multiple-resources/out.test.toml      |  1 +
 acceptance/bundle/dms/no-drift/out.test.toml  |  1 +
 .../bundle/dms/no-resources/out.test.toml     |  1 +
 .../bundle/dms/not-supported/out.test.toml    |  1 +
 .../operation-upload-fails-once/out.test.toml |  1 +
 .../dms/operation-upload-fails/out.test.toml  |  1 +
 .../operation-upload-message/out.test.toml    |  1 +
 .../bundle/dms/provenance/out.test.toml       |  1 +
 .../bundle/dms/record-failure/out.test.toml   |  1 +
 acceptance/bundle/dms/record/out.test.toml    |  1 +
 .../dms/resource-lifecycle/out.test.toml      |  1 +
 acceptance/bundle/dms/summary/out.test.toml   |  1 +
 acceptance/bundle/dms/test.toml               |  4 ++
 .../dms/version-never-created/out.test.toml   |  1 +
 .../bundle/empty_string_dropped/out.test.toml |  1 +
 acceptance/bundle/empty_string_dropped/script |  9 ++--
 .../empty_string_variable/out.test.toml       |  1 +
 .../environments/dependencies/out.test.toml   |  1 +
 .../bundle/environments/dependencies/script   |  8 ++--
 .../skip_name_prefix_for_schema/out.test.toml |  1 +
 .../bundle/generate/alert/out.test.toml       |  1 +
 .../alert_existing_id_not_found/out.test.toml |  1 +
 .../app_not_yet_deployed/out.test.toml        |  1 +
 .../generate/app_subfolders/out.test.toml     |  1 +
 .../bundle/generate/auto-bind/out.test.toml   |  1 +
 .../generate/dashboard-inplace/out.test.toml  |  1 +
 .../bundle/generate/dashboard/out.test.toml   |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../generate/designer_job/out.test.toml       |  1 +
 .../bundle/generate/genie_space/out.test.toml |  1 +
 .../out.test.toml                             |  1 +
 .../genie_space_inplace/out.test.toml         |  1 +
 .../bundle/generate/git_job/out.test.toml     |  1 +
 .../generate/include_warning/out.test.toml    |  1 +
 .../bundle/generate/ipynb_job/out.test.toml   |  1 +
 .../job_nested_notebooks/out.test.toml        |  1 +
 .../generate/lakeflow_pipelines/out.test.toml |  1 +
 .../bundle/generate/pipeline/out.test.toml    |  1 +
 .../pipeline_and_deploy/out.test.toml         |  1 +
 .../generate/pipeline_with_glob/out.test.toml |  1 +
 .../generate/pipeline_with_sql/out.test.toml  |  1 +
 .../bundle/generate/python_job/out.test.toml  |  1 +
 .../python_job_and_deploy/out.test.toml       |  1 +
 .../spark_python_task_job/out.test.toml       |  1 +
 acceptance/bundle/git-metadata/out.test.toml  |  1 +
 acceptance/bundle/git-permerror/out.test.toml |  1 +
 .../bundle/help/bundle-deploy/out.test.toml   |  1 +
 .../bundle-deployment-migrate/out.test.toml   |  1 +
 .../help/bundle-deployment/out.test.toml      |  1 +
 .../bundle/help/bundle-destroy/out.test.toml  |  1 +
 .../bundle-generate-dashboard/out.test.toml   |  1 +
 .../help/bundle-generate-job/out.test.toml    |  1 +
 .../bundle-generate-pipeline/out.test.toml    |  1 +
 .../bundle/help/bundle-generate/out.test.toml |  1 +
 .../bundle/help/bundle-init/out.test.toml     |  1 +
 .../bundle/help/bundle-open/out.test.toml     |  1 +
 .../bundle/help/bundle-run/out.test.toml      |  1 +
 .../bundle/help/bundle-schema/out.test.toml   |  1 +
 .../bundle/help/bundle-summary/out.test.toml  |  1 +
 .../bundle/help/bundle-sync/out.test.toml     |  1 +
 .../bundle/help/bundle-validate/out.test.toml |  1 +
 acceptance/bundle/help/bundle/out.test.toml   |  1 +
 .../includes/glob_in_root_path/out.test.toml  |  1 +
 .../include_outside_root/out.test.toml        |  1 +
 .../non_yaml_in_include/out.test.toml         |  1 +
 .../includes/yml_outside_root/out.test.toml   |  1 +
 .../bundle/integration_whl/base/out.test.toml |  1 +
 .../custom_params/out.test.toml               |  1 +
 .../interactive_cluster/out.test.toml         |  1 +
 .../out.test.toml                             |  1 +
 .../interactive_single_user/out.test.toml     |  1 +
 .../integration_whl/serverless/out.test.toml  |  1 +
 .../serverless_custom_params/out.test.toml    |  1 +
 .../serverless_dynamic_version/out.test.toml  |  1 +
 .../serverless_extras/out.test.toml           |  1 +
 .../out.test.toml                             |  1 +
 .../integration_whl/wrapper/out.test.toml     |  1 +
 .../wrapper_custom_params/out.test.toml       |  1 +
 .../invariant/continue_293/out.test.toml      |  1 +
 .../bundle/invariant/continue_293/test.toml   |  4 ++
 .../invariant/delete_idempotent/out.test.toml |  1 +
 .../invariant/delete_idempotent/test.toml     |  1 +
 .../destroy_idempotent/out.test.toml          |  1 +
 .../invariant/destroy_idempotent/test.toml    |  1 +
 .../bundle/invariant/migrate/out.test.toml    |  1 +
 acceptance/bundle/invariant/migrate/test.toml |  1 +
 .../bundle/invariant/no_drift/out.test.toml   |  1 +
 .../bundle/libraries/maven/out.test.toml      |  1 +
 .../outside_of_bundle_root/out.test.toml      |  1 +
 .../bundle/libraries/pypi/out.test.toml       |  1 +
 .../lifecycle/prevent-destroy/out.test.toml   |  1 +
 .../started-validation/out.test.toml          |  1 +
 .../bundle/lifecycle/started/out.test.toml    |  1 +
 .../local_state_staleness/out.test.toml       |  1 +
 .../migrate/added-direct-only/out.test.toml   |  1 +
 acceptance/bundle/migrate/added/out.test.toml |  1 +
 .../migrate/auto-migrate-clean/out.test.toml  |  1 +
 .../auto-migrate-default/out.test.toml        |  1 +
 .../out.test.toml                             |  1 +
 .../auto-migrate-direct-only/out.test.toml    |  1 +
 .../auto-migrate-empty-tfstate/out.test.toml  |  1 +
 .../migrate/auto-migrate-envvar/out.test.toml |  1 +
 .../auto-migrate-push-failure/out.test.toml   |  1 +
 .../out.test.toml                             |  1 +
 acceptance/bundle/migrate/basic/out.test.toml |  1 +
 .../bundle/migrate/dashboards/out.test.toml   |  1 +
 .../migrate/default-python/out.test.toml      |  1 +
 .../engine-config-direct/out.test.toml        |  1 +
 .../engine-config-terraform/out.test.toml     |  1 +
 .../bundle/migrate/grants/out.test.toml       |  1 +
 .../bundle/migrate/permissions/out.test.toml  |  1 +
 .../bundle/migrate/profile_arg/out.test.toml  |  1 +
 .../bundle/migrate/removed/out.test.toml      |  1 +
 acceptance/bundle/migrate/runas/out.test.toml |  1 +
 acceptance/bundle/migrate/test.toml           |  1 +
 .../bundle/migrate/var_arg/out.test.toml      |  1 +
 .../multi_profile/auto_select/out.test.toml   |  1 +
 .../multi_profile/env_auth_skip/out.test.toml |  1 +
 .../no_workspace_profiles/out.test.toml       |  1 +
 .../non_interactive_error/out.test.toml       |  1 +
 acceptance/bundle/open/out.test.toml          |  1 +
 .../bundle/override/clusters/out.test.toml    |  1 +
 .../bundle/override/job_cluster/out.test.toml |  1 +
 .../override/job_cluster_var/out.test.toml    |  1 +
 .../bundle/override/job_tasks/out.test.toml   |  1 +
 .../override/merge-string-map/out.test.toml   |  1 +
 .../override/pipeline_cluster/out.test.toml   |  1 +
 .../paths/designer_notebook/out.test.toml     |  1 +
 .../bundle/paths/fallback/out.test.toml       |  1 +
 .../paths/git_source_jobs/out.test.toml       |  1 +
 .../invalid_pipeline_globs/out.test.toml      |  1 +
 acceptance/bundle/paths/nominal/out.test.toml |  1 +
 .../paths/outside_root_no_sync/out.test.toml  |  1 +
 .../out.test.toml                             |  1 +
 .../bundle/paths/pipeline_globs/out.test.toml |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../relative_path_outside_root/out.test.toml  |  1 +
 .../relative_path_translation/out.test.toml   |  1 +
 .../bundle/plan/no_upload/out.test.toml       |  1 +
 .../presets/preset_vs_dev_mode/out.test.toml  |  1 +
 .../python/alerts-support/out.test.toml       |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../experimental-compatibility/out.test.toml  |  1 +
 .../python/grants-aliases/out.test.toml       |  1 +
 .../python/mutator-ordering/out.test.toml     |  1 +
 .../out.test.toml                             |  1 +
 .../python/pipelines-support/out.test.toml    |  1 +
 .../python/propagates-auth-env/out.test.toml  |  1 +
 .../python/resolve-variable/out.test.toml     |  1 +
 .../python/resource-loading/out.test.toml     |  1 +
 .../python/restricted-execution/out.test.toml |  1 +
 .../python/schemas-support/out.test.toml      |  1 +
 .../python/unicode-support/out.test.toml      |  1 +
 .../python/volumes-support/out.test.toml      |  1 +
 .../bundle/quality_monitor/out.test.toml      |  1 +
 acceptance/bundle/quiet-levels/out.test.toml  |  1 +
 acceptance/bundle/refschema/out.test.toml     |  1 +
 .../bad_ref_string_to_int/out.test.toml       |  1 +
 .../resource_deps/bad_syntax/out.test.toml    |  1 +
 .../computed_volume_path/out.test.toml        |  1 +
 .../resource_deps/create_error/out.test.toml  |  1 +
 .../resource_deps/create_error/output.txt     |  6 +--
 .../bundle/resource_deps/create_error/script  |  6 +--
 .../resource_deps/duplicate_ref/out.test.toml |  1 +
 .../resource_deps/grant_ref/out.test.toml     |  1 +
 .../resource_deps/id_chain/out.test.toml      |  1 +
 .../bundle/resource_deps/id_chain/script      |  6 +--
 .../resource_deps/id_star/out.test.toml       |  1 +
 .../immutable_field_ref/out.test.toml         |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../implicit_deps_volume/out.test.toml        |  1 +
 .../bundle/resource_deps/job_id/out.test.toml |  1 +
 .../bundle/resource_deps/job_id/output.txt    |  6 +--
 acceptance/bundle/resource_deps/job_id/script | 10 ++---
 .../job_id_big_graph/delete_all/out.test.toml |  1 +
 .../job_id_big_graph/delete_all/output.txt    |  2 +-
 .../job_id_big_graph/delete_all/script        |  2 +-
 .../job_id_big_graph/destroy/out.test.toml    |  1 +
 .../job_id_big_graph/destroy/output.txt       |  2 +-
 .../job_id_big_graph/destroy/script           |  2 +-
 .../job_id_delete_bar/out.test.toml           |  1 +
 .../job_id_delete_bar/output.txt              |  6 +--
 .../resource_deps/job_id_delete_bar/script    |  8 ++--
 .../job_id_delete_foo/out.test.toml           |  1 +
 .../job_id_delete_foo/output.txt              |  6 +--
 .../resource_deps/job_id_delete_foo/script    |  8 ++--
 .../resource_deps/job_tasks/out.test.toml     |  1 +
 .../resource_deps/jobs_update/out.test.toml   |  1 +
 .../resource_deps/jobs_update/output.txt      |  6 +--
 .../bundle/resource_deps/jobs_update/script   | 10 ++---
 .../jobs_update_remote/out.test.toml          |  1 +
 .../jobs_update_remote/output.txt             |  4 +-
 .../resource_deps/jobs_update_remote/script   |  8 ++--
 .../resource_deps/loop_jobs/out.test.toml     |  1 +
 .../resource_deps/loop_self/out.test.toml     |  1 +
 .../out.test.toml                             |  1 +
 .../missing_map_key/out.test.toml             |  1 +
 .../missing_string_field/out.test.toml        |  1 +
 .../missing_string_field/output.txt           |  4 +-
 .../resource_deps/missing_string_field/script |  6 +--
 .../resource_deps/model_id_ref/out.test.toml  |  1 +
 .../resource_deps/model_id_ref/output.txt     |  2 +-
 .../bundle/resource_deps/model_id_ref/script  |  2 +-
 .../non_existent_field/out.test.toml          |  1 +
 .../permission_ref/out.test.toml              |  1 +
 .../pipelines_recreate/out.test.toml          |  1 +
 .../pipelines_recreate/output.txt             |  8 ++--
 .../resource_deps/pipelines_recreate/script   | 18 ++++----
 .../out.test.toml                             |  1 +
 .../remote_app_url/out.test.toml              |  1 +
 .../resource_deps/remote_app_url/output.txt   |  6 +--
 .../resource_deps/remote_app_url/script       |  6 +--
 .../out.test.toml                             |  1 +
 .../remote_pipeline/out.test.toml             |  1 +
 .../resource_deps/remote_pipeline/script      |  4 +-
 .../resource_deps/resources_var/out.test.toml |  1 +
 .../resources_var_presets/out.test.toml       |  1 +
 .../out.test.toml                             |  1 +
 .../tf_path_only_error/out.test.toml          |  1 +
 .../tf_path_renames/out.test.toml             |  1 +
 .../unicode_reference/out.test.toml           |  1 +
 .../volume_path_contains_id/out.test.toml     |  1 +
 .../volume_path_job_ref/out.test.toml         |  1 +
 .../volume_path_job_ref/output.txt            |  2 +-
 .../resource_deps/volume_path_job_ref/script  |  4 +-
 .../resources/alerts/basic/out.test.toml      |  1 +
 .../resources/alerts/with_file/out.test.toml  |  1 +
 .../out.test.toml                             |  1 +
 .../with_file_run_from_subdir/out.test.toml   |  1 +
 .../out.test.toml                             |  1 +
 .../apps/config-drift-stopped/out.test.toml   |  1 +
 .../resources/apps/config-drift/out.test.toml |  1 +
 .../apps/config-no-deployment/out.test.toml   |  1 +
 .../apps/create_already_exists/out.test.toml  |  1 +
 .../apps/default_description/out.test.toml    |  1 +
 .../git-source-no-deployment/out.test.toml    |  1 +
 .../resources/apps/immutable/out.test.toml    |  1 +
 .../apps/inline_config/out.test.toml          |  1 +
 .../lifecycle-started-omitted/out.test.toml   |  1 +
 .../apps/lifecycle-started-omitted/script     |  2 +-
 .../out.test.toml                             |  1 +
 .../lifecycle-started-toggle/out.test.toml    |  1 +
 .../apps/lifecycle-started/out.test.toml      |  1 +
 .../apps/readplan-lifecycle/out.test.toml     |  1 +
 .../apps/resource-refs/out.test.toml          |  1 +
 .../apps/uc-securable-drift/out.test.toml     |  1 +
 .../resources/apps/update/out.test.toml       |  1 +
 .../catalogs/auto-approve/out.test.toml       |  1 +
 .../resources/catalogs/basic/out.test.toml    |  1 +
 .../comment_out_of_band/out.test.toml         |  1 +
 .../drift/managed_properties/out.test.toml    |  1 +
 .../catalogs/empty-name/out.test.toml         |  1 +
 .../catalogs/with-schemas/out.test.toml       |  1 +
 .../backend_normalization/out.test.toml       |  1 +
 .../cluster_policies/basic/out.test.toml      |  1 +
 .../out.test.toml                             |  1 +
 .../definition_multiline/out.test.toml        |  1 +
 .../definition_yaml/out.test.toml             |  1 +
 .../cluster_policies/job_ref/out.test.toml    |  1 +
 .../cluster_policies/job_ref/output.txt       |  6 +--
 .../resources/cluster_policies/job_ref/script |  6 +--
 .../out_of_band_change/out.test.toml          |  1 +
 .../permissions/levels/out.test.toml          |  1 +
 .../out_of_band_deletion/out.test.toml        |  1 +
 .../out_of_band_grant/out.test.toml           |  1 +
 .../policy_family_definition/out.test.toml    |  1 +
 .../policy_family_overrides/out.test.toml     |  1 +
 .../deploy/data_security_mode/out.test.toml   |  1 +
 .../deploy/instance_pool/out.test.toml        |  1 +
 .../instance_pool_and_node_type/out.test.toml |  1 +
 .../deploy/local_ssd_count/out.test.toml      |  1 +
 .../deploy/num_workers_absent/out.test.toml   |  1 +
 .../clusters/deploy/simple/out.test.toml      |  1 +
 .../deploy/update-after-create/out.test.toml  |  1 +
 .../update-and-resize-autoscale/out.test.toml |  1 +
 .../deploy/update-and-resize-autoscale/script |  4 +-
 .../deploy/update-and-resize/out.test.toml    |  1 +
 .../clusters/deploy/update-and-resize/script  |  4 +-
 .../deploy/workload_type/out.test.toml        |  1 +
 .../out.test.toml                             |  1 +
 .../lifecycle-started-toggle/out.test.toml    |  1 +
 .../clusters/lifecycle-started/out.test.toml  |  1 +
 .../clusters/readplan-lifecycle/out.test.toml |  1 +
 .../resize-terminated-fallback/out.test.toml  |  1 +
 .../run/spark_python_task/out.test.toml       |  1 +
 .../change-embed-credentials/out.test.toml    |  1 +
 .../dashboards/change-name/out.test.toml      |  1 +
 .../change-parent-path/out.test.toml          |  1 +
 .../change-serialized-dashboard/out.test.toml |  1 +
 .../dataset-catalog-schema/out.test.toml      |  1 +
 .../delete-trashed-out-of-band/out.test.toml  |  1 +
 .../dashboards/destroy/out.test.toml          |  1 +
 .../dashboards/detect-change/out.test.toml    |  1 +
 .../dashboards/generate_inplace/out.test.toml |  1 +
 .../dashboards/nested-folders/out.test.toml   |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../resources/dashboards/simple/out.test.toml |  1 +
 .../simple_outside_bundle_root/out.test.toml  |  1 +
 .../dashboards/simple_syncroot/out.test.toml  |  1 +
 .../unpublish-out-of-band/out.test.toml       |  1 +
 .../dashboards/unpublish-out-of-band/script   |  2 +-
 .../database_catalogs/basic/out.test.toml     |  1 +
 .../database_catalogs/recreate/out.test.toml  |  1 +
 .../database_instances/recreate/out.test.toml |  1 +
 .../single-instance/out.test.toml             |  1 +
 .../resources/experiments/basic/out.test.toml |  1 +
 .../comment_cleared/out.test.toml             |  1 +
 .../external_locations/out.test.toml          |  1 +
 .../genie_spaces/delete_warning/out.test.toml |  1 +
 .../genie_spaces/inline/out.test.toml         |  1 +
 .../parent_path_update/out.test.toml          |  1 +
 .../recreate_when_gone/out.test.toml          |  1 +
 .../serialized_space/out.test.toml            |  1 +
 .../genie_spaces/simple/out.test.toml         |  1 +
 .../version_migration/out.test.toml           |  1 +
 .../resources/grants/catalogs/out.test.toml   |  1 +
 .../grants/registered_models/out.test.toml    |  1 +
 .../schemas/all_privileges/out.test.toml      |  1 +
 .../all_privileges_coexist/out.test.toml      |  1 +
 .../schemas/change_privilege/out.test.toml    |  1 +
 .../duplicate_principals/out.test.toml        |  1 +
 .../duplicate_privileges/out.test.toml        |  1 +
 .../grants/schemas/empty_array/out.test.toml  |  1 +
 .../out_of_band_principal/out.test.toml       |  1 +
 .../grants/schemas/remove_all/out.test.toml   |  1 +
 .../schemas/remove_principal/out.test.toml    |  1 +
 .../resources/grants/volumes/out.test.toml    |  1 +
 .../resources/independent/out.test.toml       |  1 +
 .../resources/instance_pools/out.test.toml    |  1 +
 .../resources/job_runs/basic/out.test.toml    |  1 +
 .../destroy_unfinished_run/out.test.toml      |  1 +
 .../job_runs/failed_run/out.test.toml         |  1 +
 .../job_runs/interrupted_run/out.test.toml    |  1 +
 .../job_runs/job_parameters/out.test.toml     |  1 +
 .../job_runs/on_bundle_deploy/out.test.toml   |  1 +
 .../resources/job_runs/redeploy/out.test.toml |  1 +
 .../job_runs/retried_run_now/out.test.toml    |  1 +
 .../resources/job_runs/wait/out.test.toml     |  1 +
 .../resources/jobs/alert-task/out.test.toml   |  1 +
 .../resources/jobs/big_id/out.test.toml       |  1 +
 .../bundle/resources/jobs/big_id/output.txt   |  4 +-
 .../bundle/resources/jobs/big_id/script       |  4 +-
 .../bundle/resources/jobs/big_id/test.toml    |  1 +
 .../jobs/check-metadata/out.test.toml         |  1 +
 .../resources/jobs/create-error/out.test.toml |  1 +
 .../resources/jobs/delete_job/out.test.toml   |  1 +
 .../bundle/resources/jobs/delete_job/script   |  4 +-
 .../resources/jobs/delete_task/out.test.toml  |  1 +
 .../resources/jobs/delete_task/test.toml      |  1 +
 .../jobs/double-underscore-keys/out.test.toml |  1 +
 .../jobs/fail-on-active-runs/out.test.toml    |  1 +
 .../instance_pool_and_node_type/out.test.toml |  1 +
 .../jobs/no-git-provider/out.test.toml        |  1 +
 .../resources/jobs/num_workers/out.test.toml  |  1 +
 .../resources/jobs/num_workers/output.txt     |  2 +-
 .../bundle/resources/jobs/num_workers/script  |  2 +-
 .../jobs/on_failure_empty_slice/out.test.toml |  1 +
 .../jobs/on_failure_empty_slice/script        |  2 +-
 .../jobs/remote_add_tag/out.test.toml         |  1 +
 .../resources/jobs/remote_add_tag/script      |  2 +-
 .../jobs/remote_delete/deploy/out.test.toml   |  1 +
 .../jobs/remote_delete/deploy/test.toml       |  1 +
 .../jobs/remote_delete/destroy/out.test.toml  |  1 +
 .../removed_from_config/out.test.toml         |  1 +
 .../removed_from_config/output.txt            |  2 +-
 .../remote_delete/removed_from_config/script  |  2 +-
 .../jobs/remote_matches_config/out.test.toml  |  1 +
 .../jobs/remote_matches_config/output.txt     |  2 +-
 .../jobs/remote_matches_config/script         |  4 +-
 .../jobs/shared-root-path/out.test.toml       |  1 +
 .../jobs/tags_empty_map/out.test.toml         |  1 +
 .../resources/jobs/tags_empty_map/script      |  2 +-
 .../resources/jobs/task-source/out.test.toml  |  1 +
 .../resources/jobs/task-source/output.txt     |  8 ++--
 .../bundle/resources/jobs/task-source/script  |  8 ++--
 .../jobs/tasks-reorder-locally/out.test.toml  |  1 +
 .../unknown-terraform-field/out.test.toml     |  1 +
 .../resources/jobs/update/out.test.toml       |  1 +
 .../bundle/resources/jobs/update/output.txt   |  8 ++--
 .../bundle/resources/jobs/update/script       |  8 ++--
 .../bundle/resources/jobs/update/test.toml    |  1 +
 .../jobs/update_single_node/out.test.toml     |  1 +
 .../jobs/update_single_node/output.txt        |  6 +--
 .../resources/jobs/update_single_node/script  | 14 +++----
 .../jobs/webhook-reorder-remote/out.test.toml |  1 +
 .../jobs/webhook-reorder-remote/output.txt    |  2 +-
 .../jobs/webhook-reorder-remote/script        |  4 +-
 .../basic/out.test.toml                       |  1 +
 .../drift/recreated_same_name/out.test.toml   |  1 +
 .../telemetry_config_unmanaged/out.test.toml  |  1 +
 .../out.test.toml                             |  1 +
 .../drift/write_only/out.test.toml            |  1 +
 .../recreate/catalog-name/out.test.toml       |  1 +
 .../recreate/name-change/out.test.toml        |  1 +
 .../recreate/route-optimized/out.test.toml    |  1 +
 .../recreate/schema-name/out.test.toml        |  1 +
 .../recreate/table-prefix/out.test.toml       |  1 +
 .../running-endpoint/out.test.toml            |  1 +
 .../update/ai-gateway/out.test.toml           |  1 +
 .../both_gateway_and_tags/out.test.toml       |  1 +
 .../update/config/out.test.toml               |  1 +
 .../update/email-notifications/out.test.toml  |  1 +
 .../update/tags/out.test.toml                 |  1 +
 .../resources/models/basic/out.test.toml      |  1 +
 .../resources/models/empty-name/out.test.toml |  1 +
 .../models/readplan-permissions/out.test.toml |  1 +
 .../bundle/resources/permissions/_script      |  6 +--
 .../apps/current_can_manage/out.test.toml     |  1 +
 .../apps/other_can_manage/out.test.toml       |  1 +
 .../clusters/current_can_manage/out.test.toml |  1 +
 .../permissions/clusters/target/out.test.toml |  1 +
 .../dashboards/create/out.test.toml           |  1 +
 .../current_can_manage/out.test.toml          |  1 +
 .../current_can_manage/out.test.toml          |  1 +
 .../permissions/factcheck/out.test.toml       |  1 +
 .../current_can_manage/out.test.toml          |  1 +
 .../genie_spaces/current_can_manage/script    |  2 +-
 .../out_of_band_deletion/out.test.toml        |  1 +
 .../jobs/added_remotely/out.test.toml         |  1 +
 .../permissions/jobs/added_remotely/script    |  2 +-
 .../jobs/current_can_manage/out.test.toml     |  1 +
 .../jobs/current_can_manage_run/out.test.toml |  1 +
 .../jobs/current_can_manage_run/script        |  8 ++--
 .../jobs/current_is_owner/out.test.toml       |  1 +
 .../permissions/jobs/delete_one/out.test.toml |  1 +
 .../permissions/jobs/delete_one/script        |  8 ++--
 .../jobs/deleted_remotely/out.test.toml       |  1 +
 .../jobs/deleted_remotely/output.txt          |  6 +--
 .../permissions/jobs/deleted_remotely/script  | 10 ++---
 .../jobs/destroy_without_mgmtperms/test.toml  |  4 ++
 .../with_permissions/out.test.toml            |  1 +
 .../without_permissions/out.test.toml         |  1 +
 .../permissions/jobs/empty_list/out.test.toml |  1 +
 .../jobs/other_can_manage/out.test.toml       |  1 +
 .../jobs/other_can_manage_run/out.test.toml   |  1 +
 .../jobs/other_can_manage_run/script          |  4 +-
 .../jobs/other_is_owner/out.test.toml         |  1 +
 .../jobs/reorder_locally/out.test.toml        |  1 +
 .../jobs/reorder_remotely/out.test.toml       |  1 +
 .../permissions/jobs/update/out.test.toml     |  1 +
 .../permissions/jobs/update/output.txt        | 14 +++----
 .../resources/permissions/jobs/update/script  | 28 ++++++-------
 .../permissions/jobs/viewers/out.test.toml    |  1 +
 .../models/current_can_manage/out.test.toml   |  1 +
 .../models/current_can_manage/script          |  2 +-
 .../resources/permissions/out.test.toml       |  1 +
 .../pipelines/504/create/out.test.toml        |  1 +
 .../pipelines/504/plan/out.test.toml          |  1 +
 .../pipelines/504/update/out.test.toml        |  1 +
 .../current_can_manage/out.test.toml          |  1 +
 .../pipelines/current_is_owner/out.test.toml  |  1 +
 .../pipelines/empty_list/out.test.toml        |  1 +
 .../pipelines/other_can_manage/out.test.toml  |  1 +
 .../pipelines/other_is_owner/out.test.toml    |  1 +
 .../pipelines/update/out.test.toml            |  1 +
 .../permissions/pipelines/update/output.txt   | 10 ++---
 .../permissions/pipelines/update/script       | 23 ++++++-----
 .../current_can_manage/out.test.toml          |  1 +
 .../current_can_manage/out.test.toml          |  1 +
 .../target_permissions/out.test.toml          |  1 +
 .../permissions/target_permissions/script     |  6 +--
 .../current_can_manage/out.test.toml          |  1 +
 .../allow-duplicate-names/out.test.toml       |  1 +
 .../allow-duplicate-names/output.txt          |  2 +-
 .../pipelines/allow-duplicate-names/script    |  2 +-
 .../pipelines/auto-approve/out.test.toml      |  1 +
 .../resources/pipelines/auto-approve/script   |  8 ++--
 .../pipelines/drift/parameters/out.test.toml  |  1 +
 .../pipelines/drift/parameters/output.txt     |  2 +-
 .../pipelines/drift/parameters/script         |  2 +-
 .../pipelines/lakeflow-pipeline/out.test.toml |  1 +
 .../pipelines/lakeflow-pipeline/script        |  2 +-
 .../num-workers-zero/out.requests.direct.txt  |  2 -
 .../out.requests.terraform.txt                |  2 -
 .../pipelines/num-workers-zero/out.test.toml  |  1 +
 .../pipelines/num-workers-zero/script         |  2 +-
 .../pipelines/photon-true/out.test.toml       |  1 +
 .../resources/pipelines/photon-true/script    |  2 +-
 .../resources/pipelines/recreate-keys/_script | 10 +++--
 .../change-ingestion-definition/out.test.toml |  1 +
 .../change-storage/out.test.toml              |  1 +
 .../pipelines/recreate/out.test.toml          |  1 +
 .../resources/pipelines/recreate/script       |  4 +-
 .../remote_matches_config/out.test.toml       |  1 +
 .../pipelines/remote_matches_config/script    |  2 +-
 .../resources/pipelines/update/out.test.toml  |  1 +
 .../bundle/resources/pipelines/update/script  |  4 +-
 .../pipelines/zero-value-fields/out.test.toml |  1 +
 .../pipelines/zero-value-fields/script        |  2 +-
 .../postgres_branches/basic/out.test.toml     |  1 +
 .../purge_on_delete/out.test.toml             |  1 +
 .../purge_on_delete_transitions/out.test.toml |  1 +
 .../postgres_branches/recreate/out.test.toml  |  1 +
 .../replace_existing/out.test.toml            |  1 +
 .../update_protected/out.test.toml            |  1 +
 .../postgres_branches/update_protected/script |  8 ++--
 .../without_branch_id/out.test.toml           |  1 +
 .../postgres_catalogs/basic/out.test.toml     |  1 +
 .../postgres_catalogs/recreate/out.test.toml  |  1 +
 .../postgres_databases/basic/out.test.toml    |  1 +
 .../live_errors/bad_database_id/out.test.toml |  1 +
 .../live_errors/bad_role_ref/out.test.toml    |  1 +
 .../postgres_databases/recreate/out.test.toml |  1 +
 .../replace_existing/out.test.toml            |  1 +
 .../replace_existing/test.toml                |  3 ++
 .../postgres_databases/update/out.test.toml   |  1 +
 .../postgres_databases/update/script          |  8 ++--
 .../postgres_endpoints/basic/out.test.toml    |  1 +
 .../postgres_endpoints/recreate/out.test.toml |  1 +
 .../replace_existing/out.test.toml            |  1 +
 .../update_autoscaling/out.test.toml          |  1 +
 .../update_autoscaling/script                 |  8 ++--
 .../update_suspend_timeout/out.test.toml      |  1 +
 .../without_endpoint_id/out.test.toml         |  1 +
 .../postgres_projects/basic/out.test.toml     |  1 +
 .../purge_on_delete/out.test.toml             |  1 +
 .../purge_on_delete_transitions/out.test.toml |  1 +
 .../postgres_projects/recreate/out.test.toml  |  1 +
 .../update_display_name/out.test.toml         |  1 +
 .../update_display_name/script                |  8 ++--
 .../without_project_id/out.test.toml          |  1 +
 .../postgres_roles/basic/out.test.toml        |  1 +
 .../inherited-role-bind/out.test.toml         |  1 +
 .../inherited-role-conflict/out.test.toml     |  1 +
 .../inherited-role-conflict/test.toml         |  1 +
 .../recreate-postgres-role/out.test.toml      |  1 +
 .../postgres_roles/recreate/out.test.toml     |  1 +
 .../replace_existing/out.test.toml            |  1 +
 .../postgres_roles/replace_existing/test.toml |  3 ++
 .../postgres_roles/update/out.test.toml       |  1 +
 .../resources/postgres_roles/update/script    |  8 ++--
 .../basic/out.test.toml                       |  1 +
 .../recreate/out.test.toml                    |  1 +
 .../change_assets_dir/out.test.toml           |  1 +
 .../change_output_schema_name/out.test.toml   |  1 +
 .../change_table_name/out.test.toml           |  1 +
 .../quality_monitors/create/out.test.toml     |  1 +
 .../aliases_converge/out.test.toml            |  1 +
 .../registered_models/basic/out.test.toml     |  1 +
 .../resources/registered_models/basic/script  |  2 +-
 .../comment_cleared/out.test.toml             |  1 +
 .../drift/browse_only/out.test.toml           |  1 +
 .../schemas/auto-approve/out.test.toml        |  1 +
 .../resources/schemas/auto-approve/script     |  4 +-
 .../schemas/comment_out_of_band/out.test.toml |  1 +
 .../drift/managed_properties/out.test.toml    |  1 +
 .../resources/schemas/recreate/out.test.toml  |  1 +
 .../resources/schemas/update/out.test.toml    |  1 +
 .../secret_scopes/backend-type/out.test.toml  |  1 +
 .../secret_scopes/basic/out.test.toml         |  1 +
 .../secret_scopes/delete_scope/out.test.toml  |  1 +
 .../permissions-collapse/out.test.toml        |  1 +
 .../secret_scopes/permissions/out.test.toml   |  1 +
 .../resources/secrets/basic/out.test.toml     |  1 +
 .../secrets/direct-only/out.test.toml         |  1 +
 .../secrets/update-value/out.test.toml        |  1 +
 .../out.test.toml                             |  1 +
 .../validate-no-plain-text/out.test.toml      |  1 +
 .../validate-secret-is-string/out.test.toml   |  1 +
 .../lifecycle-started-edit/out.test.toml      |  1 +
 .../out.test.toml                             |  1 +
 .../lifecycle-started-toggle/out.test.toml    |  1 +
 .../lifecycle-started/out.test.toml           |  1 +
 .../resources/sql_warehouses/out.test.toml    |  1 +
 .../basic/out.test.toml                       |  1 +
 .../recreate/out.test.toml                    |  1 +
 .../basic/out.test.toml                       |  1 +
 .../drift/budget_policy/out.test.toml         |  1 +
 .../drift/recreated_same_name/out.test.toml   |  1 +
 .../drift/target_qps/out.test.toml            |  1 +
 .../recreate/create-fails/out.test.toml       |  1 +
 .../recreate/endpoint_type/out.test.toml      |  1 +
 .../update/budget_policy/out.test.toml        |  1 +
 .../update/target_qps/out.test.toml           |  1 +
 .../vector_search_indexes/basic/out.test.toml |  1 +
 .../drift/deleted_remotely/out.test.toml      |  1 +
 .../drift/orphaned_endpoint/out.test.toml     |  1 +
 .../grants/select/out.test.toml               |  1 +
 .../embedding_dimension/out.test.toml         |  1 +
 .../recreate/pending_deletion/out.test.toml   |  1 +
 .../recreate/with_endpoint/out.test.toml      |  1 +
 .../schema_normalization/out.test.toml        |  1 +
 .../volumes/catalog-var-ref/out.test.toml     |  1 +
 .../volumes/change-comment/out.test.toml      |  1 +
 .../volumes/change-name/out.test.toml         |  1 +
 .../resources/volumes/change-name/script      |  2 +-
 .../volumes/change-schema-name/out.test.toml  |  1 +
 .../volumes/comment_out_of_band/out.test.toml |  1 +
 .../volumes/comment_with_rename/out.test.toml |  1 +
 .../resources/volumes/recreate/out.test.toml  |  1 +
 .../volumes/remote-change-name/out.test.toml  |  1 +
 .../volumes/remote-change-name/script         |  2 +-
 .../volumes/remote-delete/out.test.toml       |  1 +
 .../set-storage-location/out.test.toml        |  1 +
 .../volumes/set-volume-path/out.test.toml     |  1 +
 .../volumes/uppercase-name/out.test.toml      |  1 +
 .../root/env-not-a-directory/out.test.toml    |  1 +
 .../bundle/root/env-not-found/out.test.toml   |  1 +
 .../bundle/root/not-found/out.test.toml       |  1 +
 .../bundle/root/real-empty-dir/out.test.toml  |  1 +
 .../bundle/run/app-with-job/out.test.toml     |  1 +
 acceptance/bundle/run/basic/out.test.toml     |  1 +
 .../bundle/run/diagnostics/out.test.toml      |  1 +
 .../run/inline-script/basic/out.test.toml     |  1 +
 .../run/inline-script/cwd/out.test.toml       |  1 +
 .../profile-is-passed/from_flag/out.test.toml |  1 +
 .../target-is-passed/default/out.test.toml    |  1 +
 .../target-is-passed/from_flag/out.test.toml  |  1 +
 .../run/inline-script/no-auth/out.test.toml   |  1 +
 .../run/inline-script/no-bundle/out.test.toml |  1 +
 .../inline-script/no-separator/out.test.toml  |  1 +
 .../bundle/run/jobs/partial_run/out.test.toml |  1 +
 acceptance/bundle/run/no-state/out.test.toml  |  1 +
 .../bundle/run/refresh-flags/out.test.toml    |  1 +
 .../bundle/run/scripts/basic/out.test.toml    |  1 +
 .../bundle/run/scripts/cwd/out.test.toml      |  1 +
 .../profile-is-passed/from_flag/out.test.toml |  1 +
 .../target-is-passed/default/out.test.toml    |  1 +
 .../target-is-passed/from_flag/out.test.toml  |  1 +
 .../run/scripts/env-bad-prefix/out.test.toml  |  1 +
 .../run/scripts/env-precedence/out.test.toml  |  1 +
 .../run/scripts/env-section/out.test.toml     |  1 +
 .../run/scripts/exit_code/out.test.toml       |  1 +
 .../bundle/run/scripts/io/out.test.toml       |  1 +
 .../bundle/run/scripts/no-auth/out.test.toml  |  1 +
 .../scripts/no-interpolation/out.test.toml    |  1 +
 .../run/scripts/no_content/out.test.toml      |  1 +
 .../run/scripts/shell/envvar/out.test.toml    |  1 +
 .../run/scripts/shell/math/out.test.toml      |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../bundle/run/state-wiped/out.test.toml      |  1 +
 .../run_as/allowed/regular_user/out.test.toml |  1 +
 .../allowed/service_principal/out.test.toml   |  1 +
 .../run_as/dashboard_embed/out.test.toml      |  1 +
 .../run_as/empty_override/out.test.toml       |  1 +
 .../bundle/run_as/empty_run_as/out.test.toml  |  1 +
 .../run_as/empty_run_as_dict/out.test.toml    |  1 +
 .../bundle/run_as/empty_sp/out.test.toml      |  1 +
 .../bundle/run_as/empty_user/out.test.toml    |  1 +
 .../run_as/empty_user_and_sp/out.test.toml    |  1 +
 .../invalid_both_sp_and_user/out.test.toml    |  1 +
 .../bundle/run_as/job_default/out.test.toml   |  1 +
 .../bundle/run_as/job_default/output.txt      |  4 +-
 acceptance/bundle/run_as/job_default/script   |  4 +-
 .../model_serving_different/out.test.toml     |  1 +
 .../model_serving_matching/out.test.toml      |  1 +
 acceptance/bundle/run_as/out.test.toml        |  1 +
 acceptance/bundle/run_as/pipelines/_script    |  4 +-
 .../pipelines/regular_user/out.test.toml      |  1 +
 .../pipelines/service_principal/out.test.toml |  1 +
 .../run_as/pipelines_legacy/out.test.toml     |  1 +
 acceptance/bundle/script.prepare              | 41 +++++++++++++++++++
 .../scripts/no-trailing-newline/out.test.toml |  1 +
 acceptance/bundle/scripts/out.test.toml       |  1 +
 .../restricted-execution/out.test.toml        |  1 +
 .../bundle/select/ambiguous/out.test.toml     |  1 +
 acceptance/bundle/select/basic/out.test.toml  |  1 +
 acceptance/bundle/select/basic/output.txt     |  4 +-
 acceptance/bundle/select/basic/script         |  8 ++--
 .../select/grants_permissions/out.test.toml   |  1 +
 .../bundle/select/missing/out.test.toml       |  1 +
 .../out.test.toml                             |  1 +
 .../bundle/select/rejected/out.test.toml      |  1 +
 acceptance/bundle/state/bad_env/out.test.toml |  1 +
 .../bundle/state/bad_json_local/out.test.toml |  1 +
 acceptance/bundle/state/basic/out.test.toml   |  1 +
 .../bundle/state/engine_default/out.test.toml |  1 +
 .../state/engine_mismatch/out.test.toml       |  1 +
 .../bundle/state/feature_flags/out.test.toml  |  1 +
 .../state/force_pull_commands/out.test.toml   |  1 +
 .../bundle/state/future_version/out.test.toml |  1 +
 .../state/lineage_different/out.test.toml     |  1 +
 .../state/newer_cli_version/out.test.toml     |  1 +
 .../permission_level_migration/out.test.toml  |  1 +
 .../state/permission_level_migration/script   |  2 +-
 .../permission_level_migration/test.toml      |  1 +
 .../bundle/state/same_serial/out.test.toml    |  1 +
 .../bundle/state/state_present/out.test.toml  |  1 +
 .../missing-libraries-file-path/out.test.toml |  1 +
 .../summary/modified_status/out.test.toml     |  1 +
 .../bundle/summary/modified_status/script     |  8 ++--
 acceptance/bundle/sync/dryrun/out.test.toml   |  1 +
 acceptance/bundle/sync/out.test.toml          |  1 +
 .../bundle/syncroot/dotdot-git/out.test.toml  |  1 +
 .../syncroot/dotdot-nogit/out.test.toml       |  1 +
 .../config-remote-sync-error/out.test.toml    |  1 +
 .../config-remote-sync-recreate/out.test.toml |  1 +
 .../config-remote-sync-save/out.test.toml     |  1 +
 .../config-remote-sync/out.test.toml          |  1 +
 .../out.test.toml                             |  1 +
 .../deploy-artifact-path-type/out.test.toml   |  1 +
 .../deploy-artifacts-variables/out.test.toml  |  1 +
 .../deploy-compute-type/out.test.toml         |  1 +
 .../deploy-config-file-count/out.test.toml    |  1 +
 .../deploy-error-message/out.test.toml        |  1 +
 .../telemetry/deploy-error/out.test.toml      |  1 +
 .../deploy-experimental/out.test.toml         |  1 +
 .../telemetry/deploy-mode/out.test.toml       |  1 +
 .../deploy-name-prefix/custom/out.test.toml   |  1 +
 .../mode-development/out.test.toml            |  1 +
 .../telemetry/deploy-no-uuid/out.test.toml    |  1 +
 .../telemetry/deploy-run-as/out.test.toml     |  1 +
 .../deploy-target-count/out.test.toml         |  1 +
 .../deploy-variable-count/out.test.toml       |  1 +
 .../deploy-whl-artifacts/out.test.toml        |  1 +
 .../out.test.toml                             |  1 +
 .../bundle/telemetry/deploy/out.test.toml     |  1 +
 acceptance/bundle/telemetry/test.toml         |  1 +
 .../helper_upper_lower/out.test.toml          |  1 +
 .../helper_username/out.test.toml             |  1 +
 .../helpers-error/out.test.toml               |  1 +
 .../number-precision/out.test.toml            |  1 +
 .../supported-url/out.test.toml               |  1 +
 .../unsupported-url/out.test.toml             |  1 +
 .../wrong-path/out.test.toml                  |  1 +
 .../wrong-url/out.test.toml                   |  1 +
 .../bundle/templates/dbt-sql/out.test.toml    |  1 +
 .../default-minimal/python/out.test.toml      |  1 +
 .../default-minimal/skip/out.test.toml        |  1 +
 .../default-minimal/sql/out.test.toml         |  1 +
 .../azure-government/out.test.toml            |  1 +
 .../default-python/classic/out.test.toml      |  1 +
 .../combinations/classic/out.test.toml        |  1 +
 .../combinations/serverless/out.test.toml     |  1 +
 .../fail-missing-uv/out.test.toml             |  1 +
 .../integration_classic/out.test.toml         |  1 +
 .../default-python/no-uc/out.test.toml        |  1 +
 .../serverless-customcatalog/out.test.toml    |  1 +
 .../default-python/serverless/out.test.toml   |  1 +
 .../templates/default-scala/out.test.toml     |  1 +
 .../default-sql-catalog-dash/out.test.toml    |  1 +
 .../templates/default-sql/out.test.toml       |  1 +
 .../lakeflow-integrations/out.test.toml       |  1 +
 .../lakeflow-pipelines/python/out.test.toml   |  1 +
 .../lakeflow-pipelines/sql/out.test.toml      |  1 +
 .../templates/nested-output/out.test.toml     |  1 +
 .../pydabs/check-consistency/out.test.toml    |  1 +
 .../pydabs/check-formatting/out.test.toml     |  1 +
 .../pydabs/deploy-classic/out.test.toml       |  1 +
 .../pydabs/init-classic/out.test.toml         |  1 +
 .../record-deployment-history/out.test.toml   |  1 +
 .../telemetry/custom-template/out.test.toml   |  1 +
 .../templates/telemetry/dbt-sql/out.test.toml |  1 +
 .../telemetry/default-python/out.test.toml    |  1 +
 .../telemetry/default-sql/out.test.toml       |  1 +
 acceptance/bundle/templates/test.toml         |  1 +
 acceptance/bundle/test.toml                   |  1 +
 .../trampoline/warning_message/out.test.toml  |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../bundle/undefined_resources/out.test.toml  |  1 +
 .../internal_server_error/out.test.toml       |  1 +
 .../bundle/upload/timeout/out.test.toml       |  1 +
 acceptance/bundle/user_agent/out.test.toml    |  1 +
 .../bundle/user_agent/simple/out.test.toml    |  1 +
 acceptance/bundle/user_agent/test.toml        |  1 +
 .../validate/anchor_containers/out.test.toml  |  1 +
 .../out.test.toml                             |  1 +
 .../validate/dashboard_defaults/out.test.toml |  1 +
 .../dashboard_required_name/out.test.toml     |  1 +
 .../out.test.toml                             |  1 +
 .../definitions_yaml_anchors/out.test.toml    |  1 +
 .../duplicate_yaml_merge_key/out.test.toml    |  1 +
 .../empty_resources/empty_def/out.test.toml   |  1 +
 .../empty_resources/empty_dict/out.test.toml  |  1 +
 .../empty_resources/null/out.test.toml        |  1 +
 .../empty_resources/with_grants/out.test.toml |  1 +
 .../with_permissions/out.test.toml            |  1 +
 .../bundle/validate/empty_tasks/out.test.toml |  1 +
 .../engine-config-valid/out.test.toml         |  1 +
 acceptance/bundle/validate/enum/out.test.toml |  1 +
 .../validate/enum_resource_refs/out.test.toml |  1 +
 .../genie_space_complex/out.test.toml         |  1 +
 .../genie_space_defaults/out.test.toml        |  1 +
 .../out.test.toml                             |  1 +
 .../grants_required_principal/out.test.toml   |  1 +
 .../immutable_workspace_paths/out.test.toml   |  1 +
 .../validate/include_locations/out.test.toml  |  1 +
 .../invalid-engine-bundle/out.test.toml       |  1 +
 .../invalid-engine-target/out.test.toml       |  1 +
 .../validate/job-references/out.test.toml     |  1 +
 .../out.test.toml                             |  1 +
 .../model_serving_conversion/out.test.toml    |  1 +
 .../models/missing_name/out.test.toml         |  1 +
 .../validate/models/user_id/out.test.toml     |  1 +
 .../validate/no_dashboard_etag/out.test.toml  |  1 +
 .../no_genie_space_etag/out.test.toml         |  1 +
 .../bundle/validate/permissions/out.test.toml |  1 +
 .../permissions_overlap/out.test.toml         |  1 +
 .../presets_max_concurrent_runs/out.test.toml |  1 +
 .../presets_name_prefix/out.test.toml         |  1 +
 .../presets_name_prefix_dev/out.test.toml     |  1 +
 .../validate/presets_tags/out.test.toml       |  1 +
 .../bundle/validate/required/out.test.toml    |  1 +
 .../reserved_deployment_fields/out.test.toml  |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../out.test.toml                             |  1 +
 .../sql_warehouse_required_name/out.test.toml |  1 +
 .../bundle/validate/strict/out.test.toml      |  1 +
 .../validate/sync_patterns/out.test.toml      |  1 +
 .../validate/var_in_bundle_name/out.test.toml |  1 +
 .../validate/volume_defaults/out.test.toml    |  1 +
 .../bundle/variables/arg-repeat/out.test.toml |  1 +
 .../variables/complex-cross-ref/out.test.toml |  1 +
 .../complex-cycle-self/out.test.toml          |  1 +
 .../variables/complex-cycle/out.test.toml     |  1 +
 .../variables/complex-simple/out.test.toml    |  1 +
 .../complex-transitive-deep/out.test.toml     |  1 +
 .../complex-transitive-deeper/out.test.toml   |  1 +
 .../complex-transitive/out.test.toml          |  1 +
 .../complex-with-var-reference/out.test.toml  |  1 +
 .../complex-within-complex/out.test.toml      |  1 +
 .../bundle/variables/complex/out.test.toml    |  1 +
 .../complex_multiple_files/out.test.toml      |  1 +
 .../bundle/variables/cycle/out.test.toml      |  1 +
 .../variables/double_underscore/out.test.toml |  1 +
 .../bundle/variables/empty/out.test.toml      |  1 +
 .../variables/env_overrides/out.test.toml     |  1 +
 .../variables/file-defaults/out.test.toml     |  1 +
 .../bundle/variables/git-branch/out.test.toml |  1 +
 .../bundle/variables/host/out.test.toml       |  1 +
 acceptance/bundle/variables/int/out.test.toml |  1 +
 .../bundle/variables/issue_2436/out.test.toml |  1 +
 .../issue_3039_lookup_with_ref/out.test.toml  |  1 +
 .../bundle/variables/lookup/out.test.toml     |  1 +
 .../prepend-workspace-var/out.test.toml       |  1 +
 .../variables/reference-typo/out.test.toml    |  1 +
 .../variables/resolve-builtin/out.test.toml   |  1 +
 .../variables/resolve-empty/out.test.toml     |  1 +
 .../out.test.toml                             |  1 +
 .../resolve-nonstrings/out.test.toml          |  1 +
 .../resolve-resources-fields/out.test.toml    |  1 +
 .../resolve-vars-in-root-path/out.test.toml   |  1 +
 .../variables/unicode_reference/out.test.toml |  1 +
 .../bundle/variables/vanilla/out.test.toml    |  1 +
 .../bundle/variables/var_in_var/out.test.toml |  1 +
 .../variable_in_resource_key/out.test.toml    |  1 +
 .../out.test.toml                             |  1 +
 .../without_definition/out.test.toml          |  1 +
 .../volume_path/invalid_file/out.test.toml    |  1 +
 .../invalid_resource/out.test.toml            |  1 +
 .../volume_path/invalid_root/out.test.toml    |  1 +
 .../volume_path/invalid_state/out.test.toml   |  1 +
 .../bundle/volume_path/valid/out.test.toml    |  1 +
 1071 files changed, 1334 insertions(+), 303 deletions(-)
 create mode 100644 acceptance/bundle/deploy/readplan/test.toml
 create mode 100644 acceptance/bundle/deploy/wal/corrupted-wal-entry/test.toml
 create mode 100644 acceptance/bundle/deployment/bind/test.toml
 create mode 100644 acceptance/bundle/deployment/unbind/test.toml
 create mode 100644 acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/test.toml
 create mode 100644 acceptance/bundle/resources/postgres_databases/replace_existing/test.toml
 create mode 100644 acceptance/bundle/resources/postgres_roles/replace_existing/test.toml
 create mode 100644 acceptance/bundle/script.prepare

diff --git a/acceptance/bin/print_requests.py b/acceptance/bin/print_requests.py
index 1d26f24896..c151845fc4 100755
--- a/acceptance/bin/print_requests.py
+++ b/acceptance/bin/print_requests.py
@@ -90,6 +90,15 @@
 ADD_PREFIX = "/"
 NEGATE_PREFIX = "^/"
 
+# What --nostamp deletes. A job create sends the deployment block at the top level, an
+# update nests it under new_settings.
+STAMP_FIELDS = [
+    "deployment.deployment_id",
+    "deployment.version_id",
+    "new_settings.deployment.deployment_id",
+    "new_settings.deployment.version_id",
+]
+
 
 def read_json_many(s):
     result = []
@@ -239,10 +248,19 @@ def main():
         "--del-body, which edits the parsed JSON body, this drops a field of the request "
         "record itself, e.g. raw_body for a binary upload payload.",
     )
+    parser.add_argument(
+        "--nostamp",
+        action="store_true",
+        help="Drop the deployment stamp (deployment_id, version_id) from job and pipeline "
+        "bodies, so a test asserts the same requests whether or not deployment history "
+        "recording is on. Shorthand for the --del-body fields it implies.",
+    )
     parser.add_argument("--fname", default="out.requests.txt")
     args = parser.parse_args()
 
     del_body_fields = [field for group in args.del_body for field in group.split(",")]
+    if args.nostamp:
+        del_body_fields += STAMP_FIELDS
     del_fields = [field for group in args.del_field for field in group.split(",")]
 
     test_tmp_dir = os.environ.get("TEST_TMP_DIR")
diff --git a/acceptance/bundle/ai_runtime_task/empty_code_source/out.test.toml b/acceptance/bundle/ai_runtime_task/empty_code_source/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/ai_runtime_task/empty_code_source/out.test.toml
+++ b/acceptance/bundle/ai_runtime_task/empty_code_source/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/ai_runtime_task/local_code_source/out.test.toml b/acceptance/bundle/ai_runtime_task/local_code_source/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/ai_runtime_task/local_code_source/out.test.toml
+++ b/acceptance/bundle/ai_runtime_task/local_code_source/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/ai_runtime_task/local_code_source/output.txt b/acceptance/bundle/ai_runtime_task/local_code_source/output.txt
index 768955bc2b..8b01277b57 100644
--- a/acceptance/bundle/ai_runtime_task/local_code_source/output.txt
+++ b/acceptance/bundle/ai_runtime_task/local_code_source/output.txt
@@ -21,7 +21,7 @@ src/train.py
 
 === both code_source_paths point into the bundle .air_snapshots, command_paths rewritten, deps on environments spec
 
->>> print_requests.py --sort --del-field raw_body //.air_snapshots/ //jobs/create
+>>> print_requests.py --nostamp --sort --del-field raw_body //.air_snapshots/ //jobs/create
 {
   "method": "POST",
   "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/ai-runtime-test/default/files/.air_snapshots/[SNAPSHOT].tar.gz",
@@ -114,7 +114,7 @@ Updated jobs.train
 Files: 4 uploaded, 1 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py --sort --del-field raw_body //.air_snapshots/
+>>> print_requests.py --nostamp --sort --del-field raw_body //.air_snapshots/
 {
   "method": "POST",
   "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/ai-runtime-test/default/files/.air_snapshots/[SNAPSHOT].tar.gz",
diff --git a/acceptance/bundle/ai_runtime_task/local_code_source/script b/acceptance/bundle/ai_runtime_task/local_code_source/script
index fe5e707ce0..41949cf1c8 100644
--- a/acceptance/bundle/ai_runtime_task/local_code_source/script
+++ b/acceptance/bundle/ai_runtime_task/local_code_source/script
@@ -13,8 +13,8 @@ trace list_code_snapshot.py
 title "both code_source_paths point into the bundle .air_snapshots, command_paths rewritten, deps on environments spec\n"
 # --del-field raw_body drops the binary tarball upload payload (kept readable). Filters
 # use a leading // so Git Bash on Windows does not path-convert them. --keep is not
-# passed, so print_requests.py consumes out.requests.txt.
-trace print_requests.py --sort --del-field raw_body '//.air_snapshots/' '//jobs/create'
+# passed, so print_requests.py --nostamp consumes out.requests.txt.
+trace print_requests.py --nostamp --sort --del-field raw_body '//.air_snapshots/' '//jobs/create'
 
 title "re-planning unchanged code is a no-op (no changes)\n"
 trace $CLI bundle plan
@@ -22,7 +22,7 @@ trace $CLI bundle plan
 title "editing a file changes the snapshot hash (content-addressed name changes)\n"
 update_file.py src/train.py 'print("training")' 'print("training v2")'
 trace $CLI bundle deploy
-trace print_requests.py --sort --del-field raw_body '//.air_snapshots/'
+trace print_requests.py --nostamp --sort --del-field raw_body '//.air_snapshots/'
 
 title "destroy removes the deployed bundle (including the synced snapshots)\n"
 trace $CLI bundle destroy --auto-approve
diff --git a/acceptance/bundle/apps/app_yaml/out.test.toml b/acceptance/bundle/apps/app_yaml/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/apps/app_yaml/out.test.toml
+++ b/acceptance/bundle/apps/app_yaml/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/apps/artifact_and_app_same_path/out.test.toml b/acceptance/bundle/apps/artifact_and_app_same_path/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/apps/artifact_and_app_same_path/out.test.toml
+++ b/acceptance/bundle/apps/artifact_and_app_same_path/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/apps/compute_size/out.test.toml b/acceptance/bundle/apps/compute_size/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/apps/compute_size/out.test.toml
+++ b/acceptance/bundle/apps/compute_size/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/apps/delete_deleting/out.test.toml b/acceptance/bundle/apps/delete_deleting/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/apps/delete_deleting/out.test.toml
+++ b/acceptance/bundle/apps/delete_deleting/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/apps/git_source/out.test.toml b/acceptance/bundle/apps/git_source/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/apps/git_source/out.test.toml
+++ b/acceptance/bundle/apps/git_source/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/apps/job_permissions/out.test.toml b/acceptance/bundle/apps/job_permissions/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/apps/job_permissions/out.test.toml
+++ b/acceptance/bundle/apps/job_permissions/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/apps/job_permissions_warning/out.test.toml b/acceptance/bundle/apps/job_permissions_warning/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/apps/job_permissions_warning/out.test.toml
+++ b/acceptance/bundle/apps/job_permissions_warning/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/apps/value_from_warning/out.test.toml b/acceptance/bundle/apps/value_from_warning/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/apps/value_from_warning/out.test.toml
+++ b/acceptance/bundle/apps/value_from_warning/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/ai_runtime_code_source/out.test.toml b/acceptance/bundle/artifacts/ai_runtime_code_source/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/artifacts/ai_runtime_code_source/out.test.toml
+++ b/acceptance/bundle/artifacts/ai_runtime_code_source/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/out.test.toml b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/out.test.toml
+++ b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/out.test.toml b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/out.test.toml
+++ b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/artifact_upload_for_volumes/out.test.toml b/acceptance/bundle/artifacts/artifact_upload_for_volumes/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/artifact_upload_for_volumes/out.test.toml
+++ b/acceptance/bundle/artifacts/artifact_upload_for_volumes/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/artifact_upload_for_workspace/out.test.toml b/acceptance/bundle/artifacts/artifact_upload_for_workspace/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/artifact_upload_for_workspace/out.test.toml
+++ b/acceptance/bundle/artifacts/artifact_upload_for_workspace/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/out.test.toml b/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/out.test.toml
+++ b/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/artifacts_dynamic_version/out.test.toml b/acceptance/bundle/artifacts/artifacts_dynamic_version/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/artifacts_dynamic_version/out.test.toml
+++ b/acceptance/bundle/artifacts/artifacts_dynamic_version/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/build_and_files/out.test.toml b/acceptance/bundle/artifacts/build_and_files/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/build_and_files/out.test.toml
+++ b/acceptance/bundle/artifacts/build_and_files/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/build_and_files_whl/out.test.toml b/acceptance/bundle/artifacts/build_and_files_whl/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/build_and_files_whl/out.test.toml
+++ b/acceptance/bundle/artifacts/build_and_files_whl/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/glob_exact_whl/out.test.toml b/acceptance/bundle/artifacts/glob_exact_whl/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/glob_exact_whl/out.test.toml
+++ b/acceptance/bundle/artifacts/glob_exact_whl/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/globs_in_files/out.test.toml b/acceptance/bundle/artifacts/globs_in_files/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/globs_in_files/out.test.toml
+++ b/acceptance/bundle/artifacts/globs_in_files/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/globs_in_files_in_include/out.test.toml b/acceptance/bundle/artifacts/globs_in_files_in_include/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/globs_in_files_in_include/out.test.toml
+++ b/acceptance/bundle/artifacts/globs_in_files_in_include/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/globs_invalid/out.test.toml b/acceptance/bundle/artifacts/globs_invalid/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/globs_invalid/out.test.toml
+++ b/acceptance/bundle/artifacts/globs_invalid/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/issue_3109/out.test.toml b/acceptance/bundle/artifacts/issue_3109/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/issue_3109/out.test.toml
+++ b/acceptance/bundle/artifacts/issue_3109/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/nil_artifacts/out.test.toml b/acceptance/bundle/artifacts/nil_artifacts/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/nil_artifacts/out.test.toml
+++ b/acceptance/bundle/artifacts/nil_artifacts/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/same_name_libraries/out.test.toml b/acceptance/bundle/artifacts/same_name_libraries/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/same_name_libraries/out.test.toml
+++ b/acceptance/bundle/artifacts/same_name_libraries/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/shell/bash/out.test.toml b/acceptance/bundle/artifacts/shell/bash/out.test.toml
index 2adb6d6366..56f228d004 100644
--- a/acceptance/bundle/artifacts/shell/bash/out.test.toml
+++ b/acceptance/bundle/artifacts/shell/bash/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/shell/basic/out.test.toml b/acceptance/bundle/artifacts/shell/basic/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/shell/basic/out.test.toml
+++ b/acceptance/bundle/artifacts/shell/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/shell/cmd/out.test.toml b/acceptance/bundle/artifacts/shell/cmd/out.test.toml
index a2974cfce4..d20c1278e9 100644
--- a/acceptance/bundle/artifacts/shell/cmd/out.test.toml
+++ b/acceptance/bundle/artifacts/shell/cmd/out.test.toml
@@ -2,3 +2,4 @@ Cloud = false
 GOOS.darwin = false
 GOOS.linux = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/shell/default/out.test.toml b/acceptance/bundle/artifacts/shell/default/out.test.toml
index 2adb6d6366..56f228d004 100644
--- a/acceptance/bundle/artifacts/shell/default/out.test.toml
+++ b/acceptance/bundle/artifacts/shell/default/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/shell/err-bash/out.test.toml b/acceptance/bundle/artifacts/shell/err-bash/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/shell/err-bash/out.test.toml
+++ b/acceptance/bundle/artifacts/shell/err-bash/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/shell/err-sh/out.test.toml b/acceptance/bundle/artifacts/shell/err-sh/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/shell/err-sh/out.test.toml
+++ b/acceptance/bundle/artifacts/shell/err-sh/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/shell/invalid/out.test.toml b/acceptance/bundle/artifacts/shell/invalid/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/shell/invalid/out.test.toml
+++ b/acceptance/bundle/artifacts/shell/invalid/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/shell/sh/out.test.toml b/acceptance/bundle/artifacts/shell/sh/out.test.toml
index 2adb6d6366..56f228d004 100644
--- a/acceptance/bundle/artifacts/shell/sh/out.test.toml
+++ b/acceptance/bundle/artifacts/shell/sh/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/unique_name_libraries/out.test.toml b/acceptance/bundle/artifacts/unique_name_libraries/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/unique_name_libraries/out.test.toml
+++ b/acceptance/bundle/artifacts/unique_name_libraries/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/upload_multiple_libraries/out.test.toml b/acceptance/bundle/artifacts/upload_multiple_libraries/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/upload_multiple_libraries/out.test.toml
+++ b/acceptance/bundle/artifacts/upload_multiple_libraries/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_change_version/out.test.toml b/acceptance/bundle/artifacts/whl_change_version/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_change_version/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_change_version/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_dbfs/out.test.toml b/acceptance/bundle/artifacts/whl_dbfs/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_dbfs/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_dbfs/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_dynamic/out.test.toml b/acceptance/bundle/artifacts/whl_dynamic/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_dynamic/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_dynamic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_dynamic/script b/acceptance/bundle/artifacts/whl_dynamic/script
index 068db16caf..ddb6fcd55e 100644
--- a/acceptance/bundle/artifacts/whl_dynamic/script
+++ b/acceptance/bundle/artifacts/whl_dynamic/script
@@ -4,9 +4,9 @@ cp -r $TESTDIR/../whl_explicit/my_test_code .
 mkdir prebuilt
 cp -r $TESTDIR/../whl_prebuilt_multiple/dist/lib/other_test_code-0.0.1-py3-none-any.whl prebuilt
 
-trace $CLI bundle validate -o json | jq .artifacts
+trace $CLI bundle validate -o json | nostamp | jq .artifacts
 
-$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
 
 title "There are 2 original wheels and 2 patched ones"
@@ -25,7 +25,7 @@ rm out.requests.txt
 
 title "Updating the local wheel and deploying again\n"
 touch my_test_code/src/new_module.py
-$CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
 
 title "Verify contents, it should now have new_module.py"
diff --git a/acceptance/bundle/artifacts/whl_explicit/out.test.toml b/acceptance/bundle/artifacts/whl_explicit/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_explicit/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_explicit/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_implicit/out.test.toml b/acceptance/bundle/artifacts/whl_implicit/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_implicit/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_implicit/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_implicit_custom_path/out.test.toml b/acceptance/bundle/artifacts/whl_implicit_custom_path/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_implicit_custom_path/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_implicit_custom_path/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_implicit_custom_path/script b/acceptance/bundle/artifacts/whl_implicit_custom_path/script
index fdc0723f59..623849d3bb 100644
--- a/acceptance/bundle/artifacts/whl_implicit_custom_path/script
+++ b/acceptance/bundle/artifacts/whl_implicit_custom_path/script
@@ -3,7 +3,7 @@ trace $CLI bundle deploy
 trace find.py --expect 1 whl
 
 title "Expecting 1 wheel in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' out.requests.txt | nostamp
 
 title "Expecting 1 wheel to be uploaded"
 trace jq .path < out.requests.txt | grep import | grep whl | sort
diff --git a/acceptance/bundle/artifacts/whl_implicit_notebook/out.test.toml b/acceptance/bundle/artifacts/whl_implicit_notebook/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_implicit_notebook/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_implicit_notebook/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_multiple/out.test.toml b/acceptance/bundle/artifacts/whl_multiple/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_multiple/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_multiple/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_no_cleanup/out.test.toml b/acceptance/bundle/artifacts/whl_no_cleanup/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_no_cleanup/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_no_cleanup/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_multiple/out.test.toml b/acceptance/bundle/artifacts/whl_prebuilt_multiple/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_multiple/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_prebuilt_multiple/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_outside/out.test.toml b/acceptance/bundle/artifacts/whl_prebuilt_outside/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_outside/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_prebuilt_outside/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/out.test.toml b/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_via_environment_key/out.test.toml b/acceptance/bundle/artifacts/whl_via_environment_key/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_via_environment_key/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_via_environment_key/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_via_environment_key/script b/acceptance/bundle/artifacts/whl_via_environment_key/script
index 3a0dd929c0..f82c5d7ecc 100644
--- a/acceptance/bundle/artifacts/whl_via_environment_key/script
+++ b/acceptance/bundle/artifacts/whl_via_environment_key/script
@@ -3,7 +3,7 @@ trace $CLI bundle deploy
 trace find.py --expect 1 whl
 
 title "Expecting 1 wheel in environments section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' out.requests.txt | nostamp
 
 title "Expecting 1 wheel to be uploaded"
 trace jq .path < out.requests.txt | grep import | grep whl | sort
diff --git a/acceptance/bundle/artifacts/whl_via_environment_key_extras/out.test.toml b/acceptance/bundle/artifacts/whl_via_environment_key_extras/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/artifacts/whl_via_environment_key_extras/out.test.toml
+++ b/acceptance/bundle/artifacts/whl_via_environment_key_extras/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/artifacts/whl_via_environment_key_extras/script b/acceptance/bundle/artifacts/whl_via_environment_key_extras/script
index 426eb0b71c..ccc0d9ed7f 100644
--- a/acceptance/bundle/artifacts/whl_via_environment_key_extras/script
+++ b/acceptance/bundle/artifacts/whl_via_environment_key_extras/script
@@ -3,7 +3,7 @@ trace $CLI bundle deploy
 trace find.py --expect 1 whl
 
 title "Expecting the environments dependency to keep its [train] extras suffix"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' out.requests.txt | nostamp
 
 title "Expecting 1 wheel to be uploaded under its bare filename (no extras)"
 trace jq .path < out.requests.txt | grep import | grep whl | sort
diff --git a/acceptance/bundle/benchmarks/deploy/out.test.toml b/acceptance/bundle/benchmarks/deploy/out.test.toml
index 2adb6d6366..56f228d004 100644
--- a/acceptance/bundle/benchmarks/deploy/out.test.toml
+++ b/acceptance/bundle/benchmarks/deploy/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/benchmarks/plan/out.test.toml b/acceptance/bundle/benchmarks/plan/out.test.toml
index 2adb6d6366..56f228d004 100644
--- a/acceptance/bundle/benchmarks/plan/out.test.toml
+++ b/acceptance/bundle/benchmarks/plan/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/benchmarks/validate/out.test.toml b/acceptance/bundle/benchmarks/validate/out.test.toml
index 2adb6d6366..56f228d004 100644
--- a/acceptance/bundle/benchmarks/validate/out.test.toml
+++ b/acceptance/bundle/benchmarks/validate/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/bundle_tag/id/out.test.toml b/acceptance/bundle/bundle_tag/id/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/bundle_tag/id/out.test.toml
+++ b/acceptance/bundle/bundle_tag/id/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/bundle_tag/id/output.txt b/acceptance/bundle/bundle_tag/id/output.txt
index 6feadfe6ad..8576864136 100644
--- a/acceptance/bundle/bundle_tag/id/output.txt
+++ b/acceptance/bundle/bundle_tag/id/output.txt
@@ -39,7 +39,7 @@ Created jobs.foo
 Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
@@ -78,7 +78,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 1 deleted
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
diff --git a/acceptance/bundle/bundle_tag/id/script b/acceptance/bundle/bundle_tag/id/script
index dbc595a277..759cc89eba 100644
--- a/acceptance/bundle/bundle_tag/id/script
+++ b/acceptance/bundle/bundle_tag/id/script
@@ -1,8 +1,8 @@
 trace $CLI bundle validate
-trace $CLI bundle validate -o json | jq .resources
+trace $CLI bundle validate -o json | nostamp | jq .resources
 trace $CLI bundle plan
 trace $CLI bundle deploy
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
 trace $CLI bundle summary
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/bundle_tag/url/out.test.toml b/acceptance/bundle/bundle_tag/url/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/bundle_tag/url/out.test.toml
+++ b/acceptance/bundle/bundle_tag/url/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/bundle_tag/url/output.txt b/acceptance/bundle/bundle_tag/url/output.txt
index a86aec5254..adf8cd2452 100644
--- a/acceptance/bundle/bundle_tag/url/output.txt
+++ b/acceptance/bundle/bundle_tag/url/output.txt
@@ -39,7 +39,7 @@ Created jobs.foo
 Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
@@ -78,7 +78,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 1 deleted
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
diff --git a/acceptance/bundle/bundle_tag/url/script b/acceptance/bundle/bundle_tag/url/script
index dbc595a277..759cc89eba 100644
--- a/acceptance/bundle/bundle_tag/url/script
+++ b/acceptance/bundle/bundle_tag/url/script
@@ -1,8 +1,8 @@
 trace $CLI bundle validate
-trace $CLI bundle validate -o json | jq .resources
+trace $CLI bundle validate -o json | nostamp | jq .resources
 trace $CLI bundle plan
 trace $CLI bundle deploy
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
 trace $CLI bundle summary
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/bundle_tag/url_ref/out.test.toml b/acceptance/bundle/bundle_tag/url_ref/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/bundle_tag/url_ref/out.test.toml
+++ b/acceptance/bundle/bundle_tag/url_ref/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/cli_defaults/out.test.toml b/acceptance/bundle/config-remote-sync/cli_defaults/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/cli_defaults/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/cli_defaults/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/config_edits/out.test.toml b/acceptance/bundle/config-remote-sync/config_edits/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/config_edits/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/config_edits/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/dashboard_etag/out.test.toml b/acceptance/bundle/config-remote-sync/dashboard_etag/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/dashboard_etag/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/dashboard_etag/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/flushed_cache/out.test.toml b/acceptance/bundle/config-remote-sync/flushed_cache/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/flushed_cache/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/flushed_cache/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/formatting_preserved/out.test.toml b/acceptance/bundle/config-remote-sync/formatting_preserved/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/formatting_preserved/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/formatting_preserved/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/job_fields/out.test.toml b/acceptance/bundle/config-remote-sync/job_fields/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/job_fields/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/job_fields/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/job_multiple_tasks/out.test.toml b/acceptance/bundle/config-remote-sync/job_multiple_tasks/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/job_multiple_tasks/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/job_multiple_tasks/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/job_params_variables/out.test.toml b/acceptance/bundle/config-remote-sync/job_params_variables/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/job_params_variables/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/job_params_variables/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/job_pipeline_task/out.test.toml b/acceptance/bundle/config-remote-sync/job_pipeline_task/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/job_pipeline_task/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/job_pipeline_task/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/multiple_files/out.test.toml b/acceptance/bundle/config-remote-sync/multiple_files/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/multiple_files/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/multiple_files/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/multiple_resources/out.test.toml b/acceptance/bundle/config-remote-sync/multiple_resources/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/multiple_resources/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/multiple_resources/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/output_json/out.test.toml b/acceptance/bundle/config-remote-sync/output_json/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/output_json/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/output_json/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/output_no_changes/out.test.toml b/acceptance/bundle/config-remote-sync/output_no_changes/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/output_no_changes/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/output_no_changes/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/pipeline_fields/out.test.toml b/acceptance/bundle/config-remote-sync/pipeline_fields/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/pipeline_fields/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/pipeline_fields/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/out.test.toml b/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/resolve_variables/out.test.toml b/acceptance/bundle/config-remote-sync/resolve_variables/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/resolve_variables/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/resolve_variables/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/select_basic/out.test.toml b/acceptance/bundle/config-remote-sync/select_basic/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/select_basic/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/select_basic/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/select_multiple/out.test.toml b/acceptance/bundle/config-remote-sync/select_multiple/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/select_multiple/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/select_multiple/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/skip_permissions/out.test.toml b/acceptance/bundle/config-remote-sync/skip_permissions/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/skip_permissions/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/skip_permissions/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/cli_default_split_element/out.test.toml b/acceptance/bundle/config-remote-sync/split/cli_default_split_element/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/cli_default_split_element/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/cli_default_split_element/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/dotted_target/out.test.toml b/acceptance/bundle/config-remote-sync/split/dotted_target/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/dotted_target/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/dotted_target/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/isolation/out.test.toml b/acceptance/bundle/config-remote-sync/split/isolation/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/isolation/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/isolation/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/keyed_edit/out.test.toml b/acceptance/bundle/config-remote-sync/split/keyed_edit/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/keyed_edit/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/keyed_edit/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/keyed_remove/out.test.toml b/acceptance/bundle/config-remote-sync/split/keyed_remove/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/keyed_remove/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/keyed_remove/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/keyed_rename/out.test.toml b/acceptance/bundle/config-remote-sync/split/keyed_rename/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/keyed_rename/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/keyed_rename/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/keyed_twoblock/out.test.toml b/acceptance/bundle/config-remote-sync/split/keyed_twoblock/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/keyed_twoblock/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/keyed_twoblock/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/multifile/out.test.toml b/acceptance/bundle/config-remote-sync/split/multifile/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/multifile/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/multifile/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/out.test.toml b/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/nested_sequence/out.test.toml b/acceptance/bundle/config-remote-sync/split/nested_sequence/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/nested_sequence/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/nested_sequence/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/positional/out.test.toml b/acceptance/bundle/config-remote-sync/split/positional/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/positional/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/positional/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/out.test.toml b/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/out.test.toml b/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/out.test.toml b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/out.test.toml b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/out.test.toml b/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/target_variable/out.test.toml b/acceptance/bundle/config-remote-sync/split/target_variable/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/target_variable/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/target_variable/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/split/variable_file_order/out.test.toml b/acceptance/bundle/config-remote-sync/split/variable_file_order/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/split/variable_file_order/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/split/variable_file_order/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/target_override/out.test.toml b/acceptance/bundle/config-remote-sync/target_override/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/target_override/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/target_override/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/task_rename_revert/out.test.toml b/acceptance/bundle/config-remote-sync/task_rename_revert/out.test.toml
index f8e8fe2844..f25e278148 100644
--- a/acceptance/bundle/config-remote-sync/task_rename_revert/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/task_rename_revert/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/validation_errors/out.test.toml b/acceptance/bundle/config-remote-sync/validation_errors/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/validation_errors/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/validation_errors/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/config-remote-sync/variable_reference_parent/out.test.toml b/acceptance/bundle/config-remote-sync/variable_reference_parent/out.test.toml
index a55b29471a..f574949a89 100644
--- a/acceptance/bundle/config-remote-sync/variable_reference_parent/out.test.toml
+++ b/acceptance/bundle/config-remote-sync/variable_reference_parent/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/debug/fetch-repository-info-repos-error/out.test.toml b/acceptance/bundle/debug/fetch-repository-info-repos-error/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/debug/fetch-repository-info-repos-error/out.test.toml
+++ b/acceptance/bundle/debug/fetch-repository-info-repos-error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/debug/fetch-repository-info/out.test.toml b/acceptance/bundle/debug/fetch-repository-info/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/debug/fetch-repository-info/out.test.toml
+++ b/acceptance/bundle/debug/fetch-repository-info/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/debug/list-targets/out.test.toml b/acceptance/bundle/debug/list-targets/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/debug/list-targets/out.test.toml
+++ b/acceptance/bundle/debug/list-targets/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/debug/out.test.toml b/acceptance/bundle/debug/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/debug/out.test.toml
+++ b/acceptance/bundle/debug/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/empty-bundle/out.test.toml b/acceptance/bundle/deploy/empty-bundle/out.test.toml
index af690f6f87..dc095674ca 100644
--- a/acceptance/bundle/deploy/empty-bundle/out.test.toml
+++ b/acceptance/bundle/deploy/empty-bundle/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENABLE_EXPERIMENTAL_YAML_SYNC = ["", "true"]
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/experimental-python/out.test.toml b/acceptance/bundle/deploy/experimental-python/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/deploy/experimental-python/out.test.toml
+++ b/acceptance/bundle/deploy/experimental-python/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/experimental-python/script b/acceptance/bundle/deploy/experimental-python/script
index 3e52e9c2a7..09b90b28e2 100644
--- a/acceptance/bundle/deploy/experimental-python/script
+++ b/acceptance/bundle/deploy/experimental-python/script
@@ -1,3 +1,3 @@
 trace uv run --quiet --with $DATABRICKS_BUNDLES_WHEEL -- $CLI bundle deploy
 
-trace $CLI jobs list --output json
+trace $CLI jobs list --output json | nostamp
diff --git a/acceptance/bundle/deploy/fail-on-active-runs/out.test.toml b/acceptance/bundle/deploy/fail-on-active-runs/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/deploy/fail-on-active-runs/out.test.toml
+++ b/acceptance/bundle/deploy/fail-on-active-runs/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/files/no-snapshot-sync/out.test.toml b/acceptance/bundle/deploy/files/no-snapshot-sync/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/deploy/files/no-snapshot-sync/out.test.toml
+++ b/acceptance/bundle/deploy/files/no-snapshot-sync/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/files/out-of-band-delete/out.test.toml b/acceptance/bundle/deploy/files/out-of-band-delete/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deploy/files/out-of-band-delete/out.test.toml
+++ b/acceptance/bundle/deploy/files/out-of-band-delete/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/files/out-of-band-delete/test.toml b/acceptance/bundle/deploy/files/out-of-band-delete/test.toml
index 4b1559f5a9..8c3f2408d5 100644
--- a/acceptance/bundle/deploy/files/out-of-band-delete/test.toml
+++ b/acceptance/bundle/deploy/files/out-of-band-delete/test.toml
@@ -1,6 +1,7 @@
 # Recording needs a bundle it has seen from the start. This test seeds a state file,
 # so recording refuses it. TODO(DMS): drop this once existing state can be
 # handed over to the service (see the TODO in dstate.Open).
+EnvMatrix.DMS = [""]
 
 Badness = "After the remote bundle files are deleted out-of-band, the next deploy does not re-upload them until the local sync snapshot is removed."
 
diff --git a/acceptance/bundle/deploy/force-lock-config/out.test.toml b/acceptance/bundle/deploy/force-lock-config/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/deploy/force-lock-config/out.test.toml
+++ b/acceptance/bundle/deploy/force-lock-config/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/immutable-no-artifacts/out.test.toml b/acceptance/bundle/deploy/immutable-no-artifacts/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/immutable-no-artifacts/out.test.toml
+++ b/acceptance/bundle/deploy/immutable-no-artifacts/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/immutable-permissions-change/out.test.toml b/acceptance/bundle/deploy/immutable-permissions-change/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/immutable-permissions-change/out.test.toml
+++ b/acceptance/bundle/deploy/immutable-permissions-change/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/immutable/out.test.toml b/acceptance/bundle/deploy/immutable/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/immutable/out.test.toml
+++ b/acceptance/bundle/deploy/immutable/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/mlops-stacks/out.test.toml b/acceptance/bundle/deploy/mlops-stacks/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/deploy/mlops-stacks/out.test.toml
+++ b/acceptance/bundle/deploy/mlops-stacks/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/partial-summary-on-push-fail/out.test.toml b/acceptance/bundle/deploy/partial-summary-on-push-fail/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/partial-summary-on-push-fail/out.test.toml
+++ b/acceptance/bundle/deploy/partial-summary-on-push-fail/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/pipeline-config-dots/out.test.toml b/acceptance/bundle/deploy/pipeline-config-dots/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/deploy/pipeline-config-dots/out.test.toml
+++ b/acceptance/bundle/deploy/pipeline-config-dots/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/python-notebook/out.test.toml b/acceptance/bundle/deploy/python-notebook/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/deploy/python-notebook/out.test.toml
+++ b/acceptance/bundle/deploy/python-notebook/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/python-notebook/script b/acceptance/bundle/deploy/python-notebook/script
index 601ecd3636..21318c58b6 100644
--- a/acceptance/bundle/deploy/python-notebook/script
+++ b/acceptance/bundle/deploy/python-notebook/script
@@ -1,3 +1,3 @@
 trace $CLI bundle deploy
 
-trace $CLI jobs list --output json
+trace $CLI jobs list --output json | nostamp
diff --git a/acceptance/bundle/deploy/readplan/basic/out.test.toml b/acceptance/bundle/deploy/readplan/basic/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deploy/readplan/basic/out.test.toml
+++ b/acceptance/bundle/deploy/readplan/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/readplan/cli-version-mismatch/out.test.toml b/acceptance/bundle/deploy/readplan/cli-version-mismatch/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deploy/readplan/cli-version-mismatch/out.test.toml
+++ b/acceptance/bundle/deploy/readplan/cli-version-mismatch/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/readplan/grants-remove-principal/out.test.toml b/acceptance/bundle/deploy/readplan/grants-remove-principal/out.test.toml
index 57b0f61685..bf0f576652 100644
--- a/acceptance/bundle/deploy/readplan/grants-remove-principal/out.test.toml
+++ b/acceptance/bundle/deploy/readplan/grants-remove-principal/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/deploy/readplan/invalid-plan/out.test.toml b/acceptance/bundle/deploy/readplan/invalid-plan/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deploy/readplan/invalid-plan/out.test.toml
+++ b/acceptance/bundle/deploy/readplan/invalid-plan/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/readplan/lineage-mismatch/out.test.toml b/acceptance/bundle/deploy/readplan/lineage-mismatch/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deploy/readplan/lineage-mismatch/out.test.toml
+++ b/acceptance/bundle/deploy/readplan/lineage-mismatch/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/readplan/plan-not-found/out.test.toml b/acceptance/bundle/deploy/readplan/plan-not-found/out.test.toml
index 4cc2d5fdf7..47a2f0c8b4 100644
--- a/acceptance/bundle/deploy/readplan/plan-not-found/out.test.toml
+++ b/acceptance/bundle/deploy/readplan/plan-not-found/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/readplan/plan-version-mismatch/out.test.toml b/acceptance/bundle/deploy/readplan/plan-version-mismatch/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deploy/readplan/plan-version-mismatch/out.test.toml
+++ b/acceptance/bundle/deploy/readplan/plan-version-mismatch/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/readplan/postgres_role/out.test.toml b/acceptance/bundle/deploy/readplan/postgres_role/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deploy/readplan/postgres_role/out.test.toml
+++ b/acceptance/bundle/deploy/readplan/postgres_role/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/readplan/serial-mismatch/out.test.toml b/acceptance/bundle/deploy/readplan/serial-mismatch/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deploy/readplan/serial-mismatch/out.test.toml
+++ b/acceptance/bundle/deploy/readplan/serial-mismatch/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/readplan/terraform-error/out.test.toml b/acceptance/bundle/deploy/readplan/terraform-error/out.test.toml
index d2059b4b5d..a52570d2ee 100644
--- a/acceptance/bundle/deploy/readplan/terraform-error/out.test.toml
+++ b/acceptance/bundle/deploy/readplan/terraform-error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/readplan/test.toml b/acceptance/bundle/deploy/readplan/test.toml
new file mode 100644
index 0000000000..e6ef3fcdcf
--- /dev/null
+++ b/acceptance/bundle/deploy/readplan/test.toml
@@ -0,0 +1,3 @@
+# Saved plans don't carry the deployment stamp. Applying one plans an update on the next run.
+# See dms_no_readplan in acceptance/bundle/test.toml.
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/readplan/unknown-field/out.test.toml b/acceptance/bundle/deploy/readplan/unknown-field/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deploy/readplan/unknown-field/out.test.toml
+++ b/acceptance/bundle/deploy/readplan/unknown-field/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/resource-max-wait-zero/out.test.toml b/acceptance/bundle/deploy/resource-max-wait-zero/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/resource-max-wait-zero/out.test.toml
+++ b/acceptance/bundle/deploy/resource-max-wait-zero/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/resource-max-wait/out.test.toml b/acceptance/bundle/deploy/resource-max-wait/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/resource-max-wait/out.test.toml
+++ b/acceptance/bundle/deploy/resource-max-wait/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/snapshot-comparison/out.test.toml b/acceptance/bundle/deploy/snapshot-comparison/out.test.toml
index c977d303ae..19131430a0 100644
--- a/acceptance/bundle/deploy/snapshot-comparison/out.test.toml
+++ b/acceptance/bundle/deploy/snapshot-comparison/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/spark-jar-task/out.test.toml b/acceptance/bundle/deploy/spark-jar-task/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/deploy/spark-jar-task/out.test.toml
+++ b/acceptance/bundle/deploy/spark-jar-task/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/wal/chain-3-jobs/out.test.toml b/acceptance/bundle/deploy/wal/chain-3-jobs/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/wal/chain-3-jobs/out.test.toml
+++ b/acceptance/bundle/deploy/wal/chain-3-jobs/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/wal/chain-3-jobs/script b/acceptance/bundle/deploy/wal/chain-3-jobs/script
index a5afc6f51d..c41e8e7f99 100644
--- a/acceptance/bundle/deploy/wal/chain-3-jobs/script
+++ b/acceptance/bundle/deploy/wal/chain-3-jobs/script
@@ -7,7 +7,7 @@ trace errcode $CLI bundle deploy
 
 echo ""
 echo "=== WAL content after crash ==="
-jq -S . .databricks/bundle/default/resources.json.wal 2>/dev/null || echo "No WAL file"
+jq -S . .databricks/bundle/default/resources.json.wal 2>/dev/null | nostamp || echo "No WAL file"
 
 echo ""
 echo "=== Number of jobs saved in WAL ==="
diff --git a/acceptance/bundle/deploy/wal/corrupted-wal-entry/out.test.toml b/acceptance/bundle/deploy/wal/corrupted-wal-entry/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deploy/wal/corrupted-wal-entry/out.test.toml
+++ b/acceptance/bundle/deploy/wal/corrupted-wal-entry/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt b/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt
index e9762bf4cb..f24d276441 100644
--- a/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt
+++ b/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt
@@ -11,7 +11,7 @@ Warn: Saved 1 corrupted WAL entries to [TEST_TMP_DIR]/.databricks/bundle/default
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-corrupted-test/default/files...
 Created jobs.another_valid
 Created jobs.valid_job
-Files: 6 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle summary
diff --git a/acceptance/bundle/deploy/wal/corrupted-wal-entry/test.toml b/acceptance/bundle/deploy/wal/corrupted-wal-entry/test.toml
new file mode 100644
index 0000000000..921045dfd0
--- /dev/null
+++ b/acceptance/bundle/deploy/wal/corrupted-wal-entry/test.toml
@@ -0,0 +1,4 @@
+# Recording needs a bundle it has seen from the start. This test seeds a state file,
+# so recording refuses it. TODO(DMS): drop this once existing state can be
+# handed over to the service (see the TODO in dstate.Open).
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/wal/crash-after-create/out.test.toml b/acceptance/bundle/deploy/wal/crash-after-create/out.test.toml
index f3f3189bf8..b0851b242b 100644
--- a/acceptance/bundle/deploy/wal/crash-after-create/out.test.toml
+++ b/acceptance/bundle/deploy/wal/crash-after-create/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.COMMAND = ["plan", "deploy --force-lock", "summary"]
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/wal/crash-after-create/script b/acceptance/bundle/deploy/wal/crash-after-create/script
index 264d84648d..5647c83e38 100644
--- a/acceptance/bundle/deploy/wal/crash-after-create/script
+++ b/acceptance/bundle/deploy/wal/crash-after-create/script
@@ -8,7 +8,7 @@ trace errcode $CLI bundle deploy
 
 trace assert_exists.py .databricks/bundle/default/resources.json.wal
 trace assert_not_exists.py .databricks/bundle/default/resources.json
-trace cat .databricks/bundle/default/resources.json.wal | jq
+trace cat .databricks/bundle/default/resources.json.wal | jq | nostamp
 
 title "Any other command recovers state"
 $CLI bundle $COMMAND &> LOG.COMMAND.txt
diff --git a/acceptance/bundle/deploy/wal/empty-wal/out.test.toml b/acceptance/bundle/deploy/wal/empty-wal/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/wal/empty-wal/out.test.toml
+++ b/acceptance/bundle/deploy/wal/empty-wal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/wal/failed-plan-no-wal/out.test.toml b/acceptance/bundle/deploy/wal/failed-plan-no-wal/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/wal/failed-plan-no-wal/out.test.toml
+++ b/acceptance/bundle/deploy/wal/failed-plan-no-wal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/wal/future-serial-wal/out.test.toml b/acceptance/bundle/deploy/wal/future-serial-wal/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/wal/future-serial-wal/out.test.toml
+++ b/acceptance/bundle/deploy/wal/future-serial-wal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/wal/header-only-wal/out.test.toml b/acceptance/bundle/deploy/wal/header-only-wal/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/wal/header-only-wal/out.test.toml
+++ b/acceptance/bundle/deploy/wal/header-only-wal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/wal/lineage-mismatch/out.test.toml b/acceptance/bundle/deploy/wal/lineage-mismatch/out.test.toml
index b5551c9b99..dc89c55cf9 100644
--- a/acceptance/bundle/deploy/wal/lineage-mismatch/out.test.toml
+++ b/acceptance/bundle/deploy/wal/lineage-mismatch/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.COMMAND = ["deploy", "plan", "summary"]
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/wal/stale-wal/out.test.toml b/acceptance/bundle/deploy/wal/stale-wal/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deploy/wal/stale-wal/out.test.toml
+++ b/acceptance/bundle/deploy/wal/stale-wal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deploy/wal/stale-wal/test.toml b/acceptance/bundle/deploy/wal/stale-wal/test.toml
index 9839285164..1e3340c3c6 100644
--- a/acceptance/bundle/deploy/wal/stale-wal/test.toml
+++ b/acceptance/bundle/deploy/wal/stale-wal/test.toml
@@ -1,6 +1,7 @@
 # Recording needs a bundle it has seen from the start. This test seeds a state file,
 # so recording refuses it. TODO(DMS): drop this once existing state can be
 # handed over to the service (see the TODO in dstate.Open).
+EnvMatrix.DMS = [""]
 
 # Deploy with a stale WAL (old serial) - WAL should be deleted and ignored.
 
diff --git a/acceptance/bundle/deploy/wal/wal-with-delete/out.test.toml b/acceptance/bundle/deploy/wal/wal-with-delete/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/deploy/wal/wal-with-delete/out.test.toml
+++ b/acceptance/bundle/deploy/wal/wal-with-delete/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deploy/yaml-sync-empty-grants/out.test.toml b/acceptance/bundle/deploy/yaml-sync-empty-grants/out.test.toml
index d2059b4b5d..5d0f3e4aac 100644
--- a/acceptance/bundle/deploy/yaml-sync-empty-grants/out.test.toml
+++ b/acceptance/bundle/deploy/yaml-sync-empty-grants/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/deployment/bind/alert/out.test.toml b/acceptance/bundle/deployment/bind/alert/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/alert/out.test.toml
+++ b/acceptance/bundle/deployment/bind/alert/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/catalog/out.test.toml b/acceptance/bundle/deployment/bind/catalog/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/deployment/bind/catalog/out.test.toml
+++ b/acceptance/bundle/deployment/bind/catalog/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/cluster/out.test.toml b/acceptance/bundle/deployment/bind/cluster/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/cluster/out.test.toml
+++ b/acceptance/bundle/deployment/bind/cluster/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/dashboard/out.test.toml b/acceptance/bundle/deployment/bind/dashboard/out.test.toml
index 0c49ac004e..2acec25aec 100644
--- a/acceptance/bundle/deployment/bind/dashboard/out.test.toml
+++ b/acceptance/bundle/deployment/bind/dashboard/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/deployment/bind/dashboard/recreation/out.test.toml b/acceptance/bundle/deployment/bind/dashboard/recreation/out.test.toml
index 0c49ac004e..2acec25aec 100644
--- a/acceptance/bundle/deployment/bind/dashboard/recreation/out.test.toml
+++ b/acceptance/bundle/deployment/bind/dashboard/recreation/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/deployment/bind/database_instance/out.test.toml b/acceptance/bundle/deployment/bind/database_instance/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/bind/database_instance/out.test.toml
+++ b/acceptance/bundle/deployment/bind/database_instance/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/experiment/out.test.toml b/acceptance/bundle/deployment/bind/experiment/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/experiment/out.test.toml
+++ b/acceptance/bundle/deployment/bind/experiment/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/external_location/out.test.toml b/acceptance/bundle/deployment/bind/external_location/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deployment/bind/external_location/out.test.toml
+++ b/acceptance/bundle/deployment/bind/external_location/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/genie_space/out.test.toml b/acceptance/bundle/deployment/bind/genie_space/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deployment/bind/genie_space/out.test.toml
+++ b/acceptance/bundle/deployment/bind/genie_space/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/job/already-managed-different/out.test.toml b/acceptance/bundle/deployment/bind/job/already-managed-different/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/bind/job/already-managed-different/out.test.toml
+++ b/acceptance/bundle/deployment/bind/job/already-managed-different/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/job/already-managed-same/out.test.toml b/acceptance/bundle/deployment/bind/job/already-managed-same/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/bind/job/already-managed-same/out.test.toml
+++ b/acceptance/bundle/deployment/bind/job/already-managed-same/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/job/engine-from-config/out.test.toml b/acceptance/bundle/deployment/bind/job/engine-from-config/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deployment/bind/job/engine-from-config/out.test.toml
+++ b/acceptance/bundle/deployment/bind/job/engine-from-config/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/job/generate-and-bind/out.test.toml b/acceptance/bundle/deployment/bind/job/generate-and-bind/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/job/generate-and-bind/out.test.toml
+++ b/acceptance/bundle/deployment/bind/job/generate-and-bind/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/job/job-abort-bind/out.test.toml b/acceptance/bundle/deployment/bind/job/job-abort-bind/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/job/job-abort-bind/out.test.toml
+++ b/acceptance/bundle/deployment/bind/job/job-abort-bind/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/job/job-spark-python-task/out.test.toml b/acceptance/bundle/deployment/bind/job/job-spark-python-task/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/job/job-spark-python-task/out.test.toml
+++ b/acceptance/bundle/deployment/bind/job/job-spark-python-task/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/job/noop-job/out.test.toml b/acceptance/bundle/deployment/bind/job/noop-job/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/bind/job/noop-job/out.test.toml
+++ b/acceptance/bundle/deployment/bind/job/noop-job/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/job/python-job/out.test.toml b/acceptance/bundle/deployment/bind/job/python-job/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/bind/job/python-job/out.test.toml
+++ b/acceptance/bundle/deployment/bind/job/python-job/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/job/stale-state/out.test.toml b/acceptance/bundle/deployment/bind/job/stale-state/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/bind/job/stale-state/out.test.toml
+++ b/acceptance/bundle/deployment/bind/job/stale-state/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/model-serving-endpoint/out.test.toml b/acceptance/bundle/deployment/bind/model-serving-endpoint/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/model-serving-endpoint/out.test.toml
+++ b/acceptance/bundle/deployment/bind/model-serving-endpoint/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/pipelines/recreate/out.test.toml b/acceptance/bundle/deployment/bind/pipelines/recreate/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/pipelines/recreate/out.test.toml
+++ b/acceptance/bundle/deployment/bind/pipelines/recreate/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/pipelines/update/out.test.toml b/acceptance/bundle/deployment/bind/pipelines/update/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/bind/pipelines/update/out.test.toml
+++ b/acceptance/bundle/deployment/bind/pipelines/update/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/postgres_database/out.test.toml b/acceptance/bundle/deployment/bind/postgres_database/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/bind/postgres_database/out.test.toml
+++ b/acceptance/bundle/deployment/bind/postgres_database/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/postgres_role/out.test.toml b/acceptance/bundle/deployment/bind/postgres_role/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/bind/postgres_role/out.test.toml
+++ b/acceptance/bundle/deployment/bind/postgres_role/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/quality-monitor/out.test.toml b/acceptance/bundle/deployment/bind/quality-monitor/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/bind/quality-monitor/out.test.toml
+++ b/acceptance/bundle/deployment/bind/quality-monitor/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/registered-model/out.test.toml b/acceptance/bundle/deployment/bind/registered-model/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/registered-model/out.test.toml
+++ b/acceptance/bundle/deployment/bind/registered-model/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/schema/out.test.toml b/acceptance/bundle/deployment/bind/schema/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/schema/out.test.toml
+++ b/acceptance/bundle/deployment/bind/schema/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/secret-scope/out.test.toml b/acceptance/bundle/deployment/bind/secret-scope/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/secret-scope/out.test.toml
+++ b/acceptance/bundle/deployment/bind/secret-scope/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/sql_warehouse/out.test.toml b/acceptance/bundle/deployment/bind/sql_warehouse/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/bind/sql_warehouse/out.test.toml
+++ b/acceptance/bundle/deployment/bind/sql_warehouse/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/test.toml b/acceptance/bundle/deployment/bind/test.toml
new file mode 100644
index 0000000000..b693e4ded2
--- /dev/null
+++ b/acceptance/bundle/deployment/bind/test.toml
@@ -0,0 +1,2 @@
+# Bind operations are not yet supported by the Deployment Metadata Service (DMS)
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/vector_search_endpoint/out.test.toml b/acceptance/bundle/deployment/bind/vector_search_endpoint/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/deployment/bind/vector_search_endpoint/out.test.toml
+++ b/acceptance/bundle/deployment/bind/vector_search_endpoint/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/vector_search_index/out.test.toml b/acceptance/bundle/deployment/bind/vector_search_index/out.test.toml
index 33b0e8c26b..12effa8e96 100644
--- a/acceptance/bundle/deployment/bind/vector_search_index/out.test.toml
+++ b/acceptance/bundle/deployment/bind/vector_search_index/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/bind/volume/out.test.toml b/acceptance/bundle/deployment/bind/volume/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/bind/volume/out.test.toml
+++ b/acceptance/bundle/deployment/bind/volume/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/unbind/engine-from-config/out.test.toml b/acceptance/bundle/deployment/unbind/engine-from-config/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/deployment/unbind/engine-from-config/out.test.toml
+++ b/acceptance/bundle/deployment/unbind/engine-from-config/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/unbind/grants/out.test.toml b/acceptance/bundle/deployment/unbind/grants/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/unbind/grants/out.test.toml
+++ b/acceptance/bundle/deployment/unbind/grants/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/unbind/job/out.test.toml b/acceptance/bundle/deployment/unbind/job/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/unbind/job/out.test.toml
+++ b/acceptance/bundle/deployment/unbind/job/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/unbind/permissions/out.test.toml b/acceptance/bundle/deployment/unbind/permissions/out.test.toml
index 2a13818c13..9b8ddfcd2b 100644
--- a/acceptance/bundle/deployment/unbind/permissions/out.test.toml
+++ b/acceptance/bundle/deployment/unbind/permissions/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/unbind/python-job/out.test.toml b/acceptance/bundle/deployment/unbind/python-job/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/deployment/unbind/python-job/out.test.toml
+++ b/acceptance/bundle/deployment/unbind/python-job/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/deployment/unbind/test.toml b/acceptance/bundle/deployment/unbind/test.toml
new file mode 100644
index 0000000000..9f5f5d49a0
--- /dev/null
+++ b/acceptance/bundle/deployment/unbind/test.toml
@@ -0,0 +1,2 @@
+# Unbind operations are not yet supported by the Deployment Metadata Service (DMS)
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/destroy/all-resources/out.test.toml b/acceptance/bundle/destroy/all-resources/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/destroy/all-resources/out.test.toml
+++ b/acceptance/bundle/destroy/all-resources/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/destroy/force-lock-node-limit/out.test.toml b/acceptance/bundle/destroy/force-lock-node-limit/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/destroy/force-lock-node-limit/out.test.toml
+++ b/acceptance/bundle/destroy/force-lock-node-limit/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/destroy/jobs-and-pipeline/out.test.toml b/acceptance/bundle/destroy/jobs-and-pipeline/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/destroy/jobs-and-pipeline/out.test.toml
+++ b/acceptance/bundle/destroy/jobs-and-pipeline/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/destroy/jobs-and-pipeline/script b/acceptance/bundle/destroy/jobs-and-pipeline/script
index 57ee878f12..b02d93bcec 100644
--- a/acceptance/bundle/destroy/jobs-and-pipeline/script
+++ b/acceptance/bundle/destroy/jobs-and-pipeline/script
@@ -45,7 +45,7 @@ trace $CLI workspace get-status "${DEPLOYMENT_PATH}" | jq '{path, object_type}'
 
 title "Assert the pipeline is created"
 PIPELINE_ID=$($CLI bundle summary -o json | jq -r '.resources.pipelines.bar.id')
-trace $CLI pipelines get "${PIPELINE_ID}" | jq "{spec}"
+trace $CLI pipelines get "${PIPELINE_ID}" | nostamp | jq "{spec}"
 
 title "Assert the job is created:\n"
 JOB_ID=$($CLI bundle summary -o json | jq -r '.resources.jobs.foo.id')
diff --git a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/out.test.toml b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/out.test.toml
+++ b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/destroy/root-path-name-target/out.test.toml b/acceptance/bundle/destroy/root-path-name-target/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/destroy/root-path-name-target/out.test.toml
+++ b/acceptance/bundle/destroy/root-path-name-target/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/destroy/root-path-not-scoped/out.test.toml b/acceptance/bundle/destroy/root-path-not-scoped/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/destroy/root-path-not-scoped/out.test.toml
+++ b/acceptance/bundle/destroy/root-path-not-scoped/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/destroy/sibling-target/out.test.toml b/acceptance/bundle/destroy/sibling-target/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/destroy/sibling-target/out.test.toml
+++ b/acceptance/bundle/destroy/sibling-target/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/dms/declined-deploy/out.test.toml b/acceptance/bundle/dms/declined-deploy/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/declined-deploy/out.test.toml
+++ b/acceptance/bundle/dms/declined-deploy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/depends-on/out.test.toml b/acceptance/bundle/dms/depends-on/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/depends-on/out.test.toml
+++ b/acceptance/bundle/dms/depends-on/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/deployment-metadata-change/out.test.toml b/acceptance/bundle/dms/deployment-metadata-change/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/deployment-metadata-change/out.test.toml
+++ b/acceptance/bundle/dms/deployment-metadata-change/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/emptied-resource/out.test.toml b/acceptance/bundle/dms/emptied-resource/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/emptied-resource/out.test.toml
+++ b/acceptance/bundle/dms/emptied-resource/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/existing-state/out.test.toml b/acceptance/bundle/dms/existing-state/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/existing-state/out.test.toml
+++ b/acceptance/bundle/dms/existing-state/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/failed-delete/out.test.toml b/acceptance/bundle/dms/failed-delete/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/dms/failed-delete/out.test.toml
+++ b/acceptance/bundle/dms/failed-delete/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/failed-recreate/out.test.toml b/acceptance/bundle/dms/failed-recreate/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/dms/failed-recreate/out.test.toml
+++ b/acceptance/bundle/dms/failed-recreate/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/failed-update-permissions/out.test.toml b/acceptance/bundle/dms/failed-update-permissions/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/dms/failed-update-permissions/out.test.toml
+++ b/acceptance/bundle/dms/failed-update-permissions/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/failed-update/out.test.toml b/acceptance/bundle/dms/failed-update/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/dms/failed-update/out.test.toml
+++ b/acceptance/bundle/dms/failed-update/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/multiple-resources/out.test.toml b/acceptance/bundle/dms/multiple-resources/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/multiple-resources/out.test.toml
+++ b/acceptance/bundle/dms/multiple-resources/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/no-drift/out.test.toml b/acceptance/bundle/dms/no-drift/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/no-drift/out.test.toml
+++ b/acceptance/bundle/dms/no-drift/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/no-resources/out.test.toml b/acceptance/bundle/dms/no-resources/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/no-resources/out.test.toml
+++ b/acceptance/bundle/dms/no-resources/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/not-supported/out.test.toml b/acceptance/bundle/dms/not-supported/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/not-supported/out.test.toml
+++ b/acceptance/bundle/dms/not-supported/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/operation-upload-fails-once/out.test.toml b/acceptance/bundle/dms/operation-upload-fails-once/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/dms/operation-upload-fails-once/out.test.toml
+++ b/acceptance/bundle/dms/operation-upload-fails-once/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/operation-upload-fails/out.test.toml b/acceptance/bundle/dms/operation-upload-fails/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/dms/operation-upload-fails/out.test.toml
+++ b/acceptance/bundle/dms/operation-upload-fails/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/operation-upload-message/out.test.toml b/acceptance/bundle/dms/operation-upload-message/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/dms/operation-upload-message/out.test.toml
+++ b/acceptance/bundle/dms/operation-upload-message/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/provenance/out.test.toml b/acceptance/bundle/dms/provenance/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/provenance/out.test.toml
+++ b/acceptance/bundle/dms/provenance/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/record-failure/out.test.toml b/acceptance/bundle/dms/record-failure/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/dms/record-failure/out.test.toml
+++ b/acceptance/bundle/dms/record-failure/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/record/out.test.toml b/acceptance/bundle/dms/record/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/record/out.test.toml
+++ b/acceptance/bundle/dms/record/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/resource-lifecycle/out.test.toml b/acceptance/bundle/dms/resource-lifecycle/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/resource-lifecycle/out.test.toml
+++ b/acceptance/bundle/dms/resource-lifecycle/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/summary/out.test.toml b/acceptance/bundle/dms/summary/out.test.toml
index c502b28221..d73c45e311 100644
--- a/acceptance/bundle/dms/summary/out.test.toml
+++ b/acceptance/bundle/dms/summary/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/dms/test.toml b/acceptance/bundle/dms/test.toml
index b8a3b8ed9b..0b40fb3cfa 100644
--- a/acceptance/bundle/dms/test.toml
+++ b/acceptance/bundle/dms/test.toml
@@ -4,6 +4,10 @@ Cloud = true
 # engine; it is a no-op on terraform.
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
 
+# These tests enable recording through experimental.record_deployment_history, so the
+# DATABRICKS_BUNDLE_RECORD_DEPLOYMENT_HISTORY variant the rest of the suite adds would
+# just duplicate them.
+EnvMatrix.DMS = [""]
 
 RecordRequests = true
 
diff --git a/acceptance/bundle/dms/version-never-created/out.test.toml b/acceptance/bundle/dms/version-never-created/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/dms/version-never-created/out.test.toml
+++ b/acceptance/bundle/dms/version-never-created/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/empty_string_dropped/out.test.toml b/acceptance/bundle/empty_string_dropped/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/empty_string_dropped/out.test.toml
+++ b/acceptance/bundle/empty_string_dropped/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/empty_string_dropped/script b/acceptance/bundle/empty_string_dropped/script
index 973e436617..a03c479c07 100644
--- a/acceptance/bundle/empty_string_dropped/script
+++ b/acceptance/bundle/empty_string_dropped/script
@@ -8,13 +8,14 @@
 
 # Resolved config the engines see. Today every "" field is still present here; a
 # fix in the initialize phase would drop them, and this golden would show that.
-$CLI bundle validate -o json -t direct | jq .resources > out.validate.json
+$CLI bundle validate -o json -t direct | nostamp | jq .resources > out.validate.json
 
-# Exclude non-create traffic: workspace file ops and telemetry (nondeterministic).
+# Exclude non-create traffic: workspace file ops, telemetry (nondeterministic), and the
+# deployment history calls the DMS run adds.
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy -t tf
-print_requests.py ^//api/2.0/workspace ^//telemetry --sort > out.requests.terraform.json
+print_requests.py --nostamp ^//api/2.0/workspace ^//telemetry ^//api/2.0/bundle --sort > out.requests.terraform.json
 
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy -t direct
-print_requests.py ^//api/2.0/workspace ^//telemetry --sort > out.requests.direct.json
+print_requests.py --nostamp ^//api/2.0/workspace ^//telemetry ^//api/2.0/bundle --sort > out.requests.direct.json
 
 $TESTDIR/empty_sent.py
diff --git a/acceptance/bundle/empty_string_variable/out.test.toml b/acceptance/bundle/empty_string_variable/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/empty_string_variable/out.test.toml
+++ b/acceptance/bundle/empty_string_variable/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/environments/dependencies/out.test.toml b/acceptance/bundle/environments/dependencies/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/environments/dependencies/out.test.toml
+++ b/acceptance/bundle/environments/dependencies/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/environments/dependencies/script b/acceptance/bundle/environments/dependencies/script
index 54d408a8db..00e5fc846c 100644
--- a/acceptance/bundle/environments/dependencies/script
+++ b/acceptance/bundle/environments/dependencies/script
@@ -4,11 +4,11 @@ set -euo pipefail
 trace $CLI bundle validate
 
 trace $CLI bundle deploy
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' out.requests.txt | nostamp
 
-trace jq -s '.[] | select(.path=="/api/2.0/pipelines")' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/pipelines")' out.requests.txt | nostamp
 
-trace $CLI bundle validate -o json | jq '.resources.jobs.test_job.environments'
-trace $CLI bundle validate -o json | jq '.resources.pipelines.test_pipeline.environment'
+trace $CLI bundle validate -o json | nostamp | jq '.resources.jobs.test_job.environments'
+trace $CLI bundle validate -o json | nostamp | jq '.resources.pipelines.test_pipeline.environment'
 
 rm out.requests.txt
diff --git a/acceptance/bundle/experimental/skip_name_prefix_for_schema/out.test.toml b/acceptance/bundle/experimental/skip_name_prefix_for_schema/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/experimental/skip_name_prefix_for_schema/out.test.toml
+++ b/acceptance/bundle/experimental/skip_name_prefix_for_schema/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/alert/out.test.toml b/acceptance/bundle/generate/alert/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/generate/alert/out.test.toml
+++ b/acceptance/bundle/generate/alert/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/alert_existing_id_not_found/out.test.toml b/acceptance/bundle/generate/alert_existing_id_not_found/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/alert_existing_id_not_found/out.test.toml
+++ b/acceptance/bundle/generate/alert_existing_id_not_found/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/app_not_yet_deployed/out.test.toml b/acceptance/bundle/generate/app_not_yet_deployed/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/app_not_yet_deployed/out.test.toml
+++ b/acceptance/bundle/generate/app_not_yet_deployed/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/app_subfolders/out.test.toml b/acceptance/bundle/generate/app_subfolders/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/app_subfolders/out.test.toml
+++ b/acceptance/bundle/generate/app_subfolders/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/auto-bind/out.test.toml b/acceptance/bundle/generate/auto-bind/out.test.toml
index c977d303ae..19131430a0 100644
--- a/acceptance/bundle/generate/auto-bind/out.test.toml
+++ b/acceptance/bundle/generate/auto-bind/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/dashboard-inplace/out.test.toml b/acceptance/bundle/generate/dashboard-inplace/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/dashboard-inplace/out.test.toml
+++ b/acceptance/bundle/generate/dashboard-inplace/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/dashboard/out.test.toml b/acceptance/bundle/generate/dashboard/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/dashboard/out.test.toml
+++ b/acceptance/bundle/generate/dashboard/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/dashboard_existing_id_not_found/out.test.toml b/acceptance/bundle/generate/dashboard_existing_id_not_found/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/dashboard_existing_id_not_found/out.test.toml
+++ b/acceptance/bundle/generate/dashboard_existing_id_not_found/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/dashboard_existing_path_nominal/out.test.toml b/acceptance/bundle/generate/dashboard_existing_path_nominal/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/dashboard_existing_path_nominal/out.test.toml
+++ b/acceptance/bundle/generate/dashboard_existing_path_nominal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/dashboard_existing_path_not_found/out.test.toml b/acceptance/bundle/generate/dashboard_existing_path_not_found/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/dashboard_existing_path_not_found/out.test.toml
+++ b/acceptance/bundle/generate/dashboard_existing_path_not_found/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/designer_job/out.test.toml b/acceptance/bundle/generate/designer_job/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/designer_job/out.test.toml
+++ b/acceptance/bundle/generate/designer_job/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/genie_space/out.test.toml b/acceptance/bundle/generate/genie_space/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/genie_space/out.test.toml
+++ b/acceptance/bundle/generate/genie_space/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/genie_space_existing_id_not_found/out.test.toml b/acceptance/bundle/generate/genie_space_existing_id_not_found/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/genie_space_existing_id_not_found/out.test.toml
+++ b/acceptance/bundle/generate/genie_space_existing_id_not_found/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/genie_space_inplace/out.test.toml b/acceptance/bundle/generate/genie_space_inplace/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/generate/genie_space_inplace/out.test.toml
+++ b/acceptance/bundle/generate/genie_space_inplace/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/git_job/out.test.toml b/acceptance/bundle/generate/git_job/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/git_job/out.test.toml
+++ b/acceptance/bundle/generate/git_job/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/include_warning/out.test.toml b/acceptance/bundle/generate/include_warning/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/include_warning/out.test.toml
+++ b/acceptance/bundle/generate/include_warning/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/ipynb_job/out.test.toml b/acceptance/bundle/generate/ipynb_job/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/ipynb_job/out.test.toml
+++ b/acceptance/bundle/generate/ipynb_job/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/job_nested_notebooks/out.test.toml b/acceptance/bundle/generate/job_nested_notebooks/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/job_nested_notebooks/out.test.toml
+++ b/acceptance/bundle/generate/job_nested_notebooks/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/lakeflow_pipelines/out.test.toml b/acceptance/bundle/generate/lakeflow_pipelines/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/lakeflow_pipelines/out.test.toml
+++ b/acceptance/bundle/generate/lakeflow_pipelines/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/pipeline/out.test.toml b/acceptance/bundle/generate/pipeline/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/pipeline/out.test.toml
+++ b/acceptance/bundle/generate/pipeline/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/pipeline_and_deploy/out.test.toml b/acceptance/bundle/generate/pipeline_and_deploy/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/generate/pipeline_and_deploy/out.test.toml
+++ b/acceptance/bundle/generate/pipeline_and_deploy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/pipeline_with_glob/out.test.toml b/acceptance/bundle/generate/pipeline_with_glob/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/pipeline_with_glob/out.test.toml
+++ b/acceptance/bundle/generate/pipeline_with_glob/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/pipeline_with_sql/out.test.toml b/acceptance/bundle/generate/pipeline_with_sql/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/pipeline_with_sql/out.test.toml
+++ b/acceptance/bundle/generate/pipeline_with_sql/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/python_job/out.test.toml b/acceptance/bundle/generate/python_job/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/python_job/out.test.toml
+++ b/acceptance/bundle/generate/python_job/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/python_job_and_deploy/out.test.toml b/acceptance/bundle/generate/python_job_and_deploy/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/generate/python_job_and_deploy/out.test.toml
+++ b/acceptance/bundle/generate/python_job_and_deploy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/generate/spark_python_task_job/out.test.toml b/acceptance/bundle/generate/spark_python_task_job/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/generate/spark_python_task_job/out.test.toml
+++ b/acceptance/bundle/generate/spark_python_task_job/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/git-metadata/out.test.toml b/acceptance/bundle/git-metadata/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/git-metadata/out.test.toml
+++ b/acceptance/bundle/git-metadata/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/git-permerror/out.test.toml b/acceptance/bundle/git-permerror/out.test.toml
index 2adb6d6366..56f228d004 100644
--- a/acceptance/bundle/git-permerror/out.test.toml
+++ b/acceptance/bundle/git-permerror/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-deploy/out.test.toml b/acceptance/bundle/help/bundle-deploy/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-deploy/out.test.toml
+++ b/acceptance/bundle/help/bundle-deploy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-deployment-migrate/out.test.toml b/acceptance/bundle/help/bundle-deployment-migrate/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-deployment-migrate/out.test.toml
+++ b/acceptance/bundle/help/bundle-deployment-migrate/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-deployment/out.test.toml b/acceptance/bundle/help/bundle-deployment/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-deployment/out.test.toml
+++ b/acceptance/bundle/help/bundle-deployment/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-destroy/out.test.toml b/acceptance/bundle/help/bundle-destroy/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-destroy/out.test.toml
+++ b/acceptance/bundle/help/bundle-destroy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-generate-dashboard/out.test.toml b/acceptance/bundle/help/bundle-generate-dashboard/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-generate-dashboard/out.test.toml
+++ b/acceptance/bundle/help/bundle-generate-dashboard/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-generate-job/out.test.toml b/acceptance/bundle/help/bundle-generate-job/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-generate-job/out.test.toml
+++ b/acceptance/bundle/help/bundle-generate-job/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-generate-pipeline/out.test.toml b/acceptance/bundle/help/bundle-generate-pipeline/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-generate-pipeline/out.test.toml
+++ b/acceptance/bundle/help/bundle-generate-pipeline/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-generate/out.test.toml b/acceptance/bundle/help/bundle-generate/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-generate/out.test.toml
+++ b/acceptance/bundle/help/bundle-generate/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-init/out.test.toml b/acceptance/bundle/help/bundle-init/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-init/out.test.toml
+++ b/acceptance/bundle/help/bundle-init/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-open/out.test.toml b/acceptance/bundle/help/bundle-open/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-open/out.test.toml
+++ b/acceptance/bundle/help/bundle-open/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-run/out.test.toml b/acceptance/bundle/help/bundle-run/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-run/out.test.toml
+++ b/acceptance/bundle/help/bundle-run/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-schema/out.test.toml b/acceptance/bundle/help/bundle-schema/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-schema/out.test.toml
+++ b/acceptance/bundle/help/bundle-schema/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-summary/out.test.toml b/acceptance/bundle/help/bundle-summary/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-summary/out.test.toml
+++ b/acceptance/bundle/help/bundle-summary/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-sync/out.test.toml b/acceptance/bundle/help/bundle-sync/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-sync/out.test.toml
+++ b/acceptance/bundle/help/bundle-sync/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle-validate/out.test.toml b/acceptance/bundle/help/bundle-validate/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle-validate/out.test.toml
+++ b/acceptance/bundle/help/bundle-validate/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/help/bundle/out.test.toml b/acceptance/bundle/help/bundle/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/help/bundle/out.test.toml
+++ b/acceptance/bundle/help/bundle/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/includes/glob_in_root_path/out.test.toml b/acceptance/bundle/includes/glob_in_root_path/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/includes/glob_in_root_path/out.test.toml
+++ b/acceptance/bundle/includes/glob_in_root_path/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/includes/include_outside_root/out.test.toml b/acceptance/bundle/includes/include_outside_root/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/includes/include_outside_root/out.test.toml
+++ b/acceptance/bundle/includes/include_outside_root/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/includes/non_yaml_in_include/out.test.toml b/acceptance/bundle/includes/non_yaml_in_include/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/includes/non_yaml_in_include/out.test.toml
+++ b/acceptance/bundle/includes/non_yaml_in_include/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/includes/yml_outside_root/out.test.toml b/acceptance/bundle/includes/yml_outside_root/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/includes/yml_outside_root/out.test.toml
+++ b/acceptance/bundle/includes/yml_outside_root/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/base/out.test.toml b/acceptance/bundle/integration_whl/base/out.test.toml
index 5104aa4a4f..2fbe66e8d0 100644
--- a/acceptance/bundle/integration_whl/base/out.test.toml
+++ b/acceptance/bundle/integration_whl/base/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/custom_params/out.test.toml b/acceptance/bundle/integration_whl/custom_params/out.test.toml
index 5104aa4a4f..2fbe66e8d0 100644
--- a/acceptance/bundle/integration_whl/custom_params/out.test.toml
+++ b/acceptance/bundle/integration_whl/custom_params/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/interactive_cluster/out.test.toml b/acceptance/bundle/integration_whl/interactive_cluster/out.test.toml
index 5104aa4a4f..2fbe66e8d0 100644
--- a/acceptance/bundle/integration_whl/interactive_cluster/out.test.toml
+++ b/acceptance/bundle/integration_whl/interactive_cluster/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/out.test.toml b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/out.test.toml
index 86b7c8f8ae..bed2babe8f 100644
--- a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/out.test.toml
+++ b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
 EnvMatrix.DATA_SECURITY_MODE = ["USER_ISOLATION", "SINGLE_USER"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/interactive_single_user/out.test.toml b/acceptance/bundle/integration_whl/interactive_single_user/out.test.toml
index 5104aa4a4f..2fbe66e8d0 100644
--- a/acceptance/bundle/integration_whl/interactive_single_user/out.test.toml
+++ b/acceptance/bundle/integration_whl/interactive_single_user/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/serverless/out.test.toml b/acceptance/bundle/integration_whl/serverless/out.test.toml
index 5104aa4a4f..2fbe66e8d0 100644
--- a/acceptance/bundle/integration_whl/serverless/out.test.toml
+++ b/acceptance/bundle/integration_whl/serverless/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/serverless_custom_params/out.test.toml b/acceptance/bundle/integration_whl/serverless_custom_params/out.test.toml
index 5104aa4a4f..2fbe66e8d0 100644
--- a/acceptance/bundle/integration_whl/serverless_custom_params/out.test.toml
+++ b/acceptance/bundle/integration_whl/serverless_custom_params/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/serverless_dynamic_version/out.test.toml b/acceptance/bundle/integration_whl/serverless_dynamic_version/out.test.toml
index 5104aa4a4f..2fbe66e8d0 100644
--- a/acceptance/bundle/integration_whl/serverless_dynamic_version/out.test.toml
+++ b/acceptance/bundle/integration_whl/serverless_dynamic_version/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/serverless_extras/out.test.toml b/acceptance/bundle/integration_whl/serverless_extras/out.test.toml
index 5104aa4a4f..2fbe66e8d0 100644
--- a/acceptance/bundle/integration_whl/serverless_extras/out.test.toml
+++ b/acceptance/bundle/integration_whl/serverless_extras/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/out.test.toml b/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/out.test.toml
index 5104aa4a4f..2fbe66e8d0 100644
--- a/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/out.test.toml
+++ b/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/wrapper/out.test.toml b/acceptance/bundle/integration_whl/wrapper/out.test.toml
index d2897ba280..e700e9c2d6 100644
--- a/acceptance/bundle/integration_whl/wrapper/out.test.toml
+++ b/acceptance/bundle/integration_whl/wrapper/out.test.toml
@@ -3,3 +3,4 @@ CloudSlow = true
 CloudEnvs.aws = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/integration_whl/wrapper_custom_params/out.test.toml b/acceptance/bundle/integration_whl/wrapper_custom_params/out.test.toml
index d2897ba280..e700e9c2d6 100644
--- a/acceptance/bundle/integration_whl/wrapper_custom_params/out.test.toml
+++ b/acceptance/bundle/integration_whl/wrapper_custom_params/out.test.toml
@@ -3,3 +3,4 @@ CloudSlow = true
 CloudEnvs.aws = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/invariant/continue_293/out.test.toml b/acceptance/bundle/invariant/continue_293/out.test.toml
index f5883975fc..f130299e31 100644
--- a/acceptance/bundle/invariant/continue_293/out.test.toml
+++ b/acceptance/bundle/invariant/continue_293/out.test.toml
@@ -1,5 +1,6 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.INPUT_CONFIG = [
   "alert.yml.tmpl",
   "app.yml.tmpl",
diff --git a/acceptance/bundle/invariant/continue_293/test.toml b/acceptance/bundle/invariant/continue_293/test.toml
index f174ba144c..92fb6d1978 100644
--- a/acceptance/bundle/invariant/continue_293/test.toml
+++ b/acceptance/bundle/invariant/continue_293/test.toml
@@ -1,3 +1,7 @@
+# The seed deploy runs an old CLI unaware of DMS, so resources aren't recorded.
+# Reading state from the service finds nothing; adopting pre-DMS resources is a separate story.
+EnvMatrix.DMS = [""]
+
 # $resources references to permissions and grants are not supported on v0.293.0
 EnvMatrixExclude.no_permission_ref = ["INPUT_CONFIG=job_permission_ref.yml.tmpl"]
 EnvMatrixExclude.no_cross_resource_ref = ["INPUT_CONFIG=job_cross_resource_ref.yml.tmpl"]
diff --git a/acceptance/bundle/invariant/delete_idempotent/out.test.toml b/acceptance/bundle/invariant/delete_idempotent/out.test.toml
index 8ed109d482..8a71ad2ffe 100644
--- a/acceptance/bundle/invariant/delete_idempotent/out.test.toml
+++ b/acceptance/bundle/invariant/delete_idempotent/out.test.toml
@@ -1,5 +1,6 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.INPUT_CONFIG = [
   "alert.yml.tmpl",
   "app.yml.tmpl",
diff --git a/acceptance/bundle/invariant/delete_idempotent/test.toml b/acceptance/bundle/invariant/delete_idempotent/test.toml
index a47b6c96ad..f876726848 100644
--- a/acceptance/bundle/invariant/delete_idempotent/test.toml
+++ b/acceptance/bundle/invariant/delete_idempotent/test.toml
@@ -1,5 +1,6 @@
 # Recording needs a bundle from the start. This test rewinds state and wipes the
 # deployment record path, so recording refuses it.
+EnvMatrix.DMS = [""]
 
 EnvMatrix.READPLAN = ["", "1"]
 
diff --git a/acceptance/bundle/invariant/destroy_idempotent/out.test.toml b/acceptance/bundle/invariant/destroy_idempotent/out.test.toml
index 8ed109d482..8a71ad2ffe 100644
--- a/acceptance/bundle/invariant/destroy_idempotent/out.test.toml
+++ b/acceptance/bundle/invariant/destroy_idempotent/out.test.toml
@@ -1,5 +1,6 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.INPUT_CONFIG = [
   "alert.yml.tmpl",
   "app.yml.tmpl",
diff --git a/acceptance/bundle/invariant/destroy_idempotent/test.toml b/acceptance/bundle/invariant/destroy_idempotent/test.toml
index 01b83d043b..d86b5366f2 100644
--- a/acceptance/bundle/invariant/destroy_idempotent/test.toml
+++ b/acceptance/bundle/invariant/destroy_idempotent/test.toml
@@ -1,5 +1,6 @@
 # Recording needs a bundle from the start. This test rewinds state and wipes the
 # deployment record path, so recording refuses it.
+EnvMatrix.DMS = [""]
 
 EnvMatrix.READPLAN = ["", "1"]
 
diff --git a/acceptance/bundle/invariant/migrate/out.test.toml b/acceptance/bundle/invariant/migrate/out.test.toml
index de39decabc..d1cf7575d9 100644
--- a/acceptance/bundle/invariant/migrate/out.test.toml
+++ b/acceptance/bundle/invariant/migrate/out.test.toml
@@ -1,5 +1,6 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.INPUT_CONFIG = [
   "alert.yml.tmpl",
   "app.yml.tmpl",
diff --git a/acceptance/bundle/invariant/migrate/test.toml b/acceptance/bundle/invariant/migrate/test.toml
index 7941f3a10d..2924a3dec1 100644
--- a/acceptance/bundle/invariant/migrate/test.toml
+++ b/acceptance/bundle/invariant/migrate/test.toml
@@ -1,6 +1,7 @@
 # Recording needs a bundle it has seen from the start. This test seeds a state file,
 # so recording refuses it. TODO(DMS): drop this once existing state can be
 # handed over to the service (see the TODO in dstate.Open).
+EnvMatrix.DMS = [""]
 
 # vector_search_endpoints and vector_search_indexes have no terraform converter
 EnvMatrixExclude.no_vector_search_endpoint = ["INPUT_CONFIG=vector_search_endpoint.yml.tmpl"]
diff --git a/acceptance/bundle/invariant/no_drift/out.test.toml b/acceptance/bundle/invariant/no_drift/out.test.toml
index 8ed109d482..a1354b12ab 100644
--- a/acceptance/bundle/invariant/no_drift/out.test.toml
+++ b/acceptance/bundle/invariant/no_drift/out.test.toml
@@ -1,5 +1,6 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.INPUT_CONFIG = [
   "alert.yml.tmpl",
   "app.yml.tmpl",
diff --git a/acceptance/bundle/libraries/maven/out.test.toml b/acceptance/bundle/libraries/maven/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/libraries/maven/out.test.toml
+++ b/acceptance/bundle/libraries/maven/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/libraries/outside_of_bundle_root/out.test.toml b/acceptance/bundle/libraries/outside_of_bundle_root/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/libraries/outside_of_bundle_root/out.test.toml
+++ b/acceptance/bundle/libraries/outside_of_bundle_root/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/libraries/pypi/out.test.toml b/acceptance/bundle/libraries/pypi/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/libraries/pypi/out.test.toml
+++ b/acceptance/bundle/libraries/pypi/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/lifecycle/prevent-destroy/out.test.toml b/acceptance/bundle/lifecycle/prevent-destroy/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/lifecycle/prevent-destroy/out.test.toml
+++ b/acceptance/bundle/lifecycle/prevent-destroy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/lifecycle/started-validation/out.test.toml b/acceptance/bundle/lifecycle/started-validation/out.test.toml
index 3eaff7a0e4..dd4cf5e899 100644
--- a/acceptance/bundle/lifecycle/started-validation/out.test.toml
+++ b/acceptance/bundle/lifecycle/started-validation/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/lifecycle/started/out.test.toml b/acceptance/bundle/lifecycle/started/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/lifecycle/started/out.test.toml
+++ b/acceptance/bundle/lifecycle/started/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/local_state_staleness/out.test.toml b/acceptance/bundle/local_state_staleness/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/local_state_staleness/out.test.toml
+++ b/acceptance/bundle/local_state_staleness/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/migrate/added-direct-only/out.test.toml b/acceptance/bundle/migrate/added-direct-only/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/added-direct-only/out.test.toml
+++ b/acceptance/bundle/migrate/added-direct-only/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/added/out.test.toml b/acceptance/bundle/migrate/added/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/added/out.test.toml
+++ b/acceptance/bundle/migrate/added/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/auto-migrate-clean/out.test.toml b/acceptance/bundle/migrate/auto-migrate-clean/out.test.toml
index 57b0f61685..bf0f576652 100644
--- a/acceptance/bundle/migrate/auto-migrate-clean/out.test.toml
+++ b/acceptance/bundle/migrate/auto-migrate-clean/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/migrate/auto-migrate-default/out.test.toml b/acceptance/bundle/migrate/auto-migrate-default/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/auto-migrate-default/out.test.toml
+++ b/acceptance/bundle/migrate/auto-migrate-default/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/out.test.toml b/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/out.test.toml
+++ b/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/auto-migrate-direct-only/out.test.toml b/acceptance/bundle/migrate/auto-migrate-direct-only/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/auto-migrate-direct-only/out.test.toml
+++ b/acceptance/bundle/migrate/auto-migrate-direct-only/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/auto-migrate-empty-tfstate/out.test.toml b/acceptance/bundle/migrate/auto-migrate-empty-tfstate/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/auto-migrate-empty-tfstate/out.test.toml
+++ b/acceptance/bundle/migrate/auto-migrate-empty-tfstate/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/auto-migrate-envvar/out.test.toml b/acceptance/bundle/migrate/auto-migrate-envvar/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/auto-migrate-envvar/out.test.toml
+++ b/acceptance/bundle/migrate/auto-migrate-envvar/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/auto-migrate-push-failure/out.test.toml b/acceptance/bundle/migrate/auto-migrate-push-failure/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/auto-migrate-push-failure/out.test.toml
+++ b/acceptance/bundle/migrate/auto-migrate-push-failure/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/out.test.toml b/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/out.test.toml
+++ b/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/basic/out.test.toml b/acceptance/bundle/migrate/basic/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/basic/out.test.toml
+++ b/acceptance/bundle/migrate/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/dashboards/out.test.toml b/acceptance/bundle/migrate/dashboards/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/dashboards/out.test.toml
+++ b/acceptance/bundle/migrate/dashboards/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/default-python/out.test.toml b/acceptance/bundle/migrate/default-python/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/default-python/out.test.toml
+++ b/acceptance/bundle/migrate/default-python/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/engine-config-direct/out.test.toml b/acceptance/bundle/migrate/engine-config-direct/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/engine-config-direct/out.test.toml
+++ b/acceptance/bundle/migrate/engine-config-direct/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/engine-config-terraform/out.test.toml b/acceptance/bundle/migrate/engine-config-terraform/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/engine-config-terraform/out.test.toml
+++ b/acceptance/bundle/migrate/engine-config-terraform/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/grants/out.test.toml b/acceptance/bundle/migrate/grants/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/grants/out.test.toml
+++ b/acceptance/bundle/migrate/grants/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/permissions/out.test.toml b/acceptance/bundle/migrate/permissions/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/permissions/out.test.toml
+++ b/acceptance/bundle/migrate/permissions/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/profile_arg/out.test.toml b/acceptance/bundle/migrate/profile_arg/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/profile_arg/out.test.toml
+++ b/acceptance/bundle/migrate/profile_arg/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/removed/out.test.toml b/acceptance/bundle/migrate/removed/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/removed/out.test.toml
+++ b/acceptance/bundle/migrate/removed/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/runas/out.test.toml b/acceptance/bundle/migrate/runas/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/runas/out.test.toml
+++ b/acceptance/bundle/migrate/runas/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/test.toml b/acceptance/bundle/migrate/test.toml
index 2a743ed83c..517f5524ec 100644
--- a/acceptance/bundle/migrate/test.toml
+++ b/acceptance/bundle/migrate/test.toml
@@ -11,3 +11,4 @@ EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
 # These tests deploy on terraform and then migrate to direct. Recording is direct-only, so
 # the terraform half is recorded nowhere and the migration reads state the service lacks.
 # Migrating an existing deployment onto the service is its own story.
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/migrate/var_arg/out.test.toml b/acceptance/bundle/migrate/var_arg/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/migrate/var_arg/out.test.toml
+++ b/acceptance/bundle/migrate/var_arg/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/multi_profile/auto_select/out.test.toml b/acceptance/bundle/multi_profile/auto_select/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/multi_profile/auto_select/out.test.toml
+++ b/acceptance/bundle/multi_profile/auto_select/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/multi_profile/env_auth_skip/out.test.toml b/acceptance/bundle/multi_profile/env_auth_skip/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/multi_profile/env_auth_skip/out.test.toml
+++ b/acceptance/bundle/multi_profile/env_auth_skip/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/multi_profile/no_workspace_profiles/out.test.toml b/acceptance/bundle/multi_profile/no_workspace_profiles/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/multi_profile/no_workspace_profiles/out.test.toml
+++ b/acceptance/bundle/multi_profile/no_workspace_profiles/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/multi_profile/non_interactive_error/out.test.toml b/acceptance/bundle/multi_profile/non_interactive_error/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/multi_profile/non_interactive_error/out.test.toml
+++ b/acceptance/bundle/multi_profile/non_interactive_error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/open/out.test.toml b/acceptance/bundle/open/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/open/out.test.toml
+++ b/acceptance/bundle/open/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/override/clusters/out.test.toml b/acceptance/bundle/override/clusters/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/override/clusters/out.test.toml
+++ b/acceptance/bundle/override/clusters/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/override/job_cluster/out.test.toml b/acceptance/bundle/override/job_cluster/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/override/job_cluster/out.test.toml
+++ b/acceptance/bundle/override/job_cluster/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/override/job_cluster_var/out.test.toml b/acceptance/bundle/override/job_cluster_var/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/override/job_cluster_var/out.test.toml
+++ b/acceptance/bundle/override/job_cluster_var/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/override/job_tasks/out.test.toml b/acceptance/bundle/override/job_tasks/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/override/job_tasks/out.test.toml
+++ b/acceptance/bundle/override/job_tasks/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/override/merge-string-map/out.test.toml b/acceptance/bundle/override/merge-string-map/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/override/merge-string-map/out.test.toml
+++ b/acceptance/bundle/override/merge-string-map/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/override/pipeline_cluster/out.test.toml b/acceptance/bundle/override/pipeline_cluster/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/override/pipeline_cluster/out.test.toml
+++ b/acceptance/bundle/override/pipeline_cluster/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/designer_notebook/out.test.toml b/acceptance/bundle/paths/designer_notebook/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/designer_notebook/out.test.toml
+++ b/acceptance/bundle/paths/designer_notebook/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/fallback/out.test.toml b/acceptance/bundle/paths/fallback/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/fallback/out.test.toml
+++ b/acceptance/bundle/paths/fallback/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/git_source_jobs/out.test.toml b/acceptance/bundle/paths/git_source_jobs/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/git_source_jobs/out.test.toml
+++ b/acceptance/bundle/paths/git_source_jobs/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/invalid_pipeline_globs/out.test.toml b/acceptance/bundle/paths/invalid_pipeline_globs/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/invalid_pipeline_globs/out.test.toml
+++ b/acceptance/bundle/paths/invalid_pipeline_globs/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/nominal/out.test.toml b/acceptance/bundle/paths/nominal/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/nominal/out.test.toml
+++ b/acceptance/bundle/paths/nominal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/outside_root_no_sync/out.test.toml b/acceptance/bundle/paths/outside_root_no_sync/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/outside_root_no_sync/out.test.toml
+++ b/acceptance/bundle/paths/outside_root_no_sync/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/pipeline_expected_file_got_notebook/out.test.toml b/acceptance/bundle/paths/pipeline_expected_file_got_notebook/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/pipeline_expected_file_got_notebook/out.test.toml
+++ b/acceptance/bundle/paths/pipeline_expected_file_got_notebook/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/pipeline_globs/out.test.toml b/acceptance/bundle/paths/pipeline_globs/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/pipeline_globs/out.test.toml
+++ b/acceptance/bundle/paths/pipeline_globs/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/pipeline_root_path_doesnotexist/out.test.toml b/acceptance/bundle/paths/pipeline_root_path_doesnotexist/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/pipeline_root_path_doesnotexist/out.test.toml
+++ b/acceptance/bundle/paths/pipeline_root_path_doesnotexist/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/pipelines_glob_include_and_root_path/out.test.toml b/acceptance/bundle/paths/pipelines_glob_include_and_root_path/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/pipelines_glob_include_and_root_path/out.test.toml
+++ b/acceptance/bundle/paths/pipelines_glob_include_and_root_path/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/pipelines_root_path_outside_sync_root/out.test.toml b/acceptance/bundle/paths/pipelines_root_path_outside_sync_root/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/pipelines_root_path_outside_sync_root/out.test.toml
+++ b/acceptance/bundle/paths/pipelines_root_path_outside_sync_root/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/relative_path_outside_root/out.test.toml b/acceptance/bundle/paths/relative_path_outside_root/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/relative_path_outside_root/out.test.toml
+++ b/acceptance/bundle/paths/relative_path_outside_root/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/paths/relative_path_translation/out.test.toml b/acceptance/bundle/paths/relative_path_translation/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/paths/relative_path_translation/out.test.toml
+++ b/acceptance/bundle/paths/relative_path_translation/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/plan/no_upload/out.test.toml b/acceptance/bundle/plan/no_upload/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/plan/no_upload/out.test.toml
+++ b/acceptance/bundle/plan/no_upload/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/presets/preset_vs_dev_mode/out.test.toml b/acceptance/bundle/presets/preset_vs_dev_mode/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/presets/preset_vs_dev_mode/out.test.toml
+++ b/acceptance/bundle/presets/preset_vs_dev_mode/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/python/alerts-support/out.test.toml b/acceptance/bundle/python/alerts-support/out.test.toml
index 72f664c901..02da5baab8 100644
--- a/acceptance/bundle/python/alerts-support/out.test.toml
+++ b/acceptance/bundle/python/alerts-support/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["current"]
diff --git a/acceptance/bundle/python/experimental-compatibility-both-equal/out.test.toml b/acceptance/bundle/python/experimental-compatibility-both-equal/out.test.toml
index 72c1b4ec81..164ce535b8 100644
--- a/acceptance/bundle/python/experimental-compatibility-both-equal/out.test.toml
+++ b/acceptance/bundle/python/experimental-compatibility-both-equal/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/python/experimental-compatibility-both-error/out.test.toml b/acceptance/bundle/python/experimental-compatibility-both-error/out.test.toml
index 72c1b4ec81..164ce535b8 100644
--- a/acceptance/bundle/python/experimental-compatibility-both-error/out.test.toml
+++ b/acceptance/bundle/python/experimental-compatibility-both-error/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/python/experimental-compatibility/out.test.toml b/acceptance/bundle/python/experimental-compatibility/out.test.toml
index 72c1b4ec81..164ce535b8 100644
--- a/acceptance/bundle/python/experimental-compatibility/out.test.toml
+++ b/acceptance/bundle/python/experimental-compatibility/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/python/grants-aliases/out.test.toml b/acceptance/bundle/python/grants-aliases/out.test.toml
index 72f664c901..02da5baab8 100644
--- a/acceptance/bundle/python/grants-aliases/out.test.toml
+++ b/acceptance/bundle/python/grants-aliases/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["current"]
diff --git a/acceptance/bundle/python/mutator-ordering/out.test.toml b/acceptance/bundle/python/mutator-ordering/out.test.toml
index 72c1b4ec81..164ce535b8 100644
--- a/acceptance/bundle/python/mutator-ordering/out.test.toml
+++ b/acceptance/bundle/python/mutator-ordering/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/python/mutator-permissions-owner-5682/out.test.toml b/acceptance/bundle/python/mutator-permissions-owner-5682/out.test.toml
index ac15f03516..1c4948db33 100644
--- a/acceptance/bundle/python/mutator-permissions-owner-5682/out.test.toml
+++ b/acceptance/bundle/python/mutator-permissions-owner-5682/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/python/pipelines-support/out.test.toml b/acceptance/bundle/python/pipelines-support/out.test.toml
index 72c1b4ec81..164ce535b8 100644
--- a/acceptance/bundle/python/pipelines-support/out.test.toml
+++ b/acceptance/bundle/python/pipelines-support/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/python/propagates-auth-env/out.test.toml b/acceptance/bundle/python/propagates-auth-env/out.test.toml
index 72c1b4ec81..164ce535b8 100644
--- a/acceptance/bundle/python/propagates-auth-env/out.test.toml
+++ b/acceptance/bundle/python/propagates-auth-env/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/python/resolve-variable/out.test.toml b/acceptance/bundle/python/resolve-variable/out.test.toml
index 72c1b4ec81..164ce535b8 100644
--- a/acceptance/bundle/python/resolve-variable/out.test.toml
+++ b/acceptance/bundle/python/resolve-variable/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/python/resource-loading/out.test.toml b/acceptance/bundle/python/resource-loading/out.test.toml
index 72c1b4ec81..164ce535b8 100644
--- a/acceptance/bundle/python/resource-loading/out.test.toml
+++ b/acceptance/bundle/python/resource-loading/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/python/restricted-execution/out.test.toml b/acceptance/bundle/python/restricted-execution/out.test.toml
index 72c1b4ec81..164ce535b8 100644
--- a/acceptance/bundle/python/restricted-execution/out.test.toml
+++ b/acceptance/bundle/python/restricted-execution/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/python/schemas-support/out.test.toml b/acceptance/bundle/python/schemas-support/out.test.toml
index 72f664c901..02da5baab8 100644
--- a/acceptance/bundle/python/schemas-support/out.test.toml
+++ b/acceptance/bundle/python/schemas-support/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["current"]
diff --git a/acceptance/bundle/python/unicode-support/out.test.toml b/acceptance/bundle/python/unicode-support/out.test.toml
index 72c1b4ec81..164ce535b8 100644
--- a/acceptance/bundle/python/unicode-support/out.test.toml
+++ b/acceptance/bundle/python/unicode-support/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/python/volumes-support/out.test.toml b/acceptance/bundle/python/volumes-support/out.test.toml
index 72c1b4ec81..164ce535b8 100644
--- a/acceptance/bundle/python/volumes-support/out.test.toml
+++ b/acceptance/bundle/python/volumes-support/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.PYDAB_VERSION = ["0.266.0", "current"]
diff --git a/acceptance/bundle/quality_monitor/out.test.toml b/acceptance/bundle/quality_monitor/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/quality_monitor/out.test.toml
+++ b/acceptance/bundle/quality_monitor/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/quiet-levels/out.test.toml b/acceptance/bundle/quiet-levels/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/quiet-levels/out.test.toml
+++ b/acceptance/bundle/quiet-levels/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/refschema/out.test.toml b/acceptance/bundle/refschema/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/refschema/out.test.toml
+++ b/acceptance/bundle/refschema/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/bad_ref_string_to_int/out.test.toml b/acceptance/bundle/resource_deps/bad_ref_string_to_int/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/bad_ref_string_to_int/out.test.toml
+++ b/acceptance/bundle/resource_deps/bad_ref_string_to_int/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/bad_syntax/out.test.toml b/acceptance/bundle/resource_deps/bad_syntax/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/bad_syntax/out.test.toml
+++ b/acceptance/bundle/resource_deps/bad_syntax/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/computed_volume_path/out.test.toml b/acceptance/bundle/resource_deps/computed_volume_path/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/computed_volume_path/out.test.toml
+++ b/acceptance/bundle/resource_deps/computed_volume_path/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/create_error/out.test.toml b/acceptance/bundle/resource_deps/create_error/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/create_error/out.test.toml
+++ b/acceptance/bundle/resource_deps/create_error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/create_error/output.txt b/acceptance/bundle/resource_deps/create_error/output.txt
index 6a0e7df520..dcfc83f2dd 100644
--- a/acceptance/bundle/resource_deps/create_error/output.txt
+++ b/acceptance/bundle/resource_deps/create_error/output.txt
@@ -7,7 +7,7 @@ create jobs.independent
 
 Plan: 4 to add, 0 to change, 0 to delete, 0 unchanged
 
->>> print_requests.py --sort //jobs
+>>> print_requests.py --nostamp --sort //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
@@ -75,7 +75,7 @@ create jobs.foo
 Plan: 3 to add, 0 to change, 0 to delete, 1 unchanged
 
 === Expecting no difference in the output between first and second deploy
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
@@ -103,7 +103,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 1 deleted
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
diff --git a/acceptance/bundle/resource_deps/create_error/script b/acceptance/bundle/resource_deps/create_error/script
index d475fdaea7..ea426e1876 100644
--- a/acceptance/bundle/resource_deps/create_error/script
+++ b/acceptance/bundle/resource_deps/create_error/script
@@ -1,7 +1,7 @@
 echo "*" > .gitignore
 trace $CLI bundle plan 2>&1
 musterr $CLI bundle deploy &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt
-trace print_requests.py --sort //jobs
+trace print_requests.py --nostamp --sort //jobs
 
 trace $CLI bundle summary
 
@@ -16,7 +16,7 @@ musterr $CLI bundle deploy &> out.deploy2.$DATABRICKS_BUNDLE_ENGINE.txt
 title "Expecting no difference in the output between first and second deploy"
 diff.py out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt out.deploy2.$DATABRICKS_BUNDLE_ENGINE.txt
 rm out.deploy2.$DATABRICKS_BUNDLE_ENGINE.txt
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
 
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/resource_deps/duplicate_ref/out.test.toml b/acceptance/bundle/resource_deps/duplicate_ref/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/duplicate_ref/out.test.toml
+++ b/acceptance/bundle/resource_deps/duplicate_ref/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/grant_ref/out.test.toml b/acceptance/bundle/resource_deps/grant_ref/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resource_deps/grant_ref/out.test.toml
+++ b/acceptance/bundle/resource_deps/grant_ref/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/id_chain/out.test.toml b/acceptance/bundle/resource_deps/id_chain/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/id_chain/out.test.toml
+++ b/acceptance/bundle/resource_deps/id_chain/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/id_chain/script b/acceptance/bundle/resource_deps/id_chain/script
index 244a597315..bcd103ac2a 100644
--- a/acceptance/bundle/resource_deps/id_chain/script
+++ b/acceptance/bundle/resource_deps/id_chain/script
@@ -16,7 +16,7 @@ print_requests_short() {
 trace $CLI bundle plan
 trace print_requests
 
-$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace print_requests
 
 trace $CLI bundle deploy
@@ -25,7 +25,7 @@ trace print_requests_short
 trace update_file.py databricks.yml aa_desc aa_new_desc
 trace update_file.py databricks.yml prefix new_prefix
 
-$CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
 trace print_requests
 
 trace $CLI bundle plan
@@ -34,5 +34,5 @@ trace print_requests
 trace $CLI bundle deploy
 trace print_requests_short
 
-$CLI bundle plan -o json > out.plan_skip.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_skip.$DATABRICKS_BUNDLE_ENGINE.json
 trace print_requests
diff --git a/acceptance/bundle/resource_deps/id_star/out.test.toml b/acceptance/bundle/resource_deps/id_star/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/id_star/out.test.toml
+++ b/acceptance/bundle/resource_deps/id_star/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/immutable_field_ref/out.test.toml b/acceptance/bundle/resource_deps/immutable_field_ref/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resource_deps/immutable_field_ref/out.test.toml
+++ b/acceptance/bundle/resource_deps/immutable_field_ref/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/implicit_deps_model_serving_endpoint/out.test.toml b/acceptance/bundle/resource_deps/implicit_deps_model_serving_endpoint/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/implicit_deps_model_serving_endpoint/out.test.toml
+++ b/acceptance/bundle/resource_deps/implicit_deps_model_serving_endpoint/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/implicit_deps_quality_monitor/out.test.toml b/acceptance/bundle/resource_deps/implicit_deps_quality_monitor/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/implicit_deps_quality_monitor/out.test.toml
+++ b/acceptance/bundle/resource_deps/implicit_deps_quality_monitor/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/implicit_deps_registered_model/out.test.toml b/acceptance/bundle/resource_deps/implicit_deps_registered_model/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/implicit_deps_registered_model/out.test.toml
+++ b/acceptance/bundle/resource_deps/implicit_deps_registered_model/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/implicit_deps_volume/out.test.toml b/acceptance/bundle/resource_deps/implicit_deps_volume/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/implicit_deps_volume/out.test.toml
+++ b/acceptance/bundle/resource_deps/implicit_deps_volume/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/job_id/out.test.toml b/acceptance/bundle/resource_deps/job_id/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/job_id/out.test.toml
+++ b/acceptance/bundle/resource_deps/job_id/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/job_id/output.txt b/acceptance/bundle/resource_deps/job_id/output.txt
index c85c9d22d8..e9fa9237a2 100644
--- a/acceptance/bundle/resource_deps/job_id/output.txt
+++ b/acceptance/bundle/resource_deps/job_id/output.txt
@@ -14,7 +14,7 @@ Created jobs.foo
 Files: 6 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
@@ -67,7 +67,7 @@ Deleted jobs.foo
 Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 2 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
@@ -88,4 +88,4 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 0 deleted
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/resource_deps/job_id/script b/acceptance/bundle/resource_deps/job_id/script
index 3b033fe390..f8d30917d1 100644
--- a/acceptance/bundle/resource_deps/job_id/script
+++ b/acceptance/bundle/resource_deps/job_id/script
@@ -1,16 +1,16 @@
 
 trace $CLI bundle plan
-trace $CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
 
 foo_id=`read_id.py foo`
 bar_id=`read_id.py bar`
 
 cp empty.yml databricks.yml
-trace $CLI bundle plan -o json > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
 
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.test.toml b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.test.toml
+++ b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt
index 67e276daa6..7d97a13e26 100644
--- a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt
+++ b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt
@@ -16,7 +16,7 @@ Created jobs.multi_parent2
 Files: 0 uploaded, 0 deleted
 Resources: 12 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py --sort //jobs
+>>> print_requests.py --nostamp --sort //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script
index 9136c748ee..3256abdda5 100644
--- a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script
+++ b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script
@@ -3,7 +3,7 @@ cp $TESTDIR/../empty.yml .
 echo "*" > .gitignore
 
 trace $CLI bundle deploy
-trace print_requests.py --sort //jobs
+trace print_requests.py --nostamp --sort //jobs
 
 replace_ids.py
 
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.test.toml b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.test.toml
+++ b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt
index da391a4bb8..d5630cbe32 100644
--- a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt
+++ b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt
@@ -16,7 +16,7 @@ Created jobs.multi_parent2
 Files: 0 uploaded, 0 deleted
 Resources: 12 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py --sort //jobs
+>>> print_requests.py --nostamp --sort //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script
index 7e7ec71b1a..2adcf27737 100644
--- a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script
+++ b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script
@@ -2,7 +2,7 @@ cp $TESTDIR/../databricks.yml .
 echo "*" > .gitignore
 
 trace $CLI bundle deploy
-trace print_requests.py --sort //jobs
+trace print_requests.py --nostamp --sort //jobs
 
 replace_ids.py
 
diff --git a/acceptance/bundle/resource_deps/job_id_delete_bar/out.test.toml b/acceptance/bundle/resource_deps/job_id_delete_bar/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/job_id_delete_bar/out.test.toml
+++ b/acceptance/bundle/resource_deps/job_id_delete_bar/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt b/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt
index c27aec4f27..6a31096bdd 100644
--- a/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt
+++ b/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt
@@ -6,7 +6,7 @@ Created jobs.foo
 Files: 0 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
@@ -60,7 +60,7 @@ Updated jobs.foo
 Files: 0 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 1 deleted, 0 unchanged
 
->>> print_requests.py --sort //jobs
+>>> print_requests.py --nostamp --sort //jobs
 
 >>> [CLI] bundle destroy --auto-approve
 The following resources will be deleted:
@@ -70,7 +70,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 1 deleted
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
diff --git a/acceptance/bundle/resource_deps/job_id_delete_bar/script b/acceptance/bundle/resource_deps/job_id_delete_bar/script
index 62bdc1e3fe..03b9a08781 100644
--- a/acceptance/bundle/resource_deps/job_id_delete_bar/script
+++ b/acceptance/bundle/resource_deps/job_id_delete_bar/script
@@ -1,6 +1,6 @@
 echo "*" > .gitignore
 trace $CLI bundle deploy
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
 
 foo_id=`read_id.py foo`
 
@@ -8,11 +8,11 @@ bar_id=`read_id.py bar`
 
 title "Delete bar, keep foo (foo config updated to not depend on bar)"
 cp only_foo.yml databricks.yml
-trace $CLI bundle plan -o json > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
 # Sort requests because foo's update and bar's delete have no dependency edge
 # (foo's dependency on bar was removed in only_foo.yml), so execution order is non-deterministic.
-trace print_requests.py --sort //jobs > out.deploy2.requests.$DATABRICKS_BUNDLE_ENGINE.json
+trace print_requests.py --nostamp --sort //jobs > out.deploy2.requests.$DATABRICKS_BUNDLE_ENGINE.json
 
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/resource_deps/job_id_delete_foo/out.test.toml b/acceptance/bundle/resource_deps/job_id_delete_foo/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/job_id_delete_foo/out.test.toml
+++ b/acceptance/bundle/resource_deps/job_id_delete_foo/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt b/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt
index 0c74679588..299f48c2fc 100644
--- a/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt
+++ b/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt
@@ -6,7 +6,7 @@ Created jobs.foo
 Files: 0 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
@@ -59,7 +59,7 @@ Deleted jobs.foo
 Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 1 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
@@ -76,7 +76,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 1 deleted
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
diff --git a/acceptance/bundle/resource_deps/job_id_delete_foo/script b/acceptance/bundle/resource_deps/job_id_delete_foo/script
index 89e1d97bd3..f5efbd2260 100644
--- a/acceptance/bundle/resource_deps/job_id_delete_foo/script
+++ b/acceptance/bundle/resource_deps/job_id_delete_foo/script
@@ -1,6 +1,6 @@
 echo "*" > .gitignore
 trace $CLI bundle deploy
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
 
 foo_id=`read_id.py foo`
 
@@ -8,9 +8,9 @@ bar_id=`read_id.py bar`
 
 title "Delete foo, keep bar"
 cp only_bar.yml databricks.yml
-trace $CLI bundle plan -o json > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
 
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/resource_deps/job_tasks/out.test.toml b/acceptance/bundle/resource_deps/job_tasks/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/job_tasks/out.test.toml
+++ b/acceptance/bundle/resource_deps/job_tasks/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/jobs_update/out.test.toml b/acceptance/bundle/resource_deps/jobs_update/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/jobs_update/out.test.toml
+++ b/acceptance/bundle/resource_deps/jobs_update/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/jobs_update/output.txt b/acceptance/bundle/resource_deps/jobs_update/output.txt
index 195da809b6..b03ab68e66 100644
--- a/acceptance/bundle/resource_deps/jobs_update/output.txt
+++ b/acceptance/bundle/resource_deps/jobs_update/output.txt
@@ -12,7 +12,7 @@ Created jobs.foo
 Files: 0 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
@@ -31,7 +31,7 @@ Updated jobs.foo
 Files: 0 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
@@ -73,7 +73,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 2 deleted
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
diff --git a/acceptance/bundle/resource_deps/jobs_update/script b/acceptance/bundle/resource_deps/jobs_update/script
index 3cb808b187..f806f2db84 100644
--- a/acceptance/bundle/resource_deps/jobs_update/script
+++ b/acceptance/bundle/resource_deps/jobs_update/script
@@ -2,7 +2,7 @@
 echo "*" > .gitignore
 trace $CLI bundle plan
 trace $CLI bundle deploy
-trace print_requests.py //jobs > out.deploy1.requests.json
+trace print_requests.py --nostamp //jobs > out.deploy1.requests.json
 
 foo_id=`read_id.py foo`
 
@@ -15,18 +15,18 @@ trace update_file.py databricks.yml DAYS HOURS
 trace $CLI bundle plan
 trace $CLI bundle deploy
 # per-engine output file because terraform adds output-only and server-side defaults fields into request and direct does not
-trace print_requests.py //jobs > out.deploy2.requests.$DATABRICKS_BUNDLE_ENGINE.json
+trace print_requests.py --nostamp //jobs > out.deploy2.requests.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle plan
 
 title "Fetch job ID and verify remote state"
 
 # Badness: output should not be different per engine; investigate if it's the same on cloud
-trace $CLI jobs get $foo_id > out.get_foo.$DATABRICKS_BUNDLE_ENGINE.json
-trace $CLI jobs get $bar_id
+trace $CLI jobs get $foo_id | nostamp > out.get_foo.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI jobs get $bar_id | nostamp
 rm out.requests.txt
 
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
 
 trace musterr $CLI jobs get $foo_id
 trace musterr $CLI jobs get $bar_id
diff --git a/acceptance/bundle/resource_deps/jobs_update_remote/out.test.toml b/acceptance/bundle/resource_deps/jobs_update_remote/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/jobs_update_remote/out.test.toml
+++ b/acceptance/bundle/resource_deps/jobs_update_remote/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/jobs_update_remote/output.txt b/acceptance/bundle/resource_deps/jobs_update_remote/output.txt
index e38eebee2c..58adb9698b 100644
--- a/acceptance/bundle/resource_deps/jobs_update_remote/output.txt
+++ b/acceptance/bundle/resource_deps/jobs_update_remote/output.txt
@@ -6,7 +6,7 @@ Created jobs.foo
 Files: 0 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
@@ -76,7 +76,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 2 deleted
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/reset",
diff --git a/acceptance/bundle/resource_deps/jobs_update_remote/script b/acceptance/bundle/resource_deps/jobs_update_remote/script
index 09572ae04b..d456ed8b02 100644
--- a/acceptance/bundle/resource_deps/jobs_update_remote/script
+++ b/acceptance/bundle/resource_deps/jobs_update_remote/script
@@ -1,7 +1,7 @@
 echo "*" > .gitignore
-$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
 
 trace $CLI bundle plan
 
@@ -13,7 +13,7 @@ bar_id=`read_id.py bar`
 title "Update trigger.periodic.unit remotely and re-deploy; jobs.bar is unchanged"
 trace envsubst < job_update.json > tmp.json && mv tmp.json job_update.json
 trace $CLI jobs reset --json @job_update.json
-$CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
 
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs
+trace print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/resource_deps/loop_jobs/out.test.toml b/acceptance/bundle/resource_deps/loop_jobs/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/loop_jobs/out.test.toml
+++ b/acceptance/bundle/resource_deps/loop_jobs/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/loop_self/out.test.toml b/acceptance/bundle/resource_deps/loop_self/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/loop_self/out.test.toml
+++ b/acceptance/bundle/resource_deps/loop_self/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.test.toml b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.test.toml
+++ b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/missing_map_key/out.test.toml b/acceptance/bundle/resource_deps/missing_map_key/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/missing_map_key/out.test.toml
+++ b/acceptance/bundle/resource_deps/missing_map_key/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/missing_string_field/out.test.toml b/acceptance/bundle/resource_deps/missing_string_field/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/missing_string_field/out.test.toml
+++ b/acceptance/bundle/resource_deps/missing_string_field/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/missing_string_field/output.txt b/acceptance/bundle/resource_deps/missing_string_field/output.txt
index 83cab91e4e..fcf6e1d278 100644
--- a/acceptance/bundle/resource_deps/missing_string_field/output.txt
+++ b/acceptance/bundle/resource_deps/missing_string_field/output.txt
@@ -28,7 +28,7 @@ create pipelines.foo
 
 Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 
->>> print_requests.py //pipeline
+>>> print_requests.py --nostamp //pipeline
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
@@ -37,7 +37,7 @@ Created pipelines.foo
 Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //pipeline
+>>> print_requests.py --nostamp //pipeline
 {
   "method": "POST",
   "path": "/api/2.0/pipelines",
diff --git a/acceptance/bundle/resource_deps/missing_string_field/script b/acceptance/bundle/resource_deps/missing_string_field/script
index a234d07b08..c526e98044 100644
--- a/acceptance/bundle/resource_deps/missing_string_field/script
+++ b/acceptance/bundle/resource_deps/missing_string_field/script
@@ -1,6 +1,6 @@
-trace $CLI bundle validate -o json | jq .resources
+trace $CLI bundle validate -o json | nostamp | jq .resources
 errcode $CLI bundle plan
-trace print_requests.py //pipeline
+trace print_requests.py --nostamp //pipeline
 
 trace $CLI bundle deploy
-trace print_requests.py //pipeline
+trace print_requests.py --nostamp //pipeline
diff --git a/acceptance/bundle/resource_deps/model_id_ref/out.test.toml b/acceptance/bundle/resource_deps/model_id_ref/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/model_id_ref/out.test.toml
+++ b/acceptance/bundle/resource_deps/model_id_ref/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/model_id_ref/output.txt b/acceptance/bundle/resource_deps/model_id_ref/output.txt
index 7372902f99..2d53a5b739 100644
--- a/acceptance/bundle/resource_deps/model_id_ref/output.txt
+++ b/acceptance/bundle/resource_deps/model_id_ref/output.txt
@@ -14,7 +14,7 @@ Created models.my_model
 Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //mlflow/registered-models/create //jobs/create --sort
+>>> print_requests.py --nostamp //mlflow/registered-models/create //jobs/create --sort
 {
   "method": "POST",
   "path": "/api/2.0/mlflow/registered-models/create",
diff --git a/acceptance/bundle/resource_deps/model_id_ref/script b/acceptance/bundle/resource_deps/model_id_ref/script
index 58375a7147..9fcec41429 100644
--- a/acceptance/bundle/resource_deps/model_id_ref/script
+++ b/acceptance/bundle/resource_deps/model_id_ref/script
@@ -10,4 +10,4 @@ trace $CLI bundle deploy
 model_id=$($CLI model-registry get-model my-model | jq -r '.registered_model_databricks.id')
 add_repl "$model_id" MY_MODEL_ID
 
-trace print_requests.py //mlflow/registered-models/create //jobs/create --sort
+trace print_requests.py --nostamp //mlflow/registered-models/create //jobs/create --sort
diff --git a/acceptance/bundle/resource_deps/non_existent_field/out.test.toml b/acceptance/bundle/resource_deps/non_existent_field/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/non_existent_field/out.test.toml
+++ b/acceptance/bundle/resource_deps/non_existent_field/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/permission_ref/out.test.toml b/acceptance/bundle/resource_deps/permission_ref/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resource_deps/permission_ref/out.test.toml
+++ b/acceptance/bundle/resource_deps/permission_ref/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/pipelines_recreate/out.test.toml b/acceptance/bundle/resource_deps/pipelines_recreate/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/pipelines_recreate/out.test.toml
+++ b/acceptance/bundle/resource_deps/pipelines_recreate/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/pipelines_recreate/output.txt b/acceptance/bundle/resource_deps/pipelines_recreate/output.txt
index cf1d62686f..3a5f1f3008 100644
--- a/acceptance/bundle/resource_deps/pipelines_recreate/output.txt
+++ b/acceptance/bundle/resource_deps/pipelines_recreate/output.txt
@@ -12,7 +12,7 @@ Created pipelines.foo
 Files: 0 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs //pipelines
+>>> print_requests.py --nostamp //jobs //pipelines ^//api/2.0/bundle
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
@@ -39,7 +39,7 @@ Recreated pipelines.foo
 Files: 0 uploaded, 0 deleted
 Resources: 1 created, 1 changed, 1 deleted, 0 unchanged
 
->>> print_requests.py //jobs //pipelines
+>>> print_requests.py --nostamp //jobs //pipelines ^//api/2.0/bundle
 
 === Fetch resource IDs and verify remote state
 >>> musterr [CLI] pipelines get [FOO_ID]
@@ -101,7 +101,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
->>> print_requests.py //jobs //pipelines
+>>> print_requests.py --nostamp //jobs //pipelines ^//api/2.0/bundle
 
 >>> [CLI] bundle destroy --auto-approve
 The following resources will be deleted:
@@ -116,7 +116,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 2 deleted
 
->>> print_requests.py //jobs //pipelines
+>>> print_requests.py --nostamp //jobs //pipelines ^//api/2.0/bundle
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
diff --git a/acceptance/bundle/resource_deps/pipelines_recreate/script b/acceptance/bundle/resource_deps/pipelines_recreate/script
index 1a06b13bc2..691e24279b 100644
--- a/acceptance/bundle/resource_deps/pipelines_recreate/script
+++ b/acceptance/bundle/resource_deps/pipelines_recreate/script
@@ -1,9 +1,9 @@
 
 echo "*" > .gitignore
 trace $CLI bundle plan
-$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs //pipelines > out.create.requests.json
+trace print_requests.py --nostamp //jobs //pipelines '^//api/2.0/bundle' > out.create.requests.json
 
 foo_id=`read_id.py foo`
 
@@ -14,27 +14,27 @@ trace $CLI bundle plan  # empty
 title "Update storage, triggering recreate for pipeline; this means updating downstream deps"
 trace update_file.py databricks.yml "storage: dbfs:/my-storage" "storage: dbfs:/my-new-storage"
 trace $CLI bundle plan
-$CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy --auto-approve
-trace print_requests.py //jobs //pipelines > out.update.requests.$DATABRICKS_BUNDLE_ENGINE.json
+trace print_requests.py --nostamp //jobs //pipelines '^//api/2.0/bundle' > out.update.requests.$DATABRICKS_BUNDLE_ENGINE.json
 
 foo_id_2=`read_id.py foo`
 
 title "Fetch resource IDs and verify remote state"
 
 trace musterr $CLI pipelines get $foo_id
-trace $CLI pipelines get $foo_id_2
-trace $CLI jobs get $bar_id | jq 'del(.settings.run_as)'
+trace $CLI pipelines get $foo_id_2 | nostamp
+trace $CLI jobs get $bar_id | nostamp| jq 'del(.settings.run_as)'
 rm out.requests.txt
 
 title "Follow up plan & deploy do nothing"
 trace $CLI bundle plan
-$CLI bundle plan -o json > out.plan_noop.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_noop.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs //pipelines
+trace print_requests.py --nostamp //jobs //pipelines '^//api/2.0/bundle'
 
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs //pipelines
+trace print_requests.py --nostamp //jobs //pipelines '^//api/2.0/bundle'
 
 trace musterr $CLI pipelines get $foo_id
 trace musterr $CLI pipelines get $foo_id_2
diff --git a/acceptance/bundle/resource_deps/present_ingestion_definition/out.test.toml b/acceptance/bundle/resource_deps/present_ingestion_definition/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/present_ingestion_definition/out.test.toml
+++ b/acceptance/bundle/resource_deps/present_ingestion_definition/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/remote_app_url/out.test.toml b/acceptance/bundle/resource_deps/remote_app_url/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/remote_app_url/out.test.toml
+++ b/acceptance/bundle/resource_deps/remote_app_url/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/remote_app_url/output.txt b/acceptance/bundle/resource_deps/remote_app_url/output.txt
index 9301329af1..83fae4e7a6 100644
--- a/acceptance/bundle/resource_deps/remote_app_url/output.txt
+++ b/acceptance/bundle/resource_deps/remote_app_url/output.txt
@@ -14,7 +14,7 @@ create pipelines.mypipeline
 
 Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 
->>> print_requests.py ^//import-file/
+>>> print_requests.py --nostamp ^//import-file/ ^//api/2.0/bundle
 {
   "method": "POST",
   "path": "/api/2.0/workspace/mkdirs",
@@ -30,7 +30,7 @@ Created pipelines.mypipeline
 Files: 1 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py ^//import-file/
+>>> print_requests.py --nostamp ^//import-file/ ^//api/2.0/bundle
 {
   "method": "POST",
   "path": "/api/2.0/workspace/mkdirs",
@@ -98,7 +98,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 2 deleted
 
->>> print_requests.py --sort ^//import-file/
+>>> print_requests.py --nostamp --sort ^//import-file/ ^//api/2.0/bundle
 {
   "method": "DELETE",
   "path": "/api/2.0/apps/myapp"
diff --git a/acceptance/bundle/resource_deps/remote_app_url/script b/acceptance/bundle/resource_deps/remote_app_url/script
index d38692366b..6d1e4fd583 100644
--- a/acceptance/bundle/resource_deps/remote_app_url/script
+++ b/acceptance/bundle/resource_deps/remote_app_url/script
@@ -1,9 +1,9 @@
 trace $CLI bundle validate
 trace $CLI bundle plan
-trace print_requests.py '^//import-file/'
+trace print_requests.py --nostamp '^//import-file/' '^//api/2.0/bundle'
 
 trace $CLI bundle deploy
-trace print_requests.py '^//import-file/'
+trace print_requests.py --nostamp '^//import-file/' '^//api/2.0/bundle'
 
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py --sort '^//import-file/'
+trace print_requests.py --nostamp --sort '^//import-file/' '^//api/2.0/bundle'
diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.test.toml b/acceptance/bundle/resource_deps/remote_field_storage_location/out.test.toml
index ee228cfcd7..b09d680c0e 100644
--- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.test.toml
+++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/remote_pipeline/out.test.toml b/acceptance/bundle/resource_deps/remote_pipeline/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/remote_pipeline/out.test.toml
+++ b/acceptance/bundle/resource_deps/remote_pipeline/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/remote_pipeline/script b/acceptance/bundle/resource_deps/remote_pipeline/script
index ae44dfd122..b8683429aa 100644
--- a/acceptance/bundle/resource_deps/remote_pipeline/script
+++ b/acceptance/bundle/resource_deps/remote_pipeline/script
@@ -3,8 +3,8 @@ print_requests() {
     rm out.requests.txt
 }
 
-$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
 trace print_requests
-$CLI bundle plan -o json > out.plan_skip.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_skip.$DATABRICKS_BUNDLE_ENGINE.json
 trace print_requests
diff --git a/acceptance/bundle/resource_deps/resources_var/out.test.toml b/acceptance/bundle/resource_deps/resources_var/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/resources_var/out.test.toml
+++ b/acceptance/bundle/resource_deps/resources_var/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/resources_var_presets/out.test.toml b/acceptance/bundle/resource_deps/resources_var_presets/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/resources_var_presets/out.test.toml
+++ b/acceptance/bundle/resource_deps/resources_var_presets/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/out.test.toml b/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/out.test.toml
+++ b/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/tf_path_only_error/out.test.toml b/acceptance/bundle/resource_deps/tf_path_only_error/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/tf_path_only_error/out.test.toml
+++ b/acceptance/bundle/resource_deps/tf_path_only_error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/tf_path_renames/out.test.toml b/acceptance/bundle/resource_deps/tf_path_renames/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/tf_path_renames/out.test.toml
+++ b/acceptance/bundle/resource_deps/tf_path_renames/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/unicode_reference/out.test.toml b/acceptance/bundle/resource_deps/unicode_reference/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/unicode_reference/out.test.toml
+++ b/acceptance/bundle/resource_deps/unicode_reference/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.test.toml b/acceptance/bundle/resource_deps/volume_path_contains_id/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.test.toml
+++ b/acceptance/bundle/resource_deps/volume_path_contains_id/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/volume_path_job_ref/out.test.toml b/acceptance/bundle/resource_deps/volume_path_job_ref/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resource_deps/volume_path_job_ref/out.test.toml
+++ b/acceptance/bundle/resource_deps/volume_path_job_ref/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resource_deps/volume_path_job_ref/output.txt b/acceptance/bundle/resource_deps/volume_path_job_ref/output.txt
index 63edb8decb..b4cbd222f2 100644
--- a/acceptance/bundle/resource_deps/volume_path_job_ref/output.txt
+++ b/acceptance/bundle/resource_deps/volume_path_job_ref/output.txt
@@ -44,4 +44,4 @@
   }
 }
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/resource_deps/volume_path_job_ref/script b/acceptance/bundle/resource_deps/volume_path_job_ref/script
index bcc1cf937c..6c7250cc56 100644
--- a/acceptance/bundle/resource_deps/volume_path_job_ref/script
+++ b/acceptance/bundle/resource_deps/volume_path_job_ref/script
@@ -1,5 +1,5 @@
 envsubst < databricks.yml.tmpl > databricks.yml
-trace $CLI bundle validate -o json | jq '.resources.jobs, .resources.volumes'
+trace $CLI bundle validate -o json | nostamp | jq '.resources.jobs, .resources.volumes'
 
 # The job's data_path default references the volume's computed volume_path.
 # Record the JSON plan per engine to confirm the reference is resolved into the
@@ -9,4 +9,4 @@ trace errcode $CLI bundle plan -o json &> out.plan.$DATABRICKS_BUNDLE_ENGINE.jso
 # Deploy and inspect the create-job request: the parameter default sent to
 # the Jobs API must be the interpolated volume_path.
 trace errcode $CLI bundle deploy &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt
-trace print_requests.py //jobs > out.deploy.requests.$DATABRICKS_BUNDLE_ENGINE.json
+trace print_requests.py --nostamp //jobs > out.deploy.requests.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/alerts/basic/out.test.toml b/acceptance/bundle/resources/alerts/basic/out.test.toml
index 5c1067f450..9aa264646c 100644
--- a/acceptance/bundle/resources/alerts/basic/out.test.toml
+++ b/acceptance/bundle/resources/alerts/basic/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/alerts/with_file/out.test.toml b/acceptance/bundle/resources/alerts/with_file/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/alerts/with_file/out.test.toml
+++ b/acceptance/bundle/resources/alerts/with_file/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/alerts/with_file_not_allowed_field_error/out.test.toml b/acceptance/bundle/resources/alerts/with_file_not_allowed_field_error/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/alerts/with_file_not_allowed_field_error/out.test.toml
+++ b/acceptance/bundle/resources/alerts/with_file_not_allowed_field_error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/alerts/with_file_run_from_subdir/out.test.toml b/acceptance/bundle/resources/alerts/with_file_run_from_subdir/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/alerts/with_file_run_from_subdir/out.test.toml
+++ b/acceptance/bundle/resources/alerts/with_file_run_from_subdir/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/alerts/with_file_variable_interpolation_error/out.test.toml b/acceptance/bundle/resources/alerts/with_file_variable_interpolation_error/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/alerts/with_file_variable_interpolation_error/out.test.toml
+++ b/acceptance/bundle/resources/alerts/with_file_variable_interpolation_error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/config-drift-stopped/out.test.toml b/acceptance/bundle/resources/apps/config-drift-stopped/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/apps/config-drift-stopped/out.test.toml
+++ b/acceptance/bundle/resources/apps/config-drift-stopped/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/config-drift/out.test.toml b/acceptance/bundle/resources/apps/config-drift/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/apps/config-drift/out.test.toml
+++ b/acceptance/bundle/resources/apps/config-drift/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/config-no-deployment/out.test.toml b/acceptance/bundle/resources/apps/config-no-deployment/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/apps/config-no-deployment/out.test.toml
+++ b/acceptance/bundle/resources/apps/config-no-deployment/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/create_already_exists/out.test.toml b/acceptance/bundle/resources/apps/create_already_exists/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/apps/create_already_exists/out.test.toml
+++ b/acceptance/bundle/resources/apps/create_already_exists/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/default_description/out.test.toml b/acceptance/bundle/resources/apps/default_description/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/apps/default_description/out.test.toml
+++ b/acceptance/bundle/resources/apps/default_description/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/git-source-no-deployment/out.test.toml b/acceptance/bundle/resources/apps/git-source-no-deployment/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/apps/git-source-no-deployment/out.test.toml
+++ b/acceptance/bundle/resources/apps/git-source-no-deployment/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/immutable/out.test.toml b/acceptance/bundle/resources/apps/immutable/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/apps/immutable/out.test.toml
+++ b/acceptance/bundle/resources/apps/immutable/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/inline_config/out.test.toml b/acceptance/bundle/resources/apps/inline_config/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/apps/inline_config/out.test.toml
+++ b/acceptance/bundle/resources/apps/inline_config/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/lifecycle-started-omitted/out.test.toml b/acceptance/bundle/resources/apps/lifecycle-started-omitted/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/apps/lifecycle-started-omitted/out.test.toml
+++ b/acceptance/bundle/resources/apps/lifecycle-started-omitted/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/lifecycle-started-omitted/script b/acceptance/bundle/resources/apps/lifecycle-started-omitted/script
index c836adff58..dd08f33fff 100644
--- a/acceptance/bundle/resources/apps/lifecycle-started-omitted/script
+++ b/acceptance/bundle/resources/apps/lifecycle-started-omitted/script
@@ -79,6 +79,6 @@ trace $CLI bundle deploy
 trace print_app_requests
 
 title "(started omitted, app running) -> bundle plan shows no drift"
-$CLI bundle plan -o json > LOG.planjson
+$CLI bundle plan -o json | nostamp > LOG.planjson
 verify_no_drift.py LOG.planjson
 echo "Plan: no drift detected"
diff --git a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/out.test.toml b/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/out.test.toml
index c977d303ae..19131430a0 100644
--- a/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/out.test.toml
+++ b/acceptance/bundle/resources/apps/lifecycle-started-terraform-error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/lifecycle-started-toggle/out.test.toml b/acceptance/bundle/resources/apps/lifecycle-started-toggle/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/apps/lifecycle-started-toggle/out.test.toml
+++ b/acceptance/bundle/resources/apps/lifecycle-started-toggle/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/lifecycle-started/out.test.toml b/acceptance/bundle/resources/apps/lifecycle-started/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/apps/lifecycle-started/out.test.toml
+++ b/acceptance/bundle/resources/apps/lifecycle-started/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/readplan-lifecycle/out.test.toml b/acceptance/bundle/resources/apps/readplan-lifecycle/out.test.toml
index 57b0f61685..dd03baaabb 100644
--- a/acceptance/bundle/resources/apps/readplan-lifecycle/out.test.toml
+++ b/acceptance/bundle/resources/apps/readplan-lifecycle/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/resources/apps/resource-refs/out.test.toml b/acceptance/bundle/resources/apps/resource-refs/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/apps/resource-refs/out.test.toml
+++ b/acceptance/bundle/resources/apps/resource-refs/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/uc-securable-drift/out.test.toml b/acceptance/bundle/resources/apps/uc-securable-drift/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/apps/uc-securable-drift/out.test.toml
+++ b/acceptance/bundle/resources/apps/uc-securable-drift/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/apps/update/out.test.toml b/acceptance/bundle/resources/apps/update/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/apps/update/out.test.toml
+++ b/acceptance/bundle/resources/apps/update/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/catalogs/auto-approve/out.test.toml b/acceptance/bundle/resources/catalogs/auto-approve/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/catalogs/auto-approve/out.test.toml
+++ b/acceptance/bundle/resources/catalogs/auto-approve/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/catalogs/basic/out.test.toml b/acceptance/bundle/resources/catalogs/basic/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/catalogs/basic/out.test.toml
+++ b/acceptance/bundle/resources/catalogs/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/catalogs/comment_out_of_band/out.test.toml b/acceptance/bundle/resources/catalogs/comment_out_of_band/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/catalogs/comment_out_of_band/out.test.toml
+++ b/acceptance/bundle/resources/catalogs/comment_out_of_band/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/catalogs/drift/managed_properties/out.test.toml b/acceptance/bundle/resources/catalogs/drift/managed_properties/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/catalogs/drift/managed_properties/out.test.toml
+++ b/acceptance/bundle/resources/catalogs/drift/managed_properties/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/catalogs/empty-name/out.test.toml b/acceptance/bundle/resources/catalogs/empty-name/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/catalogs/empty-name/out.test.toml
+++ b/acceptance/bundle/resources/catalogs/empty-name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/catalogs/with-schemas/out.test.toml b/acceptance/bundle/resources/catalogs/with-schemas/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/catalogs/with-schemas/out.test.toml
+++ b/acceptance/bundle/resources/catalogs/with-schemas/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/backend_normalization/out.test.toml b/acceptance/bundle/resources/cluster_policies/backend_normalization/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/cluster_policies/backend_normalization/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/backend_normalization/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/basic/out.test.toml b/acceptance/bundle/resources/cluster_policies/basic/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/cluster_policies/basic/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/definition_and_family_conflict/out.test.toml b/acceptance/bundle/resources/cluster_policies/definition_and_family_conflict/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/cluster_policies/definition_and_family_conflict/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/definition_and_family_conflict/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/definition_multiline/out.test.toml b/acceptance/bundle/resources/cluster_policies/definition_multiline/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/cluster_policies/definition_multiline/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/definition_multiline/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/definition_yaml/out.test.toml b/acceptance/bundle/resources/cluster_policies/definition_yaml/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/cluster_policies/definition_yaml/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/definition_yaml/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/job_ref/out.test.toml b/acceptance/bundle/resources/cluster_policies/job_ref/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/cluster_policies/job_ref/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/job_ref/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/job_ref/output.txt b/acceptance/bundle/resources/cluster_policies/job_ref/output.txt
index 1a5b87c162..e6682a0bb4 100644
--- a/acceptance/bundle/resources/cluster_policies/job_ref/output.txt
+++ b/acceptance/bundle/resources/cluster_policies/job_ref/output.txt
@@ -7,7 +7,7 @@ Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Deploy requests in dependency order: policy create precedes job create, job carries resolved policy id
->>> print_requests.py //policies/clusters //jobs
+>>> print_requests.py //policies/clusters //jobs --nostamp
 {
   "method": "POST",
   "path": "/api/2.0/policies/clusters/create",
@@ -56,7 +56,7 @@ Updated jobs.j
 Files: 3 uploaded, 0 deleted
 Resources: 0 created, 2 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //policies/clusters //jobs
+>>> print_requests.py //policies/clusters //jobs --nostamp
 {
   "method": "POST",
   "path": "/api/2.0/policies/clusters/edit",
@@ -107,7 +107,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 2 deleted
 
->>> print_requests.py //policies/clusters //jobs
+>>> print_requests.py //policies/clusters //jobs --nostamp
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
diff --git a/acceptance/bundle/resources/cluster_policies/job_ref/script b/acceptance/bundle/resources/cluster_policies/job_ref/script
index bd4b09777b..1117129a0e 100644
--- a/acceptance/bundle/resources/cluster_policies/job_ref/script
+++ b/acceptance/bundle/resources/cluster_policies/job_ref/script
@@ -4,14 +4,14 @@ trace $CLI bundle deploy
 pol_id=`read_id.py pol`
 
 title "Deploy requests in dependency order: policy create precedes job create, job carries resolved policy id"
-trace print_requests.py //policies/clusters //jobs
+trace print_requests.py //policies/clusters //jobs --nostamp
 
 title "Update both the policy and the job"
 trace update_file.py databricks.yml my_policy my_policy_2
 trace update_file.py databricks.yml my_job my_job_2
 trace $CLI bundle deploy
-trace print_requests.py //policies/clusters //jobs
+trace print_requests.py //policies/clusters //jobs --nostamp
 
 title "Destroy: job delete precedes policy delete"
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //policies/clusters //jobs
+trace print_requests.py //policies/clusters //jobs --nostamp
diff --git a/acceptance/bundle/resources/cluster_policies/out_of_band_change/out.test.toml b/acceptance/bundle/resources/cluster_policies/out_of_band_change/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/cluster_policies/out_of_band_change/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/out_of_band_change/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/permissions/levels/out.test.toml b/acceptance/bundle/resources/cluster_policies/permissions/levels/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/cluster_policies/permissions/levels/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/permissions/levels/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/out.test.toml b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/out.test.toml b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/policy_family_definition/out.test.toml b/acceptance/bundle/resources/cluster_policies/policy_family_definition/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/cluster_policies/policy_family_definition/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/policy_family_definition/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/cluster_policies/policy_family_overrides/out.test.toml b/acceptance/bundle/resources/cluster_policies/policy_family_overrides/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/cluster_policies/policy_family_overrides/out.test.toml
+++ b/acceptance/bundle/resources/cluster_policies/policy_family_overrides/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/deploy/data_security_mode/out.test.toml b/acceptance/bundle/resources/clusters/deploy/data_security_mode/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/clusters/deploy/data_security_mode/out.test.toml
+++ b/acceptance/bundle/resources/clusters/deploy/data_security_mode/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/deploy/instance_pool/out.test.toml b/acceptance/bundle/resources/clusters/deploy/instance_pool/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/clusters/deploy/instance_pool/out.test.toml
+++ b/acceptance/bundle/resources/clusters/deploy/instance_pool/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/out.test.toml b/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/out.test.toml
+++ b/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/out.test.toml b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/out.test.toml
index 5c9bf850af..5fdd615973 100644
--- a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/out.test.toml
+++ b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/out.test.toml
@@ -3,3 +3,4 @@ CloudEnvs.aws = false
 CloudEnvs.azure = false
 CloudEnvs.gcp = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/deploy/num_workers_absent/out.test.toml b/acceptance/bundle/resources/clusters/deploy/num_workers_absent/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/clusters/deploy/num_workers_absent/out.test.toml
+++ b/acceptance/bundle/resources/clusters/deploy/num_workers_absent/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/deploy/simple/out.test.toml b/acceptance/bundle/resources/clusters/deploy/simple/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/clusters/deploy/simple/out.test.toml
+++ b/acceptance/bundle/resources/clusters/deploy/simple/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/deploy/update-after-create/out.test.toml b/acceptance/bundle/resources/clusters/deploy/update-after-create/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/clusters/deploy/update-after-create/out.test.toml
+++ b/acceptance/bundle/resources/clusters/deploy/update-after-create/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/out.test.toml b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/out.test.toml
+++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script
index 02dcebeb3f..71d7b6860a 100755
--- a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script
+++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script
@@ -10,11 +10,11 @@ trap cleanup EXIT
 # resize, terraform update), so the per-resource line would diverge. The Resources:
 # summary agrees, so it is kept rather than using -qq.
 $CLI bundle plan > out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt
-$CLI bundle plan -o json > out.plan_.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy -q
 
 title "Cluster should exist with num_workers after bundle deployment:\n"
-CLUSTER_ID=$($CLI bundle summary -o json | jq -r '.resources.clusters.test_cluster.id')
+CLUSTER_ID=$($CLI bundle summary -o json | nostamp | jq -r '.resources.clusters.test_cluster.id')
 add_repl "$CLUSTER_ID" CLUSTER_ID
 $CLI clusters get "${CLUSTER_ID}" | jq '{cluster_name,num_workers,autoscale}'
 
diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize/out.test.toml b/acceptance/bundle/resources/clusters/deploy/update-and-resize/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/clusters/deploy/update-and-resize/out.test.toml
+++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize/script b/acceptance/bundle/resources/clusters/deploy/update-and-resize/script
index 7d007495c3..1479922034 100644
--- a/acceptance/bundle/resources/clusters/deploy/update-and-resize/script
+++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize/script
@@ -10,11 +10,11 @@ trap cleanup EXIT
 # resize, terraform update), so the per-resource line would diverge. The Resources:
 # summary agrees, so it is kept rather than using -qq.
 $CLI bundle plan > out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt
-$CLI bundle plan -o json > out.plan_.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy -q
 
 title "Cluster should exist after bundle deployment:\n"
-CLUSTER_ID=$($CLI bundle summary -o json | jq -r '.resources.clusters.test_cluster.id')
+CLUSTER_ID=$($CLI bundle summary -o json | nostamp | jq -r '.resources.clusters.test_cluster.id')
 add_repl "$CLUSTER_ID" CLUSTER_ID
 $CLI clusters get "${CLUSTER_ID}" | jq '{cluster_name,num_workers}'
 
diff --git a/acceptance/bundle/resources/clusters/deploy/workload_type/out.test.toml b/acceptance/bundle/resources/clusters/deploy/workload_type/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/clusters/deploy/workload_type/out.test.toml
+++ b/acceptance/bundle/resources/clusters/deploy/workload_type/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/out.test.toml b/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/out.test.toml
index c977d303ae..19131430a0 100644
--- a/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/out.test.toml
+++ b/acceptance/bundle/resources/clusters/lifecycle-started-terraform-error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/out.test.toml b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/out.test.toml
+++ b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/lifecycle-started/out.test.toml b/acceptance/bundle/resources/clusters/lifecycle-started/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/clusters/lifecycle-started/out.test.toml
+++ b/acceptance/bundle/resources/clusters/lifecycle-started/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/readplan-lifecycle/out.test.toml b/acceptance/bundle/resources/clusters/readplan-lifecycle/out.test.toml
index 57b0f61685..dd03baaabb 100644
--- a/acceptance/bundle/resources/clusters/readplan-lifecycle/out.test.toml
+++ b/acceptance/bundle/resources/clusters/readplan-lifecycle/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/resources/clusters/resize-terminated-fallback/out.test.toml b/acceptance/bundle/resources/clusters/resize-terminated-fallback/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/clusters/resize-terminated-fallback/out.test.toml
+++ b/acceptance/bundle/resources/clusters/resize-terminated-fallback/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/clusters/run/spark_python_task/out.test.toml b/acceptance/bundle/resources/clusters/run/spark_python_task/out.test.toml
index d56a997245..52b4eef348 100644
--- a/acceptance/bundle/resources/clusters/run/spark_python_task/out.test.toml
+++ b/acceptance/bundle/resources/clusters/run/spark_python_task/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudSlow = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/change-embed-credentials/out.test.toml b/acceptance/bundle/resources/dashboards/change-embed-credentials/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/dashboards/change-embed-credentials/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/change-embed-credentials/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/change-name/out.test.toml b/acceptance/bundle/resources/dashboards/change-name/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/dashboards/change-name/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/change-name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/change-parent-path/out.test.toml b/acceptance/bundle/resources/dashboards/change-parent-path/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/dashboards/change-parent-path/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/change-parent-path/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/out.test.toml b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/out.test.toml
index 0c49ac004e..b1bef937a2 100644
--- a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.test.toml b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.test.toml
index f16a230dfb..3035c7addb 100644
--- a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/out.test.toml b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/destroy/out.test.toml b/acceptance/bundle/resources/dashboards/destroy/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/dashboards/destroy/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/destroy/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/detect-change/out.test.toml b/acceptance/bundle/resources/dashboards/detect-change/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/dashboards/detect-change/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/detect-change/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/generate_inplace/out.test.toml b/acceptance/bundle/resources/dashboards/generate_inplace/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/dashboards/generate_inplace/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/generate_inplace/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/nested-folders/out.test.toml b/acceptance/bundle/resources/dashboards/nested-folders/out.test.toml
index df4667680a..0e852edd37 100644
--- a/acceptance/bundle/resources/dashboards/nested-folders/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/nested-folders/out.test.toml
@@ -1,4 +1,5 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.test.toml b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.test.toml
index 11a2244a3e..bf4f0e7d3c 100644
--- a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/out.test.toml b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/republish-after-draft-update/out.test.toml b/acceptance/bundle/resources/dashboards/republish-after-draft-update/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/dashboards/republish-after-draft-update/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/republish-after-draft-update/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/simple/out.test.toml b/acceptance/bundle/resources/dashboards/simple/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/dashboards/simple/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/simple/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/out.test.toml b/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/simple_syncroot/out.test.toml b/acceptance/bundle/resources/dashboards/simple_syncroot/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/dashboards/simple_syncroot/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/simple_syncroot/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/unpublish-out-of-band/out.test.toml b/acceptance/bundle/resources/dashboards/unpublish-out-of-band/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/dashboards/unpublish-out-of-band/out.test.toml
+++ b/acceptance/bundle/resources/dashboards/unpublish-out-of-band/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script b/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script
index c50acadaf2..c3af11af2f 100644
--- a/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script
+++ b/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script
@@ -25,7 +25,7 @@ trace $CLI lakeview unpublish $DASHBOARD_ID
 # Direct: shows "update" because Published field changes from false to true
 trace $CLI bundle plan > out.plan.$DATABRICKS_BUNDLE_ENGINE.txt
 
-$CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 json_in_json_normalize.py out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
 trace $CLI bundle deploy -qq
diff --git a/acceptance/bundle/resources/database_catalogs/basic/out.test.toml b/acceptance/bundle/resources/database_catalogs/basic/out.test.toml
index 205ed28280..f6514a8cd9 100644
--- a/acceptance/bundle/resources/database_catalogs/basic/out.test.toml
+++ b/acceptance/bundle/resources/database_catalogs/basic/out.test.toml
@@ -3,3 +3,4 @@ CloudSlow = true
 RunsOnDbr = true
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/database_catalogs/recreate/out.test.toml b/acceptance/bundle/resources/database_catalogs/recreate/out.test.toml
index ca7b6f28c3..bfeb0bd3ae 100644
--- a/acceptance/bundle/resources/database_catalogs/recreate/out.test.toml
+++ b/acceptance/bundle/resources/database_catalogs/recreate/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/database_instances/recreate/out.test.toml b/acceptance/bundle/resources/database_instances/recreate/out.test.toml
index ca7b6f28c3..bfeb0bd3ae 100644
--- a/acceptance/bundle/resources/database_instances/recreate/out.test.toml
+++ b/acceptance/bundle/resources/database_instances/recreate/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/database_instances/single-instance/out.test.toml b/acceptance/bundle/resources/database_instances/single-instance/out.test.toml
index f91a90a768..2dd1ac4d72 100644
--- a/acceptance/bundle/resources/database_instances/single-instance/out.test.toml
+++ b/acceptance/bundle/resources/database_instances/single-instance/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudSlow = true
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/experiments/basic/out.test.toml b/acceptance/bundle/resources/experiments/basic/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/experiments/basic/out.test.toml
+++ b/acceptance/bundle/resources/experiments/basic/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/external_locations/comment_cleared/out.test.toml b/acceptance/bundle/resources/external_locations/comment_cleared/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/external_locations/comment_cleared/out.test.toml
+++ b/acceptance/bundle/resources/external_locations/comment_cleared/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/external_locations/out.test.toml b/acceptance/bundle/resources/external_locations/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/external_locations/out.test.toml
+++ b/acceptance/bundle/resources/external_locations/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/genie_spaces/delete_warning/out.test.toml b/acceptance/bundle/resources/genie_spaces/delete_warning/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/genie_spaces/delete_warning/out.test.toml
+++ b/acceptance/bundle/resources/genie_spaces/delete_warning/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/genie_spaces/inline/out.test.toml b/acceptance/bundle/resources/genie_spaces/inline/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/genie_spaces/inline/out.test.toml
+++ b/acceptance/bundle/resources/genie_spaces/inline/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/genie_spaces/parent_path_update/out.test.toml b/acceptance/bundle/resources/genie_spaces/parent_path_update/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/genie_spaces/parent_path_update/out.test.toml
+++ b/acceptance/bundle/resources/genie_spaces/parent_path_update/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/out.test.toml b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/out.test.toml
+++ b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/genie_spaces/serialized_space/out.test.toml b/acceptance/bundle/resources/genie_spaces/serialized_space/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/genie_spaces/serialized_space/out.test.toml
+++ b/acceptance/bundle/resources/genie_spaces/serialized_space/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/genie_spaces/simple/out.test.toml b/acceptance/bundle/resources/genie_spaces/simple/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/genie_spaces/simple/out.test.toml
+++ b/acceptance/bundle/resources/genie_spaces/simple/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/genie_spaces/version_migration/out.test.toml b/acceptance/bundle/resources/genie_spaces/version_migration/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/genie_spaces/version_migration/out.test.toml
+++ b/acceptance/bundle/resources/genie_spaces/version_migration/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/catalogs/out.test.toml b/acceptance/bundle/resources/grants/catalogs/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/grants/catalogs/out.test.toml
+++ b/acceptance/bundle/resources/grants/catalogs/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/registered_models/out.test.toml b/acceptance/bundle/resources/grants/registered_models/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/grants/registered_models/out.test.toml
+++ b/acceptance/bundle/resources/grants/registered_models/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges/out.test.toml b/acceptance/bundle/resources/grants/schemas/all_privileges/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/grants/schemas/all_privileges/out.test.toml
+++ b/acceptance/bundle/resources/grants/schemas/all_privileges/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/out.test.toml b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/out.test.toml
+++ b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/schemas/change_privilege/out.test.toml b/acceptance/bundle/resources/grants/schemas/change_privilege/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/grants/schemas/change_privilege/out.test.toml
+++ b/acceptance/bundle/resources/grants/schemas/change_privilege/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.test.toml b/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.test.toml
+++ b/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/out.test.toml b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/out.test.toml
+++ b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/schemas/empty_array/out.test.toml b/acceptance/bundle/resources/grants/schemas/empty_array/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/grants/schemas/empty_array/out.test.toml
+++ b/acceptance/bundle/resources/grants/schemas/empty_array/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.test.toml b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.test.toml
+++ b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/schemas/remove_all/out.test.toml b/acceptance/bundle/resources/grants/schemas/remove_all/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/grants/schemas/remove_all/out.test.toml
+++ b/acceptance/bundle/resources/grants/schemas/remove_all/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/schemas/remove_principal/out.test.toml b/acceptance/bundle/resources/grants/schemas/remove_principal/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/grants/schemas/remove_principal/out.test.toml
+++ b/acceptance/bundle/resources/grants/schemas/remove_principal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/grants/volumes/out.test.toml b/acceptance/bundle/resources/grants/volumes/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/grants/volumes/out.test.toml
+++ b/acceptance/bundle/resources/grants/volumes/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/independent/out.test.toml b/acceptance/bundle/resources/independent/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/independent/out.test.toml
+++ b/acceptance/bundle/resources/independent/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/instance_pools/out.test.toml b/acceptance/bundle/resources/instance_pools/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/instance_pools/out.test.toml
+++ b/acceptance/bundle/resources/instance_pools/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/job_runs/basic/out.test.toml b/acceptance/bundle/resources/job_runs/basic/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/job_runs/basic/out.test.toml
+++ b/acceptance/bundle/resources/job_runs/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/job_runs/destroy_unfinished_run/out.test.toml b/acceptance/bundle/resources/job_runs/destroy_unfinished_run/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/job_runs/destroy_unfinished_run/out.test.toml
+++ b/acceptance/bundle/resources/job_runs/destroy_unfinished_run/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/job_runs/failed_run/out.test.toml b/acceptance/bundle/resources/job_runs/failed_run/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/job_runs/failed_run/out.test.toml
+++ b/acceptance/bundle/resources/job_runs/failed_run/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/job_runs/interrupted_run/out.test.toml b/acceptance/bundle/resources/job_runs/interrupted_run/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/job_runs/interrupted_run/out.test.toml
+++ b/acceptance/bundle/resources/job_runs/interrupted_run/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/job_runs/job_parameters/out.test.toml b/acceptance/bundle/resources/job_runs/job_parameters/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/job_runs/job_parameters/out.test.toml
+++ b/acceptance/bundle/resources/job_runs/job_parameters/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/job_runs/on_bundle_deploy/out.test.toml b/acceptance/bundle/resources/job_runs/on_bundle_deploy/out.test.toml
index 57b0f61685..dd03baaabb 100644
--- a/acceptance/bundle/resources/job_runs/on_bundle_deploy/out.test.toml
+++ b/acceptance/bundle/resources/job_runs/on_bundle_deploy/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/resources/job_runs/redeploy/out.test.toml b/acceptance/bundle/resources/job_runs/redeploy/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/job_runs/redeploy/out.test.toml
+++ b/acceptance/bundle/resources/job_runs/redeploy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/job_runs/retried_run_now/out.test.toml b/acceptance/bundle/resources/job_runs/retried_run_now/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/job_runs/retried_run_now/out.test.toml
+++ b/acceptance/bundle/resources/job_runs/retried_run_now/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/job_runs/wait/out.test.toml b/acceptance/bundle/resources/job_runs/wait/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/job_runs/wait/out.test.toml
+++ b/acceptance/bundle/resources/job_runs/wait/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/alert-task/out.test.toml b/acceptance/bundle/resources/jobs/alert-task/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/jobs/alert-task/out.test.toml
+++ b/acceptance/bundle/resources/jobs/alert-task/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/big_id/out.test.toml b/acceptance/bundle/resources/jobs/big_id/out.test.toml
index 57b0f61685..bf0f576652 100644
--- a/acceptance/bundle/resources/jobs/big_id/out.test.toml
+++ b/acceptance/bundle/resources/jobs/big_id/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/resources/jobs/big_id/output.txt b/acceptance/bundle/resources/jobs/big_id/output.txt
index 25b292ca86..cabb74f5aa 100644
--- a/acceptance/bundle/resources/jobs/big_id/output.txt
+++ b/acceptance/bundle/resources/jobs/big_id/output.txt
@@ -7,7 +7,7 @@ Created jobs.foo
 Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
@@ -69,7 +69,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 1 deleted
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
diff --git a/acceptance/bundle/resources/jobs/big_id/script b/acceptance/bundle/resources/jobs/big_id/script
index 0b803cb1b8..b582302257 100644
--- a/acceptance/bundle/resources/jobs/big_id/script
+++ b/acceptance/bundle/resources/jobs/big_id/script
@@ -1,8 +1,8 @@
 trace $CLI bundle validate -o json | jq .resources > out.validate.json
 trace $CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 $CLI bundle deploy $(readplanarg out.plan.direct.json)
-trace print_requests.py //jobs
+trace print_requests.py //jobs --nostamp
 print_state.py > out.state.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle plan | contains.py '0 to add, 0 to change, 0 to delete'
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs
+trace print_requests.py //jobs --nostamp
diff --git a/acceptance/bundle/resources/jobs/big_id/test.toml b/acceptance/bundle/resources/jobs/big_id/test.toml
index 16356ef589..b15d8f9e75 100644
--- a/acceptance/bundle/resources/jobs/big_id/test.toml
+++ b/acceptance/bundle/resources/jobs/big_id/test.toml
@@ -5,6 +5,7 @@ EnvMatrix.READPLAN = ["", "1"]
 
 # `bundle deploy --plan` applies pre-saved state; the stamp isn't written into the plan,
 # so the next plan reports it as a change. Recording skipped until stamp reaches saved plans.
+EnvMatrix.DMS = [""]
 
 [[Repls]]
 Old = '9223372036854775807'
diff --git a/acceptance/bundle/resources/jobs/check-metadata/out.test.toml b/acceptance/bundle/resources/jobs/check-metadata/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/jobs/check-metadata/out.test.toml
+++ b/acceptance/bundle/resources/jobs/check-metadata/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/create-error/out.test.toml b/acceptance/bundle/resources/jobs/create-error/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/jobs/create-error/out.test.toml
+++ b/acceptance/bundle/resources/jobs/create-error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/delete_job/out.test.toml b/acceptance/bundle/resources/jobs/delete_job/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/delete_job/out.test.toml
+++ b/acceptance/bundle/resources/jobs/delete_job/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/delete_job/script b/acceptance/bundle/resources/jobs/delete_job/script
index 022d90a82b..1622b3e11c 100644
--- a/acceptance/bundle/resources/jobs/delete_job/script
+++ b/acceptance/bundle/resources/jobs/delete_job/script
@@ -1,5 +1,5 @@
 trace $CLI bundle deploy
 cp empty.yml databricks.yml
-$CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-print_requests.py //jobs
+print_requests.py //jobs --nostamp
diff --git a/acceptance/bundle/resources/jobs/delete_task/out.test.toml b/acceptance/bundle/resources/jobs/delete_task/out.test.toml
index 11a2244a3e..d5b9a6f4a1 100644
--- a/acceptance/bundle/resources/jobs/delete_task/out.test.toml
+++ b/acceptance/bundle/resources/jobs/delete_task/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/resources/jobs/delete_task/test.toml b/acceptance/bundle/resources/jobs/delete_task/test.toml
index 7e5d71c08f..46a4d91b84 100644
--- a/acceptance/bundle/resources/jobs/delete_task/test.toml
+++ b/acceptance/bundle/resources/jobs/delete_task/test.toml
@@ -2,3 +2,4 @@ RecordRequests = false
 EnvMatrix.READPLAN = ["", "1"]
 # `bundle deploy --plan` applies pre-saved state; the stamp isn't written into the plan,
 # so the next plan reports it as a change. Recording skipped until stamp reaches saved plans.
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/jobs/double-underscore-keys/out.test.toml b/acceptance/bundle/resources/jobs/double-underscore-keys/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/jobs/double-underscore-keys/out.test.toml
+++ b/acceptance/bundle/resources/jobs/double-underscore-keys/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/fail-on-active-runs/out.test.toml b/acceptance/bundle/resources/jobs/fail-on-active-runs/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/jobs/fail-on-active-runs/out.test.toml
+++ b/acceptance/bundle/resources/jobs/fail-on-active-runs/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/instance_pool_and_node_type/out.test.toml b/acceptance/bundle/resources/jobs/instance_pool_and_node_type/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/instance_pool_and_node_type/out.test.toml
+++ b/acceptance/bundle/resources/jobs/instance_pool_and_node_type/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/no-git-provider/out.test.toml b/acceptance/bundle/resources/jobs/no-git-provider/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/jobs/no-git-provider/out.test.toml
+++ b/acceptance/bundle/resources/jobs/no-git-provider/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/num_workers/out.test.toml b/acceptance/bundle/resources/jobs/num_workers/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/num_workers/out.test.toml
+++ b/acceptance/bundle/resources/jobs/num_workers/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/num_workers/output.txt b/acceptance/bundle/resources/jobs/num_workers/output.txt
index ebdd907399..9004ecb3b9 100644
--- a/acceptance/bundle/resources/jobs/num_workers/output.txt
+++ b/acceptance/bundle/resources/jobs/num_workers/output.txt
@@ -21,7 +21,7 @@ Created jobs.sample_job
 Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
diff --git a/acceptance/bundle/resources/jobs/num_workers/script b/acceptance/bundle/resources/jobs/num_workers/script
index 8e430e4306..a9f612ccbd 100644
--- a/acceptance/bundle/resources/jobs/num_workers/script
+++ b/acceptance/bundle/resources/jobs/num_workers/script
@@ -1,6 +1,6 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 trace $CLI bundle deploy
-trace print_requests.py //jobs
+trace print_requests.py //jobs --nostamp
 
 trace $CLI bundle plan
 rm out.requests.txt
diff --git a/acceptance/bundle/resources/jobs/on_failure_empty_slice/out.test.toml b/acceptance/bundle/resources/jobs/on_failure_empty_slice/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/on_failure_empty_slice/out.test.toml
+++ b/acceptance/bundle/resources/jobs/on_failure_empty_slice/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/on_failure_empty_slice/script b/acceptance/bundle/resources/jobs/on_failure_empty_slice/script
index e69f9fb5ba..6f0606bc34 100644
--- a/acceptance/bundle/resources/jobs/on_failure_empty_slice/script
+++ b/acceptance/bundle/resources/jobs/on_failure_empty_slice/script
@@ -1,3 +1,3 @@
 trace $CLI bundle plan
 trace $CLI bundle deploy
-trace $CLI bundle plan -o json | jq '.plan."resources.jobs.refresh_usage_logs".changes // .' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.jobs.refresh_usage_logs".changes // .' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/jobs/remote_add_tag/out.test.toml b/acceptance/bundle/resources/jobs/remote_add_tag/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/remote_add_tag/out.test.toml
+++ b/acceptance/bundle/resources/jobs/remote_add_tag/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/remote_add_tag/script b/acceptance/bundle/resources/jobs/remote_add_tag/script
index d7593e7b8f..3a65173797 100644
--- a/acceptance/bundle/resources/jobs/remote_add_tag/script
+++ b/acceptance/bundle/resources/jobs/remote_add_tag/script
@@ -8,4 +8,4 @@ r["tags"]["new_tag"] = "new_value"
 EOF
 
 $CLI bundle plan
-$CLI bundle plan -o json > out.plan_post_update.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_post_update.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/jobs/remote_delete/deploy/out.test.toml b/acceptance/bundle/resources/jobs/remote_delete/deploy/out.test.toml
index 11a2244a3e..d5b9a6f4a1 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/deploy/out.test.toml
+++ b/acceptance/bundle/resources/jobs/remote_delete/deploy/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/resources/jobs/remote_delete/deploy/test.toml b/acceptance/bundle/resources/jobs/remote_delete/deploy/test.toml
index 7e5d71c08f..46a4d91b84 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/deploy/test.toml
+++ b/acceptance/bundle/resources/jobs/remote_delete/deploy/test.toml
@@ -2,3 +2,4 @@ RecordRequests = false
 EnvMatrix.READPLAN = ["", "1"]
 # `bundle deploy --plan` applies pre-saved state; the stamp isn't written into the plan,
 # so the next plan reports it as a change. Recording skipped until stamp reaches saved plans.
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/jobs/remote_delete/destroy/out.test.toml b/acceptance/bundle/resources/jobs/remote_delete/destroy/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/destroy/out.test.toml
+++ b/acceptance/bundle/resources/jobs/remote_delete/destroy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.test.toml b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.test.toml
+++ b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt
index 2e67a3c5de..3472511c2f 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt
+++ b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt
@@ -21,4 +21,4 @@ Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 === No delete API calls for resources that are already gone remotely
->>> print_requests.py //jobs/delete //pipelines/
+>>> print_requests.py //jobs/delete //pipelines/ --nostamp
diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/script b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/script
index 2b032406a0..89525ab713 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/script
+++ b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/script
@@ -18,4 +18,4 @@ trace $CLI bundle deploy
 trace $CLI bundle summary &> out.summary.$DATABRICKS_BUNDLE_ENGINE.txt
 
 title "No delete API calls for resources that are already gone remotely"
-trace print_requests.py //jobs/delete //pipelines/
+trace print_requests.py //jobs/delete //pipelines/ --nostamp
diff --git a/acceptance/bundle/resources/jobs/remote_matches_config/out.test.toml b/acceptance/bundle/resources/jobs/remote_matches_config/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/remote_matches_config/out.test.toml
+++ b/acceptance/bundle/resources/jobs/remote_matches_config/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/remote_matches_config/output.txt b/acceptance/bundle/resources/jobs/remote_matches_config/output.txt
index 3f6f402fa8..34cee3283a 100644
--- a/acceptance/bundle/resources/jobs/remote_matches_config/output.txt
+++ b/acceptance/bundle/resources/jobs/remote_matches_config/output.txt
@@ -22,4 +22,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
diff --git a/acceptance/bundle/resources/jobs/remote_matches_config/script b/acceptance/bundle/resources/jobs/remote_matches_config/script
index 44a0eb849f..9ca6a0655b 100755
--- a/acceptance/bundle/resources/jobs/remote_matches_config/script
+++ b/acceptance/bundle/resources/jobs/remote_matches_config/script
@@ -13,9 +13,9 @@ r["max_concurrent_runs"] = 2
 EOF
 
 trace $CLI bundle plan
-$CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
 rm out.requests.txt
 # XXX READPLAN
 trace $CLI bundle deploy
-trace print_requests.py //jobs
+trace print_requests.py //jobs --nostamp
diff --git a/acceptance/bundle/resources/jobs/shared-root-path/out.test.toml b/acceptance/bundle/resources/jobs/shared-root-path/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/jobs/shared-root-path/out.test.toml
+++ b/acceptance/bundle/resources/jobs/shared-root-path/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/tags_empty_map/out.test.toml b/acceptance/bundle/resources/jobs/tags_empty_map/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/tags_empty_map/out.test.toml
+++ b/acceptance/bundle/resources/jobs/tags_empty_map/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/tags_empty_map/script b/acceptance/bundle/resources/jobs/tags_empty_map/script
index 61ebb0a913..4a232723bd 100644
--- a/acceptance/bundle/resources/jobs/tags_empty_map/script
+++ b/acceptance/bundle/resources/jobs/tags_empty_map/script
@@ -1,3 +1,3 @@
 trace $CLI bundle plan
 trace $CLI bundle deploy
-trace $CLI bundle plan -o json | jq '.plan."resources.jobs.test_job".changes // .' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.jobs.test_job".changes // .' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/jobs/task-source/out.test.toml b/acceptance/bundle/resources/jobs/task-source/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/task-source/out.test.toml
+++ b/acceptance/bundle/resources/jobs/task-source/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/task-source/output.txt b/acceptance/bundle/resources/jobs/task-source/output.txt
index dba271ee0d..f4bca25e34 100644
--- a/acceptance/bundle/resources/jobs/task-source/output.txt
+++ b/acceptance/bundle/resources/jobs/task-source/output.txt
@@ -10,9 +10,9 @@ Created jobs.workspace_job
 Files: 8 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="git_job") | .body out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="git_job") | .body | del(.deployment.deployment_id, .deployment.version_id) out.requests.txt
 
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="workspace_job") | .body out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="workspace_job") | .body | del(.deployment.deployment_id, .deployment.version_id) out.requests.txt
 
 >>> [CLI] bundle plan
 update jobs.git_job
@@ -25,6 +25,6 @@ Updated jobs.git_job
 Files: 5 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
->>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="git_job") | .body out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="git_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id) out.requests.txt
 
->>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="workspace_job") | .body out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="workspace_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id) out.requests.txt
diff --git a/acceptance/bundle/resources/jobs/task-source/script b/acceptance/bundle/resources/jobs/task-source/script
index 838aac092c..e8908986c5 100644
--- a/acceptance/bundle/resources/jobs/task-source/script
+++ b/acceptance/bundle/resources/jobs/task-source/script
@@ -2,8 +2,8 @@ trace $CLI bundle deploy
 
 # For terraform we expect the task source to be explicitly set always
 # For direct we do not expect it to be set unless explicitly specified in the bundle config
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="git_job") | .body' out.requests.txt | jq --sort-keys > out.git_job.$DATABRICKS_BUNDLE_ENGINE.txt
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="workspace_job") | .body' out.requests.txt | jq --sort-keys > out.workspace_job.$DATABRICKS_BUNDLE_ENGINE.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="git_job") | .body | del(.deployment.deployment_id, .deployment.version_id)' out.requests.txt | jq --sort-keys > out.git_job.$DATABRICKS_BUNDLE_ENGINE.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="workspace_job") | .body | del(.deployment.deployment_id, .deployment.version_id)' out.requests.txt | jq --sort-keys > out.workspace_job.$DATABRICKS_BUNDLE_ENGINE.txt
 rm out.requests.txt
 
 # Removing the git_source block and deploying again
@@ -13,7 +13,7 @@ trace $CLI bundle deploy
 
 # In direct mode update should not contain source unless explicitly specified in the bundle config
 # In terraform mode update should always contain source field
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="git_job") | .body' out.requests.txt | jq --sort-keys >> out.git_job.$DATABRICKS_BUNDLE_ENGINE.txt
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="workspace_job") | .body' out.requests.txt | jq --sort-keys >> out.workspace_job.$DATABRICKS_BUNDLE_ENGINE.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="git_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id)' out.requests.txt | jq --sort-keys >> out.git_job.$DATABRICKS_BUNDLE_ENGINE.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="workspace_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id)' out.requests.txt | jq --sort-keys >> out.workspace_job.$DATABRICKS_BUNDLE_ENGINE.txt
 
 rm out.requests.txt
diff --git a/acceptance/bundle/resources/jobs/tasks-reorder-locally/out.test.toml b/acceptance/bundle/resources/jobs/tasks-reorder-locally/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/tasks-reorder-locally/out.test.toml
+++ b/acceptance/bundle/resources/jobs/tasks-reorder-locally/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/unknown-terraform-field/out.test.toml b/acceptance/bundle/resources/jobs/unknown-terraform-field/out.test.toml
index d2059b4b5d..5d0f3e4aac 100644
--- a/acceptance/bundle/resources/jobs/unknown-terraform-field/out.test.toml
+++ b/acceptance/bundle/resources/jobs/unknown-terraform-field/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/update/out.test.toml b/acceptance/bundle/resources/jobs/update/out.test.toml
index 11a2244a3e..d5b9a6f4a1 100644
--- a/acceptance/bundle/resources/jobs/update/out.test.toml
+++ b/acceptance/bundle/resources/jobs/update/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/resources/jobs/update/output.txt b/acceptance/bundle/resources/jobs/update/output.txt
index 0fecb880fc..48e055a6cb 100644
--- a/acceptance/bundle/resources/jobs/update/output.txt
+++ b/acceptance/bundle/resources/jobs/update/output.txt
@@ -8,7 +8,7 @@ Created jobs.foo
 Files: 0 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
@@ -18,7 +18,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
 
 === Update trigger.periodic.unit and re-deploy
 >>> update_file.py databricks.yml DAYS HOURS
@@ -32,7 +32,7 @@ Updated jobs.foo
 Files: 0 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
@@ -87,7 +87,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 1 deleted
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
diff --git a/acceptance/bundle/resources/jobs/update/script b/acceptance/bundle/resources/jobs/update/script
index 270efcaea6..1be869aa50 100644
--- a/acceptance/bundle/resources/jobs/update/script
+++ b/acceptance/bundle/resources/jobs/update/script
@@ -2,14 +2,14 @@ echo "*" > .gitignore
 trace $CLI bundle plan
 $CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 $CLI bundle deploy $(readplanarg out.plan_create.direct.json)
-trace print_requests.py //jobs > out.create.requests.json
+trace print_requests.py //jobs --nostamp > out.create.requests.json
 
 print_state.py > out.state.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle plan
 trace $CLI bundle plan -o json > out.plan_skip.$DATABRICKS_BUNDLE_ENGINE.json
 
 $CLI bundle deploy $(readplanarg out.plan_skip.direct.json)
-trace print_requests.py //jobs
+trace print_requests.py //jobs --nostamp
 
 title "Update trigger.periodic.unit and re-deploy"
 trace update_file.py databricks.yml DAYS HOURS
@@ -17,7 +17,7 @@ trace $CLI bundle plan
 $CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
 
 $CLI bundle deploy $(readplanarg out.plan_update.direct.json)
-trace print_requests.py //jobs | jq 'del(.body.new_settings.run_as, .body.new_settings.webhook_notifications, .body.new_settings.email_notifications)' > out.update.requests.json
+trace print_requests.py //jobs --nostamp | jq 'del(.body.new_settings.run_as, .body.new_settings.webhook_notifications, .body.new_settings.email_notifications)' > out.update.requests.json
 
 trace $CLI bundle plan
 
@@ -30,7 +30,7 @@ rm out.requests.txt
 
 title "Destroy the job and verify that it's removed from the state and from remote"
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs
+trace print_requests.py //jobs --nostamp
 
 trace musterr $CLI jobs get $ppid
 rm out.requests.txt
diff --git a/acceptance/bundle/resources/jobs/update/test.toml b/acceptance/bundle/resources/jobs/update/test.toml
index 50fdca07c5..20c8733641 100644
--- a/acceptance/bundle/resources/jobs/update/test.toml
+++ b/acceptance/bundle/resources/jobs/update/test.toml
@@ -1,3 +1,4 @@
 EnvMatrix.READPLAN = ["", "1"]
 # `bundle deploy --plan` applies pre-saved state; the stamp isn't written into the plan,
 # so the next plan reports it as a change. Recording skipped until stamp reaches saved plans.
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/jobs/update_single_node/out.test.toml b/acceptance/bundle/resources/jobs/update_single_node/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/jobs/update_single_node/out.test.toml
+++ b/acceptance/bundle/resources/jobs/update_single_node/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/update_single_node/output.txt b/acceptance/bundle/resources/jobs/update_single_node/output.txt
index 2f3e61786f..55afa897b0 100644
--- a/acceptance/bundle/resources/jobs/update_single_node/output.txt
+++ b/acceptance/bundle/resources/jobs/update_single_node/output.txt
@@ -10,7 +10,7 @@ Created jobs.foo
 Files: 0 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
 
 === Update trigger.periodic.unit and re-deploy
 >>> update_file.py databricks.yml DAYS HOURS
@@ -26,7 +26,7 @@ Updated jobs.foo
 Files: 0 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
@@ -88,7 +88,7 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 1 deleted
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
 {
   "method": "POST",
   "path": "/api/2.2/jobs/delete",
diff --git a/acceptance/bundle/resources/jobs/update_single_node/script b/acceptance/bundle/resources/jobs/update_single_node/script
index 9e84f677e7..4deefe32bb 100644
--- a/acceptance/bundle/resources/jobs/update_single_node/script
+++ b/acceptance/bundle/resources/jobs/update_single_node/script
@@ -1,17 +1,17 @@
 echo "*" > .gitignore
 trace $CLI bundle plan
-$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-$CLI bundle plan -o json > out.plan_skip.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_skip.$DATABRICKS_BUNDLE_ENGINE.json
 
-trace print_requests.py //jobs > out.create.requests.txt
+trace print_requests.py //jobs > out.create.requests.txt --nostamp
 
 title "Update trigger.periodic.unit and re-deploy"
 trace update_file.py databricks.yml DAYS HOURS
 trace $CLI bundle plan
-$CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs > out.update.requests.$DATABRICKS_BUNDLE_ENGINE.json
+trace print_requests.py //jobs > out.update.requests.$DATABRICKS_BUNDLE_ENGINE.json --nostamp
 
 trace $CLI bundle plan
 
@@ -19,12 +19,12 @@ title "Fetch job ID and verify remote state"
 
 ppid=`read_id.py foo`
 
-trace $CLI jobs get $ppid | jq 'del(.settings.run_as)'
+trace $CLI jobs get $ppid | jq 'del(.settings.run_as, .settings.deployment.deployment_id, .settings.deployment.version_id)'
 rm out.requests.txt
 
 title "Destroy the job and verify that it's removed from the state and from remote"
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs
+trace print_requests.py //jobs --nostamp
 
 trace musterr $CLI jobs get $ppid
 rm out.requests.txt
diff --git a/acceptance/bundle/resources/jobs/webhook-reorder-remote/out.test.toml b/acceptance/bundle/resources/jobs/webhook-reorder-remote/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/jobs/webhook-reorder-remote/out.test.toml
+++ b/acceptance/bundle/resources/jobs/webhook-reorder-remote/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt b/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt
index d1caade809..f0fdccbb1d 100644
--- a/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt
+++ b/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt
@@ -16,7 +16,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py //jobs --nostamp
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
diff --git a/acceptance/bundle/resources/jobs/webhook-reorder-remote/script b/acceptance/bundle/resources/jobs/webhook-reorder-remote/script
index ebbcb3409b..c0257db633 100644
--- a/acceptance/bundle/resources/jobs/webhook-reorder-remote/script
+++ b/acceptance/bundle/resources/jobs/webhook-reorder-remote/script
@@ -14,6 +14,6 @@ EOF
 
 # The reordered remote must not produce a phantom diff: on_* lists are diffed by id.
 trace $CLI bundle plan
-$CLI bundle plan -o json | jq '.plan."resources.jobs.my_job".changes' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp | jq '.plan."resources.jobs.my_job".changes' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
-trace print_requests.py //jobs
+trace print_requests.py //jobs --nostamp
diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/basic/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/basic/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/out.test.toml
index f91a90a768..2dd1ac4d72 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudSlow = true
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/config/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/update/config/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/update/config/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/config/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/tags/out.test.toml b/acceptance/bundle/resources/model_serving_endpoints/update/tags/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/update/tags/out.test.toml
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/tags/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/models/basic/out.test.toml b/acceptance/bundle/resources/models/basic/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/models/basic/out.test.toml
+++ b/acceptance/bundle/resources/models/basic/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/models/empty-name/out.test.toml b/acceptance/bundle/resources/models/empty-name/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/models/empty-name/out.test.toml
+++ b/acceptance/bundle/resources/models/empty-name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/models/readplan-permissions/out.test.toml b/acceptance/bundle/resources/models/readplan-permissions/out.test.toml
index 57b0f61685..dd03baaabb 100644
--- a/acceptance/bundle/resources/models/readplan-permissions/out.test.toml
+++ b/acceptance/bundle/resources/models/readplan-permissions/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/resources/permissions/_script b/acceptance/bundle/resources/permissions/_script
index 90e6596c9a..8f6a0d9c8c 100644
--- a/acceptance/bundle/resources/permissions/_script
+++ b/acceptance/bundle/resources/permissions/_script
@@ -1,10 +1,10 @@
-trace $CLI bundle validate -o json | jq .resources.$RESOURCE.foo.permissions
+trace $CLI bundle validate -o json | nostamp | jq .resources.$RESOURCE.foo.permissions
 rm out.requests.txt
 
-$CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
 print_requests() {
-    jq -c < out.requests.txt | jq 'select(.method != "GET" and (.path | contains("permissions")))'
+    jq -c < out.requests.txt | jq 'select(.method != "GET" and (.path | contains("permissions")) and (.path | contains("/api/2.0/bundle") | not))'
     rm out.requests.txt
 }
 
diff --git a/acceptance/bundle/resources/permissions/apps/current_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/apps/current_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/apps/current_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/apps/current_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/apps/other_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/apps/other_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/apps/other_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/apps/other_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/clusters/current_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/clusters/current_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/clusters/current_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/clusters/current_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/clusters/target/out.test.toml b/acceptance/bundle/resources/permissions/clusters/target/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/clusters/target/out.test.toml
+++ b/acceptance/bundle/resources/permissions/clusters/target/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/dashboards/create/out.test.toml b/acceptance/bundle/resources/permissions/dashboards/create/out.test.toml
index 2fcc38d01d..7ba2327422 100644
--- a/acceptance/bundle/resources/permissions/dashboards/create/out.test.toml
+++ b/acceptance/bundle/resources/permissions/dashboards/create/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/database_instances/current_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/database_instances/current_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/database_instances/current_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/database_instances/current_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/experiments/current_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/experiments/current_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/experiments/current_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/experiments/current_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/factcheck/out.test.toml b/acceptance/bundle/resources/permissions/factcheck/out.test.toml
index 205ed28280..f6514a8cd9 100644
--- a/acceptance/bundle/resources/permissions/factcheck/out.test.toml
+++ b/acceptance/bundle/resources/permissions/factcheck/out.test.toml
@@ -3,3 +3,4 @@ CloudSlow = true
 RunsOnDbr = true
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script
index ae805caebb..e589a40bd5 100644
--- a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script
+++ b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script
@@ -1,7 +1,7 @@
 trace $CLI bundle validate -o json | jq .resources.genie_spaces.foo.permissions
 rm out.requests.txt
 
-$CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
 rm out.requests.txt
 trace $CLI bundle deploy
diff --git a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/out.test.toml b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/out.test.toml
+++ b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/added_remotely/out.test.toml b/acceptance/bundle/resources/permissions/jobs/added_remotely/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/added_remotely/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/added_remotely/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/added_remotely/script b/acceptance/bundle/resources/permissions/jobs/added_remotely/script
index 6e8f759cbb..e85bcde537 100644
--- a/acceptance/bundle/resources/permissions/jobs/added_remotely/script
+++ b/acceptance/bundle/resources/permissions/jobs/added_remotely/script
@@ -10,7 +10,7 @@ title "Add permissions out of band"
 trace $CLI permissions set jobs "$job_id" --json @remote_add.json
 
 trace $CLI bundle plan
-trace $CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
 trace $CLI bundle plan
 
diff --git a/acceptance/bundle/resources/permissions/jobs/current_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/jobs/current_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/current_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/current_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/out.test.toml b/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/out.test.toml
index 2fcc38d01d..7ba2327422 100644
--- a/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/script b/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/script
index 96eaf8a4c7..3c8217c195 100644
--- a/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/script
+++ b/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/script
@@ -1,11 +1,11 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
-trace $CLI bundle validate -t green -o json | jq .resources
+trace $CLI bundle validate -t green -o json | nostamp | jq .resources
 trace errcode $CLI bundle deploy -t green
-print_requests.py //jobs &> out.deploy.requests.json
+print_requests.py //jobs --nostamp &> out.deploy.requests.json
 
 # check plan to ensure there is not drift
-trace $CLI bundle plan -o json -t green > out.plan.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle plan -o json -t green | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.txt
 
 trace errcode $CLI bundle destroy -t green --auto-approve
-print_requests.py //jobs &> out.destroy.requests.$DATABRICKS_BUNDLE_ENGINE.json
+print_requests.py //jobs --nostamp &> out.destroy.requests.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/permissions/jobs/current_is_owner/out.test.toml b/acceptance/bundle/resources/permissions/jobs/current_is_owner/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/current_is_owner/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/current_is_owner/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/delete_one/out.test.toml b/acceptance/bundle/resources/permissions/jobs/delete_one/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/permissions/jobs/delete_one/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/delete_one/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/delete_one/script b/acceptance/bundle/resources/permissions/jobs/delete_one/script
index b51fed3b89..1f0aa1c80a 100644
--- a/acceptance/bundle/resources/permissions/jobs/delete_one/script
+++ b/acceptance/bundle/resources/permissions/jobs/delete_one/script
@@ -8,16 +8,16 @@ if [ -n "$CLOUD_ENV" ]; then
 fi
 rm -f out.requests.txt
 
-trace $CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 
 cleanup() {
     trace errcode $CLI bundle destroy --auto-approve
-    print_requests.py //jobs/ > out.requests_destroy.$DATABRICKS_BUNDLE_ENGINE.json
+    print_requests.py --nostamp //jobs/ > out.requests_destroy.$DATABRICKS_BUNDLE_ENGINE.json
 }
 trap cleanup EXIT
 
 trace $CLI bundle deploy
-print_requests.py //jobs/ | gron.py --sort-arrays access_control_list > out.requests_create.txt
+print_requests.py --nostamp //jobs/ | gron.py --sort-arrays access_control_list > out.requests_create.txt
 
 trace $CLI bundle plan
 
@@ -29,7 +29,7 @@ rm -f out.requests.txt
 title "Delete one permission and deploy again\n"
 grep -v DELETE databricks.yml > tmp.yml && mv tmp.yml databricks.yml
 trace $CLI bundle deploy
-print_requests.py //jobs/ | gron.py --sort-arrays access_control_list > out.requests_update.txt
+print_requests.py --nostamp //jobs/ | gron.py --sort-arrays access_control_list > out.requests_update.txt
 
 $CLI permissions get jobs "$job_id" | gron.py --sort-arrays access_control_list | grep -v display_name > out.permissions_update.txt
 rm -f out.requests.txt
diff --git a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/out.test.toml b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt
index 861c6f7cd2..306af15c4e 100644
--- a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt
@@ -8,7 +8,7 @@ Created jobs.job_with_permissions.permissions
 Files: 7 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs/
+>>> print_requests.py --nostamp //jobs/
 
 >>> [CLI] permissions get jobs [JOB_WITH_PERMISSIONS_ID]
 {
@@ -90,7 +90,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
   "object_type": "job"
 }
 
->>> print_requests.py //jobs/
+>>> print_requests.py --nostamp //jobs/
 {
   "method": "PUT",
   "path": "/api/2.0/permissions/jobs/[JOB_WITH_PERMISSIONS_ID]",
@@ -112,7 +112,7 @@ Updated jobs.job_with_permissions.permissions
 Files: 4 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
->>> print_requests.py //jobs/
+>>> print_requests.py --nostamp //jobs/
 
 >>> [CLI] permissions get jobs [JOB_WITH_PERMISSIONS_ID]
 {
diff --git a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/script b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/script
index 28369ea37c..cce4d71d0c 100644
--- a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/script
+++ b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/script
@@ -1,6 +1,6 @@
-trace $CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs/ > out.requests_create.json
+trace print_requests.py --nostamp //jobs/ > out.requests_create.json
 
 job_id="$(read_id.py job_with_permissions)"
 
@@ -9,11 +9,11 @@ rm -f out.requests.txt
 
 title "Delete permissions remotely"
 trace $CLI permissions set jobs "$job_id" --json @remote_delete.json
-trace print_requests.py //jobs/
+trace print_requests.py --nostamp //jobs/
 
-trace $CLI bundle plan -o json > out.plan_restore.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_restore.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs/ > out.requests_restore.json
+trace print_requests.py --nostamp //jobs/ > out.requests_restore.json
 
 trace $CLI permissions get jobs "$job_id"
 rm -f out.requests.txt
diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/test.toml b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/test.toml
new file mode 100644
index 0000000000..921045dfd0
--- /dev/null
+++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/test.toml
@@ -0,0 +1,4 @@
+# Recording needs a bundle it has seen from the start. This test seeds a state file,
+# so recording refuses it. TODO(DMS): drop this once existing state can be
+# handed over to the service (see the TODO in dstate.Open).
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.test.toml b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.test.toml
index ccb9d5ba41..95d84941c4 100644
--- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.test.toml
@@ -3,3 +3,4 @@ RunsOnDbr = false
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.test.toml b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.test.toml
index ccb9d5ba41..95d84941c4 100644
--- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.test.toml
@@ -3,3 +3,4 @@ RunsOnDbr = false
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/permissions/jobs/empty_list/out.test.toml b/acceptance/bundle/resources/permissions/jobs/empty_list/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/empty_list/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/empty_list/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/other_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/jobs/other_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/other_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/other_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/out.test.toml b/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/script b/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/script
index 4c406d91cf..3e8d8d7c69 100644
--- a/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/script
+++ b/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 trace $CLI bundle validate -t green -o json | jq .resources
 trace errcode $CLI bundle deploy -t green
-print_requests.py //jobs &> out.deploy.requests.json
+print_requests.py //jobs --nostamp &> out.deploy.requests.json
 
 trace errcode $CLI bundle destroy -t green --auto-approve
-print_requests.py //jobs &> out.destroy.requests.$DATABRICKS_BUNDLE_ENGINE.json
+print_requests.py //jobs --nostamp &> out.destroy.requests.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/permissions/jobs/other_is_owner/out.test.toml b/acceptance/bundle/resources/permissions/jobs/other_is_owner/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/other_is_owner/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/other_is_owner/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/reorder_locally/out.test.toml b/acceptance/bundle/resources/permissions/jobs/reorder_locally/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/reorder_locally/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/reorder_locally/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/reorder_remotely/out.test.toml b/acceptance/bundle/resources/permissions/jobs/reorder_remotely/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/reorder_remotely/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/reorder_remotely/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/update/out.test.toml b/acceptance/bundle/resources/permissions/jobs/update/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/update/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/update/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/jobs/update/output.txt b/acceptance/bundle/resources/permissions/jobs/update/output.txt
index 23ddca160a..86bf9effa0 100644
--- a/acceptance/bundle/resources/permissions/jobs/update/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/update/output.txt
@@ -14,7 +14,7 @@ Created jobs.job_with_permissions.permissions
 Files: 7 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs/
+>>> print_requests.py --nostamp //jobs/
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
@@ -80,7 +80,7 @@ Updated jobs.job_with_permissions.permissions
 Files: 6 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
->>> print_requests.py //jobs/
+>>> print_requests.py --nostamp //jobs/
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
@@ -95,7 +95,7 @@ Updated jobs.job_with_permissions.permissions
 Files: 5 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
->>> print_requests.py //jobs/
+>>> print_requests.py --nostamp //jobs/
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
@@ -110,7 +110,7 @@ Deleted jobs.job_with_permissions.permissions
 Files: 5 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 1 unchanged
 
->>> print_requests.py //jobs/
+>>> print_requests.py --nostamp //jobs/
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
@@ -138,7 +138,7 @@ Created jobs.job_with_permissions.permissions
 Files: 4 uploaded, 1 deleted
 Resources: 1 created, 0 changed, 0 deleted, 1 unchanged
 
->>> print_requests.py //jobs/
+>>> print_requests.py --nostamp //jobs/
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
@@ -153,7 +153,7 @@ Deleted jobs.job_with_permissions.permissions
 Files: 5 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 1 unchanged
 
->>> print_requests.py //jobs/
+>>> print_requests.py --nostamp //jobs/
 
 >>> [CLI] bundle destroy --auto-approve
 The following resources will be deleted:
@@ -163,4 +163,4 @@ All files and directories at the following location will be deleted: /Workspace/
 
 Destroy: 1 deleted
 
->>> print_requests.py //jobs/
+>>> print_requests.py --nostamp //jobs/
diff --git a/acceptance/bundle/resources/permissions/jobs/update/script b/acceptance/bundle/resources/permissions/jobs/update/script
index 38ac1a5b62..28f2c121f2 100644
--- a/acceptance/bundle/resources/permissions/jobs/update/script
+++ b/acceptance/bundle/resources/permissions/jobs/update/script
@@ -1,10 +1,10 @@
 cp databricks.yml databricks.yml.saved
 trace $CLI bundle plan
-trace $CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs/ > out.requests_create.json
+trace print_requests.py --nostamp //jobs/ > out.requests_create.json
 trace $CLI bundle plan
-trace $CLI bundle plan -o json > out.plan_post_create.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_post_create.$DATABRICKS_BUNDLE_ENGINE.json
 
 job_id="$(read_id.py job_with_permissions)"
 
@@ -13,41 +13,41 @@ rm -f out.requests.txt
 
 title "Update one permission and deploy again\n"
 update_file.py databricks.yml CAN_VIEW CAN_MANAGE
-trace $CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs/ > out.requests_update.json
+trace print_requests.py --nostamp //jobs/ > out.requests_update.json
 trace $CLI bundle plan
 
 title "Delete one permission and deploy again\n"
 grep -v DELETE_ONE databricks.yml > tmp.yml && mv tmp.yml databricks.yml
-trace $CLI bundle plan -o json > out.plan_delete_one.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_delete_one.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs/ > out.requests_delete_one.json
+trace print_requests.py --nostamp //jobs/ > out.requests_delete_one.json
 trace $CLI bundle plan
 
 title "Delete the whole block and deploy again\n"
 grep -v PERMISSIONS databricks.yml > tmp.yml && mv tmp.yml databricks.yml
-trace $CLI bundle plan -o json > out.plan_delete_all.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_delete_all.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs/ > out.requests_delete_all.$DATABRICKS_BUNDLE_ENGINE.json
+trace print_requests.py --nostamp //jobs/ > out.requests_delete_all.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle plan
 
 title "Restore original config\n"
 trace diff.py databricks.yml.saved databricks.yml
 
 mv databricks.yml.saved databricks.yml
-trace $CLI bundle plan -o json > out.plan_restore.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_restore.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs/ > out.requests_restore_original.json
+trace print_requests.py --nostamp //jobs/ > out.requests_restore_original.json
 trace $CLI bundle plan
 
 title "Set permissions: []\n"
 grep -vE '(PERMISSIONS|DELETE_ONE)' databricks.yml > tmp.yml && mv tmp.yml databricks.yml
 update_file.py databricks.yml '# permissions: [] # EXPLICIT_EMPTY' 'permissions: [] # EXPLICIT_EMPTY'
-trace $CLI bundle plan -o json > out.plan_set_empty.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_set_empty.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //jobs/ > out.requests_set_empty.$DATABRICKS_BUNDLE_ENGINE.json
+trace print_requests.py --nostamp //jobs/ > out.requests_set_empty.$DATABRICKS_BUNDLE_ENGINE.json
 
 trace $CLI bundle destroy --auto-approve
-trace print_requests.py //jobs/ > out.requests_destroy.$DATABRICKS_BUNDLE_ENGINE.json
+trace print_requests.py --nostamp //jobs/ > out.requests_destroy.$DATABRICKS_BUNDLE_ENGINE.json
 #rm -fr .databricks
diff --git a/acceptance/bundle/resources/permissions/jobs/viewers/out.test.toml b/acceptance/bundle/resources/permissions/jobs/viewers/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/jobs/viewers/out.test.toml
+++ b/acceptance/bundle/resources/permissions/jobs/viewers/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/models/current_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/models/current_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/models/current_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/models/current_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/models/current_can_manage/script b/acceptance/bundle/resources/permissions/models/current_can_manage/script
index 0ade9d8934..0a6935c20b 100644
--- a/acceptance/bundle/resources/permissions/models/current_can_manage/script
+++ b/acceptance/bundle/resources/permissions/models/current_can_manage/script
@@ -1,7 +1,7 @@
 trace $CLI bundle validate -o json | jq .resources.$RESOURCE.foo.permissions
 rm out.requests.txt
 
-$CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
 rm out.requests.txt
 trace errcode $CLI bundle deploy &> out.deploy.txt
diff --git a/acceptance/bundle/resources/permissions/out.test.toml b/acceptance/bundle/resources/permissions/out.test.toml
index 91b0158ff2..3311ac099b 100644
--- a/acceptance/bundle/resources/permissions/out.test.toml
+++ b/acceptance/bundle/resources/permissions/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 Phase = 1
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/pipelines/504/create/out.test.toml b/acceptance/bundle/resources/permissions/pipelines/504/create/out.test.toml
index a9c71d8890..4f26abefa0 100644
--- a/acceptance/bundle/resources/permissions/pipelines/504/create/out.test.toml
+++ b/acceptance/bundle/resources/permissions/pipelines/504/create/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = []
diff --git a/acceptance/bundle/resources/permissions/pipelines/504/plan/out.test.toml b/acceptance/bundle/resources/permissions/pipelines/504/plan/out.test.toml
index a9c71d8890..4f26abefa0 100644
--- a/acceptance/bundle/resources/permissions/pipelines/504/plan/out.test.toml
+++ b/acceptance/bundle/resources/permissions/pipelines/504/plan/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = []
diff --git a/acceptance/bundle/resources/permissions/pipelines/504/update/out.test.toml b/acceptance/bundle/resources/permissions/pipelines/504/update/out.test.toml
index a9c71d8890..4f26abefa0 100644
--- a/acceptance/bundle/resources/permissions/pipelines/504/update/out.test.toml
+++ b/acceptance/bundle/resources/permissions/pipelines/504/update/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = []
diff --git a/acceptance/bundle/resources/permissions/pipelines/current_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/pipelines/current_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/pipelines/current_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/pipelines/current_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/pipelines/current_is_owner/out.test.toml b/acceptance/bundle/resources/permissions/pipelines/current_is_owner/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/pipelines/current_is_owner/out.test.toml
+++ b/acceptance/bundle/resources/permissions/pipelines/current_is_owner/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/pipelines/empty_list/out.test.toml b/acceptance/bundle/resources/permissions/pipelines/empty_list/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/pipelines/empty_list/out.test.toml
+++ b/acceptance/bundle/resources/permissions/pipelines/empty_list/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/pipelines/other_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/pipelines/other_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/pipelines/other_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/pipelines/other_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/pipelines/other_is_owner/out.test.toml b/acceptance/bundle/resources/permissions/pipelines/other_is_owner/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/pipelines/other_is_owner/out.test.toml
+++ b/acceptance/bundle/resources/permissions/pipelines/other_is_owner/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/pipelines/update/out.test.toml b/acceptance/bundle/resources/permissions/pipelines/update/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/pipelines/update/out.test.toml
+++ b/acceptance/bundle/resources/permissions/pipelines/update/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/pipelines/update/output.txt b/acceptance/bundle/resources/permissions/pipelines/update/output.txt
index dbccf317c7..c2a0571b83 100644
--- a/acceptance/bundle/resources/permissions/pipelines/update/output.txt
+++ b/acceptance/bundle/resources/permissions/pipelines/update/output.txt
@@ -8,7 +8,7 @@ Created pipelines.foo.permissions
 Files: 7 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //pipeline
+>>> print_requests.py --nostamp //pipeline ^//api/2.0/bundle
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
@@ -60,7 +60,7 @@ Updated pipelines.foo.permissions
 Files: 5 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
->>> print_requests.py //pipeline
+>>> print_requests.py --nostamp //pipeline ^//api/2.0/bundle
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
@@ -75,7 +75,7 @@ Updated pipelines.foo.permissions
 Files: 5 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
->>> print_requests.py //pipeline
+>>> print_requests.py --nostamp //pipeline ^//api/2.0/bundle
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
@@ -99,7 +99,7 @@ Deleted pipelines.foo.permissions
 Files: 5 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 1 unchanged
 
->>> print_requests.py //pipeline --sort
+>>> print_requests.py --nostamp //pipeline ^//api/2.0/bundle --sort
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
@@ -114,7 +114,7 @@ Created pipelines.foo.permissions
 Files: 4 uploaded, 1 deleted
 Resources: 1 created, 0 changed, 0 deleted, 1 unchanged
 
->>> print_requests.py //pipeline
+>>> print_requests.py --nostamp //pipeline ^//api/2.0/bundle
 
 >>> [CLI] bundle plan
 Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
diff --git a/acceptance/bundle/resources/permissions/pipelines/update/script b/acceptance/bundle/resources/permissions/pipelines/update/script
index 3fc2edd239..9ace44addb 100644
--- a/acceptance/bundle/resources/permissions/pipelines/update/script
+++ b/acceptance/bundle/resources/permissions/pipelines/update/script
@@ -1,7 +1,7 @@
 cp databricks.yml databricks.yml.saved
-trace $CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //pipeline > out.requests_create.json
+trace print_requests.py --nostamp //pipeline '^//api/2.0/bundle' > out.requests_create.json
 trace $CLI bundle plan
 
 pipeline_id="$(read_id.py foo)"
@@ -11,32 +11,33 @@ rm -f out.requests.txt
 
 title "Update one permission and deploy again\n"
 update_file.py databricks.yml CAN_VIEW CAN_MANAGE
-trace $CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //pipeline > out.requests_update.json
+trace print_requests.py --nostamp //pipeline '^//api/2.0/bundle' > out.requests_update.json
 trace $CLI bundle plan
 
 title "Delete one permission and deploy again\n"
 grep -v DELETE_ONE databricks.yml > tmp.yml && mv tmp.yml databricks.yml
-trace $CLI bundle plan -o json > out.plan_delete_one.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_delete_one.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //pipeline > out.requests_delete_one.json
+trace print_requests.py --nostamp //pipeline '^//api/2.0/bundle' > out.requests_delete_one.json
 trace $CLI bundle plan
 
 title "Delete the whole block and deploy again\n"
 grep -v PERMISSIONS databricks.yml > tmp.yml && mv tmp.yml databricks.yml
 trace cat databricks.yml
-trace $CLI bundle plan -o json > out.plan_delete_all.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_delete_all.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //pipeline --sort > out.requests_delete_all.json
+trace print_requests.py --nostamp //pipeline '^//api/2.0/bundle' --sort > out.requests_delete_all.json
 trace $CLI bundle plan
 
 title "Restore original config\n"
 mv databricks.yml.saved databricks.yml
-trace $CLI bundle plan -o json > out.plan_restore.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp > out.plan_restore.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-trace print_requests.py //pipeline > out.requests_restore_original.json
+trace print_requests.py --nostamp //pipeline '^//api/2.0/bundle' > out.requests_restore_original.json
 trace $CLI bundle plan
 
 trace $CLI bundle destroy --auto-approve
-print_requests.py //pipeline > out.requests_destroy.json
+print_requests.py --nostamp //pipeline '^//api/2.0/bundle' > out.requests_destroy.json
+rm -f out.requests.txt
diff --git a/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/target_permissions/out.test.toml b/acceptance/bundle/resources/permissions/target_permissions/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/permissions/target_permissions/out.test.toml
+++ b/acceptance/bundle/resources/permissions/target_permissions/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/permissions/target_permissions/script b/acceptance/bundle/resources/permissions/target_permissions/script
index 1a07dad637..7a443d8cc2 100644
--- a/acceptance/bundle/resources/permissions/target_permissions/script
+++ b/acceptance/bundle/resources/permissions/target_permissions/script
@@ -1,7 +1,7 @@
 trace $CLI bundle plan
-$CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
-print_requests.py //jobs/ > out.requests_create.$DATABRICKS_BUNDLE_ENGINE.json
+print_requests.py --nostamp //jobs/ > out.requests_create.$DATABRICKS_BUNDLE_ENGINE.json
 
 trace $CLI bundle destroy --auto-approve
-print_requests.py //jobs/ > out.requests_delete.$DATABRICKS_BUNDLE_ENGINE.json
+print_requests.py --nostamp //jobs/ > out.requests_delete.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/out.test.toml b/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/out.test.toml
+++ b/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/allow-duplicate-names/out.test.toml b/acceptance/bundle/resources/pipelines/allow-duplicate-names/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/pipelines/allow-duplicate-names/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/allow-duplicate-names/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt b/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt
index e10e04e6b4..4ddbabbe7e 100644
--- a/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt
+++ b/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt
@@ -5,7 +5,7 @@ Created pipelines.pipeline_one
 Files: 9 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //pipelines
+>>> print_requests.py //pipelines --nostamp
 {
   "method": "POST",
   "path": "/api/2.0/pipelines",
diff --git a/acceptance/bundle/resources/pipelines/allow-duplicate-names/script b/acceptance/bundle/resources/pipelines/allow-duplicate-names/script
index d121e073a3..ec26ce5540 100644
--- a/acceptance/bundle/resources/pipelines/allow-duplicate-names/script
+++ b/acceptance/bundle/resources/pipelines/allow-duplicate-names/script
@@ -16,4 +16,4 @@ export PIPELINE_ID
 # Deploy the bundle that has a pipeline with the same name:
 trace $CLI bundle deploy
 
-trace print_requests.py //pipelines
+trace print_requests.py //pipelines --nostamp
diff --git a/acceptance/bundle/resources/pipelines/auto-approve/out.test.toml b/acceptance/bundle/resources/pipelines/auto-approve/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/pipelines/auto-approve/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/auto-approve/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/auto-approve/script b/acceptance/bundle/resources/pipelines/auto-approve/script
index 7c68356ea7..f0b6c4f904 100644
--- a/acceptance/bundle/resources/pipelines/auto-approve/script
+++ b/acceptance/bundle/resources/pipelines/auto-approve/script
@@ -9,12 +9,12 @@ trap cleanup EXIT
 trace $CLI bundle deploy
 
 title "Assert the pipeline is created"
-PIPELINE_ID=$($CLI bundle summary -o json | jq -r '.resources.pipelines.bar.id')
-trace $CLI pipelines get "${PIPELINE_ID}" | jq "{spec}"
+PIPELINE_ID=$($CLI bundle summary -o json | nostamp | jq -r '.resources.pipelines.bar.id')
+trace $CLI pipelines get "${PIPELINE_ID}" | nostamp| jq "{spec}"
 
 title "Assert the job is created"
-JOB_ID=$($CLI bundle summary -o json | jq -r '.resources.jobs.foo.id')
-$CLI jobs get "${JOB_ID}" | jq '{name: .settings.name}'
+JOB_ID=$($CLI bundle summary -o json | nostamp | jq -r '.resources.jobs.foo.id')
+$CLI jobs get "${JOB_ID}" | nostamp| jq '{name: .settings.name}'
 
 title "Remove resources from configuration."
 trace rm resources.yml
diff --git a/acceptance/bundle/resources/pipelines/drift/parameters/out.test.toml b/acceptance/bundle/resources/pipelines/drift/parameters/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/pipelines/drift/parameters/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/drift/parameters/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/drift/parameters/output.txt b/acceptance/bundle/resources/pipelines/drift/parameters/output.txt
index 6a03f536d1..5cdecffe53 100644
--- a/acceptance/bundle/resources/pipelines/drift/parameters/output.txt
+++ b/acceptance/bundle/resources/pipelines/drift/parameters/output.txt
@@ -16,7 +16,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline-parameter
 Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
->>> print_requests.py //api/2.0/pipelines
+>>> print_requests.py --nostamp //api/2.0/pipelines
 json.method = "POST";
 json.path = "/api/2.0/pipelines";
 json.body.channel = "CURRENT";
diff --git a/acceptance/bundle/resources/pipelines/drift/parameters/script b/acceptance/bundle/resources/pipelines/drift/parameters/script
index 6773f24891..1d9fd0f2c0 100644
--- a/acceptance/bundle/resources/pipelines/drift/parameters/script
+++ b/acceptance/bundle/resources/pipelines/drift/parameters/script
@@ -8,4 +8,4 @@ trace $CLI bundle plan | contains.py "Plan: 0 to add, 0 to change, 0 to delete,
 
 title "Redeploy is a no-op (no update call)"
 trace $CLI bundle deploy
-trace print_requests.py //api/2.0/pipelines | gron.py | contains.py '!json.method = "PUT"'
+trace print_requests.py --nostamp //api/2.0/pipelines | gron.py | contains.py '!json.method = "PUT"'
diff --git a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/out.test.toml b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script
index d380b57c97..a319f62fb1 100644
--- a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script
+++ b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script
@@ -8,5 +8,5 @@ cleanup() {
 trap cleanup EXIT
 trace $CLI bundle deploy
 
-trace jq -s '.[] | select(.path=="/api/2.0/pipelines" and .method == "POST") | .body' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/pipelines" and .method == "POST") | .body' out.requests.txt | nostamp
 rm out.requests.txt
diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/out.requests.direct.txt b/acceptance/bundle/resources/pipelines/num-workers-zero/out.requests.direct.txt
index 62341cc543..547928989d 100644
--- a/acceptance/bundle/resources/pipelines/num-workers-zero/out.requests.direct.txt
+++ b/acceptance/bundle/resources/pipelines/num-workers-zero/out.requests.direct.txt
@@ -1,5 +1,3 @@
-
->>> errcode jq -s .[] | select(.method == "POST" and (.path | contains("/pipelines"))) out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/pipelines",
diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/out.requests.terraform.txt b/acceptance/bundle/resources/pipelines/num-workers-zero/out.requests.terraform.txt
index 7bf5518128..e1ec34db0b 100644
--- a/acceptance/bundle/resources/pipelines/num-workers-zero/out.requests.terraform.txt
+++ b/acceptance/bundle/resources/pipelines/num-workers-zero/out.requests.terraform.txt
@@ -1,5 +1,3 @@
-
->>> errcode jq -s .[] | select(.method == "POST" and (.path | contains("/pipelines"))) out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/pipelines",
diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/out.test.toml b/acceptance/bundle/resources/pipelines/num-workers-zero/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/pipelines/num-workers-zero/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/num-workers-zero/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/script b/acceptance/bundle/resources/pipelines/num-workers-zero/script
index 6906383438..d23c1e063d 100644
--- a/acceptance/bundle/resources/pipelines/num-workers-zero/script
+++ b/acceptance/bundle/resources/pipelines/num-workers-zero/script
@@ -1,3 +1,3 @@
 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
+trace errcode jq -s '.[] | select(.method == "POST" and (.path | contains("/pipelines")))' out.requests.txt | nostamp > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
 rm out.requests.txt
diff --git a/acceptance/bundle/resources/pipelines/photon-true/out.test.toml b/acceptance/bundle/resources/pipelines/photon-true/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/pipelines/photon-true/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/photon-true/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/photon-true/script b/acceptance/bundle/resources/pipelines/photon-true/script
index 73eba500cd..3fe12431e6 100644
--- a/acceptance/bundle/resources/pipelines/photon-true/script
+++ b/acceptance/bundle/resources/pipelines/photon-true/script
@@ -1,2 +1,2 @@
 trace $CLI bundle deploy
-print_requests.py //api/2.0/pipelines
+print_requests.py --nostamp //api/2.0/pipelines
diff --git a/acceptance/bundle/resources/pipelines/recreate-keys/_script b/acceptance/bundle/resources/pipelines/recreate-keys/_script
index d1cb49b382..45c53d8674 100644
--- a/acceptance/bundle/resources/pipelines/recreate-keys/_script
+++ b/acceptance/bundle/resources/pipelines/recreate-keys/_script
@@ -2,13 +2,15 @@ trace cat databricks.yml
 touch foo.py
 touch bar.py
 trace $CLI bundle plan  # should show 'create'
-$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
 
 ppid1=`read_id.py my`
 
 print_requests() {
-    jq --sort-keys 'select(.method != "GET" and (.path | contains("/pipelines")))' < out.requests.txt
+    # Excludes /api/2.0/bundle: a DMS operation path embeds the resource key, so it also
+    # contains "/pipelines".
+    jq --sort-keys 'select(.method != "GET" and (.path | contains("/pipelines")) and (.path | contains("/api/2.0/bundle") | not))' < out.requests.txt | nostamp
     rm -f out.requests.txt
 }
 
@@ -16,14 +18,14 @@ trace print_requests
 
 trace update_file.py databricks.yml $CONFIG_UPDATE
 trace $CLI bundle plan  # should show 'recreate'
-$CLI bundle plan -o json > out.plan_recreate.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_recreate.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy --auto-approve
 trace print_requests
 
 title "Fetch pipeline ID and verify remote state"
 
 ppid2=`read_id.py my`
-trace $CLI pipelines get $ppid2
+trace $CLI pipelines get $ppid2 | nostamp
 
 title "Verify that original pipeline is gone"
 trace musterr $CLI pipelines get $ppid1
diff --git a/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.test.toml b/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/out.test.toml b/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/recreate/out.test.toml b/acceptance/bundle/resources/pipelines/recreate/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/pipelines/recreate/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/recreate/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/recreate/script b/acceptance/bundle/resources/pipelines/recreate/script
index 08423e1d32..0a814d0898 100644
--- a/acceptance/bundle/resources/pipelines/recreate/script
+++ b/acceptance/bundle/resources/pipelines/recreate/script
@@ -8,8 +8,8 @@ trap cleanup EXIT
 trace $CLI bundle deploy
 
 title "Assert the pipeline is created with catalog"
-PIPELINE_ID=$($CLI bundle summary -o json | jq -r '.resources.pipelines.foo.id')
-trace $CLI pipelines get "${PIPELINE_ID}" | jq "{spec}"
+PIPELINE_ID=$($CLI bundle summary -o json | nostamp | jq -r '.resources.pipelines.foo.id')
+trace $CLI pipelines get "${PIPELINE_ID}" | nostamp| jq "{spec}"
 
 # Note: In Terraform provider v1.98.0+, changing catalog no longer triggers recreation.
 # We switch to using storage location instead, which still triggers recreation.
diff --git a/acceptance/bundle/resources/pipelines/remote_matches_config/out.test.toml b/acceptance/bundle/resources/pipelines/remote_matches_config/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/pipelines/remote_matches_config/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/remote_matches_config/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/remote_matches_config/script b/acceptance/bundle/resources/pipelines/remote_matches_config/script
index 5b9c37402c..6a6a334022 100644
--- a/acceptance/bundle/resources/pipelines/remote_matches_config/script
+++ b/acceptance/bundle/resources/pipelines/remote_matches_config/script
@@ -15,6 +15,6 @@ r["run_as"] = {"user_name": "changed@example.test"}
 EOF
 
 trace $CLI bundle plan
-$CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
 rm out.requests.txt
diff --git a/acceptance/bundle/resources/pipelines/update/out.test.toml b/acceptance/bundle/resources/pipelines/update/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/pipelines/update/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/update/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/update/script b/acceptance/bundle/resources/pipelines/update/script
index 255dea2e00..d9eb259cbb 100644
--- a/acceptance/bundle/resources/pipelines/update/script
+++ b/acceptance/bundle/resources/pipelines/update/script
@@ -4,7 +4,7 @@ touch bar.py
 trace $CLI bundle deploy
 
 print_requests() {
-    print_requests.py //pipelines
+    print_requests.py //pipelines --nostamp
     read_state.py pipelines my id name
 }
 
@@ -21,7 +21,7 @@ rm out.requests.txt
 title "Fetch pipeline ID and verify remote state"
 
 ppid=`read_id.py my`
-trace $CLI pipelines get $ppid
+trace $CLI pipelines get $ppid | nostamp
 rm out.requests.txt
 
 title "Destroy the pipeline and verify that it's removed from the state and from remote"
diff --git a/acceptance/bundle/resources/pipelines/zero-value-fields/out.test.toml b/acceptance/bundle/resources/pipelines/zero-value-fields/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/pipelines/zero-value-fields/out.test.toml
+++ b/acceptance/bundle/resources/pipelines/zero-value-fields/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/pipelines/zero-value-fields/script b/acceptance/bundle/resources/pipelines/zero-value-fields/script
index 06f64fc53f..ef7e886ea0 100644
--- a/acceptance/bundle/resources/pipelines/zero-value-fields/script
+++ b/acceptance/bundle/resources/pipelines/zero-value-fields/script
@@ -1,5 +1,5 @@
 trace $CLI bundle deploy
-print_requests.py //api/2.0/pipelines > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
+print_requests.py --nostamp //api/2.0/pipelines > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
 
 if [ -f .databricks/bundle/default/terraform/bundle.tf.json ]; then
   jq .resource.databricks_pipeline .databricks/bundle/default/terraform/bundle.tf.json > out.tf.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/postgres_branches/basic/out.test.toml b/acceptance/bundle/resources/postgres_branches/basic/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_branches/basic/out.test.toml
+++ b/acceptance/bundle/resources/postgres_branches/basic/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.test.toml b/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.test.toml
+++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.test.toml b/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.test.toml
index 1314e661c2..7ad46517ec 100644
--- a/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.test.toml
+++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_branches/recreate/out.test.toml b/acceptance/bundle/resources/postgres_branches/recreate/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_branches/recreate/out.test.toml
+++ b/acceptance/bundle/resources/postgres_branches/recreate/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_branches/replace_existing/out.test.toml b/acceptance/bundle/resources/postgres_branches/replace_existing/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_branches/replace_existing/out.test.toml
+++ b/acceptance/bundle/resources/postgres_branches/replace_existing/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_branches/update_protected/out.test.toml b/acceptance/bundle/resources/postgres_branches/update_protected/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_branches/update_protected/out.test.toml
+++ b/acceptance/bundle/resources/postgres_branches/update_protected/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_branches/update_protected/script b/acceptance/bundle/resources/postgres_branches/update_protected/script
index 28d21b69ec..1566c88583 100755
--- a/acceptance/bundle/resources/postgres_branches/update_protected/script
+++ b/acceptance/bundle/resources/postgres_branches/update_protected/script
@@ -15,7 +15,7 @@ print_requests() {
 title "Initial deployment"
 trace $CLI bundle validate
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_branches.dev_branch" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_branches.dev_branch" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -28,7 +28,7 @@ trace $CLI postgres get-branch "${branch_name}" | branch_fields
 
 title "Verify no_change (no changes)"
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '(.plan."resources.postgres_branches.dev_branch" // .) | del(.remote_state.status.logical_size_bytes)' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '(.plan."resources.postgres_branches.dev_branch" // .) | del(.remote_state.status.logical_size_bytes)' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -39,7 +39,7 @@ trace update_file.py databricks.yml "is_protected: false" "is_protected: true"
 trace cat databricks.yml
 
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '(.plan."resources.postgres_branches.dev_branch" // .) | del(.remote_state.status.logical_size_bytes)' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '(.plan."resources.postgres_branches.dev_branch" // .) | del(.remote_state.status.logical_size_bytes)' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -51,7 +51,7 @@ trace $CLI postgres get-branch "${branch_name}" | branch_fields
 title "Restore is_protected to false"
 trace update_file.py databricks.yml "is_protected: true" "is_protected: false"
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '(.plan."resources.postgres_branches.dev_branch" // .) | del(.remote_state.status.logical_size_bytes)' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '(.plan."resources.postgres_branches.dev_branch" // .) | del(.remote_state.status.logical_size_bytes)' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
diff --git a/acceptance/bundle/resources/postgres_branches/without_branch_id/out.test.toml b/acceptance/bundle/resources/postgres_branches/without_branch_id/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_branches/without_branch_id/out.test.toml
+++ b/acceptance/bundle/resources/postgres_branches/without_branch_id/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_catalogs/basic/out.test.toml b/acceptance/bundle/resources/postgres_catalogs/basic/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_catalogs/basic/out.test.toml
+++ b/acceptance/bundle/resources/postgres_catalogs/basic/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_catalogs/recreate/out.test.toml b/acceptance/bundle/resources/postgres_catalogs/recreate/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_catalogs/recreate/out.test.toml
+++ b/acceptance/bundle/resources/postgres_catalogs/recreate/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_databases/basic/out.test.toml b/acceptance/bundle/resources/postgres_databases/basic/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_databases/basic/out.test.toml
+++ b/acceptance/bundle/resources/postgres_databases/basic/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/out.test.toml b/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/out.test.toml
index 1314e661c2..7ad46517ec 100644
--- a/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/out.test.toml
+++ b/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/out.test.toml b/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/out.test.toml
index 1314e661c2..7ad46517ec 100644
--- a/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/out.test.toml
+++ b/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_databases/recreate/out.test.toml b/acceptance/bundle/resources/postgres_databases/recreate/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_databases/recreate/out.test.toml
+++ b/acceptance/bundle/resources/postgres_databases/recreate/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_databases/replace_existing/out.test.toml b/acceptance/bundle/resources/postgres_databases/replace_existing/out.test.toml
index c4a214dd3d..94f9aa0931 100644
--- a/acceptance/bundle/resources/postgres_databases/replace_existing/out.test.toml
+++ b/acceptance/bundle/resources/postgres_databases/replace_existing/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/postgres_databases/replace_existing/test.toml b/acceptance/bundle/resources/postgres_databases/replace_existing/test.toml
new file mode 100644
index 0000000000..f77da87a11
--- /dev/null
+++ b/acceptance/bundle/resources/postgres_databases/replace_existing/test.toml
@@ -0,0 +1,3 @@
+# `bundle unbind` does not yet drop the resource from what the deployment metadata service
+# reports, so the plan after the unbind still sees the database as tracked.
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/postgres_databases/update/out.test.toml b/acceptance/bundle/resources/postgres_databases/update/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_databases/update/out.test.toml
+++ b/acceptance/bundle/resources/postgres_databases/update/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_databases/update/script b/acceptance/bundle/resources/postgres_databases/update/script
index e23fea3bba..bdbad2b67c 100644
--- a/acceptance/bundle/resources/postgres_databases/update/script
+++ b/acceptance/bundle/resources/postgres_databases/update/script
@@ -15,7 +15,7 @@ print_requests() {
 title "Initial deployment"
 trace $CLI bundle validate
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -29,7 +29,7 @@ trace $CLI postgres get-database "${database_name}" | database_fields
 
 title "Verify no changes"
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -40,7 +40,7 @@ trace update_file.py databricks.yml "postgres_database: initial_db_name" "postgr
 trace cat databricks.yml
 
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -52,7 +52,7 @@ trace $CLI postgres get-database "${database_name}" | database_fields
 title "Restore postgres_database to original value"
 trace update_file.py databricks.yml "postgres_database: renamed_db_name" "postgres_database: initial_db_name"
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
diff --git a/acceptance/bundle/resources/postgres_endpoints/basic/out.test.toml b/acceptance/bundle/resources/postgres_endpoints/basic/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_endpoints/basic/out.test.toml
+++ b/acceptance/bundle/resources/postgres_endpoints/basic/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_endpoints/recreate/out.test.toml b/acceptance/bundle/resources/postgres_endpoints/recreate/out.test.toml
index 1314e661c2..7ad46517ec 100644
--- a/acceptance/bundle/resources/postgres_endpoints/recreate/out.test.toml
+++ b/acceptance/bundle/resources/postgres_endpoints/recreate/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.test.toml b/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.test.toml
+++ b/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/out.test.toml b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/out.test.toml
+++ b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script
index 1df081df0a..f2506c21a0 100755
--- a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script
+++ b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script
@@ -15,7 +15,7 @@ print_requests() {
 title "Initial deployment"
 trace $CLI bundle validate
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -29,7 +29,7 @@ trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields
 
 title "Verify no changes"
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -40,7 +40,7 @@ trace update_file.py databricks.yml "autoscaling_limit_max_cu: 8" "autoscaling_l
 trace cat databricks.yml
 
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -52,7 +52,7 @@ trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields
 title "Restore endpoint autoscaling to original value"
 trace update_file.py databricks.yml "autoscaling_limit_max_cu: 4" "autoscaling_limit_max_cu: 8"
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
diff --git a/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/out.test.toml b/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/out.test.toml
+++ b/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.test.toml b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.test.toml
+++ b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_projects/basic/out.test.toml b/acceptance/bundle/resources/postgres_projects/basic/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_projects/basic/out.test.toml
+++ b/acceptance/bundle/resources/postgres_projects/basic/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.test.toml b/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.test.toml
+++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.test.toml b/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.test.toml
index 1314e661c2..7ad46517ec 100644
--- a/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.test.toml
+++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_projects/recreate/out.test.toml b/acceptance/bundle/resources/postgres_projects/recreate/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_projects/recreate/out.test.toml
+++ b/acceptance/bundle/resources/postgres_projects/recreate/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.test.toml b/acceptance/bundle/resources/postgres_projects/update_display_name/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.test.toml
+++ b/acceptance/bundle/resources/postgres_projects/update_display_name/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/script b/acceptance/bundle/resources/postgres_projects/update_display_name/script
index 5c6ac02445..657eca2186 100755
--- a/acceptance/bundle/resources/postgres_projects/update_display_name/script
+++ b/acceptance/bundle/resources/postgres_projects/update_display_name/script
@@ -15,7 +15,7 @@ print_requests() {
 title "Initial deployment"
 trace $CLI bundle validate
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -27,7 +27,7 @@ trace $CLI postgres get-project "${project_name}" | project_fields
 
 title "Verify no changes"
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -38,7 +38,7 @@ trace update_file.py databricks.yml "Original Name" "Updated Name"
 trace cat databricks.yml
 
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -50,7 +50,7 @@ trace $CLI postgres get-project "${project_name}" | project_fields
 title "Restore display_name to original value"
 trace update_file.py databricks.yml "Updated Name" "Original Name"
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
diff --git a/acceptance/bundle/resources/postgres_projects/without_project_id/out.test.toml b/acceptance/bundle/resources/postgres_projects/without_project_id/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_projects/without_project_id/out.test.toml
+++ b/acceptance/bundle/resources/postgres_projects/without_project_id/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_roles/basic/out.test.toml b/acceptance/bundle/resources/postgres_roles/basic/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_roles/basic/out.test.toml
+++ b/acceptance/bundle/resources/postgres_roles/basic/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_roles/inherited-role-bind/out.test.toml b/acceptance/bundle/resources/postgres_roles/inherited-role-bind/out.test.toml
index 1269a1c579..ce8be6534d 100644
--- a/acceptance/bundle/resources/postgres_roles/inherited-role-bind/out.test.toml
+++ b/acceptance/bundle/resources/postgres_roles/inherited-role-bind/out.test.toml
@@ -2,3 +2,4 @@ Cloud = false
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/out.test.toml b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/out.test.toml
index 1269a1c579..26f5e3debd 100644
--- a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/out.test.toml
+++ b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/out.test.toml
@@ -2,3 +2,4 @@ Cloud = false
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/test.toml b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/test.toml
index cc495d1205..5bfbe6698e 100644
--- a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/test.toml
+++ b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/test.toml
@@ -8,3 +8,4 @@ EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
 
 # `bundle unbind` does not yet drop the resource from what the deployment metadata service
 # reports, so the role staged above still looks tracked.
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/out.test.toml b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/out.test.toml
index 1314e661c2..7ad46517ec 100644
--- a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/out.test.toml
+++ b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_roles/recreate/out.test.toml b/acceptance/bundle/resources/postgres_roles/recreate/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_roles/recreate/out.test.toml
+++ b/acceptance/bundle/resources/postgres_roles/recreate/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_roles/replace_existing/out.test.toml b/acceptance/bundle/resources/postgres_roles/replace_existing/out.test.toml
index c4a214dd3d..94f9aa0931 100644
--- a/acceptance/bundle/resources/postgres_roles/replace_existing/out.test.toml
+++ b/acceptance/bundle/resources/postgres_roles/replace_existing/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/postgres_roles/replace_existing/test.toml b/acceptance/bundle/resources/postgres_roles/replace_existing/test.toml
new file mode 100644
index 0000000000..ca4bbbef12
--- /dev/null
+++ b/acceptance/bundle/resources/postgres_roles/replace_existing/test.toml
@@ -0,0 +1,3 @@
+# `bundle unbind` does not yet drop the resource from what the deployment metadata service
+# reports, so the plan after the unbind still sees the role as tracked.
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/resources/postgres_roles/update/out.test.toml b/acceptance/bundle/resources/postgres_roles/update/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_roles/update/out.test.toml
+++ b/acceptance/bundle/resources/postgres_roles/update/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_roles/update/script b/acceptance/bundle/resources/postgres_roles/update/script
index 6c727a3453..5eea84136a 100644
--- a/acceptance/bundle/resources/postgres_roles/update/script
+++ b/acceptance/bundle/resources/postgres_roles/update/script
@@ -15,7 +15,7 @@ print_requests() {
 title "Initial deployment"
 trace $CLI bundle validate
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -28,7 +28,7 @@ trace $CLI postgres get-role "${role_name}" | role_fields
 
 title "Verify no changes"
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -39,7 +39,7 @@ trace update_file.py databricks.yml "createdb: false" "createdb: true"
 trace cat databricks.yml
 
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
@@ -50,7 +50,7 @@ trace $CLI postgres get-role "${role_name}" | role_fields
 title "Restore attributes.createdb to original value"
 trace update_file.py databricks.yml "createdb: true" "createdb: false"
 trace $CLI bundle plan
-trace $CLI bundle plan -o json | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
 rm -f out.requests.txt
 trace $CLI bundle deploy
 
diff --git a/acceptance/bundle/resources/postgres_synced_tables/basic/out.test.toml b/acceptance/bundle/resources/postgres_synced_tables/basic/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_synced_tables/basic/out.test.toml
+++ b/acceptance/bundle/resources/postgres_synced_tables/basic/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/postgres_synced_tables/recreate/out.test.toml b/acceptance/bundle/resources/postgres_synced_tables/recreate/out.test.toml
index c4a214dd3d..9c8db837a9 100644
--- a/acceptance/bundle/resources/postgres_synced_tables/recreate/out.test.toml
+++ b/acceptance/bundle/resources/postgres_synced_tables/recreate/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.test.toml b/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.test.toml
+++ b/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/out.test.toml b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/out.test.toml
+++ b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/quality_monitors/change_table_name/out.test.toml b/acceptance/bundle/resources/quality_monitors/change_table_name/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/quality_monitors/change_table_name/out.test.toml
+++ b/acceptance/bundle/resources/quality_monitors/change_table_name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/quality_monitors/create/out.test.toml b/acceptance/bundle/resources/quality_monitors/create/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/quality_monitors/create/out.test.toml
+++ b/acceptance/bundle/resources/quality_monitors/create/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/registered_models/aliases_converge/out.test.toml b/acceptance/bundle/resources/registered_models/aliases_converge/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/registered_models/aliases_converge/out.test.toml
+++ b/acceptance/bundle/resources/registered_models/aliases_converge/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/registered_models/basic/out.test.toml b/acceptance/bundle/resources/registered_models/basic/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/registered_models/basic/out.test.toml
+++ b/acceptance/bundle/resources/registered_models/basic/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/registered_models/basic/script b/acceptance/bundle/resources/registered_models/basic/script
index 42313057e0..61dff74182 100644
--- a/acceptance/bundle/resources/registered_models/basic/script
+++ b/acceptance/bundle/resources/registered_models/basic/script
@@ -20,7 +20,7 @@ trap cleanup EXIT
 deploy_registered_model() {
     trace $CLI bundle plan
     trace $CLI bundle deploy
-    registered_model_id=$($CLI bundle summary --output json | jq -r '.resources.registered_models.my_registered_model.id')
+    registered_model_id=$($CLI bundle summary --output json | nostamp | jq -r '.resources.registered_models.my_registered_model.id')
     trace $CLI registered-models get "${registered_model_id}" | jq '{name, comment, catalog_name, schema_name}'
 }
 
diff --git a/acceptance/bundle/resources/registered_models/comment_cleared/out.test.toml b/acceptance/bundle/resources/registered_models/comment_cleared/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/registered_models/comment_cleared/out.test.toml
+++ b/acceptance/bundle/resources/registered_models/comment_cleared/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/registered_models/drift/browse_only/out.test.toml b/acceptance/bundle/resources/registered_models/drift/browse_only/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/registered_models/drift/browse_only/out.test.toml
+++ b/acceptance/bundle/resources/registered_models/drift/browse_only/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/schemas/auto-approve/out.test.toml b/acceptance/bundle/resources/schemas/auto-approve/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/schemas/auto-approve/out.test.toml
+++ b/acceptance/bundle/resources/schemas/auto-approve/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/schemas/auto-approve/script b/acceptance/bundle/resources/schemas/auto-approve/script
index 9ea9f4fc41..f2f2b6cbad 100644
--- a/acceptance/bundle/resources/schemas/auto-approve/script
+++ b/acceptance/bundle/resources/schemas/auto-approve/script
@@ -20,8 +20,8 @@ title "Assert the schema is created"
 trace $CLI schemas get "${CATALOG_NAME}.${SCHEMA_NAME}" | jq "{full_name, comment}"
 
 title "Assert the pipeline is created and uses the schema"
-PIPELINE_ID=$($CLI bundle summary -o json | jq -r '.resources.pipelines.foo.id')
-trace $CLI pipelines get "${PIPELINE_ID}" | jq "{spec}"
+PIPELINE_ID=$($CLI bundle summary -o json | nostamp | jq -r '.resources.pipelines.foo.id')
+trace $CLI pipelines get "${PIPELINE_ID}" | nostamp| jq "{spec}"
 
 title "Create a volume in the schema, and add a file to it. This ensures that the
      schema has some data in it and deletion will fail unless the generated
diff --git a/acceptance/bundle/resources/schemas/comment_out_of_band/out.test.toml b/acceptance/bundle/resources/schemas/comment_out_of_band/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/schemas/comment_out_of_band/out.test.toml
+++ b/acceptance/bundle/resources/schemas/comment_out_of_band/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/schemas/drift/managed_properties/out.test.toml b/acceptance/bundle/resources/schemas/drift/managed_properties/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/schemas/drift/managed_properties/out.test.toml
+++ b/acceptance/bundle/resources/schemas/drift/managed_properties/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/schemas/recreate/out.test.toml b/acceptance/bundle/resources/schemas/recreate/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/schemas/recreate/out.test.toml
+++ b/acceptance/bundle/resources/schemas/recreate/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/schemas/update/out.test.toml b/acceptance/bundle/resources/schemas/update/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/schemas/update/out.test.toml
+++ b/acceptance/bundle/resources/schemas/update/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/secret_scopes/backend-type/out.test.toml b/acceptance/bundle/resources/secret_scopes/backend-type/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/secret_scopes/backend-type/out.test.toml
+++ b/acceptance/bundle/resources/secret_scopes/backend-type/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/secret_scopes/basic/out.test.toml b/acceptance/bundle/resources/secret_scopes/basic/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/secret_scopes/basic/out.test.toml
+++ b/acceptance/bundle/resources/secret_scopes/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/secret_scopes/delete_scope/out.test.toml b/acceptance/bundle/resources/secret_scopes/delete_scope/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/secret_scopes/delete_scope/out.test.toml
+++ b/acceptance/bundle/resources/secret_scopes/delete_scope/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/secret_scopes/permissions-collapse/out.test.toml b/acceptance/bundle/resources/secret_scopes/permissions-collapse/out.test.toml
index f9d412341d..3f27baf73d 100644
--- a/acceptance/bundle/resources/secret_scopes/permissions-collapse/out.test.toml
+++ b/acceptance/bundle/resources/secret_scopes/permissions-collapse/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 RunsOnDbr = true
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/secret_scopes/permissions/out.test.toml b/acceptance/bundle/resources/secret_scopes/permissions/out.test.toml
index 5110985527..a560ff5a08 100644
--- a/acceptance/bundle/resources/secret_scopes/permissions/out.test.toml
+++ b/acceptance/bundle/resources/secret_scopes/permissions/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 RunsOnDbr = true
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/secrets/basic/out.test.toml b/acceptance/bundle/resources/secrets/basic/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/secrets/basic/out.test.toml
+++ b/acceptance/bundle/resources/secrets/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/secrets/direct-only/out.test.toml b/acceptance/bundle/resources/secrets/direct-only/out.test.toml
index d2059b4b5d..5d0f3e4aac 100644
--- a/acceptance/bundle/resources/secrets/direct-only/out.test.toml
+++ b/acceptance/bundle/resources/secrets/direct-only/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/secrets/update-value/out.test.toml b/acceptance/bundle/resources/secrets/update-value/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/secrets/update-value/out.test.toml
+++ b/acceptance/bundle/resources/secrets/update-value/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/secrets/validate-no-plain-text-default/out.test.toml b/acceptance/bundle/resources/secrets/validate-no-plain-text-default/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/secrets/validate-no-plain-text-default/out.test.toml
+++ b/acceptance/bundle/resources/secrets/validate-no-plain-text-default/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/secrets/validate-no-plain-text/out.test.toml b/acceptance/bundle/resources/secrets/validate-no-plain-text/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/secrets/validate-no-plain-text/out.test.toml
+++ b/acceptance/bundle/resources/secrets/validate-no-plain-text/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/secrets/validate-secret-is-string/out.test.toml b/acceptance/bundle/resources/secrets/validate-secret-is-string/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/secrets/validate-secret-is-string/out.test.toml
+++ b/acceptance/bundle/resources/secrets/validate-secret-is-string/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/out.test.toml b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/out.test.toml
index 33b0e8c26b..f9f4880725 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/out.test.toml
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/out.test.toml b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/out.test.toml
index 965ebcea17..c5c084b944 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/out.test.toml
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-terraform-error/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 CloudSlow = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/out.test.toml b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/out.test.toml
index af93b7a5a6..803afc4b4a 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/out.test.toml
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 CloudSlow = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/out.test.toml b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/out.test.toml
index af93b7a5a6..803afc4b4a 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/out.test.toml
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 CloudSlow = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/sql_warehouses/out.test.toml b/acceptance/bundle/resources/sql_warehouses/out.test.toml
index d404ab0ef7..4f0550c97b 100644
--- a/acceptance/bundle/resources/sql_warehouses/out.test.toml
+++ b/acceptance/bundle/resources/sql_warehouses/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 CloudSlow = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/synced_database_tables/basic/out.test.toml b/acceptance/bundle/resources/synced_database_tables/basic/out.test.toml
index 3b4a34a8ba..3247a9b207 100644
--- a/acceptance/bundle/resources/synced_database_tables/basic/out.test.toml
+++ b/acceptance/bundle/resources/synced_database_tables/basic/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 RunsOnDbr = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/synced_database_tables/recreate/out.test.toml b/acceptance/bundle/resources/synced_database_tables/recreate/out.test.toml
index ca7b6f28c3..bfeb0bd3ae 100644
--- a/acceptance/bundle/resources/synced_database_tables/recreate/out.test.toml
+++ b/acceptance/bundle/resources/synced_database_tables/recreate/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_endpoints/basic/out.test.toml b/acceptance/bundle/resources/vector_search_endpoints/basic/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/basic/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_endpoints/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/out.test.toml b/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/out.test.toml b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/out.test.toml b/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/out.test.toml b/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/out.test.toml b/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/out.test.toml b/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/out.test.toml b/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_indexes/basic/out.test.toml b/acceptance/bundle/resources/vector_search_indexes/basic/out.test.toml
index 589a95872b..9da8f3609b 100644
--- a/acceptance/bundle/resources/vector_search_indexes/basic/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_indexes/basic/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/out.test.toml b/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/out.test.toml
index c454e23286..77fd9b3b82 100644
--- a/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/out.test.toml b/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/out.test.toml
index c454e23286..77fd9b3b82 100644
--- a/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_indexes/grants/select/out.test.toml b/acceptance/bundle/resources/vector_search_indexes/grants/select/out.test.toml
index 589a95872b..9da8f3609b 100644
--- a/acceptance/bundle/resources/vector_search_indexes/grants/select/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_indexes/grants/select/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/out.test.toml b/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/out.test.toml
index 33b0e8c26b..f9f4880725 100644
--- a/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/out.test.toml b/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/out.test.toml
index c454e23286..77fd9b3b82 100644
--- a/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/out.test.toml b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/out.test.toml
index c454e23286..77fd9b3b82 100644
--- a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/vector_search_indexes/schema_normalization/out.test.toml b/acceptance/bundle/resources/vector_search_indexes/schema_normalization/out.test.toml
index 589a95872b..9da8f3609b 100644
--- a/acceptance/bundle/resources/vector_search_indexes/schema_normalization/out.test.toml
+++ b/acceptance/bundle/resources/vector_search_indexes/schema_normalization/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/catalog-var-ref/out.test.toml b/acceptance/bundle/resources/volumes/catalog-var-ref/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/resources/volumes/catalog-var-ref/out.test.toml
+++ b/acceptance/bundle/resources/volumes/catalog-var-ref/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/change-comment/out.test.toml b/acceptance/bundle/resources/volumes/change-comment/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/volumes/change-comment/out.test.toml
+++ b/acceptance/bundle/resources/volumes/change-comment/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/change-name/out.test.toml b/acceptance/bundle/resources/volumes/change-name/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/volumes/change-name/out.test.toml
+++ b/acceptance/bundle/resources/volumes/change-name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/change-name/script b/acceptance/bundle/resources/volumes/change-name/script
index ba4d63c403..396ffb1515 100644
--- a/acceptance/bundle/resources/volumes/change-name/script
+++ b/acceptance/bundle/resources/volumes/change-name/script
@@ -10,7 +10,7 @@ trace update_file.py databricks.yml myvolume mynewvolume
 
 trace $CLI bundle plan
 # terraform marks this as "update", direct marks this as "update_with_id"
-$CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
 trace print_requests.py //unity
 
diff --git a/acceptance/bundle/resources/volumes/change-schema-name/out.test.toml b/acceptance/bundle/resources/volumes/change-schema-name/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/volumes/change-schema-name/out.test.toml
+++ b/acceptance/bundle/resources/volumes/change-schema-name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/comment_out_of_band/out.test.toml b/acceptance/bundle/resources/volumes/comment_out_of_band/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/volumes/comment_out_of_band/out.test.toml
+++ b/acceptance/bundle/resources/volumes/comment_out_of_band/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/comment_with_rename/out.test.toml b/acceptance/bundle/resources/volumes/comment_with_rename/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/resources/volumes/comment_with_rename/out.test.toml
+++ b/acceptance/bundle/resources/volumes/comment_with_rename/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/recreate/out.test.toml b/acceptance/bundle/resources/volumes/recreate/out.test.toml
index e21011b8e0..aad5ccf549 100644
--- a/acceptance/bundle/resources/volumes/recreate/out.test.toml
+++ b/acceptance/bundle/resources/volumes/recreate/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 RunsOnDbr = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/remote-change-name/out.test.toml b/acceptance/bundle/resources/volumes/remote-change-name/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/volumes/remote-change-name/out.test.toml
+++ b/acceptance/bundle/resources/volumes/remote-change-name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/remote-change-name/script b/acceptance/bundle/resources/volumes/remote-change-name/script
index 2485737fdf..536ad6d50b 100644
--- a/acceptance/bundle/resources/volumes/remote-change-name/script
+++ b/acceptance/bundle/resources/volumes/remote-change-name/script
@@ -1,4 +1,4 @@
-$CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
+$CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
 
 trace $CLI volumes update mycatalog.myschema.myname --json '{"new_name": "my_new_name"}'
diff --git a/acceptance/bundle/resources/volumes/remote-delete/out.test.toml b/acceptance/bundle/resources/volumes/remote-delete/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/volumes/remote-delete/out.test.toml
+++ b/acceptance/bundle/resources/volumes/remote-delete/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/set-storage-location/out.test.toml b/acceptance/bundle/resources/volumes/set-storage-location/out.test.toml
index ee228cfcd7..b09d680c0e 100644
--- a/acceptance/bundle/resources/volumes/set-storage-location/out.test.toml
+++ b/acceptance/bundle/resources/volumes/set-storage-location/out.test.toml
@@ -2,3 +2,4 @@ Cloud = true
 CloudEnvs.azure = false
 CloudEnvs.gcp = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/set-volume-path/out.test.toml b/acceptance/bundle/resources/volumes/set-volume-path/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/resources/volumes/set-volume-path/out.test.toml
+++ b/acceptance/bundle/resources/volumes/set-volume-path/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/resources/volumes/uppercase-name/out.test.toml b/acceptance/bundle/resources/volumes/uppercase-name/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/resources/volumes/uppercase-name/out.test.toml
+++ b/acceptance/bundle/resources/volumes/uppercase-name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/root/env-not-a-directory/out.test.toml b/acceptance/bundle/root/env-not-a-directory/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/root/env-not-a-directory/out.test.toml
+++ b/acceptance/bundle/root/env-not-a-directory/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/root/env-not-found/out.test.toml b/acceptance/bundle/root/env-not-found/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/root/env-not-found/out.test.toml
+++ b/acceptance/bundle/root/env-not-found/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/root/not-found/out.test.toml b/acceptance/bundle/root/not-found/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/root/not-found/out.test.toml
+++ b/acceptance/bundle/root/not-found/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/root/real-empty-dir/out.test.toml b/acceptance/bundle/root/real-empty-dir/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/root/real-empty-dir/out.test.toml
+++ b/acceptance/bundle/root/real-empty-dir/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/app-with-job/out.test.toml b/acceptance/bundle/run/app-with-job/out.test.toml
index 5104aa4a4f..2fbe66e8d0 100644
--- a/acceptance/bundle/run/app-with-job/out.test.toml
+++ b/acceptance/bundle/run/app-with-job/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 CloudSlow = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/basic/out.test.toml b/acceptance/bundle/run/basic/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/basic/out.test.toml
+++ b/acceptance/bundle/run/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/diagnostics/out.test.toml b/acceptance/bundle/run/diagnostics/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/diagnostics/out.test.toml
+++ b/acceptance/bundle/run/diagnostics/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/inline-script/basic/out.test.toml b/acceptance/bundle/run/inline-script/basic/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/inline-script/basic/out.test.toml
+++ b/acceptance/bundle/run/inline-script/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/inline-script/cwd/out.test.toml b/acceptance/bundle/run/inline-script/cwd/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/inline-script/cwd/out.test.toml
+++ b/acceptance/bundle/run/inline-script/cwd/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/out.test.toml b/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/out.test.toml
+++ b/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/out.test.toml b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/out.test.toml
+++ b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/out.test.toml b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/out.test.toml
+++ b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/inline-script/no-auth/out.test.toml b/acceptance/bundle/run/inline-script/no-auth/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/inline-script/no-auth/out.test.toml
+++ b/acceptance/bundle/run/inline-script/no-auth/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/inline-script/no-bundle/out.test.toml b/acceptance/bundle/run/inline-script/no-bundle/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/inline-script/no-bundle/out.test.toml
+++ b/acceptance/bundle/run/inline-script/no-bundle/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/inline-script/no-separator/out.test.toml b/acceptance/bundle/run/inline-script/no-separator/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/inline-script/no-separator/out.test.toml
+++ b/acceptance/bundle/run/inline-script/no-separator/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/jobs/partial_run/out.test.toml b/acceptance/bundle/run/jobs/partial_run/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/jobs/partial_run/out.test.toml
+++ b/acceptance/bundle/run/jobs/partial_run/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/no-state/out.test.toml b/acceptance/bundle/run/no-state/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/no-state/out.test.toml
+++ b/acceptance/bundle/run/no-state/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/refresh-flags/out.test.toml b/acceptance/bundle/run/refresh-flags/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/refresh-flags/out.test.toml
+++ b/acceptance/bundle/run/refresh-flags/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/basic/out.test.toml b/acceptance/bundle/run/scripts/basic/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/basic/out.test.toml
+++ b/acceptance/bundle/run/scripts/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/cwd/out.test.toml b/acceptance/bundle/run/scripts/cwd/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/cwd/out.test.toml
+++ b/acceptance/bundle/run/scripts/cwd/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/out.test.toml b/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/out.test.toml
+++ b/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/out.test.toml b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/out.test.toml
+++ b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/out.test.toml b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/out.test.toml
+++ b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/env-bad-prefix/out.test.toml b/acceptance/bundle/run/scripts/env-bad-prefix/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/env-bad-prefix/out.test.toml
+++ b/acceptance/bundle/run/scripts/env-bad-prefix/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/env-precedence/out.test.toml b/acceptance/bundle/run/scripts/env-precedence/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/env-precedence/out.test.toml
+++ b/acceptance/bundle/run/scripts/env-precedence/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/env-section/out.test.toml b/acceptance/bundle/run/scripts/env-section/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/env-section/out.test.toml
+++ b/acceptance/bundle/run/scripts/env-section/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/exit_code/out.test.toml b/acceptance/bundle/run/scripts/exit_code/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/exit_code/out.test.toml
+++ b/acceptance/bundle/run/scripts/exit_code/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/io/out.test.toml b/acceptance/bundle/run/scripts/io/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/io/out.test.toml
+++ b/acceptance/bundle/run/scripts/io/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/no-auth/out.test.toml b/acceptance/bundle/run/scripts/no-auth/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/no-auth/out.test.toml
+++ b/acceptance/bundle/run/scripts/no-auth/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/no-interpolation/out.test.toml b/acceptance/bundle/run/scripts/no-interpolation/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/no-interpolation/out.test.toml
+++ b/acceptance/bundle/run/scripts/no-interpolation/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/no_content/out.test.toml b/acceptance/bundle/run/scripts/no_content/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/no_content/out.test.toml
+++ b/acceptance/bundle/run/scripts/no_content/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/shell/envvar/out.test.toml b/acceptance/bundle/run/scripts/shell/envvar/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/shell/envvar/out.test.toml
+++ b/acceptance/bundle/run/scripts/shell/envvar/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/shell/math/out.test.toml b/acceptance/bundle/run/scripts/shell/math/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/shell/math/out.test.toml
+++ b/acceptance/bundle/run/scripts/shell/math/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/unique_keys/duplicate_resource_and_script_name_root/out.test.toml b/acceptance/bundle/run/scripts/unique_keys/duplicate_resource_and_script_name_root/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/unique_keys/duplicate_resource_and_script_name_root/out.test.toml
+++ b/acceptance/bundle/run/scripts/unique_keys/duplicate_resource_and_script_name_root/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/unique_keys/duplicate_resource_and_script_subconfigurations/out.test.toml b/acceptance/bundle/run/scripts/unique_keys/duplicate_resource_and_script_subconfigurations/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/unique_keys/duplicate_resource_and_script_subconfigurations/out.test.toml
+++ b/acceptance/bundle/run/scripts/unique_keys/duplicate_resource_and_script_subconfigurations/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/scripts/unique_keys/duplicate_script_names_in_subconfiguration/out.test.toml b/acceptance/bundle/run/scripts/unique_keys/duplicate_script_names_in_subconfiguration/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/scripts/unique_keys/duplicate_script_names_in_subconfiguration/out.test.toml
+++ b/acceptance/bundle/run/scripts/unique_keys/duplicate_script_names_in_subconfiguration/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run/state-wiped/out.test.toml b/acceptance/bundle/run/state-wiped/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run/state-wiped/out.test.toml
+++ b/acceptance/bundle/run/state-wiped/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/allowed/regular_user/out.test.toml b/acceptance/bundle/run_as/allowed/regular_user/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/allowed/regular_user/out.test.toml
+++ b/acceptance/bundle/run_as/allowed/regular_user/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/allowed/service_principal/out.test.toml b/acceptance/bundle/run_as/allowed/service_principal/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/allowed/service_principal/out.test.toml
+++ b/acceptance/bundle/run_as/allowed/service_principal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/dashboard_embed/out.test.toml b/acceptance/bundle/run_as/dashboard_embed/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/dashboard_embed/out.test.toml
+++ b/acceptance/bundle/run_as/dashboard_embed/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/empty_override/out.test.toml b/acceptance/bundle/run_as/empty_override/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/empty_override/out.test.toml
+++ b/acceptance/bundle/run_as/empty_override/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/empty_run_as/out.test.toml b/acceptance/bundle/run_as/empty_run_as/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/empty_run_as/out.test.toml
+++ b/acceptance/bundle/run_as/empty_run_as/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/empty_run_as_dict/out.test.toml b/acceptance/bundle/run_as/empty_run_as_dict/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/empty_run_as_dict/out.test.toml
+++ b/acceptance/bundle/run_as/empty_run_as_dict/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/empty_sp/out.test.toml b/acceptance/bundle/run_as/empty_sp/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/empty_sp/out.test.toml
+++ b/acceptance/bundle/run_as/empty_sp/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/empty_user/out.test.toml b/acceptance/bundle/run_as/empty_user/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/empty_user/out.test.toml
+++ b/acceptance/bundle/run_as/empty_user/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/empty_user_and_sp/out.test.toml b/acceptance/bundle/run_as/empty_user_and_sp/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/empty_user_and_sp/out.test.toml
+++ b/acceptance/bundle/run_as/empty_user_and_sp/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/invalid_both_sp_and_user/out.test.toml b/acceptance/bundle/run_as/invalid_both_sp_and_user/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/invalid_both_sp_and_user/out.test.toml
+++ b/acceptance/bundle/run_as/invalid_both_sp_and_user/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/job_default/out.test.toml b/acceptance/bundle/run_as/job_default/out.test.toml
index c502b28221..ae5c7bd798 100644
--- a/acceptance/bundle/run_as/job_default/out.test.toml
+++ b/acceptance/bundle/run_as/job_default/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/job_default/output.txt b/acceptance/bundle/run_as/job_default/output.txt
index fe5721893b..21613bc205 100644
--- a/acceptance/bundle/run_as/job_default/output.txt
+++ b/acceptance/bundle/run_as/job_default/output.txt
@@ -6,7 +6,7 @@ Created jobs.job_with_run_as
 Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
@@ -58,7 +58,7 @@ Updated jobs.job_with_run_as
 Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
->>> print_requests.py //jobs
+>>> print_requests.py --nostamp //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/reset",
diff --git a/acceptance/bundle/run_as/job_default/script b/acceptance/bundle/run_as/job_default/script
index 3e80f98838..be96b20547 100644
--- a/acceptance/bundle/run_as/job_default/script
+++ b/acceptance/bundle/run_as/job_default/script
@@ -8,7 +8,7 @@ trap cleanup EXIT
 
 title "Deploy with run_as"
 trace $CLI bundle deploy
-trace print_requests.py //jobs | contains.py "!GET" "POST"
+trace print_requests.py --nostamp //jobs | contains.py "!GET" "POST"
 JOB_ID=$($CLI bundle summary -o json | jq -r '.resources.jobs.job_with_run_as.id')
 trace $CLI jobs get $JOB_ID | jq -r '.settings.run_as'
 
@@ -18,5 +18,5 @@ update_file.py databricks.yml "run_as:
 title "Remove run_as and redeploy"
 trace $CLI bundle plan
 trace $CLI bundle deploy
-trace print_requests.py //jobs | contains.py "!GET" "POST"
+trace print_requests.py --nostamp //jobs | contains.py "!GET" "POST"
 trace $CLI jobs get $JOB_ID | jq -r '.settings.run_as'
diff --git a/acceptance/bundle/run_as/model_serving_different/out.test.toml b/acceptance/bundle/run_as/model_serving_different/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/model_serving_different/out.test.toml
+++ b/acceptance/bundle/run_as/model_serving_different/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/model_serving_matching/out.test.toml b/acceptance/bundle/run_as/model_serving_matching/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/model_serving_matching/out.test.toml
+++ b/acceptance/bundle/run_as/model_serving_matching/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/out.test.toml b/acceptance/bundle/run_as/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/out.test.toml
+++ b/acceptance/bundle/run_as/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/pipelines/_script b/acceptance/bundle/run_as/pipelines/_script
index ad875a39a7..293600ded7 100644
--- a/acceptance/bundle/run_as/pipelines/_script
+++ b/acceptance/bundle/run_as/pipelines/_script
@@ -1,5 +1,5 @@
 print_requests() {
-    jq --sort-keys 'select(.method != "GET" and (.path | contains("/pipelines")))' < out.requests.txt
+    jq --sort-keys 'select(.method != "GET" and (.path | contains("/pipelines")) and (.path | contains("/api/2.0/bundle") | not))' < out.requests.txt | nostamp
     rm out.requests.txt
 }
 
@@ -15,7 +15,7 @@ for target in "${targets[@]}"; do
     trace $CLI bundle plan -t $target
 
     # Debug plan
-    $CLI bundle plan -o json -t $target > out.plan_$target.$DATABRICKS_BUNDLE_ENGINE.json
+    $CLI bundle plan -o json -t $target | nostamp > out.plan_$target.$DATABRICKS_BUNDLE_ENGINE.json
 
     # Deploy
     rm -f out.requests.txt
diff --git a/acceptance/bundle/run_as/pipelines/regular_user/out.test.toml b/acceptance/bundle/run_as/pipelines/regular_user/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/pipelines/regular_user/out.test.toml
+++ b/acceptance/bundle/run_as/pipelines/regular_user/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/pipelines/service_principal/out.test.toml b/acceptance/bundle/run_as/pipelines/service_principal/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/pipelines/service_principal/out.test.toml
+++ b/acceptance/bundle/run_as/pipelines/service_principal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/run_as/pipelines_legacy/out.test.toml b/acceptance/bundle/run_as/pipelines_legacy/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/run_as/pipelines_legacy/out.test.toml
+++ b/acceptance/bundle/run_as/pipelines_legacy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/script.prepare b/acceptance/bundle/script.prepare
new file mode 100644
index 0000000000..7d86ce8842
--- /dev/null
+++ b/acceptance/bundle/script.prepare
@@ -0,0 +1,41 @@
+nostamp() {
+    # Reads JSON on stdin, writes it back with the deployment stamp removed.
+    #
+    # Deployment history recording adds deployment_id and version_id to every job and
+    # pipeline. Acceptance tests compare output byte for byte, so those two extra fields
+    # would fail every test in the DATABRICKS_BUNDLE_RECORD_DEPLOYMENT_HISTORY=true run
+    # (see bundle/test.toml).
+    # Pipe a plan, a state dump, or a resource payload through this and the test asserts one
+    # golden file either way. Tests under bundle/dms assert the stamp itself and must not.
+    #
+    # Three passes, because the stamp shows up in three shapes:
+    #
+    #   1. Nested in a deployment block, as printed by `jobs get` / `pipelines get`:
+    #        "deployment": {"deployment_id": "87..", "kind": "BUNDLE",
+    #                       "metadata_file_path": "/x", "version_id": "1"}
+    #      -> both keys dropped, "kind" and "metadata_file_path" kept.
+    #
+    #   2. Flat in a plan's "changes", keyed by field path:
+    #        "changes": {"deployment.version_id": {"action": "skip", ...}, "name": {...}}
+    #      -> the stamp entries dropped, real changes kept.
+    #
+    #   3. A "changes" object that pass 2 emptied to {} - it existed only because of
+    #      recording, so the key goes too.
+    #
+    # Two things it deliberately keeps:
+    #
+    #   - A deployment_id anywhere else. Pass 1 requires "kind" and "metadata_file_path" as
+    #     neighbours, a pair unique to the deployment block, so an unrelated field of the
+    #     same name is untouched.
+    #   - "version_id": "". A terraform state dump carries that for a job it never stamped,
+    #     and it is the test's own expected output, so `.value == ""` keeps it.
+    #
+    # Arguments are passed to jq, for callers whose input is not formatted the way jq
+    # formats by default: a state dump is printed verbatim from disk, so it needs
+    # --indent 1 to come back out unchanged.
+    jq "$@" '((.. | objects | select(has("kind") and has("metadata_file_path")))
+         |= with_entries(select((.key | IN("deployment_id", "version_id")) == false or .value == "")))
+        | ((.. | objects | .changes? | objects)
+           |= with_entries(select(.key | IN("deployment.deployment_id", "deployment.version_id") | not)))
+        | del(.. | objects | select(.changes == {}) | .changes)'
+}
diff --git a/acceptance/bundle/scripts/no-trailing-newline/out.test.toml b/acceptance/bundle/scripts/no-trailing-newline/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/scripts/no-trailing-newline/out.test.toml
+++ b/acceptance/bundle/scripts/no-trailing-newline/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/scripts/out.test.toml b/acceptance/bundle/scripts/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/scripts/out.test.toml
+++ b/acceptance/bundle/scripts/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/scripts/restricted-execution/out.test.toml b/acceptance/bundle/scripts/restricted-execution/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/scripts/restricted-execution/out.test.toml
+++ b/acceptance/bundle/scripts/restricted-execution/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/select/ambiguous/out.test.toml b/acceptance/bundle/select/ambiguous/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/select/ambiguous/out.test.toml
+++ b/acceptance/bundle/select/ambiguous/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/select/basic/out.test.toml b/acceptance/bundle/select/basic/out.test.toml
index 82ab0e6c74..a420f50c42 100644
--- a/acceptance/bundle/select/basic/out.test.toml
+++ b/acceptance/bundle/select/basic/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/select/basic/output.txt b/acceptance/bundle/select/basic/output.txt
index 0d84ac9c56..1cc1dff557 100644
--- a/acceptance/bundle/select/basic/output.txt
+++ b/acceptance/bundle/select/basic/output.txt
@@ -32,7 +32,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged, 1 not selected
 === Telemetry:
 select_used true
 
->>> print_requests.py --sort //jobs
+>>> print_requests.py --nostamp --sort //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
@@ -106,7 +106,7 @@ Created jobs.baz
 Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 2 unchanged
 
->>> print_requests.py --sort //jobs
+>>> print_requests.py --nostamp --sort //jobs
 {
   "method": "POST",
   "path": "/api/2.2/jobs/create",
diff --git a/acceptance/bundle/select/basic/script b/acceptance/bundle/select/basic/script
index 88c61a537b..12db6ca0ba 100644
--- a/acceptance/bundle/select/basic/script
+++ b/acceptance/bundle/select/basic/script
@@ -22,14 +22,14 @@ trace $CLI bundle plan --select jobs.foo
 # JSON embeds remote state that differs between local and cloud), then deploy it:
 # inline, or via --plan (READPLAN=1). The deploy is not traced because readplanarg
 # varies the command line between READPLAN variants, which must produce identical output.
-$CLI bundle plan --select jobs.foo -o json > plan.json
+$CLI bundle plan --select jobs.foo -o json | nostamp > plan.json
 title "bundle deploy --select jobs.foo\n"
 $CLI bundle deploy --select jobs.foo $(readplanarg plan.json)
 # The deploy reports that --select was used via telemetry.
 title "Telemetry:\n"
 print_telemetry_bool_values | grep '^select_used '
 # Only bar and foo were created, never baz.
-trace print_requests.py --sort //jobs
+trace print_requests.py --nostamp --sort //jobs
 # Summary after the partial deploy: foo and bar are deployed, baz is not.
 trace $CLI bundle summary
 
@@ -37,11 +37,11 @@ trace $CLI bundle summary
 # foo and bar are already deployed, so only baz remains to create.
 title "Full plan after partial deploy"
 trace $CLI bundle plan
-$CLI bundle plan -o json > plan-full.json
+$CLI bundle plan -o json | nostamp > plan-full.json
 title "Full deploy\n"
 $CLI bundle deploy $(readplanarg plan-full.json)
 # Only baz is created this time.
-trace print_requests.py --sort //jobs
+trace print_requests.py --nostamp --sort //jobs
 # Everything is deployed now: no changes.
 title "Full plan again"
 trace $CLI bundle plan
diff --git a/acceptance/bundle/select/grants_permissions/out.test.toml b/acceptance/bundle/select/grants_permissions/out.test.toml
index 57b0f61685..dd03baaabb 100644
--- a/acceptance/bundle/select/grants_permissions/out.test.toml
+++ b/acceptance/bundle/select/grants_permissions/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/select/missing/out.test.toml b/acceptance/bundle/select/missing/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/select/missing/out.test.toml
+++ b/acceptance/bundle/select/missing/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/select/plan_file_survives_not_selected/out.test.toml b/acceptance/bundle/select/plan_file_survives_not_selected/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/select/plan_file_survives_not_selected/out.test.toml
+++ b/acceptance/bundle/select/plan_file_survives_not_selected/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/select/rejected/out.test.toml b/acceptance/bundle/select/rejected/out.test.toml
index d2059b4b5d..5d0f3e4aac 100644
--- a/acceptance/bundle/select/rejected/out.test.toml
+++ b/acceptance/bundle/select/rejected/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/bad_env/out.test.toml b/acceptance/bundle/state/bad_env/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/state/bad_env/out.test.toml
+++ b/acceptance/bundle/state/bad_env/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/bad_json_local/out.test.toml b/acceptance/bundle/state/bad_json_local/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/state/bad_json_local/out.test.toml
+++ b/acceptance/bundle/state/bad_json_local/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/basic/out.test.toml b/acceptance/bundle/state/basic/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/state/basic/out.test.toml
+++ b/acceptance/bundle/state/basic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/engine_default/out.test.toml b/acceptance/bundle/state/engine_default/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/state/engine_default/out.test.toml
+++ b/acceptance/bundle/state/engine_default/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/engine_mismatch/out.test.toml b/acceptance/bundle/state/engine_mismatch/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/state/engine_mismatch/out.test.toml
+++ b/acceptance/bundle/state/engine_mismatch/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/feature_flags/out.test.toml b/acceptance/bundle/state/feature_flags/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/state/feature_flags/out.test.toml
+++ b/acceptance/bundle/state/feature_flags/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/force_pull_commands/out.test.toml b/acceptance/bundle/state/force_pull_commands/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/state/force_pull_commands/out.test.toml
+++ b/acceptance/bundle/state/force_pull_commands/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/future_version/out.test.toml b/acceptance/bundle/state/future_version/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/state/future_version/out.test.toml
+++ b/acceptance/bundle/state/future_version/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/lineage_different/out.test.toml b/acceptance/bundle/state/lineage_different/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/state/lineage_different/out.test.toml
+++ b/acceptance/bundle/state/lineage_different/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/newer_cli_version/out.test.toml b/acceptance/bundle/state/newer_cli_version/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/state/newer_cli_version/out.test.toml
+++ b/acceptance/bundle/state/newer_cli_version/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/permission_level_migration/out.test.toml b/acceptance/bundle/state/permission_level_migration/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/state/permission_level_migration/out.test.toml
+++ b/acceptance/bundle/state/permission_level_migration/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/state/permission_level_migration/script b/acceptance/bundle/state/permission_level_migration/script
index c317985fc8..32211ebeb4 100644
--- a/acceptance/bundle/state/permission_level_migration/script
+++ b/acceptance/bundle/state/permission_level_migration/script
@@ -15,4 +15,4 @@ title "Deploy (migrates state)"
 trace $CLI bundle deploy
 
 title "Print state after deploy"
-trace print_state.py
+trace print_state.py | nostamp --indent 1
diff --git a/acceptance/bundle/state/permission_level_migration/test.toml b/acceptance/bundle/state/permission_level_migration/test.toml
index 8cbfebc10f..884ab4cfb2 100644
--- a/acceptance/bundle/state/permission_level_migration/test.toml
+++ b/acceptance/bundle/state/permission_level_migration/test.toml
@@ -1,6 +1,7 @@
 # Recording needs a bundle it has seen from the start. This test seeds a state file,
 # so recording refuses it. TODO(DMS): drop this once existing state can be
 # handed over to the service (see the TODO in dstate.Open).
+EnvMatrix.DMS = [""]
 
 Ignore = [".databricks"]
 
diff --git a/acceptance/bundle/state/same_serial/out.test.toml b/acceptance/bundle/state/same_serial/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/state/same_serial/out.test.toml
+++ b/acceptance/bundle/state/same_serial/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/state/state_present/out.test.toml b/acceptance/bundle/state/state_present/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/state/state_present/out.test.toml
+++ b/acceptance/bundle/state/state_present/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/summary/missing-libraries-file-path/out.test.toml b/acceptance/bundle/summary/missing-libraries-file-path/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/summary/missing-libraries-file-path/out.test.toml
+++ b/acceptance/bundle/summary/missing-libraries-file-path/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/summary/modified_status/out.test.toml b/acceptance/bundle/summary/modified_status/out.test.toml
index 23ab8a6fbc..c2eddd75c2 100644
--- a/acceptance/bundle/summary/modified_status/out.test.toml
+++ b/acceptance/bundle/summary/modified_status/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
 EnvMatrix.VARIANT = ["empty_resources.yml", "no_resources.yml"]
diff --git a/acceptance/bundle/summary/modified_status/script b/acceptance/bundle/summary/modified_status/script
index 4da723c08e..22149b2c76 100644
--- a/acceptance/bundle/summary/modified_status/script
+++ b/acceptance/bundle/summary/modified_status/script
@@ -1,14 +1,14 @@
 title "Initial view of resources without id and modified_status=created"
-trace $CLI bundle summary -o json | jq .resources
+trace $CLI bundle summary -o json | nostamp | jq .resources
 
 trace $CLI bundle deploy
 
 title "Post-deployment view of resources with id and without modified_status"
-trace $CLI bundle summary -o json | jq .resources
+trace $CLI bundle summary -o json | nostamp | jq .resources
 mv $VARIANT databricks.yml
 
 title "Expecting all resources to have modified_status=deleted"
-trace $CLI bundle summary -o json | jq .resources
+trace $CLI bundle summary -o json | nostamp | jq .resources
 
 trace $CLI bundle destroy --auto-approve
-trace $CLI bundle summary -o json | jq .resources
+trace $CLI bundle summary -o json | nostamp | jq .resources
diff --git a/acceptance/bundle/sync/dryrun/out.test.toml b/acceptance/bundle/sync/dryrun/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/sync/dryrun/out.test.toml
+++ b/acceptance/bundle/sync/dryrun/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/sync/out.test.toml b/acceptance/bundle/sync/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/sync/out.test.toml
+++ b/acceptance/bundle/sync/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/syncroot/dotdot-git/out.test.toml b/acceptance/bundle/syncroot/dotdot-git/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/syncroot/dotdot-git/out.test.toml
+++ b/acceptance/bundle/syncroot/dotdot-git/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/syncroot/dotdot-nogit/out.test.toml b/acceptance/bundle/syncroot/dotdot-nogit/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/syncroot/dotdot-nogit/out.test.toml
+++ b/acceptance/bundle/syncroot/dotdot-nogit/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/telemetry/config-remote-sync-error/out.test.toml b/acceptance/bundle/telemetry/config-remote-sync-error/out.test.toml
index 14bca3c36e..500d0290dd 100644
--- a/acceptance/bundle/telemetry/config-remote-sync-error/out.test.toml
+++ b/acceptance/bundle/telemetry/config-remote-sync-error/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/config-remote-sync-recreate/out.test.toml b/acceptance/bundle/telemetry/config-remote-sync-recreate/out.test.toml
index 4cc2d5fdf7..47a2f0c8b4 100644
--- a/acceptance/bundle/telemetry/config-remote-sync-recreate/out.test.toml
+++ b/acceptance/bundle/telemetry/config-remote-sync-recreate/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/config-remote-sync-save/out.test.toml b/acceptance/bundle/telemetry/config-remote-sync-save/out.test.toml
index 4cc2d5fdf7..47a2f0c8b4 100644
--- a/acceptance/bundle/telemetry/config-remote-sync-save/out.test.toml
+++ b/acceptance/bundle/telemetry/config-remote-sync-save/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/config-remote-sync/out.test.toml b/acceptance/bundle/telemetry/config-remote-sync/out.test.toml
index 4cc2d5fdf7..47a2f0c8b4 100644
--- a/acceptance/bundle/telemetry/config-remote-sync/out.test.toml
+++ b/acceptance/bundle/telemetry/config-remote-sync/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 GOOS.windows = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-app-lifecycle-started/out.test.toml b/acceptance/bundle/telemetry/deploy-app-lifecycle-started/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/telemetry/deploy-app-lifecycle-started/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-app-lifecycle-started/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-artifact-path-type/out.test.toml b/acceptance/bundle/telemetry/deploy-artifact-path-type/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-artifact-path-type/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-artifact-path-type/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-artifacts-variables/out.test.toml b/acceptance/bundle/telemetry/deploy-artifacts-variables/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-artifacts-variables/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-artifacts-variables/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-compute-type/out.test.toml b/acceptance/bundle/telemetry/deploy-compute-type/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-compute-type/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-compute-type/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-config-file-count/out.test.toml b/acceptance/bundle/telemetry/deploy-config-file-count/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-config-file-count/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-config-file-count/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-error-message/out.test.toml b/acceptance/bundle/telemetry/deploy-error-message/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-error-message/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-error-message/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-error/out.test.toml b/acceptance/bundle/telemetry/deploy-error/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-error/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-experimental/out.test.toml b/acceptance/bundle/telemetry/deploy-experimental/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-experimental/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-experimental/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-mode/out.test.toml b/acceptance/bundle/telemetry/deploy-mode/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-mode/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-mode/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-name-prefix/custom/out.test.toml b/acceptance/bundle/telemetry/deploy-name-prefix/custom/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-name-prefix/custom/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-name-prefix/custom/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/out.test.toml b/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-no-uuid/out.test.toml b/acceptance/bundle/telemetry/deploy-no-uuid/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-no-uuid/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-no-uuid/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-run-as/out.test.toml b/acceptance/bundle/telemetry/deploy-run-as/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-run-as/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-run-as/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-target-count/out.test.toml b/acceptance/bundle/telemetry/deploy-target-count/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-target-count/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-target-count/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-variable-count/out.test.toml b/acceptance/bundle/telemetry/deploy-variable-count/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-variable-count/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-variable-count/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-whl-artifacts/out.test.toml b/acceptance/bundle/telemetry/deploy-whl-artifacts/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-whl-artifacts/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-whl-artifacts/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/out.test.toml b/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/deploy/out.test.toml b/acceptance/bundle/telemetry/deploy/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/telemetry/deploy/out.test.toml
+++ b/acceptance/bundle/telemetry/deploy/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/telemetry/test.toml b/acceptance/bundle/telemetry/test.toml
index 667a39b71c..0fe0f33b77 100644
--- a/acceptance/bundle/telemetry/test.toml
+++ b/acceptance/bundle/telemetry/test.toml
@@ -3,6 +3,7 @@ IncludeRequestHeaders = ["User-Agent"]
 
 # Telemetry reports the byte size of the serialized state, which the deployment stamp
 # legitimately grows. The number is the assertion here, so there is nothing to normalize.
+EnvMatrix.DMS = [""]
 
 Env.DATABRICKS_CACHE_ENABLED = 'false'
 
diff --git a/acceptance/bundle/templates-machinery/helper_upper_lower/out.test.toml b/acceptance/bundle/templates-machinery/helper_upper_lower/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/templates-machinery/helper_upper_lower/out.test.toml
+++ b/acceptance/bundle/templates-machinery/helper_upper_lower/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/templates-machinery/helper_username/out.test.toml b/acceptance/bundle/templates-machinery/helper_username/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/templates-machinery/helper_username/out.test.toml
+++ b/acceptance/bundle/templates-machinery/helper_username/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/templates-machinery/helpers-error/out.test.toml b/acceptance/bundle/templates-machinery/helpers-error/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/templates-machinery/helpers-error/out.test.toml
+++ b/acceptance/bundle/templates-machinery/helpers-error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/templates-machinery/number-precision/out.test.toml b/acceptance/bundle/templates-machinery/number-precision/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/templates-machinery/number-precision/out.test.toml
+++ b/acceptance/bundle/templates-machinery/number-precision/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/templates-machinery/supported-url/out.test.toml b/acceptance/bundle/templates-machinery/supported-url/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/templates-machinery/supported-url/out.test.toml
+++ b/acceptance/bundle/templates-machinery/supported-url/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/templates-machinery/unsupported-url/out.test.toml b/acceptance/bundle/templates-machinery/unsupported-url/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/templates-machinery/unsupported-url/out.test.toml
+++ b/acceptance/bundle/templates-machinery/unsupported-url/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/templates-machinery/wrong-path/out.test.toml b/acceptance/bundle/templates-machinery/wrong-path/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/templates-machinery/wrong-path/out.test.toml
+++ b/acceptance/bundle/templates-machinery/wrong-path/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/templates-machinery/wrong-url/out.test.toml b/acceptance/bundle/templates-machinery/wrong-url/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/templates-machinery/wrong-url/out.test.toml
+++ b/acceptance/bundle/templates-machinery/wrong-url/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/templates/dbt-sql/out.test.toml b/acceptance/bundle/templates/dbt-sql/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/dbt-sql/out.test.toml
+++ b/acceptance/bundle/templates/dbt-sql/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/default-minimal/python/out.test.toml b/acceptance/bundle/templates/default-minimal/python/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/default-minimal/python/out.test.toml
+++ b/acceptance/bundle/templates/default-minimal/python/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/default-minimal/skip/out.test.toml b/acceptance/bundle/templates/default-minimal/skip/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/default-minimal/skip/out.test.toml
+++ b/acceptance/bundle/templates/default-minimal/skip/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/default-minimal/sql/out.test.toml b/acceptance/bundle/templates/default-minimal/sql/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/default-minimal/sql/out.test.toml
+++ b/acceptance/bundle/templates/default-minimal/sql/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/default-python/azure-government/out.test.toml b/acceptance/bundle/templates/default-python/azure-government/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/default-python/azure-government/out.test.toml
+++ b/acceptance/bundle/templates/default-python/azure-government/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/default-python/classic/out.test.toml b/acceptance/bundle/templates/default-python/classic/out.test.toml
index c3ec5833d7..f0134140e6 100644
--- a/acceptance/bundle/templates/default-python/classic/out.test.toml
+++ b/acceptance/bundle/templates/default-python/classic/out.test.toml
@@ -1,4 +1,5 @@
 Cloud = false
 Phase = 1
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/templates/default-python/combinations/classic/out.test.toml b/acceptance/bundle/templates/default-python/combinations/classic/out.test.toml
index d7035f9775..ec2e3a2068 100644
--- a/acceptance/bundle/templates/default-python/combinations/classic/out.test.toml
+++ b/acceptance/bundle/templates/default-python/combinations/classic/out.test.toml
@@ -1,6 +1,7 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
 EnvMatrix.DLT = ["yes", "no"]
+EnvMatrix.DMS = [""]
 EnvMatrix.NBOOK = ["yes", "no"]
 EnvMatrix.PY = ["yes", "no"]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/templates/default-python/combinations/serverless/out.test.toml b/acceptance/bundle/templates/default-python/combinations/serverless/out.test.toml
index d7035f9775..ec2e3a2068 100644
--- a/acceptance/bundle/templates/default-python/combinations/serverless/out.test.toml
+++ b/acceptance/bundle/templates/default-python/combinations/serverless/out.test.toml
@@ -1,6 +1,7 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
 EnvMatrix.DLT = ["yes", "no"]
+EnvMatrix.DMS = [""]
 EnvMatrix.NBOOK = ["yes", "no"]
 EnvMatrix.PY = ["yes", "no"]
 EnvMatrix.READPLAN = ["", "1"]
diff --git a/acceptance/bundle/templates/default-python/fail-missing-uv/out.test.toml b/acceptance/bundle/templates/default-python/fail-missing-uv/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/default-python/fail-missing-uv/out.test.toml
+++ b/acceptance/bundle/templates/default-python/fail-missing-uv/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/default-python/integration_classic/out.test.toml b/acceptance/bundle/templates/default-python/integration_classic/out.test.toml
index 6a16ccd3a9..8767816210 100644
--- a/acceptance/bundle/templates/default-python/integration_classic/out.test.toml
+++ b/acceptance/bundle/templates/default-python/integration_classic/out.test.toml
@@ -1,5 +1,6 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.UV_PYTHON = [
   "3.9",
   "3.10",
diff --git a/acceptance/bundle/templates/default-python/no-uc/out.test.toml b/acceptance/bundle/templates/default-python/no-uc/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/default-python/no-uc/out.test.toml
+++ b/acceptance/bundle/templates/default-python/no-uc/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/default-python/serverless-customcatalog/out.test.toml b/acceptance/bundle/templates/default-python/serverless-customcatalog/out.test.toml
index 91b0158ff2..86234a2fd0 100644
--- a/acceptance/bundle/templates/default-python/serverless-customcatalog/out.test.toml
+++ b/acceptance/bundle/templates/default-python/serverless-customcatalog/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 Phase = 1
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/default-python/serverless/out.test.toml b/acceptance/bundle/templates/default-python/serverless/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/default-python/serverless/out.test.toml
+++ b/acceptance/bundle/templates/default-python/serverless/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/default-scala/out.test.toml b/acceptance/bundle/templates/default-scala/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/default-scala/out.test.toml
+++ b/acceptance/bundle/templates/default-scala/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/default-sql-catalog-dash/out.test.toml b/acceptance/bundle/templates/default-sql-catalog-dash/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/default-sql-catalog-dash/out.test.toml
+++ b/acceptance/bundle/templates/default-sql-catalog-dash/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/default-sql/out.test.toml b/acceptance/bundle/templates/default-sql/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/default-sql/out.test.toml
+++ b/acceptance/bundle/templates/default-sql/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/lakeflow-integrations/out.test.toml b/acceptance/bundle/templates/lakeflow-integrations/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/lakeflow-integrations/out.test.toml
+++ b/acceptance/bundle/templates/lakeflow-integrations/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/lakeflow-pipelines/python/out.test.toml b/acceptance/bundle/templates/lakeflow-pipelines/python/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/lakeflow-pipelines/python/out.test.toml
+++ b/acceptance/bundle/templates/lakeflow-pipelines/python/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/lakeflow-pipelines/sql/out.test.toml b/acceptance/bundle/templates/lakeflow-pipelines/sql/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/lakeflow-pipelines/sql/out.test.toml
+++ b/acceptance/bundle/templates/lakeflow-pipelines/sql/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/nested-output/out.test.toml b/acceptance/bundle/templates/nested-output/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/nested-output/out.test.toml
+++ b/acceptance/bundle/templates/nested-output/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/pydabs/check-consistency/out.test.toml b/acceptance/bundle/templates/pydabs/check-consistency/out.test.toml
index 6291d04323..d063dccb93 100644
--- a/acceptance/bundle/templates/pydabs/check-consistency/out.test.toml
+++ b/acceptance/bundle/templates/pydabs/check-consistency/out.test.toml
@@ -1,5 +1,6 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.INCLUDE_JOB = ["yes", "no"]
 EnvMatrix.INCLUDE_PIPELINE = ["yes", "no"]
 EnvMatrix.INCLUDE_PYTHON = ["yes", "no"]
diff --git a/acceptance/bundle/templates/pydabs/check-formatting/out.test.toml b/acceptance/bundle/templates/pydabs/check-formatting/out.test.toml
index 6291d04323..d063dccb93 100644
--- a/acceptance/bundle/templates/pydabs/check-formatting/out.test.toml
+++ b/acceptance/bundle/templates/pydabs/check-formatting/out.test.toml
@@ -1,5 +1,6 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
 EnvMatrix.INCLUDE_JOB = ["yes", "no"]
 EnvMatrix.INCLUDE_PIPELINE = ["yes", "no"]
 EnvMatrix.INCLUDE_PYTHON = ["yes", "no"]
diff --git a/acceptance/bundle/templates/pydabs/deploy-classic/out.test.toml b/acceptance/bundle/templates/pydabs/deploy-classic/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/pydabs/deploy-classic/out.test.toml
+++ b/acceptance/bundle/templates/pydabs/deploy-classic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/pydabs/init-classic/out.test.toml b/acceptance/bundle/templates/pydabs/init-classic/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/pydabs/init-classic/out.test.toml
+++ b/acceptance/bundle/templates/pydabs/init-classic/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/record-deployment-history/out.test.toml b/acceptance/bundle/templates/record-deployment-history/out.test.toml
index 0938e67898..27ec2a7fcd 100644
--- a/acceptance/bundle/templates/record-deployment-history/out.test.toml
+++ b/acceptance/bundle/templates/record-deployment-history/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/telemetry/custom-template/out.test.toml b/acceptance/bundle/templates/telemetry/custom-template/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/telemetry/custom-template/out.test.toml
+++ b/acceptance/bundle/templates/telemetry/custom-template/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/telemetry/dbt-sql/out.test.toml b/acceptance/bundle/templates/telemetry/dbt-sql/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/telemetry/dbt-sql/out.test.toml
+++ b/acceptance/bundle/templates/telemetry/dbt-sql/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/telemetry/default-python/out.test.toml b/acceptance/bundle/templates/telemetry/default-python/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/telemetry/default-python/out.test.toml
+++ b/acceptance/bundle/templates/telemetry/default-python/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/telemetry/default-sql/out.test.toml b/acceptance/bundle/templates/telemetry/default-sql/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/templates/telemetry/default-sql/out.test.toml
+++ b/acceptance/bundle/templates/telemetry/default-sql/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/templates/test.toml b/acceptance/bundle/templates/test.toml
index 65acb924b0..0bd852bf02 100644
--- a/acceptance/bundle/templates/test.toml
+++ b/acceptance/bundle/templates/test.toml
@@ -2,6 +2,7 @@
 
 # Template tests materialize and deploy full projects, taking tens of seconds each.
 # Recording adds minutes without new coverage the rest of the suite provides.
+EnvMatrix.DMS = [""]
 
 [[Server]]
 Pattern = "POST /telemetry-ext"
diff --git a/acceptance/bundle/test.toml b/acceptance/bundle/test.toml
index e5b65e05c1..463a31d84c 100644
--- a/acceptance/bundle/test.toml
+++ b/acceptance/bundle/test.toml
@@ -5,6 +5,7 @@ EnvVaryOutput = "DATABRICKS_BUNDLE_ENGINE"
 # service (DMS) is exercised by every test rather than only the handful under bundle/dms. Empty
 # is the default pair of engine runs. CI gives this variant its own cell ("directdms"), so the
 # direct cell still runs each test once; a local run covers both.
+EnvMatrix.DMS = ["", "true"]
 
 # DMS is only supported by the direct engine, and only against the local testserver:
 # the service runs in dev and staging, so a cloud run has nothing to record to.
diff --git a/acceptance/bundle/trampoline/warning_message/out.test.toml b/acceptance/bundle/trampoline/warning_message/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/trampoline/warning_message/out.test.toml
+++ b/acceptance/bundle/trampoline/warning_message/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/trampoline/warning_message_with_new_spark/out.test.toml b/acceptance/bundle/trampoline/warning_message_with_new_spark/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/trampoline/warning_message_with_new_spark/out.test.toml
+++ b/acceptance/bundle/trampoline/warning_message_with_new_spark/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/trampoline/warning_message_with_old_spark/out.test.toml b/acceptance/bundle/trampoline/warning_message_with_old_spark/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/trampoline/warning_message_with_old_spark/out.test.toml
+++ b/acceptance/bundle/trampoline/warning_message_with_old_spark/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/undefined_resources/out.test.toml b/acceptance/bundle/undefined_resources/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/undefined_resources/out.test.toml
+++ b/acceptance/bundle/undefined_resources/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/upload/internal_server_error/out.test.toml b/acceptance/bundle/upload/internal_server_error/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/upload/internal_server_error/out.test.toml
+++ b/acceptance/bundle/upload/internal_server_error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/upload/timeout/out.test.toml b/acceptance/bundle/upload/timeout/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/upload/timeout/out.test.toml
+++ b/acceptance/bundle/upload/timeout/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/user_agent/out.test.toml b/acceptance/bundle/user_agent/out.test.toml
index 91b0158ff2..86234a2fd0 100644
--- a/acceptance/bundle/user_agent/out.test.toml
+++ b/acceptance/bundle/user_agent/out.test.toml
@@ -1,3 +1,4 @@
 Cloud = false
 Phase = 1
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/user_agent/simple/out.test.toml b/acceptance/bundle/user_agent/simple/out.test.toml
index 98ea504048..ae80080989 100644
--- a/acceptance/bundle/user_agent/simple/out.test.toml
+++ b/acceptance/bundle/user_agent/simple/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = [""]
diff --git a/acceptance/bundle/user_agent/test.toml b/acceptance/bundle/user_agent/test.toml
index a59011d72d..fc020a2b87 100644
--- a/acceptance/bundle/user_agent/test.toml
+++ b/acceptance/bundle/user_agent/test.toml
@@ -5,5 +5,6 @@ IncludeRequestHeaders = ["User-Agent"]
 # This test asserts the User-Agent on every single request the CLI makes, so recording's
 # extra calls belong in the golden rather than being filtered out - but they are the same
 # header the existing requests already cover, so the DMS run only adds entries to maintain.
+EnvMatrix.DMS = [""]
 
 Env.DATABRICKS_CACHE_ENABLED = 'false'
diff --git a/acceptance/bundle/validate/anchor_containers/out.test.toml b/acceptance/bundle/validate/anchor_containers/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/anchor_containers/out.test.toml
+++ b/acceptance/bundle/validate/anchor_containers/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/catalog_requires_direct_mode/out.test.toml b/acceptance/bundle/validate/catalog_requires_direct_mode/out.test.toml
index d2059b4b5d..5d0f3e4aac 100644
--- a/acceptance/bundle/validate/catalog_requires_direct_mode/out.test.toml
+++ b/acceptance/bundle/validate/catalog_requires_direct_mode/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/dashboard_defaults/out.test.toml b/acceptance/bundle/validate/dashboard_defaults/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/dashboard_defaults/out.test.toml
+++ b/acceptance/bundle/validate/dashboard_defaults/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/dashboard_required_name/out.test.toml b/acceptance/bundle/validate/dashboard_required_name/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/dashboard_required_name/out.test.toml
+++ b/acceptance/bundle/validate/dashboard_required_name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/dashboard_required_warehouse_id/out.test.toml b/acceptance/bundle/validate/dashboard_required_warehouse_id/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/dashboard_required_warehouse_id/out.test.toml
+++ b/acceptance/bundle/validate/dashboard_required_warehouse_id/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/definitions_yaml_anchors/out.test.toml b/acceptance/bundle/validate/definitions_yaml_anchors/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/definitions_yaml_anchors/out.test.toml
+++ b/acceptance/bundle/validate/definitions_yaml_anchors/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/duplicate_yaml_merge_key/out.test.toml b/acceptance/bundle/validate/duplicate_yaml_merge_key/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/duplicate_yaml_merge_key/out.test.toml
+++ b/acceptance/bundle/validate/duplicate_yaml_merge_key/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/empty_resources/empty_def/out.test.toml b/acceptance/bundle/validate/empty_resources/empty_def/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/empty_resources/empty_def/out.test.toml
+++ b/acceptance/bundle/validate/empty_resources/empty_def/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/empty_resources/empty_dict/out.test.toml b/acceptance/bundle/validate/empty_resources/empty_dict/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/empty_resources/empty_dict/out.test.toml
+++ b/acceptance/bundle/validate/empty_resources/empty_dict/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/empty_resources/null/out.test.toml b/acceptance/bundle/validate/empty_resources/null/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/empty_resources/null/out.test.toml
+++ b/acceptance/bundle/validate/empty_resources/null/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/empty_resources/with_grants/out.test.toml b/acceptance/bundle/validate/empty_resources/with_grants/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/empty_resources/with_grants/out.test.toml
+++ b/acceptance/bundle/validate/empty_resources/with_grants/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/empty_resources/with_permissions/out.test.toml b/acceptance/bundle/validate/empty_resources/with_permissions/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/empty_resources/with_permissions/out.test.toml
+++ b/acceptance/bundle/validate/empty_resources/with_permissions/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/empty_tasks/out.test.toml b/acceptance/bundle/validate/empty_tasks/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/empty_tasks/out.test.toml
+++ b/acceptance/bundle/validate/empty_tasks/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/engine-config-valid/out.test.toml b/acceptance/bundle/validate/engine-config-valid/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/engine-config-valid/out.test.toml
+++ b/acceptance/bundle/validate/engine-config-valid/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/enum/out.test.toml b/acceptance/bundle/validate/enum/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/enum/out.test.toml
+++ b/acceptance/bundle/validate/enum/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/enum_resource_refs/out.test.toml b/acceptance/bundle/validate/enum_resource_refs/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/enum_resource_refs/out.test.toml
+++ b/acceptance/bundle/validate/enum_resource_refs/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/genie_space_complex/out.test.toml b/acceptance/bundle/validate/genie_space_complex/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/genie_space_complex/out.test.toml
+++ b/acceptance/bundle/validate/genie_space_complex/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/genie_space_defaults/out.test.toml b/acceptance/bundle/validate/genie_space_defaults/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/genie_space_defaults/out.test.toml
+++ b/acceptance/bundle/validate/genie_space_defaults/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/genie_space_file_path_and_inline/out.test.toml b/acceptance/bundle/validate/genie_space_file_path_and_inline/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/genie_space_file_path_and_inline/out.test.toml
+++ b/acceptance/bundle/validate/genie_space_file_path_and_inline/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/grants_required_principal/out.test.toml b/acceptance/bundle/validate/grants_required_principal/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/validate/grants_required_principal/out.test.toml
+++ b/acceptance/bundle/validate/grants_required_principal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/immutable_workspace_paths/out.test.toml b/acceptance/bundle/validate/immutable_workspace_paths/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/immutable_workspace_paths/out.test.toml
+++ b/acceptance/bundle/validate/immutable_workspace_paths/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/include_locations/out.test.toml b/acceptance/bundle/validate/include_locations/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/include_locations/out.test.toml
+++ b/acceptance/bundle/validate/include_locations/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/invalid-engine-bundle/out.test.toml b/acceptance/bundle/validate/invalid-engine-bundle/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/invalid-engine-bundle/out.test.toml
+++ b/acceptance/bundle/validate/invalid-engine-bundle/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/invalid-engine-target/out.test.toml b/acceptance/bundle/validate/invalid-engine-target/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/invalid-engine-target/out.test.toml
+++ b/acceptance/bundle/validate/invalid-engine-target/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/job-references/out.test.toml b/acceptance/bundle/validate/job-references/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/job-references/out.test.toml
+++ b/acceptance/bundle/validate/job-references/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/model_serving_both_fields_error/out.test.toml b/acceptance/bundle/validate/model_serving_both_fields_error/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/model_serving_both_fields_error/out.test.toml
+++ b/acceptance/bundle/validate/model_serving_both_fields_error/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/model_serving_conversion/out.test.toml b/acceptance/bundle/validate/model_serving_conversion/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/model_serving_conversion/out.test.toml
+++ b/acceptance/bundle/validate/model_serving_conversion/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/models/missing_name/out.test.toml b/acceptance/bundle/validate/models/missing_name/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/models/missing_name/out.test.toml
+++ b/acceptance/bundle/validate/models/missing_name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/models/user_id/out.test.toml b/acceptance/bundle/validate/models/user_id/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/models/user_id/out.test.toml
+++ b/acceptance/bundle/validate/models/user_id/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/no_dashboard_etag/out.test.toml b/acceptance/bundle/validate/no_dashboard_etag/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/no_dashboard_etag/out.test.toml
+++ b/acceptance/bundle/validate/no_dashboard_etag/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/no_genie_space_etag/out.test.toml b/acceptance/bundle/validate/no_genie_space_etag/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/validate/no_genie_space_etag/out.test.toml
+++ b/acceptance/bundle/validate/no_genie_space_etag/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/permissions/out.test.toml b/acceptance/bundle/validate/permissions/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/permissions/out.test.toml
+++ b/acceptance/bundle/validate/permissions/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/permissions_overlap/out.test.toml b/acceptance/bundle/validate/permissions_overlap/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/permissions_overlap/out.test.toml
+++ b/acceptance/bundle/validate/permissions_overlap/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/presets_max_concurrent_runs/out.test.toml b/acceptance/bundle/validate/presets_max_concurrent_runs/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/presets_max_concurrent_runs/out.test.toml
+++ b/acceptance/bundle/validate/presets_max_concurrent_runs/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/presets_name_prefix/out.test.toml b/acceptance/bundle/validate/presets_name_prefix/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/presets_name_prefix/out.test.toml
+++ b/acceptance/bundle/validate/presets_name_prefix/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/presets_name_prefix_dev/out.test.toml b/acceptance/bundle/validate/presets_name_prefix_dev/out.test.toml
index 0938e67898..59b56a2037 100644
--- a/acceptance/bundle/validate/presets_name_prefix_dev/out.test.toml
+++ b/acceptance/bundle/validate/presets_name_prefix_dev/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/presets_tags/out.test.toml b/acceptance/bundle/validate/presets_tags/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/presets_tags/out.test.toml
+++ b/acceptance/bundle/validate/presets_tags/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/required/out.test.toml b/acceptance/bundle/validate/required/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/required/out.test.toml
+++ b/acceptance/bundle/validate/required/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/reserved_deployment_fields/out.test.toml b/acceptance/bundle/validate/reserved_deployment_fields/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/reserved_deployment_fields/out.test.toml
+++ b/acceptance/bundle/validate/reserved_deployment_fields/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/reserved_job_run_idempotency_token/out.test.toml b/acceptance/bundle/validate/reserved_job_run_idempotency_token/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/reserved_job_run_idempotency_token/out.test.toml
+++ b/acceptance/bundle/validate/reserved_job_run_idempotency_token/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/secret_scope_invalid_permission_level/out.test.toml b/acceptance/bundle/validate/secret_scope_invalid_permission_level/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/secret_scope_invalid_permission_level/out.test.toml
+++ b/acceptance/bundle/validate/secret_scope_invalid_permission_level/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/secret_scope_required_principal/out.test.toml b/acceptance/bundle/validate/secret_scope_required_principal/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/secret_scope_required_principal/out.test.toml
+++ b/acceptance/bundle/validate/secret_scope_required_principal/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/sql_warehouse_required_name/out.test.toml b/acceptance/bundle/validate/sql_warehouse_required_name/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/sql_warehouse_required_name/out.test.toml
+++ b/acceptance/bundle/validate/sql_warehouse_required_name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/strict/out.test.toml b/acceptance/bundle/validate/strict/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/strict/out.test.toml
+++ b/acceptance/bundle/validate/strict/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/sync_patterns/out.test.toml b/acceptance/bundle/validate/sync_patterns/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/sync_patterns/out.test.toml
+++ b/acceptance/bundle/validate/sync_patterns/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/var_in_bundle_name/out.test.toml b/acceptance/bundle/validate/var_in_bundle_name/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/var_in_bundle_name/out.test.toml
+++ b/acceptance/bundle/validate/var_in_bundle_name/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/validate/volume_defaults/out.test.toml b/acceptance/bundle/validate/volume_defaults/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/validate/volume_defaults/out.test.toml
+++ b/acceptance/bundle/validate/volume_defaults/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/arg-repeat/out.test.toml b/acceptance/bundle/variables/arg-repeat/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/arg-repeat/out.test.toml
+++ b/acceptance/bundle/variables/arg-repeat/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/complex-cross-ref/out.test.toml b/acceptance/bundle/variables/complex-cross-ref/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/complex-cross-ref/out.test.toml
+++ b/acceptance/bundle/variables/complex-cross-ref/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/complex-cycle-self/out.test.toml b/acceptance/bundle/variables/complex-cycle-self/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/complex-cycle-self/out.test.toml
+++ b/acceptance/bundle/variables/complex-cycle-self/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/complex-cycle/out.test.toml b/acceptance/bundle/variables/complex-cycle/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/complex-cycle/out.test.toml
+++ b/acceptance/bundle/variables/complex-cycle/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/complex-simple/out.test.toml b/acceptance/bundle/variables/complex-simple/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/complex-simple/out.test.toml
+++ b/acceptance/bundle/variables/complex-simple/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/complex-transitive-deep/out.test.toml b/acceptance/bundle/variables/complex-transitive-deep/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/complex-transitive-deep/out.test.toml
+++ b/acceptance/bundle/variables/complex-transitive-deep/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/complex-transitive-deeper/out.test.toml b/acceptance/bundle/variables/complex-transitive-deeper/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/complex-transitive-deeper/out.test.toml
+++ b/acceptance/bundle/variables/complex-transitive-deeper/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/complex-transitive/out.test.toml b/acceptance/bundle/variables/complex-transitive/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/complex-transitive/out.test.toml
+++ b/acceptance/bundle/variables/complex-transitive/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/complex-with-var-reference/out.test.toml b/acceptance/bundle/variables/complex-with-var-reference/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/complex-with-var-reference/out.test.toml
+++ b/acceptance/bundle/variables/complex-with-var-reference/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/complex-within-complex/out.test.toml b/acceptance/bundle/variables/complex-within-complex/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/complex-within-complex/out.test.toml
+++ b/acceptance/bundle/variables/complex-within-complex/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/complex/out.test.toml b/acceptance/bundle/variables/complex/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/complex/out.test.toml
+++ b/acceptance/bundle/variables/complex/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/complex_multiple_files/out.test.toml b/acceptance/bundle/variables/complex_multiple_files/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/complex_multiple_files/out.test.toml
+++ b/acceptance/bundle/variables/complex_multiple_files/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/cycle/out.test.toml b/acceptance/bundle/variables/cycle/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/cycle/out.test.toml
+++ b/acceptance/bundle/variables/cycle/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/double_underscore/out.test.toml b/acceptance/bundle/variables/double_underscore/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/double_underscore/out.test.toml
+++ b/acceptance/bundle/variables/double_underscore/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/empty/out.test.toml b/acceptance/bundle/variables/empty/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/empty/out.test.toml
+++ b/acceptance/bundle/variables/empty/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/env_overrides/out.test.toml b/acceptance/bundle/variables/env_overrides/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/env_overrides/out.test.toml
+++ b/acceptance/bundle/variables/env_overrides/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/file-defaults/out.test.toml b/acceptance/bundle/variables/file-defaults/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/file-defaults/out.test.toml
+++ b/acceptance/bundle/variables/file-defaults/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/git-branch/out.test.toml b/acceptance/bundle/variables/git-branch/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/git-branch/out.test.toml
+++ b/acceptance/bundle/variables/git-branch/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/host/out.test.toml b/acceptance/bundle/variables/host/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/host/out.test.toml
+++ b/acceptance/bundle/variables/host/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/int/out.test.toml b/acceptance/bundle/variables/int/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/int/out.test.toml
+++ b/acceptance/bundle/variables/int/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/issue_2436/out.test.toml b/acceptance/bundle/variables/issue_2436/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/issue_2436/out.test.toml
+++ b/acceptance/bundle/variables/issue_2436/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/issue_3039_lookup_with_ref/out.test.toml b/acceptance/bundle/variables/issue_3039_lookup_with_ref/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/issue_3039_lookup_with_ref/out.test.toml
+++ b/acceptance/bundle/variables/issue_3039_lookup_with_ref/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/lookup/out.test.toml b/acceptance/bundle/variables/lookup/out.test.toml
index 2a13818c13..cef45fe553 100644
--- a/acceptance/bundle/variables/lookup/out.test.toml
+++ b/acceptance/bundle/variables/lookup/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/prepend-workspace-var/out.test.toml b/acceptance/bundle/variables/prepend-workspace-var/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/prepend-workspace-var/out.test.toml
+++ b/acceptance/bundle/variables/prepend-workspace-var/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/reference-typo/out.test.toml b/acceptance/bundle/variables/reference-typo/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/reference-typo/out.test.toml
+++ b/acceptance/bundle/variables/reference-typo/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/resolve-builtin/out.test.toml b/acceptance/bundle/variables/resolve-builtin/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/resolve-builtin/out.test.toml
+++ b/acceptance/bundle/variables/resolve-builtin/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/resolve-empty/out.test.toml b/acceptance/bundle/variables/resolve-empty/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/resolve-empty/out.test.toml
+++ b/acceptance/bundle/variables/resolve-empty/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/resolve-field-within-complex/out.test.toml b/acceptance/bundle/variables/resolve-field-within-complex/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/resolve-field-within-complex/out.test.toml
+++ b/acceptance/bundle/variables/resolve-field-within-complex/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/resolve-nonstrings/out.test.toml b/acceptance/bundle/variables/resolve-nonstrings/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/resolve-nonstrings/out.test.toml
+++ b/acceptance/bundle/variables/resolve-nonstrings/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/resolve-resources-fields/out.test.toml b/acceptance/bundle/variables/resolve-resources-fields/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/resolve-resources-fields/out.test.toml
+++ b/acceptance/bundle/variables/resolve-resources-fields/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/resolve-vars-in-root-path/out.test.toml b/acceptance/bundle/variables/resolve-vars-in-root-path/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/resolve-vars-in-root-path/out.test.toml
+++ b/acceptance/bundle/variables/resolve-vars-in-root-path/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/unicode_reference/out.test.toml b/acceptance/bundle/variables/unicode_reference/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/unicode_reference/out.test.toml
+++ b/acceptance/bundle/variables/unicode_reference/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/vanilla/out.test.toml b/acceptance/bundle/variables/vanilla/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/vanilla/out.test.toml
+++ b/acceptance/bundle/variables/vanilla/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/var_in_var/out.test.toml b/acceptance/bundle/variables/var_in_var/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/var_in_var/out.test.toml
+++ b/acceptance/bundle/variables/var_in_var/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/variable_in_resource_key/out.test.toml b/acceptance/bundle/variables/variable_in_resource_key/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/variable_in_resource_key/out.test.toml
+++ b/acceptance/bundle/variables/variable_in_resource_key/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/variable_overrides_in_target/out.test.toml b/acceptance/bundle/variables/variable_overrides_in_target/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/variable_overrides_in_target/out.test.toml
+++ b/acceptance/bundle/variables/variable_overrides_in_target/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/variables/without_definition/out.test.toml b/acceptance/bundle/variables/without_definition/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/variables/without_definition/out.test.toml
+++ b/acceptance/bundle/variables/without_definition/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/volume_path/invalid_file/out.test.toml b/acceptance/bundle/volume_path/invalid_file/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/volume_path/invalid_file/out.test.toml
+++ b/acceptance/bundle/volume_path/invalid_file/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/volume_path/invalid_resource/out.test.toml b/acceptance/bundle/volume_path/invalid_resource/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/volume_path/invalid_resource/out.test.toml
+++ b/acceptance/bundle/volume_path/invalid_resource/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/volume_path/invalid_root/out.test.toml b/acceptance/bundle/volume_path/invalid_root/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/volume_path/invalid_root/out.test.toml
+++ b/acceptance/bundle/volume_path/invalid_root/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/volume_path/invalid_state/out.test.toml b/acceptance/bundle/volume_path/invalid_state/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/volume_path/invalid_state/out.test.toml
+++ b/acceptance/bundle/volume_path/invalid_state/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]
diff --git a/acceptance/bundle/volume_path/valid/out.test.toml b/acceptance/bundle/volume_path/valid/out.test.toml
index 98ea504048..e1af1a235a 100644
--- a/acceptance/bundle/volume_path/valid/out.test.toml
+++ b/acceptance/bundle/volume_path/valid/out.test.toml
@@ -1,2 +1,3 @@
 Cloud = false
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
+EnvMatrix.DMS = ["", "true"]