diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go index bf5b298d2a2..304383e6846 100644 --- a/acceptance/acceptance_test.go +++ b/acceptance/acceptance_test.go @@ -948,8 +948,8 @@ func runTest(t *testing.T, cmd.Env = append(cmd.Env, "CLOUD_ENV_BASE="+envBase) // Must be added PrepareReplacementsUser, otherwise conflicts with [USERNAME] - // UniqueUUID defaults to false: number distinct UUIDs only when a test opts in. - testdiff.PrepareReplacementsUUID(t, &repls, isTruePtr(config.UniqueUUID)) + // UniqueUUID defaults to true: number distinct UUIDs unless the test opts out. + testdiff.PrepareReplacementsUUID(t, &repls, config.UniqueUUID == nil || *config.UniqueUUID) // User replacements: repls.Repls = append(repls.Repls, config.Repls...) diff --git a/acceptance/air/run-submit/output.txt b/acceptance/air/run-submit/output.txt index 516c4f122d7..bb13064d8d6 100644 --- a/acceptance/air/run-submit/output.txt +++ b/acceptance/air/run-submit/output.txt @@ -78,7 +78,7 @@ Stream logs after submission using: } } ], - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][0]", "run_name": "submit-smoke", "tasks": [ { @@ -129,7 +129,7 @@ Stream logs after submission using: } } ], - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][1]", "run_name": "b300-submit-smoke", "tasks": [ { diff --git a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/output.txt b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/output.txt index 369460360da..e57cd5ae3d7 100644 --- a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/output.txt +++ b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/output.txt @@ -6,15 +6,15 @@ "browse_only": false, "catalog_name": "main", "catalog_type": "MANAGED_CATALOG", - "created_at": [UNIX_TIME_MILLIS][0], + "created_at": [UNIX_TIME_MILLIS], "created_by": "[USERNAME]", "enable_predictive_optimization": "INHERIT", "full_name": "main.schema-[UNIQUE_NAME]", - "metastore_id": "[UUID]", + "metastore_id": "[UUID][0]", "name": "schema-[UNIQUE_NAME]", "owner": "[USERNAME]", - "schema_id": "[UUID]", - "updated_at": [UNIX_TIME_MILLIS][0], + "schema_id": "[UUID][1]", + "updated_at": [UNIX_TIME_MILLIS], "updated_by": "[USERNAME]" } diff --git a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/output.txt b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/output.txt index d5788b0b3c5..106be95def1 100644 --- a/acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/output.txt +++ b/acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/output.txt @@ -6,15 +6,15 @@ "browse_only": false, "catalog_name": "main", "catalog_type": "MANAGED_CATALOG", - "created_at": [UNIX_TIME_MILLIS][0], + "created_at": [UNIX_TIME_MILLIS], "created_by": "[USERNAME]", "enable_predictive_optimization": "INHERIT", "full_name": "main.schema-[UNIQUE_NAME]", - "metastore_id": "[UUID]", + "metastore_id": "[UUID][0]", "name": "schema-[UNIQUE_NAME]", "owner": "[USERNAME]", - "schema_id": "[UUID]", - "updated_at": [UNIX_TIME_MILLIS][0], + "schema_id": "[UUID][1]", + "updated_at": [UNIX_TIME_MILLIS], "updated_by": "[USERNAME]" } diff --git a/acceptance/bundle/deploy/readplan/whl-upload/output.txt b/acceptance/bundle/deploy/readplan/whl-upload/output.txt index 48212c57e37..04d64fe158a 100644 --- a/acceptance/bundle/deploy/readplan/whl-upload/output.txt +++ b/acceptance/bundle/deploy/readplan/whl-upload/output.txt @@ -1,7 +1,7 @@ === bundle deploy uploads the wheel >>> [CLI] bundle deploy -Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl... +Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/whl-upload/default/files... Created jobs.my_job Files: 2 uploaded, 0 deleted @@ -10,7 +10,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //artifacts/.internal --del-field raw_body { "method": "POST", - "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/whl-upload/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl", + "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/whl-upload/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl", "q": { "overwrite": "true" } @@ -26,7 +26,7 @@ Destroy: 1 deleted === bundle deploy --plan also uploads the wheel >>> [CLI] bundle deploy --plan tmp.plan.json -Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl... +Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/whl-upload/default/files... Created jobs.my_job Files: 4 uploaded, 0 deleted @@ -35,7 +35,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //artifacts/.internal --del-field raw_body { "method": "POST", - "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/whl-upload/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl", + "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/whl-upload/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl", "q": { "overwrite": "true" } diff --git a/acceptance/bundle/dms/no-drift/output.txt b/acceptance/bundle/dms/no-drift/output.txt index c0b7a35688e..d818cd50548 100644 --- a/acceptance/bundle/dms/no-drift/output.txt +++ b/acceptance/bundle/dms/no-drift/output.txt @@ -32,7 +32,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "features": { "deployment_history": {} @@ -47,7 +47,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged { "state_version": 3, "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "features": { "deployment_history": {} }, @@ -119,7 +119,7 @@ Resources: 0 created, 1 changed, 0 deleted, 1 unchanged } { "method": "PUT", - "path": "/api/2.0/pipelines/[UUID]", + "path": "/api/2.0/pipelines/[UUID][1]", "body": { "catalog": "main", "channel": "CURRENT", @@ -177,7 +177,7 @@ Warning: The "development" property of pipelines is deprecated. Use "mode: devel { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 2, "features": { "deployment_history": {} @@ -196,7 +196,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged { "state_version": 3, "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "features": { "deployment_history": {} }, diff --git a/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/output.txt b/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/output.txt index ae76c6b53d9..61f8f061534 100644 --- a/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/output.txt +++ b/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/output.txt @@ -1,7 +1,7 @@ >>> [CLI] bundle deploy Building my_test_code... -Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl... +Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... Created jobs.some_other_job Files: 13 uploaded, 0 deleted @@ -10,7 +10,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === The environment dependency keeps its [train] extras suffix >>> [CLI] jobs get [SOME_OTHER_JOB_ID] [ - "/Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl[train]" + "/Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl[train]" ] >>> [CLI] bundle run some_other_job diff --git a/acceptance/bundle/migrate/command/basic/out.new_state.json b/acceptance/bundle/migrate/command/basic/out.new_state.json index 81f4123c8c3..e3945a2c940 100644 --- a/acceptance/bundle/migrate/command/basic/out.new_state.json +++ b/acceptance/bundle/migrate/command/basic/out.new_state.json @@ -1,7 +1,7 @@ { "state_version": 3, "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 6, "state": { "resources.jobs.test_job": { @@ -29,7 +29,7 @@ } }, "resources.pipelines.test_pipeline": { - "__id__": "[UUID]", + "__id__": "[UUID][1]", "state": { "channel": "CURRENT", "deployment": { @@ -51,7 +51,7 @@ "myjob_timeout": "0", "myvolume_id": "mycat.myschema.myvol", "volume_catalog_name": "mycat", - "volume_storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]" + "volume_storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][2]/volumes/[UUID][3]" } }, "depends_on": [ diff --git a/acceptance/bundle/migrate/command/basic/out.original_state.json b/acceptance/bundle/migrate/command/basic/out.original_state.json index 89a3af519d6..d17bec88956 100644 --- a/acceptance/bundle/migrate/command/basic/out.original_state.json +++ b/acceptance/bundle/migrate/command/basic/out.original_state.json @@ -2,7 +2,7 @@ "version": 4, "terraform_version": "1.5.5", "serial": 4, - "lineage": "[UUID]", + "lineage": "[UUID][0]", "outputs": {}, "resources": [ { @@ -199,7 +199,7 @@ "filters": [], "gateway_definition": [], "health": null, - "id": "[UUID]", + "id": "[UUID][1]", "ingestion_definition": [], "last_modified": [UNIX_TIME_MILLIS], "latest_updates": null, @@ -233,19 +233,19 @@ "serverless": false, "serverless_compute_id": null, "state": "IDLE", - "storage": "dbfs:/pipelines/[UUID]", + "storage": "dbfs:/pipelines/[UUID][1]", "tags": { "myjob_id": "[TEST_JOB_ID]", "myjob_name": "Test Migration Job", "myjob_timeout": "0", "myvolume_id": "mycat.myschema.myvol", "volume_catalog_name": "mycat", - "volume_storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]" + "volume_storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][2]/volumes/[UUID][3]" }, "target": null, "timeouts": null, "trigger": [], - "url": "[DATABRICKS_URL]/#joblist/pipelines/[UUID]", + "url": "[DATABRICKS_URL]/#joblist/pipelines/[UUID][1]", "usage_policy_id": null }, "sensitive_attributes": [], @@ -277,7 +277,7 @@ } ], "schema_name": "myschema", - "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]", + "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][2]/volumes/[UUID][3]", "volume_path": "/Volumes/mycat/myschema/myvol", "volume_type": "MANAGED" }, diff --git a/acceptance/bundle/migrate/command/basic/out.plan_update.json b/acceptance/bundle/migrate/command/basic/out.plan_update.json index b873a52a785..dc06b6c6a3c 100644 --- a/acceptance/bundle/migrate/command/basic/out.plan_update.json +++ b/acceptance/bundle/migrate/command/basic/out.plan_update.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 6, "plan": { "resources.jobs.test_job": { @@ -155,7 +155,7 @@ "myjob_timeout": "${resources.jobs.test_job.timeout_seconds}", "myvolume_id": "mycat.myschema.myvol", "volume_catalog_name": "mycat", - "volume_storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]" + "volume_storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][1]/volumes/[UUID][2]" } }, "vars": { @@ -171,7 +171,7 @@ }, "edition": "ADVANCED", "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE", - "id": "[UUID]", + "id": "[UUID][3]", "last_modified": [UNIX_TIME_MILLIS][1], "libraries": [ { @@ -181,17 +181,17 @@ } ], "name": "Test Migration Pipeline", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][3]", "run_as_user_name": "[USERNAME]", "state": "IDLE", - "storage": "dbfs:/pipelines/[UUID]", + "storage": "dbfs:/pipelines/[UUID][3]", "tags": { "myjob_id": "[TEST_JOB_ID]", "myjob_name": "Test Migration Job", "myjob_timeout": "0", "myvolume_id": "mycat.myschema.myvol", "volume_catalog_name": "mycat", - "volume_storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]" + "volume_storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][1]/volumes/[UUID][2]" } }, "changes": { @@ -204,7 +204,7 @@ "storage": { "action": "skip", "reason": "immutable_backend_value", - "remote": "dbfs:/pipelines/[UUID]" + "remote": "dbfs:/pipelines/[UUID][3]" }, "tags['myjob_name']": { "action": "update", @@ -230,16 +230,16 @@ "name": "myvol", "owner": "[USERNAME]", "schema_name": "myschema", - "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]", + "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][1]/volumes/[UUID][2]", "updated_at": [UNIX_TIME_MILLIS][2], - "volume_id": "[UUID]", + "volume_id": "[UUID][2]", "volume_type": "MANAGED" }, "changes": { "storage_location": { "action": "skip", "reason": "immutable_backend_value", - "remote": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]" + "remote": "s3://[METASTORE_NAME]/metastore/[UUID][1]/volumes/[UUID][2]" } } } diff --git a/acceptance/bundle/migrate/command/basic/output.txt b/acceptance/bundle/migrate/command/basic/output.txt index 5574c5fbbd7..bf60764a052 100644 --- a/acceptance/bundle/migrate/command/basic/output.txt +++ b/acceptance/bundle/migrate/command/basic/output.txt @@ -19,12 +19,12 @@ To undo the migration, remove [TEST_TMP_DIR]/.databricks/bundle/dev/resources.js >>> diff out.original_state.json out.backup_state.json >>> jq .state."resources.pipelines.test_pipeline".state.tags.volume_storage_location out.new_state.json -"s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]" +"s3://[METASTORE_NAME]/metastore/[UUID][0]/volumes/[UUID][1]" === Should show that it's already migrated >>> musterr [CLI] bundle deployment migrate Error: already using direct engine -Details: [TEST_TMP_DIR]/.databricks/bundle/dev/resources.json: local direct state serial=6 lineage="[UUID]" +Details: [TEST_TMP_DIR]/.databricks/bundle/dev/resources.json: local direct state serial=6 lineage="[UUID][2]" >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 3 unchanged @@ -36,7 +36,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 3 unchanged { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID][3] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -48,7 +48,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 3 unchanged { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID][4] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -64,20 +64,20 @@ Files: 3 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 3 unchanged >>> print_requests.py --get //jobs/get -"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" -"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" +"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][5] interactive/none engine/direct auth/pat" +"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][5] interactive/none engine/direct auth/pat" === Should show that it's already migrated >>> musterr [CLI] bundle deployment migrate Error: already using direct engine -Details: [TEST_TMP_DIR]/.databricks/bundle/dev/resources.json: local direct state serial=6 lineage="[UUID]" +Details: [TEST_TMP_DIR]/.databricks/bundle/dev/resources.json: local direct state serial=6 lineage="[UUID][2]" >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle debug states -[TEST_TMP_DIR]/.databricks/bundle/dev/resources.json: local direct state serial=6 lineage="[UUID]" +[TEST_TMP_DIR]/.databricks/bundle/dev/resources.json: local direct state serial=6 lineage="[UUID][2]" >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle debug states --force-pull -resources.json: remote direct state serial=6 lineage="[UUID]" -[TEST_TMP_DIR]/.databricks/bundle/dev/resources.json: local direct state serial=6 lineage="[UUID]" +resources.json: remote direct state serial=6 lineage="[UUID][2]" +[TEST_TMP_DIR]/.databricks/bundle/dev/resources.json: local direct state serial=6 lineage="[UUID][2]" === Extra plan: should have no drift >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle plan @@ -105,8 +105,8 @@ Resources: 0 created, 2 changed, 0 deleted, 1 unchanged >>> replay_tfstate.py .databricks/terraform-prod-requests.json .databricks/terraform-prod.tfstate -t prod >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle debug states -t prod -[TEST_TMP_DIR]/.databricks/bundle/prod/terraform/terraform.tfstate: local terraform state serial=5 lineage="[UUID]" +[TEST_TMP_DIR]/.databricks/bundle/prod/terraform/terraform.tfstate: local terraform state serial=5 lineage="[UUID][6]" >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle debug states -t prod --force-pull -terraform.tfstate: remote terraform state serial=5 lineage="[UUID]" -[TEST_TMP_DIR]/.databricks/bundle/prod/terraform/terraform.tfstate: local terraform state serial=5 lineage="[UUID]" +terraform.tfstate: remote terraform state serial=5 lineage="[UUID][6]" +[TEST_TMP_DIR]/.databricks/bundle/prod/terraform/terraform.tfstate: local terraform state serial=5 lineage="[UUID][6]" diff --git a/acceptance/bundle/migrate/command/default-python/out.state_after_migration.json b/acceptance/bundle/migrate/command/default-python/out.state_after_migration.json index 007548bcee5..1ab1c3eb693 100644 --- a/acceptance/bundle/migrate/command/default-python/out.state_after_migration.json +++ b/acceptance/bundle/migrate/command/default-python/out.state_after_migration.json @@ -50,7 +50,7 @@ "job_cluster_key": "job_cluster", "libraries": [ { - "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl" + "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl" } ], "notebook_task": { @@ -67,7 +67,7 @@ "job_cluster_key": "job_cluster", "libraries": [ { - "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl" + "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl" } ], "python_wheel_task": { diff --git a/acceptance/bundle/migrate/command/default-python/out.state_original.json b/acceptance/bundle/migrate/command/default-python/out.state_original.json index 049572d0136..fc567072200 100644 --- a/acceptance/bundle/migrate/command/default-python/out.state_original.json +++ b/acceptance/bundle/migrate/command/default-python/out.state_original.json @@ -188,7 +188,7 @@ "provider_config": [], "pypi": [], "requirements": "", - "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl" + "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl" } ], "max_retries": 0, @@ -262,7 +262,7 @@ "provider_config": [], "pypi": [], "requirements": "", - "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl" + "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl" } ], "max_retries": 0, diff --git a/acceptance/bundle/migrate/command/grants/out.original_state.json b/acceptance/bundle/migrate/command/grants/out.original_state.json index b83be57aff1..4a518964795 100644 --- a/acceptance/bundle/migrate/command/grants/out.original_state.json +++ b/acceptance/bundle/migrate/command/grants/out.original_state.json @@ -2,7 +2,7 @@ "version": 4, "terraform_version": "1.5.5", "serial": 7, - "lineage": "[UUID]", + "lineage": "[UUID][0]", "outputs": {}, "resources": [ { @@ -172,11 +172,11 @@ "browse_only": false, "catalog_name": "main", "comment": "mycomment", - "created_at": [UNIX_TIME_MILLIS][0], + "created_at": [UNIX_TIME_MILLIS], "created_by": "[USERNAME]", "full_name": "main.schema_grants.mymodel", "id": "main.schema_grants.mymodel", - "metastore_id": "[UUID]", + "metastore_id": "[UUID][1]", "name": "mymodel", "owner": "[USERNAME]", "provider_config": [ @@ -186,7 +186,7 @@ ], "schema_name": "schema_grants", "storage_location": null, - "updated_at": [UNIX_TIME_MILLIS][0], + "updated_at": [UNIX_TIME_MILLIS], "updated_by": "[USERNAME]" }, "sensitive_attributes": [], @@ -211,7 +211,7 @@ "enable_predictive_optimization": "INHERIT", "force_destroy": true, "id": "main.schema_grants", - "metastore_id": "[UUID]", + "metastore_id": "[UUID][2]", "name": "schema_grants", "owner": "[USERNAME]", "properties": null, @@ -220,7 +220,7 @@ "workspace_id": "[WORKSPACE_ID]" } ], - "schema_id": "[UUID]", + "schema_id": "[UUID][3]", "storage_root": null }, "sensitive_attributes": [], @@ -248,7 +248,7 @@ } ], "schema_name": "schema_grants", - "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]", + "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][2]/volumes/[UUID][4]", "volume_path": "/Volumes/main/schema_grants/volume_name", "volume_type": "MANAGED" }, diff --git a/acceptance/bundle/migrate/command/permissions/out.new_state.json b/acceptance/bundle/migrate/command/permissions/out.new_state.json index a2545a07093..21c2edac657 100644 --- a/acceptance/bundle/migrate/command/permissions/out.new_state.json +++ b/acceptance/bundle/migrate/command/permissions/out.new_state.json @@ -1,7 +1,7 @@ { "state_version": 3, "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 7, "state": { "resources.jobs.test_job": { @@ -51,7 +51,7 @@ ] }, "resources.pipelines.test_pipeline": { - "__id__": "[UUID]", + "__id__": "[UUID][1]", "state": { "channel": "CURRENT", "deployment": { @@ -70,9 +70,9 @@ } }, "resources.pipelines.test_pipeline.permissions": { - "__id__": "/pipelines/[UUID]", + "__id__": "/pipelines/[UUID][1]", "state": { - "object_id": "/pipelines/[UUID]", + "object_id": "/pipelines/[UUID][1]", "__embed__": [ { "level": "CAN_MANAGE", diff --git a/acceptance/bundle/migrate/command/permissions/out.original_state.json b/acceptance/bundle/migrate/command/permissions/out.original_state.json index e127e33e07b..9fdf9ab3a5f 100644 --- a/acceptance/bundle/migrate/command/permissions/out.original_state.json +++ b/acceptance/bundle/migrate/command/permissions/out.original_state.json @@ -2,7 +2,7 @@ "version": 4, "terraform_version": "1.5.5", "serial": 5, - "lineage": "[UUID]", + "lineage": "[UUID][0]", "outputs": {}, "resources": [ { @@ -266,14 +266,14 @@ "directory_id": null, "directory_path": null, "experiment_id": null, - "id": "/pipelines/[UUID]", + "id": "/pipelines/[UUID][1]", "instance_pool_id": null, "job_id": null, "knowledge_assistant_id": null, "notebook_id": null, "notebook_path": null, "object_type": "pipelines", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][1]", "provider_config": [ { "workspace_id": "[WORKSPACE_ID]" @@ -335,7 +335,7 @@ "filters": [], "gateway_definition": [], "health": null, - "id": "[UUID]", + "id": "[UUID][1]", "ingestion_definition": [], "last_modified": [UNIX_TIME_MILLIS], "latest_updates": null, @@ -369,12 +369,12 @@ "serverless": false, "serverless_compute_id": null, "state": "IDLE", - "storage": "dbfs:/pipelines/[UUID]", + "storage": "dbfs:/pipelines/[UUID][1]", "tags": null, "target": null, "timeouts": null, "trigger": [], - "url": "[DATABRICKS_URL]/#joblist/pipelines/[UUID]", + "url": "[DATABRICKS_URL]/#joblist/pipelines/[UUID][1]", "usage_policy_id": null }, "sensitive_attributes": [], diff --git a/acceptance/bundle/migrate/command/permissions/output.txt b/acceptance/bundle/migrate/command/permissions/output.txt index 4b24a246e36..d9f06fd88ae 100644 --- a/acceptance/bundle/migrate/command/permissions/output.txt +++ b/acceptance/bundle/migrate/command/permissions/output.txt @@ -21,7 +21,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 4 unchanged { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -33,7 +33,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 4 unchanged { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID][1] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -49,17 +49,17 @@ Files: 3 uploaded, 0 deleted Resources: 0 created, 0 changed, 0 deleted, 4 unchanged >>> print_requests.py --get //jobs/get -"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" -"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" +"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][2] interactive/none engine/direct auth/pat" +"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][2] interactive/none engine/direct auth/pat" === Should show that it's already migrated >>> musterr [CLI] bundle deployment migrate Error: already using direct engine -Details: [TEST_TMP_DIR]/.databricks/bundle/default/resources.json: local direct state serial=7 lineage="[UUID]" +Details: [TEST_TMP_DIR]/.databricks/bundle/default/resources.json: local direct state serial=7 lineage="[UUID][3]" >>> [CLI] bundle debug states -[TEST_TMP_DIR]/.databricks/bundle/default/resources.json: local direct state serial=7 lineage="[UUID]" +[TEST_TMP_DIR]/.databricks/bundle/default/resources.json: local direct state serial=7 lineage="[UUID][3]" >>> [CLI] bundle debug states --force-pull -resources.json: remote direct state serial=7 lineage="[UUID]" -[TEST_TMP_DIR]/.databricks/bundle/default/resources.json: local direct state serial=7 lineage="[UUID]" +resources.json: remote direct state serial=7 lineage="[UUID][3]" +[TEST_TMP_DIR]/.databricks/bundle/default/resources.json: local direct state serial=7 lineage="[UUID][3]" diff --git a/acceptance/bundle/migrate/command/runas/out.create_requests.json b/acceptance/bundle/migrate/command/runas/out.create_requests.json index abeb78d7d35..45cb2b8ac93 100644 --- a/acceptance/bundle/migrate/command/runas/out.create_requests.json +++ b/acceptance/bundle/migrate/command/runas/out.create_requests.json @@ -23,7 +23,7 @@ ], "name": "DABs Revenue Pipeline", "run_as": { - "service_principal_name": "[UUID]" + "service_principal_name": "[UUID][0]" }, "serverless": true, "target": "team_eng_deco" @@ -36,7 +36,7 @@ ] }, "method": "PUT", - "path": "/api/2.0/permissions/pipelines/[UUID]", + "path": "/api/2.0/permissions/pipelines/[UUID][1]", "body": { "access_control_list": [ { diff --git a/acceptance/bundle/migrate/command/runas/out.new_state.json b/acceptance/bundle/migrate/command/runas/out.new_state.json index 134f7aff689..af6d8cb2db0 100644 --- a/acceptance/bundle/migrate/command/runas/out.new_state.json +++ b/acceptance/bundle/migrate/command/runas/out.new_state.json @@ -1,11 +1,11 @@ { "state_version": 3, "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 5, "state": { "resources.pipelines.foo": { - "__id__": "[UUID]", + "__id__": "[UUID][1]", "state": { "catalog": "main", "channel": "CURRENT", @@ -23,16 +23,16 @@ ], "name": "DABs Revenue Pipeline", "run_as": { - "service_principal_name": "[UUID]" + "service_principal_name": "[UUID][2]" }, "serverless": true, "target": "team_eng_deco" } }, "resources.pipelines.foo.permissions": { - "__id__": "/pipelines/[UUID]", + "__id__": "/pipelines/[UUID][1]", "state": { - "object_id": "/pipelines/[UUID]", + "object_id": "/pipelines/[UUID][1]", "__embed__": [ { "level": "CAN_VIEW", diff --git a/acceptance/bundle/migrate/command/runas/out.old_state.json b/acceptance/bundle/migrate/command/runas/out.old_state.json index ffc6dcc50da..047387609ef 100644 --- a/acceptance/bundle/migrate/command/runas/out.old_state.json +++ b/acceptance/bundle/migrate/command/runas/out.old_state.json @@ -2,7 +2,7 @@ "version": 4, "terraform_version": "1.5.5", "serial": 3, - "lineage": "[UUID]", + "lineage": "[UUID][0]", "outputs": {}, "resources": [ { @@ -39,14 +39,14 @@ "directory_id": null, "directory_path": null, "experiment_id": null, - "id": "/pipelines/[UUID]", + "id": "/pipelines/[UUID][1]", "instance_pool_id": null, "job_id": null, "knowledge_assistant_id": null, "notebook_id": null, "notebook_path": null, "object_type": "pipelines", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][1]", "provider_config": [ { "workspace_id": "[WORKSPACE_ID]" @@ -108,7 +108,7 @@ "filters": [], "gateway_definition": [], "health": null, - "id": "[UUID]", + "id": "[UUID][1]", "ingestion_definition": [], "last_modified": [UNIX_TIME_MILLIS], "latest_updates": null, @@ -139,7 +139,7 @@ "run_as": [ { "group_name": "", - "service_principal_name": "[UUID]", + "service_principal_name": "[UUID][2]", "user_name": "" } ], @@ -153,7 +153,7 @@ "target": "team_eng_deco", "timeouts": null, "trigger": [], - "url": "[DATABRICKS_URL]/#joblist/pipelines/[UUID]", + "url": "[DATABRICKS_URL]/#joblist/pipelines/[UUID][1]", "usage_policy_id": null }, "sensitive_attributes": [], diff --git a/acceptance/bundle/migrate/command/runas/out.pipelines_get.json b/acceptance/bundle/migrate/command/runas/out.pipelines_get.json index fb06fd6bdb6..78c3a5afa6f 100644 --- a/acceptance/bundle/migrate/command/runas/out.pipelines_get.json +++ b/acceptance/bundle/migrate/command/runas/out.pipelines_get.json @@ -3,9 +3,9 @@ "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE", "last_modified": [UNIX_TIME_MILLIS], "name": "DABs Revenue Pipeline", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][0]", "run_as": { - "service_principal_name": "[UUID]" + "service_principal_name": "[UUID][1]" }, "run_as_user_name": "[USERNAME]", "spec": { @@ -16,7 +16,7 @@ "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/dabs_revenue-[UNIQUE_NAME]/production/state/metadata.json" }, "edition": "ADVANCED", - "id": "[UUID]", + "id": "[UUID][0]", "libraries": [ { "notebook": { diff --git a/acceptance/bundle/migrate/command/runas/out.plan.json b/acceptance/bundle/migrate/command/runas/out.plan.json index 3c6a3717007..cd7a66e31f3 100644 --- a/acceptance/bundle/migrate/command/runas/out.plan.json +++ b/acceptance/bundle/migrate/command/runas/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 5, "plan": { "resources.pipelines.foo": { @@ -16,7 +16,7 @@ }, "edition": "ADVANCED", "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE", - "id": "[UUID]", + "id": "[UUID][1]", "last_modified": [UNIX_TIME_MILLIS], "libraries": [ { @@ -26,9 +26,9 @@ } ], "name": "DABs Revenue Pipeline", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][1]", "run_as": { - "service_principal_name": "[UUID]" + "service_principal_name": "[UUID][2]" }, "run_as_user_name": "[USERNAME]", "serverless": true, @@ -45,7 +45,7 @@ ], "action": "skip", "remote_state": { - "object_id": "/pipelines/[UUID]", + "object_id": "/pipelines/[UUID][1]", "__embed__": [ { "level": "CAN_VIEW", diff --git a/acceptance/bundle/python/pipeline-development-mutator/output.txt b/acceptance/bundle/python/pipeline-development-mutator/output.txt index c281946ba91..ba2610dfe7c 100644 --- a/acceptance/bundle/python/pipeline-development-mutator/output.txt +++ b/acceptance/bundle/python/pipeline-development-mutator/output.txt @@ -41,14 +41,14 @@ Warning: The "development: false" set by a Python mutator is ignored when runnin To run this pipeline in production, set "presets.pipelines_development: false" on the target. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "development": true } diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.requests.json b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.requests.json index 5ce661fb129..6b92aaa2af7 100644 --- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.requests.json +++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.requests.json @@ -21,7 +21,7 @@ "path": "/api/2.1/unity-catalog/volumes", "body": { "catalog_name": "main", - "comment": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]", + "comment": "s3://[METASTORE_NAME]/metastore/[UUID][0]/volumes/[UUID][1]", "name": "volumefoo-[UNIQUE_NAME]", "schema_name": "myschema-[UNIQUE_NAME]", "volume_type": "MANAGED" diff --git a/acceptance/bundle/resource_deps/remote_pipeline/out.plan_skip.json b/acceptance/bundle/resource_deps/remote_pipeline/out.plan_skip.json index 37e2b7f7193..11c57380b78 100644 --- a/acceptance/bundle/resource_deps/remote_pipeline/out.plan_skip.json +++ b/acceptance/bundle/resource_deps/remote_pipeline/out.plan_skip.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.pipelines.foo1": { @@ -15,19 +15,19 @@ }, "edition": "ADVANCED", "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE", - "id": "[UUID]", + "id": "[UUID][1]", "last_modified": [UNIX_TIME_MILLIS], "name": "foo1 name", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][1]", "run_as_user_name": "[USERNAME]", "state": "IDLE", - "storage": "dbfs:/pipelines/[UUID]" + "storage": "dbfs:/pipelines/[UUID][1]" }, "changes": { "storage": { "action": "skip", "reason": "immutable_backend_value", - "remote": "dbfs:/pipelines/[UUID]" + "remote": "dbfs:/pipelines/[UUID][1]" } } }, @@ -48,19 +48,19 @@ }, "edition": "ADVANCED", "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE", - "id": "[UUID]", + "id": "[UUID][2]", "last_modified": [UNIX_TIME_MILLIS], "name": "foo2 foo1.creator_user_name=[USERNAME]", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][2]", "run_as_user_name": "[USERNAME]", "state": "IDLE", - "storage": "dbfs:/pipelines/[UUID]" + "storage": "dbfs:/pipelines/[UUID][2]" }, "changes": { "storage": { "action": "skip", "reason": "immutable_backend_value", - "remote": "dbfs:/pipelines/[UUID]" + "remote": "dbfs:/pipelines/[UUID][2]" } } }, @@ -81,19 +81,19 @@ }, "edition": "ADVANCED", "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE", - "id": "[UUID]", + "id": "[UUID][3]", "last_modified": [UNIX_TIME_MILLIS], "name": "foo3 foo2.state=IDLE", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][3]", "run_as_user_name": "[USERNAME]", "state": "IDLE", - "storage": "dbfs:/pipelines/[UUID]" + "storage": "dbfs:/pipelines/[UUID][3]" }, "changes": { "storage": { "action": "skip", "reason": "immutable_backend_value", - "remote": "dbfs:/pipelines/[UUID]" + "remote": "dbfs:/pipelines/[UUID][3]" } } }, @@ -114,19 +114,19 @@ }, "edition": "ADVANCED", "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE", - "id": "[UUID]", + "id": "[UUID][4]", "last_modified": [UNIX_TIME_MILLIS], "name": "foo4 foo3.last_modified=[UNIX_TIME_MILLIS]", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][4]", "run_as_user_name": "[USERNAME]", "state": "IDLE", - "storage": "dbfs:/pipelines/[UUID]" + "storage": "dbfs:/pipelines/[UUID][4]" }, "changes": { "storage": { "action": "skip", "reason": "immutable_backend_value", - "remote": "dbfs:/pipelines/[UUID]" + "remote": "dbfs:/pipelines/[UUID][4]" } } } diff --git a/acceptance/bundle/resource_deps/run_state_resolution/pipelines/output.txt b/acceptance/bundle/resource_deps/run_state_resolution/pipelines/output.txt index d1458911a15..2588e1236cc 100644 --- a/acceptance/bundle/resource_deps/run_state_resolution/pipelines/output.txt +++ b/acceptance/bundle/resource_deps/run_state_resolution/pipelines/output.txt @@ -6,6 +6,6 @@ Files: 2 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged, 2 not selected >>> [CLI] bundle run foo -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.plan.json b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.plan.json index fa0567e471e..f7c2f5cb09c 100644 --- a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.plan.json +++ b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.dashboards.dashboard1": { @@ -9,12 +9,12 @@ "remote_state": { "create_time": "[TIMESTAMP]", "dashboard_id": "[DASHBOARD_ID]", - "display_name": "test bundle-deploy-dashboard-dataset [UUID]", + "display_name": "test bundle-deploy-dashboard-dataset [UUID][1]", "embed_credentials": true, "etag": "[ETAG]", "lifecycle_state": "ACTIVE", "parent_path": "/Workspace/Users/[USERNAME]", - "path": "/Users/[USERNAME]/test bundle-deploy-dashboard-dataset [UUID].lvdash.json", + "path": "/Users/[USERNAME]/test bundle-deploy-dashboard-dataset [UUID][1].lvdash.json", "published": true, "serialized_dashboard": "[SERIALIZED_FIXTURE]", "update_time": "[TIMESTAMP]", @@ -57,7 +57,7 @@ "path": { "action": "skip", "reason": "spec:output_only", - "remote": "/Users/[USERNAME]/test bundle-deploy-dashboard-dataset [UUID].lvdash.json" + "remote": "/Users/[USERNAME]/test bundle-deploy-dashboard-dataset [UUID][1].lvdash.json" }, "serialized_dashboard": { "action": "skip", diff --git a/acceptance/bundle/resources/dashboards/detect-change/out.plan.json b/acceptance/bundle/resources/dashboards/detect-change/out.plan.json index 74462c9c567..243ab19e66d 100644 --- a/acceptance/bundle/resources/dashboards/detect-change/out.plan.json +++ b/acceptance/bundle/resources/dashboards/detect-change/out.plan.json @@ -65,8 +65,8 @@ "serialized_dashboard": { "action": "skip", "reason": "etag_based", - "old": "sha256:[HASH][0]", - "new": "sha256:[HASH][0]", + "old": "sha256:[HASH]", + "new": "sha256:[HASH]", "remote": "{}\n" }, "update_time": { diff --git a/acceptance/bundle/resources/dashboards/simple/out.plan.json b/acceptance/bundle/resources/dashboards/simple/out.plan.json index 1f3d8674749..e3dbde10f71 100644 --- a/acceptance/bundle/resources/dashboards/simple/out.plan.json +++ b/acceptance/bundle/resources/dashboards/simple/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.dashboards.dashboard1": { @@ -9,12 +9,12 @@ "remote_state": { "create_time": "[TIMESTAMP]", "dashboard_id": "[DASHBOARD_ID]", - "display_name": "test bundle-deploy-dashboard [UUID]", + "display_name": "test bundle-deploy-dashboard [UUID][1]", "embed_credentials": true, "etag": "[ETAG]", "lifecycle_state": "ACTIVE", "parent_path": "/Workspace/Users/[USERNAME]", - "path": "/Users/[USERNAME]/test bundle-deploy-dashboard [UUID].lvdash.json", + "path": "/Users/[USERNAME]/test bundle-deploy-dashboard [UUID][1].lvdash.json", "published": true, "serialized_dashboard": "{}\n", "update_time": "[TIMESTAMP]", @@ -45,7 +45,7 @@ "path": { "action": "skip", "reason": "spec:output_only", - "remote": "/Users/[USERNAME]/test bundle-deploy-dashboard [UUID].lvdash.json" + "remote": "/Users/[USERNAME]/test bundle-deploy-dashboard [UUID][1].lvdash.json" }, "serialized_dashboard": { "action": "skip", diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.plan.json b/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.plan.json index 4586c6ab570..885884210a3 100644 --- a/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.plan.json +++ b/acceptance/bundle/resources/grants/schemas/duplicate_principals/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.schemas.apps_schema": { @@ -14,10 +14,10 @@ "created_by": "[USERNAME]", "enable_predictive_optimization": "INHERIT", "full_name": "main.schema_dup_grants_[UNIQUE_NAME]", - "metastore_id": "[UUID]", + "metastore_id": "[UUID][1]", "name": "schema_dup_grants_[UNIQUE_NAME]", "owner": "[USERNAME]", - "schema_id": "[UUID]" + "schema_id": "[UUID][2]" } }, "resources.schemas.apps_schema.grants": { diff --git a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan.json b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan.json index 038a187a8ed..dfb10ea9b05 100644 --- a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan.json +++ b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.schemas.grants_schema": { @@ -14,10 +14,10 @@ "created_by": "[USERNAME]", "enable_predictive_optimization": "INHERIT", "full_name": "main.schema_out_of_band_principal_[UNIQUE_NAME]", - "metastore_id": "[UUID]", + "metastore_id": "[UUID][1]", "name": "schema_out_of_band_principal_[UNIQUE_NAME]", "owner": "[USERNAME]", - "schema_id": "[UUID]" + "schema_id": "[UUID][2]" } }, "resources.schemas.grants_schema.grants": { diff --git a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan2.json b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan2.json index 3b9720936dc..78b0aa501c0 100644 --- a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan2.json +++ b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/out.plan2.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 2, "plan": { "resources.schemas.grants_schema": { @@ -14,10 +14,10 @@ "created_by": "[USERNAME]", "enable_predictive_optimization": "INHERIT", "full_name": "main.schema_out_of_band_principal_[UNIQUE_NAME]", - "metastore_id": "[UUID]", + "metastore_id": "[UUID][1]", "name": "schema_out_of_band_principal_[UNIQUE_NAME]", "owner": "[USERNAME]", - "schema_id": "[UUID]" + "schema_id": "[UUID][2]" } }, "resources.schemas.grants_schema.grants": { diff --git a/acceptance/bundle/resources/grants/volumes/out.plan2.json b/acceptance/bundle/resources/grants/volumes/out.plan2.json index 198c6851573..c59443cb28f 100644 --- a/acceptance/bundle/resources/grants/volumes/out.plan2.json +++ b/acceptance/bundle/resources/grants/volumes/out.plan2.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.schemas.grants_schema": { @@ -33,14 +33,14 @@ "name": "volume_name", "owner": "[USERNAME]", "schema_name": "schema_grants_[UNIQUE_NAME]", - "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]", + "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][1]/volumes/[UUID][2]", "volume_type": "MANAGED" }, "changes": { "storage_location": { "action": "skip", "reason": "immutable_backend_value", - "remote": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]" + "remote": "s3://[METASTORE_NAME]/metastore/[UUID][1]/volumes/[UUID][2]" } } }, diff --git a/acceptance/bundle/resources/job_runs/failed_run/output.txt b/acceptance/bundle/resources/job_runs/failed_run/output.txt index 44d3b17412a..89861c025a4 100644 --- a/acceptance/bundle/resources/job_runs/failed_run/output.txt +++ b/acceptance/bundle/resources/job_runs/failed_run/output.txt @@ -72,7 +72,7 @@ Files: 0 uploaded, 0 deleted "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][0]", "job_id": [MY_JOB_ID] } } @@ -80,7 +80,7 @@ Files: 0 uploaded, 0 deleted "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][1]", "job_id": [MY_JOB_ID] } } diff --git a/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt b/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt index f910dffcc05..50e7e4a46d7 100644 --- a/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt +++ b/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt @@ -17,7 +17,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][0]", "job_id": [MY_JOB_ID] } } @@ -33,8 +33,8 @@ Plan: 1 to add, 0 to change, 1 to delete, 1 unchanged "lifecycle.triggers_state.on_bundle_deploy": { "action": "recreate", "reason": "immutable", - "old": "[UUID]", - "new": "[UUID]" + "old": "[UUID][1]", + "new": "[UUID][2]" }, "result_state": { "action": "skip", @@ -76,7 +76,7 @@ Resources: "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][3]", "job_id": [MY_JOB_ID] } } diff --git a/acceptance/bundle/resources/job_runs/on_file_change/output.txt b/acceptance/bundle/resources/job_runs/on_file_change/output.txt index cd580a8efa4..529c8ed962a 100644 --- a/acceptance/bundle/resources/job_runs/on_file_change/output.txt +++ b/acceptance/bundle/resources/job_runs/on_file_change/output.txt @@ -17,7 +17,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][0]", "job_id": [MY_JOB_ID] } } @@ -104,7 +104,7 @@ Resources: 1 created, 0 changed, 1 deleted, 1 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][1]", "job_id": [MY_JOB_ID] } } @@ -182,7 +182,7 @@ Resources: 1 created, 0 changed, 1 deleted, 1 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][2]", "job_id": [MY_JOB_ID] } } @@ -207,7 +207,7 @@ Resources: 1 created, 0 changed, 1 deleted, 1 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][3]", "job_id": [MY_JOB_ID] } } diff --git a/acceptance/bundle/resources/job_runs/on_file_change_build/output.txt b/acceptance/bundle/resources/job_runs/on_file_change_build/output.txt index 8cde92e29b9..e36e49bfa63 100644 --- a/acceptance/bundle/resources/job_runs/on_file_change_build/output.txt +++ b/acceptance/bundle/resources/job_runs/on_file_change_build/output.txt @@ -18,7 +18,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][0]", "job_id": [MY_JOB_ID] } } @@ -38,7 +38,7 @@ Resources: 1 created, 0 changed, 1 deleted, 1 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][1]", "job_id": [MY_JOB_ID] } } diff --git a/acceptance/bundle/resources/job_runs/on_file_change_glob/output.txt b/acceptance/bundle/resources/job_runs/on_file_change_glob/output.txt index ed04ecb79d3..3f189586db7 100644 --- a/acceptance/bundle/resources/job_runs/on_file_change_glob/output.txt +++ b/acceptance/bundle/resources/job_runs/on_file_change_glob/output.txt @@ -17,7 +17,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][0]", "job_id": [MY_JOB_ID] } } @@ -55,7 +55,7 @@ Resources: 1 created, 0 changed, 1 deleted, 1 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][1]", "job_id": [MY_JOB_ID] } } diff --git a/acceptance/bundle/resources/job_runs/on_file_change_predeploy/output.txt b/acceptance/bundle/resources/job_runs/on_file_change_predeploy/output.txt index bbf77481367..5e4224e2469 100644 --- a/acceptance/bundle/resources/job_runs/on_file_change_predeploy/output.txt +++ b/acceptance/bundle/resources/job_runs/on_file_change_predeploy/output.txt @@ -18,7 +18,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][0]", "job_id": [MY_JOB_ID] } } @@ -38,7 +38,7 @@ Resources: 1 created, 0 changed, 1 deleted, 1 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][1]", "job_id": [MY_JOB_ID] } } diff --git a/acceptance/bundle/resources/job_runs/redeploy/output.txt b/acceptance/bundle/resources/job_runs/redeploy/output.txt index 577db05fae9..c88a8a5d1b6 100644 --- a/acceptance/bundle/resources/job_runs/redeploy/output.txt +++ b/acceptance/bundle/resources/job_runs/redeploy/output.txt @@ -33,7 +33,7 @@ Resources: "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][0]", "job_id": [MY_JOB_ID], "job_parameters": { "env": "dev" @@ -126,7 +126,7 @@ Resources: "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[UUID]", + "idempotency_token": "[UUID][1]", "job_id": [MY_JOB_ID], "job_parameters": { "env": "prod" diff --git a/acceptance/bundle/resources/job_runs/retried_run_now/output.txt b/acceptance/bundle/resources/job_runs/retried_run_now/output.txt index bf30c0cb2c0..a856ca44fc9 100644 --- a/acceptance/bundle/resources/job_runs/retried_run_now/output.txt +++ b/acceptance/bundle/resources/job_runs/retried_run_now/output.txt @@ -18,7 +18,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[IDEMPOTENCY_TOKEN][0]", + "idempotency_token": "[IDEMPOTENCY_TOKEN]", "job_id": [MY_JOB_ID] } } @@ -26,7 +26,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "method": "POST", "path": "/api/2.2/jobs/run-now", "body": { - "idempotency_token": "[IDEMPOTENCY_TOKEN][0]", + "idempotency_token": "[IDEMPOTENCY_TOKEN]", "job_id": [MY_JOB_ID] } } diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/out.second-plan.txt b/acceptance/bundle/resources/model_serving_endpoints/basic/out.second-plan.txt index 60bca95b9ff..8d48bc21467 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/basic/out.second-plan.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/basic/out.second-plan.txt @@ -5,11 +5,11 @@ json.serial = 1; json.plan.resources.model_serving_endpoints.my_endpoint.action = "recreate"; json.plan.resources.model_serving_endpoints.my_endpoint.new_state.value.name = "[ENDPOINT_NAME_2]"; json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.description = ""; -json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.creation_timestamp = [UNIX_TIME_MILLIS][0]; +json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.creation_timestamp = [UNIX_TIME_MILLIS]; json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.creator = "[USERNAME]"; json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.description = ""; json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.id = "[ENDPOINT_ID_1]"; -json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.last_updated_timestamp = [UNIX_TIME_MILLIS][0]; +json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.last_updated_timestamp = [UNIX_TIME_MILLIS]; json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.name = "[ENDPOINT_NAME_1]"; json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.permission_level = "CAN_MANAGE"; json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.route_optimized = false; diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/out.second-plan.json b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/out.second-plan.json index 89686b87922..475588afef9 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/out.second-plan.json +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/out.second-plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.model_serving_endpoints.test_endpoint": { @@ -92,11 +92,11 @@ ] } }, - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "description": "", - "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "id": "[UUID][1]", + "last_updated_timestamp": [UNIX_TIME_MILLIS], "name": "[ORIGINAL_ENDPOINT_ID]", "permission_level": "CAN_MANAGE", "route_optimized": false, @@ -105,7 +105,7 @@ "ready": "NOT_READY" } }, - "endpoint_id": "[UUID]", + "endpoint_id": "[UUID][1]", "name": "[ORIGINAL_ENDPOINT_ID]", "route_optimized": false }, diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/out.second-plan.json b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/out.second-plan.json index 2a50d836ce7..2ff282564ee 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/out.second-plan.json +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/out.second-plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.model_serving_endpoints.test_endpoint": { @@ -77,11 +77,11 @@ ] } }, - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "description": "", - "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "id": "[UUID][1]", + "last_updated_timestamp": [UNIX_TIME_MILLIS], "name": "[ORIGINAL_ENDPOINT_ID]", "permission_level": "CAN_MANAGE", "route_optimized": false, @@ -90,7 +90,7 @@ "ready": "NOT_READY" } }, - "endpoint_id": "[UUID]", + "endpoint_id": "[UUID][1]", "name": "[ORIGINAL_ENDPOINT_ID]", "route_optimized": false }, diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.second-plan.json b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.second-plan.json index b5555453219..ece201c92bd 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.second-plan.json +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.second-plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.model_serving_endpoints.test_endpoint": { @@ -66,11 +66,11 @@ ] } }, - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "description": "", - "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "id": "[UUID][1]", + "last_updated_timestamp": [UNIX_TIME_MILLIS], "name": "[ORIGINAL_ENDPOINT_ID]", "permission_level": "CAN_MANAGE", "route_optimized": false, @@ -79,7 +79,7 @@ "ready": "NOT_READY" } }, - "endpoint_id": "[UUID]", + "endpoint_id": "[UUID][1]", "name": "[ORIGINAL_ENDPOINT_ID]", "route_optimized": false }, diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt index c0bc3f5ea66..2aa97e5cf60 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt @@ -66,11 +66,11 @@ Resources: 1 created, 0 changed, 1 deleted, 0 unchanged ] } }, - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "description": "", "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "last_updated_timestamp": [UNIX_TIME_MILLIS], "name": "[ORIGINAL_ENDPOINT_ID]", "permission_level": "CAN_MANAGE", "route_optimized": true, diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/out.second-plan.json b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/out.second-plan.json index 0a2bc7bee2d..6eed2db733c 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/out.second-plan.json +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/out.second-plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.model_serving_endpoints.test_endpoint": { @@ -92,11 +92,11 @@ ] } }, - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "description": "", - "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "id": "[UUID][1]", + "last_updated_timestamp": [UNIX_TIME_MILLIS], "name": "[ORIGINAL_ENDPOINT_ID]", "permission_level": "CAN_MANAGE", "route_optimized": false, @@ -105,7 +105,7 @@ "ready": "NOT_READY" } }, - "endpoint_id": "[UUID]", + "endpoint_id": "[UUID][1]", "name": "[ORIGINAL_ENDPOINT_ID]", "route_optimized": false }, diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/out.second-plan.json b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/out.second-plan.json index 6d2c9deccb6..b0dcbb07303 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/out.second-plan.json +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/out.second-plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.model_serving_endpoints.test_endpoint": { @@ -92,11 +92,11 @@ ] } }, - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "description": "", - "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "id": "[UUID][1]", + "last_updated_timestamp": [UNIX_TIME_MILLIS], "name": "[ORIGINAL_ENDPOINT_ID]", "permission_level": "CAN_MANAGE", "route_optimized": false, @@ -105,7 +105,7 @@ "ready": "NOT_READY" } }, - "endpoint_id": "[UUID]", + "endpoint_id": "[UUID][1]", "name": "[ORIGINAL_ENDPOINT_ID]", "route_optimized": false }, diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/out.plan.json b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/out.plan.json index afe9fa25886..67a85435776 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/out.plan.json +++ b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.model_serving_endpoints.test_endpoint": { @@ -92,11 +92,11 @@ ] } }, - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "description": "", - "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "id": "[UUID][1]", + "last_updated_timestamp": [UNIX_TIME_MILLIS], "name": "[ENDPOINT_ID]", "permission_level": "CAN_MANAGE", "route_optimized": false, @@ -105,7 +105,7 @@ "ready": "NOT_READY" } }, - "endpoint_id": "[UUID]", + "endpoint_id": "[UUID][1]", "name": "[ENDPOINT_ID]", "route_optimized": false }, diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/out.plan.json b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/out.plan.json index 32c30ee2612..8a65245e800 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/out.plan.json +++ b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.model_serving_endpoints.test_endpoint": { @@ -98,11 +98,11 @@ ] } }, - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "description": "", - "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "id": "[UUID][1]", + "last_updated_timestamp": [UNIX_TIME_MILLIS], "name": "[ENDPOINT_ID]", "permission_level": "CAN_MANAGE", "route_optimized": false, @@ -117,7 +117,7 @@ } ] }, - "endpoint_id": "[UUID]", + "endpoint_id": "[UUID][1]", "name": "[ENDPOINT_ID]", "route_optimized": false, "tags": [ diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/config/out.plan.json b/acceptance/bundle/resources/model_serving_endpoints/update/config/out.plan.json index 5b90f2088d6..305867deb43 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/config/out.plan.json +++ b/acceptance/bundle/resources/model_serving_endpoints/update/config/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.model_serving_endpoints.test_endpoint": { @@ -83,11 +83,11 @@ ] } }, - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "description": "", - "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "id": "[UUID][1]", + "last_updated_timestamp": [UNIX_TIME_MILLIS], "name": "[ENDPOINT_ID]", "permission_level": "CAN_MANAGE", "route_optimized": false, @@ -96,7 +96,7 @@ "ready": "NOT_READY" } }, - "endpoint_id": "[UUID]", + "endpoint_id": "[UUID][1]", "name": "[ENDPOINT_ID]", "route_optimized": false }, diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/out.plan.json b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/out.plan.json index 0f860ce7ac3..8792b7d7d1d 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/out.plan.json +++ b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.model_serving_endpoints.test_endpoint": { @@ -87,7 +87,7 @@ ] } }, - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "description": "", "email_notifications": { @@ -95,8 +95,8 @@ "user1@example.com" ] }, - "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "id": "[UUID][1]", + "last_updated_timestamp": [UNIX_TIME_MILLIS], "name": "[ENDPOINT_ID]", "permission_level": "CAN_MANAGE", "route_optimized": false, @@ -105,7 +105,7 @@ "ready": "NOT_READY" } }, - "endpoint_id": "[UUID]", + "endpoint_id": "[UUID][1]", "name": "[ENDPOINT_ID]", "route_optimized": false }, diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/tags/out.plan.json b/acceptance/bundle/resources/model_serving_endpoints/update/tags/out.plan.json index f8850241ddf..680d0b25997 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/tags/out.plan.json +++ b/acceptance/bundle/resources/model_serving_endpoints/update/tags/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.model_serving_endpoints.test_endpoint": { @@ -83,11 +83,11 @@ ] } }, - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "description": "", - "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "id": "[UUID][1]", + "last_updated_timestamp": [UNIX_TIME_MILLIS], "name": "[ENDPOINT_ID]", "permission_level": "CAN_MANAGE", "route_optimized": false, @@ -102,7 +102,7 @@ } ] }, - "endpoint_id": "[UUID]", + "endpoint_id": "[UUID][1]", "name": "[ENDPOINT_ID]", "route_optimized": false, "tags": [ diff --git a/acceptance/bundle/resources/permissions/clusters/target/out.requests.json b/acceptance/bundle/resources/permissions/clusters/target/out.requests.json index 9a0adb10f0f..dec183677ae 100644 --- a/acceptance/bundle/resources/permissions/clusters/target/out.requests.json +++ b/acceptance/bundle/resources/permissions/clusters/target/out.requests.json @@ -14,20 +14,20 @@ } { "method": "PUT", - "path": "/api/2.0/permissions/clusters/[UUID]", + "path": "/api/2.0/permissions/clusters/[UUID][0]", "body": { "access_control_list": [ { "permission_level": "CAN_ATTACH_TO", - "service_principal_name": "[UUID]" + "service_principal_name": "[UUID][1]" }, { "permission_level": "CAN_RESTART", - "service_principal_name": "[UUID]" + "service_principal_name": "[UUID][2]" }, { "permission_level": "CAN_MANAGE", - "service_principal_name": "[UUID]" + "service_principal_name": "[UUID][3]" }, { "permission_level": "CAN_MANAGE", diff --git a/acceptance/bundle/resources/permissions/clusters/target/output.txt b/acceptance/bundle/resources/permissions/clusters/target/output.txt index 37ff60bd025..68a49427c3e 100644 --- a/acceptance/bundle/resources/permissions/clusters/target/output.txt +++ b/acceptance/bundle/resources/permissions/clusters/target/output.txt @@ -25,15 +25,15 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more "permissions": [ { "level": "CAN_ATTACH_TO", - "service_principal_name": "[UUID]" + "service_principal_name": "[UUID][0]" }, { "level": "CAN_RESTART", - "service_principal_name": "[UUID]" + "service_principal_name": "[UUID][1]" }, { "level": "CAN_MANAGE", - "service_principal_name": "[UUID]" + "service_principal_name": "[UUID][2]" }, { "level": "CAN_MANAGE", diff --git a/acceptance/bundle/resources/pipelines/recreate-add-whole-block/out.plan.json b/acceptance/bundle/resources/pipelines/recreate-add-whole-block/out.plan.json index 345c3fb80fd..71920640ac7 100644 --- a/acceptance/bundle/resources/pipelines/recreate-add-whole-block/out.plan.json +++ b/acceptance/bundle/resources/pipelines/recreate-add-whole-block/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.pipelines.my": { @@ -40,7 +40,7 @@ }, "edition": "ADVANCED", "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE", - "id": "[UUID]", + "id": "[UUID][1]", "last_modified": [UNIX_TIME_MILLIS], "libraries": [ { @@ -50,7 +50,7 @@ } ], "name": "test-pipeline-[UNIQUE_NAME]", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][1]", "run_as_user_name": "[USERNAME]", "state": "IDLE", "storage": "dbfs:/pipelines/custom" diff --git a/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/out.plan.json b/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/out.plan.json index e9d4cb5b6d8..08766e2f90c 100644 --- a/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/out.plan.json +++ b/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.pipelines.my": { @@ -34,7 +34,7 @@ }, "edition": "ADVANCED", "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE", - "id": "[UUID]", + "id": "[UUID][1]", "ingestion_definition": { "connection_name": "my_connection", "objects": [ @@ -50,7 +50,7 @@ } ], "name": "test-pipeline-[UNIQUE_NAME]", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][1]", "run_as_user_name": "[USERNAME]", "state": "IDLE", "storage": "dbfs:/pipelines/custom" diff --git a/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/out.plan.json b/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/out.plan.json index 90a8ddd5c91..39cc2aef2f3 100644 --- a/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/out.plan.json +++ b/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.postgres_projects.my_project": { @@ -38,7 +38,7 @@ "project_id": "test-pg-proj-[UNIQUE_NAME]", "synthetic_storage_size_bytes": 0 }, - "uid": "[UUID]", + "uid": "[UUID][1]", "update_time": "[TIMESTAMP]" }, "changes": { diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt b/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt index d0a4f3b91b8..f910036be1e 100644 --- a/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt +++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt @@ -35,7 +35,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "project_id": "test-pg-proj-hard-[UNIQUE_NAME]", "synthetic_storage_size_bytes": 0 }, - "uid": "[UUID]" + "uid": "[UUID][0]" } >>> [CLI] postgres get-project projects/test-pg-proj-soft-[UNIQUE_NAME] @@ -58,7 +58,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "project_id": "test-pg-proj-soft-[UNIQUE_NAME]", "synthetic_storage_size_bytes": 0 }, - "uid": "[UUID]" + "uid": "[UUID][1]" } >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --sort --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ diff --git a/acceptance/bundle/resources/schemas/recreate/output.txt b/acceptance/bundle/resources/schemas/recreate/output.txt index 8cbfb7e6731..8c11c4e0fe4 100644 --- a/acceptance/bundle/resources/schemas/recreate/output.txt +++ b/acceptance/bundle/resources/schemas/recreate/output.txt @@ -80,8 +80,8 @@ Error: Schema 'main.myschema' does not exist. }, "enable_predictive_optimization": "INHERIT", "full_name": "newmain.myschema", - "metastore_id": "[UUID]", + "metastore_id": "[UUID][0]", "name": "myschema", "owner": "[USERNAME]", - "schema_id": "[UUID]" + "schema_id": "[UUID][1]" } diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt index 777eace89a2..f704efd804d 100644 --- a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt @@ -19,7 +19,7 @@ Plan: 1 to add, 0 to change, 1 to delete, 1 unchanged { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.vector_search_endpoints.my_endpoint": { @@ -31,15 +31,15 @@ Plan: 1 to add, 0 to change, 1 to delete, 1 unchanged } }, "remote_state": { - "creation_timestamp": [UNIX_TIME_MILLIS][0], + "creation_timestamp": [UNIX_TIME_MILLIS], "creator": "[USERNAME]", "endpoint_status": { "state": "ONLINE" }, "endpoint_type": "STANDARD", - "endpoint_uuid": "[UUID]", - "id": "[UUID]", - "last_updated_timestamp": [UNIX_TIME_MILLIS][0], + "endpoint_uuid": "[UUID][1]", + "id": "[UUID][1]", + "last_updated_timestamp": [UNIX_TIME_MILLIS], "last_updated_user": "[USERNAME]", "name": "vs-endpoint-[UNIQUE_NAME]", "scaling_info": {} @@ -74,7 +74,7 @@ Plan: 1 to add, 0 to change, 1 to delete, 1 unchanged "schema_json": "{\"id\":\"int\",\"vector\":\"array\"}" }, "endpoint_name": "vs-endpoint-[UNIQUE_NAME]", - "endpoint_uuid": "[UUID]", + "endpoint_uuid": "[UUID][1]", "index_subtype": "HYBRID", "index_type": "DIRECT_ACCESS", "name": "main.default.vs_index_[UNIQUE_NAME]", @@ -94,8 +94,8 @@ Plan: 1 to add, 0 to change, 1 to delete, 1 unchanged "endpoint_uuid": { "action": "skip", "reason": "state-only field", - "old": "[UUID]", - "remote": "[UUID]" + "old": "[UUID][1]", + "remote": "[UUID][1]" }, "index_subtype": { "action": "skip", diff --git a/acceptance/bundle/resources/volumes/change-comment/output.txt b/acceptance/bundle/resources/volumes/change-comment/output.txt index 275ccb5f70d..b045eb60df2 100644 --- a/acceptance/bundle/resources/volumes/change-comment/output.txt +++ b/acceptance/bundle/resources/volumes/change-comment/output.txt @@ -43,15 +43,15 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "catalog_name": "main", "comment": "COMMENT1", - "created_at": [UNIX_TIME_MILLIS][0], + "created_at": [UNIX_TIME_MILLIS], "created_by": "[USERNAME]", "full_name": "main.myschema.myvolume", "name": "myvolume", "owner": "[USERNAME]", "schema_name": "myschema", - "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]", - "updated_at": [UNIX_TIME_MILLIS][0], - "volume_id": "[UUID]", + "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][0]/volumes/[UUID][1]", + "updated_at": [UNIX_TIME_MILLIS], + "volume_id": "[UUID][1]", "volume_type": "MANAGED" } diff --git a/acceptance/bundle/resources/volumes/change-name/out.plan.json b/acceptance/bundle/resources/volumes/change-name/out.plan.json index eb9308f572b..47d55af7ad3 100644 --- a/acceptance/bundle/resources/volumes/change-name/out.plan.json +++ b/acceptance/bundle/resources/volumes/change-name/out.plan.json @@ -1,7 +1,7 @@ { "plan_version": [PLAN_VERSION], "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][0]", "serial": 1, "plan": { "resources.volumes.volume1": { @@ -18,15 +18,15 @@ "remote_state": { "catalog_name": "main", "comment": "COMMENT1", - "created_at": [UNIX_TIME_MILLIS][0], + "created_at": [UNIX_TIME_MILLIS], "created_by": "[USERNAME]", "full_name": "main.myschema.myvolume", "name": "myvolume", "owner": "[USERNAME]", "schema_name": "myschema", - "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]", - "updated_at": [UNIX_TIME_MILLIS][0], - "volume_id": "[UUID]", + "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][1]/volumes/[UUID][2]", + "updated_at": [UNIX_TIME_MILLIS], + "volume_id": "[UUID][2]", "volume_type": "MANAGED" }, "changes": { @@ -40,7 +40,7 @@ "storage_location": { "action": "skip", "reason": "immutable_backend_value", - "remote": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]" + "remote": "s3://[METASTORE_NAME]/metastore/[UUID][1]/volumes/[UUID][2]" } } } diff --git a/acceptance/bundle/resources/volumes/change-name/output.txt b/acceptance/bundle/resources/volumes/change-name/output.txt index 417cd36f6fd..81b57fcda65 100644 --- a/acceptance/bundle/resources/volumes/change-name/output.txt +++ b/acceptance/bundle/resources/volumes/change-name/output.txt @@ -68,10 +68,10 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged "name": "mynewvolume", "owner": "[USERNAME]", "schema_name": "myschema", - "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]", + "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][0]/volumes/[UUID][1]", "updated_at": [UNIX_TIME_MILLIS][1], "updated_by": "[USERNAME]", - "volume_id": "[UUID]", + "volume_id": "[UUID][1]", "volume_type": "MANAGED" } diff --git a/acceptance/bundle/resources/volumes/comment_out_of_band/output.txt b/acceptance/bundle/resources/volumes/comment_out_of_band/output.txt index b6619370518..82af14b00a2 100644 --- a/acceptance/bundle/resources/volumes/comment_out_of_band/output.txt +++ b/acceptance/bundle/resources/volumes/comment_out_of_band/output.txt @@ -18,7 +18,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "storage_location": { "action": "skip", "reason": "immutable_backend_value", - "remote": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]" + "remote": "s3://[METASTORE_NAME]/metastore/[UUID][0]/volumes/[UUID][1]" } } diff --git a/acceptance/bundle/resources/volumes/remote-change-name/output.txt b/acceptance/bundle/resources/volumes/remote-change-name/output.txt index 3bdbb6d7fe5..9e6c6272954 100644 --- a/acceptance/bundle/resources/volumes/remote-change-name/output.txt +++ b/acceptance/bundle/resources/volumes/remote-change-name/output.txt @@ -14,10 +14,10 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged "name": "my_new_name", "owner": "[USERNAME]", "schema_name": "myschema", - "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]", + "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][0]/volumes/[UUID][1]", "updated_at": [UNIX_TIME_MILLIS][1], "updated_by": "[USERNAME]", - "volume_id": "[UUID]", + "volume_id": "[UUID][1]", "volume_type": "MANAGED" } @@ -30,10 +30,10 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged "name": "my_new_name", "owner": "[USERNAME]", "schema_name": "myschema", - "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID]/volumes/[UUID]", + "storage_location": "s3://[METASTORE_NAME]/metastore/[UUID][0]/volumes/[UUID][1]", "updated_at": [UNIX_TIME_MILLIS][1], "updated_by": "[USERNAME]", - "volume_id": "[UUID]", + "volume_id": "[UUID][1]", "volume_type": "MANAGED" } diff --git a/acceptance/bundle/run/development-mode-changes/output.txt b/acceptance/bundle/run/development-mode-changes/output.txt index c238681ff50..fbc0856911d 100644 --- a/acceptance/bundle/run/development-mode-changes/output.txt +++ b/acceptance/bundle/run/development-mode-changes/output.txt @@ -21,14 +21,14 @@ Warning: The "development" property of pipelines is deprecated. Use "mode: devel at resources.pipelines.my_pipeline.development in databricks.yml:18:24 -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "development": true } @@ -44,14 +44,14 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> update_file.py databricks.yml switch_to_dev: {} switch_to_dev: {mode: development} >>> [CLI] bundle run my_pipeline -t switch_to_dev -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][2]/updates/[UUID][3] -Update ID: [UUID] +Update ID: [UUID][3] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][2]/updates", "body": { "development": true } @@ -67,14 +67,14 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> update_file.py databricks.yml switch_from_dev: {mode: development} switch_from_dev: {} >>> [CLI] bundle run my_pipeline -t switch_from_dev -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][4]/updates/[UUID][5] -Update ID: [UUID] +Update ID: [UUID][5] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][4]/updates", "body": {} } @@ -91,9 +91,9 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged false >>> [CLI] bundle run my_pipeline -t ui_toggle -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[MY_PIPELINE_ID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[MY_PIPELINE_ID]/updates/[UUID][6] -Update ID: [UUID] +Update ID: [UUID][6] >>> print_requests.py //pipelines { diff --git a/acceptance/bundle/run/development-mode/output.txt b/acceptance/bundle/run/development-mode/output.txt index aae6f729a98..8abe1170d5c 100644 --- a/acceptance/bundle/run/development-mode/output.txt +++ b/acceptance/bundle/run/development-mode/output.txt @@ -7,14 +7,14 @@ Files: 2 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run my_pipeline -t prod -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": {} } @@ -26,14 +26,14 @@ Files: 2 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run my_pipeline -t dev -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][2]/updates/[UUID][3] -Update ID: [UUID] +Update ID: [UUID][3] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][2]/updates", "body": { "development": true } @@ -45,9 +45,9 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][2]/updates/[UUID][4] -Update ID: [UUID] +Update ID: [UUID][4] Update for pipeline completed successfully. @@ -57,7 +57,7 @@ Pipeline configurations for this update: >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][2]/updates", "body": { "development": true } @@ -71,13 +71,13 @@ Files: 2 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run my_pipeline -t dev_preset_off -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][5]/updates/[UUID][6] -Update ID: [UUID] +Update ID: [UUID][6] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][5]/updates", "body": {} } diff --git a/acceptance/bundle/run/development-override/output.txt b/acceptance/bundle/run/development-override/output.txt index 7110012790f..85ed152bb16 100644 --- a/acceptance/bundle/run/development-override/output.txt +++ b/acceptance/bundle/run/development-override/output.txt @@ -22,13 +22,13 @@ Warning: The "development" property of pipelines is deprecated. Use "mode: devel at resources.pipelines.my_pipeline.development in databricks.yml:8:20 -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": {} } diff --git a/acceptance/bundle/run/refresh-flags/output.txt b/acceptance/bundle/run/refresh-flags/output.txt index 694608a5810..78680ea662f 100644 --- a/acceptance/bundle/run/refresh-flags/output.txt +++ b/acceptance/bundle/run/refresh-flags/output.txt @@ -7,14 +7,14 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Running pipeline with --refresh flag and specific tables >>> [CLI] bundle run my_pipeline --refresh table1,table2 -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "refresh_selection": [ "table1", @@ -25,14 +25,14 @@ Update ID: [UUID] === Running pipeline with --full-refresh-all flag >>> [CLI] bundle run my_pipeline --full-refresh-all -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][2] -Update ID: [UUID] +Update ID: [UUID][2] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "full_refresh": true } @@ -40,14 +40,14 @@ Update ID: [UUID] === Running pipeline with --full-refresh flag and specific tables >>> [CLI] bundle run my_pipeline --full-refresh table1,table2 -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][3] -Update ID: [UUID] +Update ID: [UUID][3] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "full_refresh_selection": [ "table1", @@ -58,14 +58,14 @@ Update ID: [UUID] === Running pipeline with --full-refresh flag and --refresh flag >>> [CLI] bundle run my_pipeline --full-refresh table1,table2 --refresh table3,table4 -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][4] -Update ID: [UUID] +Update ID: [UUID][4] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "full_refresh_selection": [ "table1", diff --git a/acceptance/bundle/run_as/pipelines/regular_user/out.requests_t_service_principal_name.json b/acceptance/bundle/run_as/pipelines/regular_user/out.requests_t_service_principal_name.json index ed348b0244c..3ca1a86f731 100644 --- a/acceptance/bundle/run_as/pipelines/regular_user/out.requests_t_service_principal_name.json +++ b/acceptance/bundle/run_as/pipelines/regular_user/out.requests_t_service_principal_name.json @@ -15,7 +15,7 @@ ], "name": "nyc taxi loader", "run_as": { - "service_principal_name": "[UUID]" + "service_principal_name": "[UUID][0]" } }, "method": "POST", @@ -39,5 +39,5 @@ ] }, "method": "PUT", - "path": "/api/2.0/permissions/pipelines/[UUID]" + "path": "/api/2.0/permissions/pipelines/[UUID][1]" } diff --git a/acceptance/bundle/run_as/pipelines/regular_user/out.requests_t_service_principal_name_different.json b/acceptance/bundle/run_as/pipelines/regular_user/out.requests_t_service_principal_name_different.json index 31184316639..9d842f8ebe0 100644 --- a/acceptance/bundle/run_as/pipelines/regular_user/out.requests_t_service_principal_name_different.json +++ b/acceptance/bundle/run_as/pipelines/regular_user/out.requests_t_service_principal_name_different.json @@ -15,7 +15,7 @@ ], "name": "nyc taxi loader", "run_as": { - "user_name": "[UUID]" + "user_name": "[UUID][0]" } }, "method": "POST", @@ -39,5 +39,5 @@ ] }, "method": "PUT", - "path": "/api/2.0/permissions/pipelines/[UUID]" + "path": "/api/2.0/permissions/pipelines/[UUID][1]" } diff --git a/acceptance/bundle/run_as/pipelines/service_principal/out.requests_t_service_principal_name_different.json b/acceptance/bundle/run_as/pipelines/service_principal/out.requests_t_service_principal_name_different.json index 2748dd56670..52bda81609d 100644 --- a/acceptance/bundle/run_as/pipelines/service_principal/out.requests_t_service_principal_name_different.json +++ b/acceptance/bundle/run_as/pipelines/service_principal/out.requests_t_service_principal_name_different.json @@ -15,7 +15,7 @@ ], "name": "nyc taxi loader", "run_as": { - "user_name": "[UUID]" + "user_name": "[UUID][0]" } }, "method": "POST", @@ -39,5 +39,5 @@ ] }, "method": "PUT", - "path": "/api/2.0/permissions/pipelines/[UUID]" + "path": "/api/2.0/permissions/pipelines/[UUID][1]" } diff --git a/acceptance/bundle/state/state_present/output.txt b/acceptance/bundle/state/state_present/output.txt index c4dad432aa0..b46ada344ad 100644 --- a/acceptance/bundle/state/state_present/output.txt +++ b/acceptance/bundle/state/state_present/output.txt @@ -9,8 +9,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> print_requests.py --get //api/2.1/unity-catalog/schemas "replay_tfstate.py" -"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] interactive/none auth/pat" -"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" +"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID][0] interactive/none auth/pat" +"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" === A resources.json with a lower serial does not win: the terraform state still migrates >>> [CLI] bundle plan @@ -31,7 +31,7 @@ Files: 1 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //api/2.1/unity-catalog/schemas -"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" +"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][1] interactive/none engine/direct auth/pat" >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -51,14 +51,14 @@ Files: 1 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //api/2.1/unity-catalog/schemas -"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" +"cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][2] interactive/none engine/direct auth/pat" >>> print_state.py 1 >>> [CLI] bundle debug states -[TEST_TMP_DIR]/.databricks/bundle/default/resources.json: local direct state serial=1 lineage="[UUID]" +[TEST_TMP_DIR]/.databricks/bundle/default/resources.json: local direct state serial=1 lineage="[UUID][3]" >>> [CLI] bundle debug states --force-pull -resources.json: remote direct state serial=1 lineage="[UUID]" -[TEST_TMP_DIR]/.databricks/bundle/default/resources.json: local direct state serial=1 lineage="[UUID]" +resources.json: remote direct state serial=1 lineage="[UUID][3]" +[TEST_TMP_DIR]/.databricks/bundle/default/resources.json: local direct state serial=1 lineage="[UUID][3]" diff --git a/acceptance/bundle/summary/modified_status/output.txt b/acceptance/bundle/summary/modified_status/output.txt index 59d922c8b85..b64c1a66aaa 100644 --- a/acceptance/bundle/summary/modified_status/output.txt +++ b/acceptance/bundle/summary/modified_status/output.txt @@ -93,14 +93,14 @@ Resources: 4 created, 0 changed, 0 deleted, 0 unchanged } } }, - "id": "[UUID]", + "id": "[UUID][0]", "parent_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/resources", "query_text": "select 2", "schedule": { "quartz_cron_schedule": "44 19 */1 * * ?", "timezone_id": "Europe/Amsterdam" }, - "url": "[DATABRICKS_URL]/sql/alerts-v2/[UUID]?w=[WORKSPACE_ID]", + "url": "[DATABRICKS_URL]/sql/alerts-v2/[UUID][0]?w=[WORKSPACE_ID]", "warehouse_id": "aaaaaaaaaaaaaaaa" } }, @@ -112,7 +112,7 @@ Resources: 4 created, 0 changed, 0 deleted, 0 unchanged "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json" }, "edition": "ADVANCED", - "id": "[UUID]", + "id": "[UUID][1]", "libraries": [ { "file": { @@ -121,7 +121,7 @@ Resources: 4 created, 0 changed, 0 deleted, 0 unchanged } ], "name": "test-pipeline", - "url": "[DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID]" + "url": "[DATABRICKS_URL]/pipelines/[UUID][1]?w=[WORKSPACE_ID]" } }, "schemas": { @@ -139,11 +139,11 @@ Resources: 4 created, 0 changed, 0 deleted, 0 unchanged "cluster_size": "X-Large", "enable_photon": true, "enable_serverless_compute": true, - "id": "[UUID]", + "id": "[UUID][2]", "max_num_clusters": 1, "name": "test-sql-warehouse", "spot_instance_policy": "COST_OPTIMIZED", - "url": "[DATABRICKS_URL]/sql/warehouses/[UUID]?w=[WORKSPACE_ID]" + "url": "[DATABRICKS_URL]/sql/warehouses/[UUID][2]?w=[WORKSPACE_ID]" } } } @@ -153,16 +153,16 @@ Resources: 4 created, 0 changed, 0 deleted, 0 unchanged { "alerts": { "my_alert": { - "id": "[UUID]", + "id": "[UUID][0]", "modified_status": "deleted", - "url": "[DATABRICKS_URL]/sql/alerts-v2/[UUID]?w=[WORKSPACE_ID]" + "url": "[DATABRICKS_URL]/sql/alerts-v2/[UUID][0]?w=[WORKSPACE_ID]" } }, "pipelines": { "my_pipeline": { - "id": "[UUID]", + "id": "[UUID][1]", "modified_status": "deleted", - "url": "[DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID]" + "url": "[DATABRICKS_URL]/pipelines/[UUID][1]?w=[WORKSPACE_ID]" } }, "schemas": { @@ -174,9 +174,9 @@ Resources: 4 created, 0 changed, 0 deleted, 0 unchanged }, "sql_warehouses": { "my_sql_warehouse": { - "id": "[UUID]", + "id": "[UUID][2]", "modified_status": "deleted", - "url": "[DATABRICKS_URL]/sql/warehouses/[UUID]?w=[WORKSPACE_ID]" + "url": "[DATABRICKS_URL]/sql/warehouses/[UUID][2]?w=[WORKSPACE_ID]" } } } diff --git a/acceptance/bundle/templates/default-python/classic/out.plan_dev.json b/acceptance/bundle/templates/default-python/classic/out.plan_dev.json index 12ce3f987f5..e68ec963a2f 100644 --- a/acceptance/bundle/templates/default-python/classic/out.plan_dev.json +++ b/acceptance/bundle/templates/default-python/classic/out.plan_dev.json @@ -55,7 +55,7 @@ "job_cluster_key": "job_cluster", "libraries": [ { - "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl" + "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl" } ], "notebook_task": { @@ -72,7 +72,7 @@ "job_cluster_key": "job_cluster", "libraries": [ { - "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl" + "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl" } ], "python_wheel_task": { diff --git a/acceptance/bundle/templates/default-python/classic/out.requests.dev.txt b/acceptance/bundle/templates/default-python/classic/out.requests.dev.txt index 43ac10e32b4..f6236811f38 100644 --- a/acceptance/bundle/templates/default-python/classic/out.requests.dev.txt +++ b/acceptance/bundle/templates/default-python/classic/out.requests.dev.txt @@ -140,7 +140,7 @@ "job_cluster_key": "job_cluster", "libraries": [ { - "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl" + "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl" } ], "notebook_task": { @@ -157,7 +157,7 @@ "job_cluster_key": "job_cluster", "libraries": [ { - "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl" + "whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl" } ], "python_wheel_task": { diff --git a/acceptance/bundle/templates/test.toml b/acceptance/bundle/templates/test.toml index 0bd852bf020..3e6560e08d6 100644 --- a/acceptance/bundle/templates/test.toml +++ b/acceptance/bundle/templates/test.toml @@ -4,6 +4,12 @@ # Recording adds minutes without new coverage the rest of the suite provides. EnvMatrix.DMS = [""] +# Several template tests diff.py-compare one template's fresh output against a sibling +# template's committed golden (e.g. serverless-customcatalog vs serverless). Numbering +# UUIDs per file would make those comparisons spurious, and the distinction adds no +# value for a rendered template, so keep [UUID] flat across the subtree. +UniqueUUID = false + [[Server]] Pattern = "POST /telemetry-ext" Response.Body = ''' diff --git a/acceptance/bundle/user_agent/output.txt b/acceptance/bundle/user_agent/output.txt index 947a3167408..bf7f6fc0615 100644 --- a/acceptance/bundle/user_agent/output.txt +++ b/acceptance/bundle/user_agent/output.txt @@ -1,6 +1,6 @@ -MISS deploy /api/2.0/preview/scim/v2/Me 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none auth/pat' -MISS deploy /api/2.0/workspace/get-status 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none auth/pat' -MISS deploy /api/2.0/workspace/get-status 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none auth/pat' +MISS deploy /api/2.0/preview/scim/v2/Me 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none auth/pat' +MISS deploy /api/2.0/workspace/get-status 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none auth/pat' +MISS deploy /api/2.0/workspace/get-status 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none auth/pat' OK deploy /api/2.0/workspace/export engine/direct OK deploy /api/2.0/workspace/export engine/direct OK deploy /api/2.0/workspace/get-status engine/direct @@ -20,10 +20,10 @@ OK deploy /api/2.0/workspace/mkdirs engine/direct OK deploy /api/2.0/workspace/mkdirs engine/direct OK deploy /api/2.1/unity-catalog/schemas engine/direct MISS deploy /.well-known/databricks-config 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]' -MISS destroy /api/2.0/preview/scim/v2/Me 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none auth/pat' -MISS destroy /api/2.0/workspace/export 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none auth/pat' -MISS destroy /api/2.0/workspace/get-status 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none auth/pat' -MISS destroy /api/2.0/workspace/get-status 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none auth/pat' +MISS destroy /api/2.0/preview/scim/v2/Me 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none auth/pat' +MISS destroy /api/2.0/workspace/export 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none auth/pat' +MISS destroy /api/2.0/workspace/get-status 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none auth/pat' +MISS destroy /api/2.0/workspace/get-status 'cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none auth/pat' OK destroy /api/2.1/unity-catalog/schemas/mycatalog.myschema engine/direct OK destroy /api/2.0/workspace/export engine/direct OK destroy /api/2.0/workspace/get-status engine/direct diff --git a/acceptance/bundle/user_agent/simple/out.requests.deploy.json b/acceptance/bundle/user_agent/simple/out.requests.deploy.json index f0c60602386..d83861aa0c1 100644 --- a/acceptance/bundle/user_agent/simple/out.requests.deploy.json +++ b/acceptance/bundle/user_agent/simple/out.requests.deploy.json @@ -1,7 +1,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none auth/pat" ] }, "method": "GET", @@ -10,7 +10,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none auth/pat" ] }, "method": "GET", @@ -23,7 +23,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none auth/pat" ] }, "method": "GET", @@ -36,7 +36,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -49,7 +49,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -62,7 +62,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -74,7 +74,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -87,7 +87,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -100,7 +100,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -113,7 +113,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -126,7 +126,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -138,7 +138,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -147,7 +147,7 @@ "overwrite": "false" }, "body": { - "ID": "[UUID]", + "ID": "[UUID][1]", "AcquisitionTime": "[TIMESTAMP]", "IsForced": false, "User": "[USERNAME]" @@ -156,7 +156,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -165,7 +165,7 @@ "overwrite": "false" }, "body": { - "ID": "[UUID]", + "ID": "[UUID][1]", "AcquisitionTime": "[TIMESTAMP]", "IsForced": false, "User": "[USERNAME]" @@ -174,7 +174,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -193,13 +193,13 @@ "is_notebook": false } ], - "id": "[UUID]" + "id": "[UUID][2]" } } { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -231,7 +231,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -242,7 +242,7 @@ "body": { "state_version": 3, "cli_version": "[CLI_VERSION]", - "lineage": "[UUID]", + "lineage": "[UUID][3]", "serial": 1, "state": { "resources.schemas.foo": { @@ -258,7 +258,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -271,7 +271,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -283,7 +283,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -295,7 +295,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -307,7 +307,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", diff --git a/acceptance/bundle/user_agent/simple/out.requests.destroy.json b/acceptance/bundle/user_agent/simple/out.requests.destroy.json index 43de64cf21f..383c431e1a0 100644 --- a/acceptance/bundle/user_agent/simple/out.requests.destroy.json +++ b/acceptance/bundle/user_agent/simple/out.requests.destroy.json @@ -1,7 +1,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none auth/pat" ] }, "method": "GET", @@ -10,7 +10,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none auth/pat" ] }, "method": "GET", @@ -23,7 +23,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none auth/pat" ] }, "method": "GET", @@ -36,7 +36,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none auth/pat" ] }, "method": "GET", @@ -49,7 +49,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "DELETE", @@ -61,7 +61,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -74,7 +74,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -86,7 +86,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -99,7 +99,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -112,7 +112,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "GET", @@ -121,7 +121,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -130,7 +130,7 @@ "overwrite": "false" }, "body": { - "ID": "[UUID]", + "ID": "[UUID][1]", "AcquisitionTime": "[TIMESTAMP]", "IsForced": false, "User": "[USERNAME]" @@ -139,7 +139,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", @@ -151,7 +151,7 @@ { "headers": { "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID][0] interactive/none engine/direct auth/pat" ] }, "method": "POST", diff --git a/acceptance/cmd/api/profile-overrides-env/output.txt b/acceptance/cmd/api/profile-overrides-env/output.txt index bba9952d34d..1e49ba5c9ad 100644 --- a/acceptance/cmd/api/profile-overrides-env/output.txt +++ b/acceptance/cmd/api/profile-overrides-env/output.txt @@ -11,7 +11,7 @@ "Bearer [DATABRICKS_TOKEN]" ], "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/api_get cmd-exec-id/[UUID] interactive/none auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/api_get cmd-exec-id/[UUID][0] interactive/none auth/pat" ], "X-Databricks-Workspace-Id": [ "[WORKSPACE_ID]" @@ -33,7 +33,7 @@ "Bearer [DATABRICKS_TOKEN]" ], "User-Agent": [ - "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/api_get cmd-exec-id/[UUID] interactive/none auth/pat" + "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/api_get cmd-exec-id/[UUID][1] interactive/none auth/pat" ], "X-Databricks-Workspace-Id": [ "[WORKSPACE_ID]" diff --git a/acceptance/cmd/patchwhl/output.txt b/acceptance/cmd/patchwhl/output.txt index ed36b234141..d6d9972aa2b 100644 --- a/acceptance/cmd/patchwhl/output.txt +++ b/acceptance/cmd/patchwhl/output.txt @@ -3,11 +3,11 @@ >>> setmtime.py [TIMESTAMP] my_test_code-0.0.1-py3-none-any.whl >>> [CLI] selftest patchwhl my_test_code-0.0.1-py3-none-any.whl -Warn: Patched whl: my_test_code-0.0.1-py3-none-any.whl -> my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl +Warn: Patched whl: my_test_code-0.0.1-py3-none-any.whl -> my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl >>> diff.py original output ---- original/my_test_code-0.0.1+[UNIX_TIME_NANOS][0].dist-info/METADATA -+++ output/my_test_code-0.0.1+[UNIX_TIME_NANOS][0].dist-info/METADATA +--- original/my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/METADATA ++++ output/my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/METADATA @@ -1,5 +1,5 @@ Metadata-Version: 2.1 Name: my-test-code @@ -15,8 +15,8 @@ Warn: Patched whl: my_test_code-0.0.1-py3-none-any.whl -> my_test_code-0.0.1+[UN +Version: 0.0.1+[UNIX_TIME_NANOS] Summary: my test wheel Home-page: https://databricks.com ---- original/my_test_code-0.0.1+[UNIX_TIME_NANOS][0].dist-info/RECORD -+++ output/my_test_code-0.0.1+[UNIX_TIME_NANOS][0].dist-info/RECORD +--- original/my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD ++++ output/my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD @@ -1,7 +1,7 @@ src/__init__.py,sha256=BRmKeYehopKv4NG_SFa7t6wn248RrPHJivu7DM1R-Rw,48 src/__main__.py,sha256=8TtsnLsaJEM35Y4L8ocrv-qfxusgYpRL2HPyYiabHng,242 diff --git a/acceptance/cmd/patchwhl/output/my_test_code-0.0.1+1741187253123456700.dist-info/RECORD b/acceptance/cmd/patchwhl/output/my_test_code-0.0.1+1741187253123456700.dist-info/RECORD index 010da2844b7..56678166ab0 100644 --- a/acceptance/cmd/patchwhl/output/my_test_code-0.0.1+1741187253123456700.dist-info/RECORD +++ b/acceptance/cmd/patchwhl/output/my_test_code-0.0.1+1741187253123456700.dist-info/RECORD @@ -1,7 +1,7 @@ src/__init__.py,sha256=BRmKeYehopKv4NG_SFa7t6wn248RrPHJivu7DM1R-Rw,48 src/__main__.py,sha256=8TtsnLsaJEM35Y4L8ocrv-qfxusgYpRL2HPyYiabHng,242 -my_test_code-0.0.1+[UNIX_TIME_NANOS][0].dist-info/METADATA,sha256=H99P2vEwB_hBVPNtPwsXZotaDQzmWEGeSlOtMzWe62U,217 -my_test_code-0.0.1+[UNIX_TIME_NANOS][0].dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92 -my_test_code-0.0.1+[UNIX_TIME_NANOS][0].dist-info/entry_points.txt,sha256=oDWOW9SsBlk4Uejj1ftYPBxfhJ5ZJctb4JOUIG1rc-4,34 -my_test_code-0.0.1+[UNIX_TIME_NANOS][0].dist-info/top_level.txt,sha256=74rtVfumQlgAPzR5_2CgYN24MB0XARCg0t-gzk6gTrM,4 -my_test_code-0.0.1+[UNIX_TIME_NANOS][0].dist-info/RECORD,, +my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/METADATA,sha256=H99P2vEwB_hBVPNtPwsXZotaDQzmWEGeSlOtMzWe62U,217 +my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92 +my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/entry_points.txt,sha256=oDWOW9SsBlk4Uejj1ftYPBxfhJ5ZJctb4JOUIG1rc-4,34 +my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/top_level.txt,sha256=74rtVfumQlgAPzR5_2CgYN24MB0XARCg0t-gzk6gTrM,4 +my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD,, diff --git a/acceptance/cmd/workspace/apps/output.txt b/acceptance/cmd/workspace/apps/output.txt index 3fe9bf974c0..f4ea28d062a 100644 --- a/acceptance/cmd/workspace/apps/output.txt +++ b/acceptance/cmd/workspace/apps/output.txt @@ -35,7 +35,7 @@ } } ], - "service_principal_client_id": "[UUID]", + "service_principal_client_id": "[UUID][0]", "service_principal_id": [SERVICE_PRINCIPAL_ID], "service_principal_name": "app-test-name", "url": "test-name-123.cloud.databricksapps.com" @@ -77,7 +77,7 @@ } } ], - "service_principal_client_id": "[UUID]", + "service_principal_client_id": "[UUID][1]", "service_principal_id": [SERVICE_PRINCIPAL_ID], "service_principal_name": "app-test-name", "url": "test-name-123.cloud.databricksapps.com" diff --git a/acceptance/cmd/workspace/queries/output.txt b/acceptance/cmd/workspace/queries/output.txt index 20b6395e6b3..91e65bbe98a 100644 --- a/acceptance/cmd/workspace/queries/output.txt +++ b/acceptance/cmd/workspace/queries/output.txt @@ -1,5 +1,5 @@ >>> [CLI] queries list ID Name Author -[UUID] Example query 1 user@acme.com -[UUID] Example query 2 user@acme.com +[UUID][0] Example query 1 user@acme.com +[UUID][1] Example query 2 user@acme.com diff --git a/acceptance/internal/config.go b/acceptance/internal/config.go index d3a343b5376..fe4aa51cbdc 100644 --- a/acceptance/internal/config.go +++ b/acceptance/internal/config.go @@ -63,11 +63,11 @@ type TestConfig struct { // Old is a regexp, New is a replacement expression. Repls []testdiff.Replacement - // If true, distinct UUIDs in an output are numbered ([UUID][0], [UUID][1], ...) so - // the golden pins which value appears where. If absent, defaults to false and every - // UUID collapses to [UUID]. Enable it for tests that need to tell distinct UUIDs - // apart; leave it off when they appear in a non-deterministic order (the index - // assignment would be unstable). + // Whether distinct UUIDs in an output are numbered ([UUID][0], [UUID][1], ...) so + // the golden pins which value appears where; a lone UUID stays [UUID]. If absent, + // defaults to true. Set to false for tests that emit multiple distinct UUIDs in a + // non-deterministic order (the index assignment would be unstable), or where the + // distinction is not worth the extra tokens. UniqueUUID *bool // List of server stubs to load. Example configuration: diff --git a/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt b/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt index a4e2c1eb7a4..6470c25b206 100644 --- a/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt +++ b/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run/ Created pipelines.my_pipeline Files: 1 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged -View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID] +View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID][0]?w=[WORKSPACE_ID] === Dry running pipeline, should have validate_only set to true >>> [CLI] pipelines dry-run @@ -12,12 +12,12 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "validate_only": true } @@ -29,12 +29,12 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][2] -Update ID: [UUID] +Update ID: [UUID][2] { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "validate_only": true } diff --git a/acceptance/pipelines/dry-run/no-wait/output.txt b/acceptance/pipelines/dry-run/no-wait/output.txt index 50e609a6814..e26d2ff1787 100644 --- a/acceptance/pipelines/dry-run/no-wait/output.txt +++ b/acceptance/pipelines/dry-run/no-wait/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run- Created pipelines.my_pipeline Files: 1 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged -View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID] +View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID][0]?w=[WORKSPACE_ID] === Dry running pipeline with --no-wait flag >>> [CLI] pipelines dry-run --no-wait @@ -12,6 +12,6 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] diff --git a/acceptance/pipelines/dry-run/restart/output.txt b/acceptance/pipelines/dry-run/restart/output.txt index cf77b26a8e3..ef0456bd478 100644 --- a/acceptance/pipelines/dry-run/restart/output.txt +++ b/acceptance/pipelines/dry-run/restart/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run- Created pipelines.my_pipeline Files: 1 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged -View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID] +View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID][0]?w=[WORKSPACE_ID] === Dry running pipeline with --restart flag, should stop the current pipeline and start a new run >>> [CLI] pipelines dry-run --restart @@ -12,18 +12,18 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/stop" + "path": "/api/2.0/pipelines/[UUID][0]/stop" } { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "validate_only": true } diff --git a/acceptance/pipelines/e2e/output.txt b/acceptance/pipelines/e2e/output.txt index a699e7b7143..56ac7b696b3 100644 --- a/acceptance/pipelines/e2e/output.txt +++ b/acceptance/pipelines/e2e/output.txt @@ -22,7 +22,7 @@ Created pipelines.lakeflow_project_etl Files: 13 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged View your job sample_job here: [DATABRICKS_URL]/jobs/[SAMPLE_JOB_ID]?w=[WORKSPACE_ID] -View your pipeline lakeflow_project_etl here: [DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID] +View your pipeline lakeflow_project_etl here: [DATABRICKS_URL]/pipelines/[UUID][0]?w=[WORKSPACE_ID] === Run pipeline >>> [CLI] pipelines run @@ -30,9 +30,9 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] Update for pipeline completed successfully. @@ -46,17 +46,17 @@ Created pipelines.lakeflow_project_etl_2 Files: 1 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 2 unchanged View your job sample_job here: [DATABRICKS_URL]/jobs/[SAMPLE_JOB_ID]?w=[WORKSPACE_ID] -View your pipeline lakeflow_project_etl here: [DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID] -View your pipeline lakeflow_project_etl_2 here: [DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID] +View your pipeline lakeflow_project_etl here: [DATABRICKS_URL]/pipelines/[UUID][0]?w=[WORKSPACE_ID] +View your pipeline lakeflow_project_etl_2 here: [DATABRICKS_URL]/pipelines/[UUID][2]?w=[WORKSPACE_ID] === Assert the second pipeline is created ->>> [CLI] pipelines get [UUID] +>>> [CLI] pipelines get [UUID][2] { "creator_user_name": "[USERNAME]", "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE", "last_modified": [UNIX_TIME_MILLIS], "name": "[dev [USERNAME]] lakeflow_project_etl_2", - "pipeline_id": "[UUID]", + "pipeline_id": "[UUID][2]", "run_as_user_name": "[USERNAME]", "spec": { "channel": "CURRENT", @@ -66,9 +66,9 @@ View your pipeline lakeflow_project_etl_2 here: [DATABRICKS_URL]/pipelines/[UUID }, "development": true, "edition": "ADVANCED", - "id": "[UUID]", + "id": "[UUID][2]", "name": "[dev [USERNAME]] lakeflow_project_etl_2", - "storage": "dbfs:/pipelines/[UUID]", + "storage": "dbfs:/pipelines/[UUID][2]", "tags": { "dev": "[USERNAME]" } @@ -81,9 +81,9 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][2]/updates/[UUID][3] -Update ID: [UUID] +Update ID: [UUID][3] Update for pipeline completed successfully. diff --git a/acceptance/pipelines/e2e/output/lakeflow_project/src/lakeflow_project_etl/explorations/sample_exploration.ipynb b/acceptance/pipelines/e2e/output/lakeflow_project/src/lakeflow_project_etl/explorations/sample_exploration.ipynb index b83ee2a9abe..1734a4d4c84 100644 --- a/acceptance/pipelines/e2e/output/lakeflow_project/src/lakeflow_project_etl/explorations/sample_exploration.ipynb +++ b/acceptance/pipelines/e2e/output/lakeflow_project/src/lakeflow_project_etl/explorations/sample_exploration.ipynb @@ -6,7 +6,7 @@ "application/vnd.databricks.v1+cell": { "cellMetadata": {}, "inputWidgets": {}, - "nuid": "[UUID]", + "nuid": "[UUID][0]", "showTitle": false, "tableResultSettingsMap": {}, "title": "" @@ -27,7 +27,7 @@ "application/vnd.databricks.v1+cell": { "cellMetadata": {}, "inputWidgets": {}, - "nuid": "[UUID]", + "nuid": "[UUID][1]", "showTitle": false, "tableResultSettingsMap": {}, "title": "" diff --git a/acceptance/pipelines/init/python/output/my_python_project/src/my_python_project_etl/explorations/sample_exploration.ipynb b/acceptance/pipelines/init/python/output/my_python_project/src/my_python_project_etl/explorations/sample_exploration.ipynb index 4135310a57f..9489efa656c 100644 --- a/acceptance/pipelines/init/python/output/my_python_project/src/my_python_project_etl/explorations/sample_exploration.ipynb +++ b/acceptance/pipelines/init/python/output/my_python_project/src/my_python_project_etl/explorations/sample_exploration.ipynb @@ -6,7 +6,7 @@ "application/vnd.databricks.v1+cell": { "cellMetadata": {}, "inputWidgets": {}, - "nuid": "[UUID]", + "nuid": "[UUID][0]", "showTitle": false, "tableResultSettingsMap": {}, "title": "" @@ -27,7 +27,7 @@ "application/vnd.databricks.v1+cell": { "cellMetadata": {}, "inputWidgets": {}, - "nuid": "[UUID]", + "nuid": "[UUID][1]", "showTitle": false, "tableResultSettingsMap": {}, "title": "" diff --git a/acceptance/pipelines/init/sql/output/my_sql_project/src/my_sql_project_etl/explorations/sample_exploration.ipynb b/acceptance/pipelines/init/sql/output/my_sql_project/src/my_sql_project_etl/explorations/sample_exploration.ipynb index 6c0c2f1f4e7..9c8c265cfc7 100644 --- a/acceptance/pipelines/init/sql/output/my_sql_project/src/my_sql_project_etl/explorations/sample_exploration.ipynb +++ b/acceptance/pipelines/init/sql/output/my_sql_project/src/my_sql_project_etl/explorations/sample_exploration.ipynb @@ -6,7 +6,7 @@ "application/vnd.databricks.v1+cell": { "cellMetadata": {}, "inputWidgets": {}, - "nuid": "[UUID]", + "nuid": "[UUID][0]", "showTitle": false, "tableResultSettingsMap": {}, "title": "" @@ -27,7 +27,7 @@ "application/vnd.databricks.v1+cell": { "cellMetadata": {}, "inputWidgets": {}, - "nuid": "[UUID]", + "nuid": "[UUID][1]", "showTitle": false, "tableResultSettingsMap": {}, "title": "" diff --git a/acceptance/pipelines/run/no-wait/output.txt b/acceptance/pipelines/run/no-wait/output.txt index ff1d3d832b2..0378c4cfbcc 100644 --- a/acceptance/pipelines/run/no-wait/output.txt +++ b/acceptance/pipelines/run/no-wait/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run- Created pipelines.my_pipeline Files: 2 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged -View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID] +View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID][0]?w=[WORKSPACE_ID] === test --no-wait flag >>> [CLI] pipelines run --no-wait @@ -12,9 +12,9 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] Update for pipeline completed successfully. diff --git a/acceptance/pipelines/run/refresh-flags/output.txt b/acceptance/pipelines/run/refresh-flags/output.txt index 68dcd0c9a23..9887b899820 100644 --- a/acceptance/pipelines/run/refresh-flags/output.txt +++ b/acceptance/pipelines/run/refresh-flags/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run- Created pipelines.my_pipeline Files: 2 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged -View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID] +View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID][0]?w=[WORKSPACE_ID] === Running pipeline with --refresh flag and specific tables >>> [CLI] pipelines run --refresh table1,table2 @@ -12,9 +12,9 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] Update for pipeline completed successfully. @@ -24,7 +24,7 @@ Pipeline configurations for this update: >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "refresh_selection": [ "table1", @@ -39,9 +39,9 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][2] -Update ID: [UUID] +Update ID: [UUID][2] Update for pipeline completed successfully. @@ -51,7 +51,7 @@ Pipeline configurations for this update: >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "full_refresh": true } @@ -63,9 +63,9 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][3] -Update ID: [UUID] +Update ID: [UUID][3] Update for pipeline completed successfully. @@ -75,7 +75,7 @@ Pipeline configurations for this update: >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "full_refresh_selection": [ "table1", @@ -90,9 +90,9 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][4] -Update ID: [UUID] +Update ID: [UUID][4] Update for pipeline completed successfully. @@ -102,7 +102,7 @@ Pipeline configurations for this update: >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": { "full_refresh_selection": [ "table1", diff --git a/acceptance/pipelines/run/restart/output.txt b/acceptance/pipelines/run/restart/output.txt index 07a3215d5dd..f1098f0af08 100644 --- a/acceptance/pipelines/run/restart/output.txt +++ b/acceptance/pipelines/run/restart/output.txt @@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run- Created pipelines.my_pipeline Files: 2 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged -View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID] +View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID][0]?w=[WORKSPACE_ID] === Running pipeline with --restart flag >>> [CLI] pipelines run --restart @@ -12,9 +12,9 @@ Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] Update for pipeline completed successfully. @@ -24,10 +24,10 @@ Pipeline configurations for this update: >>> print_requests.py //pipelines { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/stop" + "path": "/api/2.0/pipelines/[UUID][0]/stop" } { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/updates", + "path": "/api/2.0/pipelines/[UUID][0]/updates", "body": {} } diff --git a/acceptance/pipelines/stop/output.txt b/acceptance/pipelines/stop/output.txt index 76587739aed..1f14be93164 100644 --- a/acceptance/pipelines/stop/output.txt +++ b/acceptance/pipelines/stop/output.txt @@ -4,16 +4,16 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-stop Created pipelines.my_pipeline Files: 2 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged -View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[WORKSPACE_ID] +View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID][0]?w=[WORKSPACE_ID] >>> [CLI] pipelines run Recommendation: This command runs the last deployed version of the code If you've made local changes, run 'databricks pipelines deploy' first to ensure they are included. -Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID]/updates/[UUID] +Update URL: [DATABRICKS_URL]/#joblist/pipelines/[UUID][0]/updates/[UUID][1] -Update ID: [UUID] +Update ID: [UUID][1] Update for pipeline completed successfully. @@ -26,7 +26,7 @@ Stopping my_pipeline... my_pipeline has been stopped. { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/stop" + "path": "/api/2.0/pipelines/[UUID][0]/stop" } === Stopping pipeline with KEY, expect same output as without KEY @@ -35,5 +35,5 @@ Stopping my_pipeline... my_pipeline has been stopped. { "method": "POST", - "path": "/api/2.0/pipelines/[UUID]/stop" + "path": "/api/2.0/pipelines/[UUID][0]/stop" } diff --git a/acceptance/telemetry/failure/output.txt b/acceptance/telemetry/failure/output.txt index a4a56f92e22..ef78fed75a8 100644 --- a/acceptance/telemetry/failure/output.txt +++ b/acceptance/telemetry/failure/output.txt @@ -18,8 +18,8 @@ HH:MM:SS Debug: POST /telemetry-ext > { > "items": null, > "protoLogs": [ -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" +> "{\"frontend_log_event_id\":\"[UUID][0]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", +> "{\"frontend_log_event_id\":\"[UUID][1]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" > ], > "uploadTime": [UNIX_TIME_MILLIS][0] > } @@ -34,8 +34,8 @@ HH:MM:SS Debug: POST /telemetry-ext > { > "items": null, > "protoLogs": [ -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" +> "{\"frontend_log_event_id\":\"[UUID][0]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", +> "{\"frontend_log_event_id\":\"[UUID][1]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" > ], > "uploadTime": [UNIX_TIME_MILLIS][1] > } @@ -50,8 +50,8 @@ HH:MM:SS Debug: POST /telemetry-ext > { > "items": null, > "protoLogs": [ -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" +> "{\"frontend_log_event_id\":\"[UUID][0]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", +> "{\"frontend_log_event_id\":\"[UUID][1]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" > ], > "uploadTime": [UNIX_TIME_MILLIS][2] > } @@ -66,11 +66,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th >>> cat [OUTPUT_DIR]/out.requests.txt { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][0]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", @@ -84,11 +84,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][1]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", @@ -102,11 +102,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][0]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", @@ -120,11 +120,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][1]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", @@ -138,11 +138,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][0]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", @@ -156,11 +156,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][1]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", diff --git a/acceptance/telemetry/partial-success/output.txt b/acceptance/telemetry/partial-success/output.txt index cfcda42e67d..c0f13e759bd 100644 --- a/acceptance/telemetry/partial-success/output.txt +++ b/acceptance/telemetry/partial-success/output.txt @@ -18,8 +18,8 @@ HH:MM:SS Debug: POST /telemetry-ext > { > "items": null, > "protoLogs": [ -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" +> "{\"frontend_log_event_id\":\"[UUID][0]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", +> "{\"frontend_log_event_id\":\"[UUID][1]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" > ], > "uploadTime": [UNIX_TIME_MILLIS][0] > } @@ -33,8 +33,8 @@ HH:MM:SS Debug: POST /telemetry-ext > { > "items": null, > "protoLogs": [ -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" +> "{\"frontend_log_event_id\":\"[UUID][0]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", +> "{\"frontend_log_event_id\":\"[UUID][1]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" > ], > "uploadTime": [UNIX_TIME_MILLIS][1] > } @@ -48,8 +48,8 @@ HH:MM:SS Debug: POST /telemetry-ext > { > "items": null, > "protoLogs": [ -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" +> "{\"frontend_log_event_id\":\"[UUID][0]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", +> "{\"frontend_log_event_id\":\"[UUID][1]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" > ], > "uploadTime": [UNIX_TIME_MILLIS][2] > } @@ -63,11 +63,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th >>> cat [OUTPUT_DIR]/out.requests.txt { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][0]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", @@ -81,11 +81,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][1]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", @@ -99,11 +99,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][0]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", @@ -117,11 +117,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][1]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", @@ -135,11 +135,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][0]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", @@ -153,11 +153,11 @@ HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after th } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][1]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", diff --git a/acceptance/telemetry/success/output.txt b/acceptance/telemetry/success/output.txt index 67a3874fe77..1b8e528deed 100644 --- a/acceptance/telemetry/success/output.txt +++ b/acceptance/telemetry/success/output.txt @@ -18,8 +18,8 @@ HH:MM:SS Debug: POST /telemetry-ext > { > "items": null, > "protoLogs": [ -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" +> "{\"frontend_log_event_id\":\"[UUID][0]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", +> "{\"frontend_log_event_id\":\"[UUID][1]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" > ], > "uploadTime": [UNIX_TIME_MILLIS] > } @@ -32,7 +32,7 @@ HH:MM:SS Debug: All 2 logs uploaded successfully pid=PID >>> cat [OUTPUT_DIR]/out.requests.txt { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][0]", "entry": { "databricks_cli_log": { "execution_context": { @@ -50,7 +50,7 @@ HH:MM:SS Debug: All 2 logs uploaded successfully pid=PID } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][1]", "entry": { "databricks_cli_log": { "execution_context": { diff --git a/acceptance/telemetry/timeout/output.txt b/acceptance/telemetry/timeout/output.txt index 550fe861652..53d3135f17a 100644 --- a/acceptance/telemetry/timeout/output.txt +++ b/acceptance/telemetry/timeout/output.txt @@ -18,8 +18,8 @@ HH:MM:SS Debug: POST /telemetry-ext > { > "items": null, > "protoLogs": [ -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", -> "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" +> "{\"frontend_log_event_id\":\"[UUID][0]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)", +> "{\"frontend_log_event_id\":\"[UUID][1]\",\"entry\":{\"databricks_cli_log\":{\"... (N more bytes)" > ], > "uploadTime": [UNIX_TIME_MILLIS] > } @@ -30,11 +30,11 @@ HH:MM:SS Info: telemetry upload failed: uploading telemetry logs timed out: Post >>> cat [OUTPUT_DIR]/out.requests.txt { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][0]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", @@ -48,11 +48,11 @@ HH:MM:SS Info: telemetry upload failed: uploading telemetry logs timed out: Post } } { - "frontend_log_event_id": "[UUID]", + "frontend_log_event_id": "[UUID][1]", "entry": { "databricks_cli_log": { "execution_context": { - "cmd_exec_id": "[UUID]", + "cmd_exec_id": "[UUID][2]", "version": "[CLI_VERSION]", "command": "selftest_send-telemetry", "operating_system": "[OS]", diff --git a/libs/testdiff/replacement.go b/libs/testdiff/replacement.go index 583860bfa30..55ab6edb14c 100644 --- a/libs/testdiff/replacement.go +++ b/libs/testdiff/replacement.go @@ -58,25 +58,25 @@ func (r *ReplacementsContext) Replace(s string) string { continue } - matches := repl.Old.FindAllString(s, -1) - if len(matches) <= 1 { + // Assign a stable [N] suffix per distinct matched value, in order of first + // appearance. Number only when there is more than one distinct value: a lone + // value (even if repeated) stays unsuffixed, so the common single-match output + // is identical to the non-distinct case. + seen := make(map[string]int) + for _, match := range repl.Old.FindAllString(s, -1) { + if _, ok := seen[match]; !ok { + seen[match] = len(seen) + } + } + if len(seen) <= 1 { s = repl.Old.ReplaceAllString(s, repl.New) continue } - nextIndex := 0 - seen := make(map[string]int) s = repl.Old.ReplaceAllStringFunc(s, func(match string) string { - idx, ok := seen[match] - if !ok { - idx = nextIndex - seen[match] = idx - nextIndex++ - } - submatches := repl.Old.FindStringSubmatchIndex(match) replaced := repl.Old.ExpandString(nil, repl.New, match, submatches) - return string(replaced) + "[" + strconv.Itoa(idx) + "]" + return string(replaced) + "[" + strconv.Itoa(seen[match]) + "]" }) } return s @@ -229,8 +229,8 @@ func PrepareReplacementsUser(t testutil.TestingT, r *ReplacementsContext, u iam. // PrepareReplacementsUUID registers the UUID replacement. When unique is true, // distinct UUIDs in a single output are numbered ([UUID][0], [UUID][1], ...) so the -// golden pins which value appears where. When false, every UUID collapses to [UUID] -// regardless of value. +// golden pins which value appears where; a lone UUID stays [UUID]. When false, every +// UUID collapses to [UUID] regardless of value. func PrepareReplacementsUUID(t testutil.TestingT, r *ReplacementsContext, unique bool) { t.Helper() r.Repls = append(r.Repls, Replacement{Old: uuidRegex, New: "[UUID]", Distinct: unique}) diff --git a/libs/testdiff/replacement_test.go b/libs/testdiff/replacement_test.go index ac6ac5c0806..ca8be6628bf 100644 --- a/libs/testdiff/replacement_test.go +++ b/libs/testdiff/replacement_test.go @@ -74,6 +74,17 @@ func TestReplacement_DistinctSingleMatch(t *testing.T) { assert.Equal(t, "[NUMBER]", got) } +func TestReplacement_DistinctSingleValueRepeated(t *testing.T) { + rc := ReplacementsContext{Repls: []Replacement{ + {Old: regexp.MustCompile(`\d+`), New: "[NUMBER]", Distinct: true}, + }} + + // A single distinct value, even repeated, stays unsuffixed: numbering only + // adds signal when there is more than one distinct value to tell apart. + got := rc.Replace("25\n25") + assert.Equal(t, "[NUMBER]\n[NUMBER]", got) +} + func TestReplaceAppliesInOrder(t *testing.T) { input := "A"