Skip to content

Commit 217f7a0

Browse files
committed
Regenerate remaining acceptance test golden files
The user_agent test output now includes the .well-known/databricks-config request. The telemetry deploy test has non-deterministic request ordering that differs between terraform and direct engine variants. Co-authored-by: Isaac
1 parent a66458b commit 217f7a0

File tree

2 files changed

+66
-59
lines changed

2 files changed

+66
-59
lines changed

acceptance/bundle/telemetry/deploy/out.requests.txt

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -160,32 +160,6 @@
160160
"path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files"
161161
}
162162
}
163-
{
164-
"headers": {
165-
"User-Agent": [
166-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat"
167-
]
168-
},
169-
"method": "POST",
170-
"path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/output.txt",
171-
"q": {
172-
"overwrite": "true"
173-
},
174-
"raw_body": "\n\u003e\u003e\u003e [CLI] bundle deploy\nUploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...\n"
175-
}
176-
{
177-
"headers": {
178-
"User-Agent": [
179-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat"
180-
]
181-
},
182-
"method": "POST",
183-
"path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/databricks.yml",
184-
"q": {
185-
"overwrite": "true"
186-
},
187-
"raw_body": "bundle:\n name: test-bundle\n uuid: [UUID]\n\nresources:\n jobs:\n job_one:\n name: job one\n job_two:\n name: job two\n job_three:\n name: job three\n\n pipelines:\n pipeline_one:\n name: pipeline one\n pipeline_two:\n name: pipeline two\n"
188-
}
189163
{
190164
"headers": {
191165
"User-Agent": [
@@ -350,19 +324,19 @@
350324
"Distinct": false
351325
},
352326
{
353-
"Old": "https://127\\.0\\.0\\.1:51297",
327+
"Old": "https://127\\.0\\.0\\.1:52538",
354328
"New": "[DATABRICKS_URL]",
355329
"Order": 0,
356330
"Distinct": false
357331
},
358332
{
359-
"Old": "http://127\\.0\\.0\\.1:51297",
333+
"Old": "http://127\\.0\\.0\\.1:52538",
360334
"New": "[DATABRICKS_URL]",
361335
"Order": 0,
362336
"Distinct": false
363337
},
364338
{
365-
"Old": "127\\.0\\.0\\.1:51297",
339+
"Old": "127\\.0\\.0\\.1:52538",
366340
"New": "[DATABRICKS_HOST]",
367341
"Order": 0,
368342
"Distinct": false
@@ -484,10 +458,24 @@
484458
]
485459
},
486460
"method": "POST",
487-
"path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/test.toml",
461+
"path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/output.txt",
488462
"q": {
489463
"overwrite": "true"
490-
}
464+
},
465+
"raw_body": "\n\u003e\u003e\u003e [CLI] bundle deploy\nUploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...\n"
466+
}
467+
{
468+
"headers": {
469+
"User-Agent": [
470+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat"
471+
]
472+
},
473+
"method": "POST",
474+
"path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/databricks.yml",
475+
"q": {
476+
"overwrite": "true"
477+
},
478+
"raw_body": "bundle:\n name: test-bundle\n uuid: [UUID]\n\nresources:\n jobs:\n job_one:\n name: job one\n job_two:\n name: job two\n job_three:\n name: job three\n\n pipelines:\n pipeline_one:\n name: pipeline one\n pipeline_two:\n name: pipeline two\n"
491479
}
492480
{
493481
"headers": {
@@ -502,6 +490,18 @@
502490
},
503491
"raw_body": "{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]\"\n ]\n },\n \"method\": \"GET\",\n \"path\": \"/.well-known/databricks-config\"\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none auth/pat\"\n ]\n },\n \"method\": \"GET\",\n \"path\": \"/api/2.0/preview/scim/v2/Me\"\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none auth/pat\"\n ]\n },\n \"method\": \"GET\",\n \"path\": \"/api/2.0/workspace/get-status\",\n \"q\": {\n \"path\": \"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/terraform.tfstate\",\n \"return_export_info\": \"true\"\n }\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none auth/pat\"\n ]\n },\n \"method\": \"GET\",\n \"path\": \"/api/2.0/workspace/get-status\",\n \"q\": {\n \"path\": \"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/resources.json\",\n \"return_export_info\": \"true\"\n }\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat\"\n ]\n },\n \"method\": \"GET\",\n \"path\": \"/api/2.0/workspace/get-status\",\n \"q\": {\n \"path\": \"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deployment.json\",\n \"return_export_info\": \"true\"\n }\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat\"\n ]\n },\n \"method\": \"POST\",\n \"path\": \"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deploy.lock\",\n \"q\": {\n \"overwrite\": \"false\"\n },\n \"body\": {\n \"ID\": \"[UUID]\",\n \"AcquisitionTime\": \"[TIMESTAMP]\",\n \"IsForced\": false,\n \"User\": \"[USERNAME]\"\n }\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat\"\n ]\n },\n \"method\": \"GET\",\n \"path\": \"/api/2.0/workspace/get-status\",\n \"q\": {\n \"path\": \"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deploy.lock\",\n \"return_export_info\": \"true\"\n }\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat\"\n ]\n },\n \"method\": \"GET\",\n \"path\": \"/api/2.0/workspace/export\",\n \"q\": {\n \"direct_download\": \"true\",\n \"path\": \"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deploy.lock\"\n }\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat\"\n ]\n },\n \"method\": \"POST\",\n \"path\": \"/api/2.0/workspace/delete\",\n \"body\": {\n \"path\": \"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal\",\n \"recursive\": true\n }\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat\"\n ]\n },\n \"method\": \"POST\",\n \"path\": \"/api/2.0/workspace/mkdirs\",\n \"body\": {\n \"path\": \"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal\"\n }\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat\"\n ]\n },\n \"method\": \"GET\",\n \"path\": \"/api/2.0/workspace/get-status\",\n \"q\": {\n \"path\": \"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files\"\n }\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat\"\n ]\n },\n \"method\": \"POST\",\n \"path\": \"/api/2.0/workspace/mkdirs\",\n \"body\": {\n \"path\": \"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files\"\n }\n}\n{\n \"headers\": {\n \"User-Agent\": [\n \"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat\"\n ]\n },\n \"method\": \"GET\",\n \"path\": \"/api/2.0/workspace/get-status\",\n \"q\": {\n \"path\": \"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files\"\n }\n}\n"
504492
}
493+
{
494+
"headers": {
495+
"User-Agent": [
496+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/terraform auth/pat"
497+
]
498+
},
499+
"method": "POST",
500+
"path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/test.toml",
501+
"q": {
502+
"overwrite": "true"
503+
}
504+
}
505505
{
506506
"headers": {
507507
"User-Agent": [
@@ -519,6 +519,10 @@
519519
"cli_version": "[DEV_VERSION]",
520520
"timestamp": "[TIMESTAMP]",
521521
"files": [
522+
{
523+
"local_path": "script",
524+
"is_notebook": false
525+
},
522526
{
523527
"local_path": "test.toml",
524528
"is_notebook": false
@@ -538,10 +542,6 @@
538542
{
539543
"local_path": "repls.json",
540544
"is_notebook": false
541-
},
542-
{
543-
"local_path": "script",
544-
"is_notebook": false
545545
}
546546
],
547547
"id": "[UUID]"
@@ -565,15 +565,6 @@
565565
"name": "pipeline two"
566566
}
567567
}
568-
{
569-
"headers": {
570-
"User-Agent": [
571-
"databricks-tf-provider/1.111.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/pipeline auth/pat"
572-
]
573-
},
574-
"method": "GET",
575-
"path": "/api/2.0/pipelines/[UUID]"
576-
}
577568
{
578569
"headers": {
579570
"User-Agent": [
@@ -619,6 +610,15 @@
619610
"method": "GET",
620611
"path": "/api/2.0/pipelines/[UUID]"
621612
}
613+
{
614+
"headers": {
615+
"User-Agent": [
616+
"databricks-tf-provider/1.111.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/pipeline auth/pat"
617+
]
618+
},
619+
"method": "GET",
620+
"path": "/api/2.0/pipelines/[UUID]"
621+
}
622622
{
623623
"headers": {
624624
"User-Agent": [
@@ -635,7 +635,7 @@
635635
"edit_mode": "UI_LOCKED",
636636
"format": "MULTI_TASK",
637637
"max_concurrent_runs": 1,
638-
"name": "job three",
638+
"name": "job one",
639639
"queue": {
640640
"enabled": true
641641
}
@@ -675,6 +675,18 @@
675675
}
676676
}
677677
}
678+
{
679+
"headers": {
680+
"User-Agent": [
681+
"databricks-tf-provider/1.111.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/job auth/pat"
682+
]
683+
},
684+
"method": "GET",
685+
"path": "/api/2.2/jobs/get",
686+
"q": {
687+
"job_id": "[NUMID]"
688+
}
689+
}
678690
{
679691
"headers": {
680692
"User-Agent": [
@@ -691,7 +703,7 @@
691703
"edit_mode": "UI_LOCKED",
692704
"format": "MULTI_TASK",
693705
"max_concurrent_runs": 1,
694-
"name": "job one",
706+
"name": "job three",
695707
"queue": {
696708
"enabled": true
697709
}
@@ -709,18 +721,6 @@
709721
"job_id": "[NUMID]"
710722
}
711723
}
712-
{
713-
"headers": {
714-
"User-Agent": [
715-
"databricks-tf-provider/1.111.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/job auth/pat"
716-
]
717-
},
718-
"method": "GET",
719-
"path": "/api/2.2/jobs/get",
720-
"q": {
721-
"job_id": "[NUMID]"
722-
}
723-
}
724724
{
725725
"headers": {
726726
"User-Agent": [
@@ -1263,7 +1263,7 @@
12631263
"uploadTime": [UNIX_TIME_MILLIS][2],
12641264
"items": [],
12651265
"protoLogs": [
1266-
"{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[DEV_VERSION]\",\"command\":\"bundle_deploy\",\"operating_system\":\"[OS]\",\"execution_time_ms\":1588,\"exit_code\":0},\"bundle_deploy_event\":{\"bundle_uuid\":\"[UUID]\",\"deployment_id\":\"[UUID]\",\"resource_count\":5,\"resource_job_count\":3,\"resource_pipeline_count\":2,\"resource_model_count\":0,\"resource_experiment_count\":0,\"resource_model_serving_endpoint_count\":0,\"resource_registered_model_count\":0,\"resource_quality_monitor_count\":0,\"resource_schema_count\":0,\"resource_volume_count\":0,\"resource_cluster_count\":0,\"resource_dashboard_count\":0,\"resource_app_count\":0,\"resource_job_ids\":[\"[NUMID]\",\"[NUMID]\",\"[NUMID]\"],\"resource_pipeline_ids\":[\"[UUID]\",\"[UUID]\"],\"experimental\":{\"configuration_file_count\":1,\"variable_count\":0,\"complex_variable_count\":0,\"lookup_variable_count\":0,\"target_count\":1,\"bool_values\":[{\"key\":\"local.cache.attempt\",\"value\":true},{\"key\":\"local.cache.miss\",\"value\":true},{\"key\":\"experimental.use_legacy_run_as\",\"value\":false},{\"key\":\"run_as_set\",\"value\":false},{\"key\":\"presets_name_prefix_is_set\",\"value\":false},{\"key\":\"python_wheel_wrapper_is_set\",\"value\":false},{\"key\":\"skip_artifact_cleanup\",\"value\":false},{\"key\":\"has_serverless_compute\",\"value\":false},{\"key\":\"has_classic_job_compute\",\"value\":false},{\"key\":\"has_classic_interactive_compute\",\"value\":false}],\"bundle_mode\":\"TYPE_UNSPECIFIED\",\"workspace_artifact_path_type\":\"WORKSPACE_FILE_SYSTEM\",\"bundle_mutator_execution_time_ms\":[{\"key\":\"terraform.(plan)\",\"value\":825},{\"key\":\"terraform.(apply)\",\"value\":450},{\"key\":\"phases.Initialize\",\"value\":22},{\"key\":\"files.(upload)\",\"value\":12},{\"key\":\"phases.Build\",\"value\":8},{\"key\":\"artifacts.(build)\",\"value\":7},{\"key\":\"resourcemutator.(processStaticResources)\",\"value\":7},{\"key\":\"deploy.(statePull)\",\"value\":5},{\"key\":\"mutator.(populateCurrentUser)\",\"value\":5},{\"key\":\"lock.(acquire)\",\"value\":4},{\"key\":\"mutator.(initializeCache)\",\"value\":3},{\"key\":\"terraform.(write)\",\"value\":2},{\"key\":\"artifacts.(cleanUp)\",\"value\":2},{\"key\":\"deploy.(statePush)\",\"value\":1},{\"key\":\"libraries.(upload)\",\"value\":1},{\"key\":\"metadata.(upload)\",\"value\":1},{\"key\":\"validate.FastValidate\",\"value\":0}],\"local_cache_measurements_ms\":[{\"key\":\"local.cache.compute_duration\",\"value\":0}]}}}}}"
1266+
"{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[DEV_VERSION]\",\"command\":\"bundle_deploy\",\"operating_system\":\"[OS]\",\"execution_time_ms\":2367,\"exit_code\":0},\"bundle_deploy_event\":{\"bundle_uuid\":\"[UUID]\",\"deployment_id\":\"[UUID]\",\"resource_count\":5,\"resource_job_count\":3,\"resource_pipeline_count\":2,\"resource_model_count\":0,\"resource_experiment_count\":0,\"resource_model_serving_endpoint_count\":0,\"resource_registered_model_count\":0,\"resource_quality_monitor_count\":0,\"resource_schema_count\":0,\"resource_volume_count\":0,\"resource_cluster_count\":0,\"resource_dashboard_count\":0,\"resource_app_count\":0,\"resource_job_ids\":[\"[NUMID]\",\"[NUMID]\",\"[NUMID]\"],\"resource_pipeline_ids\":[\"[UUID]\",\"[UUID]\"],\"experimental\":{\"configuration_file_count\":1,\"variable_count\":0,\"complex_variable_count\":0,\"lookup_variable_count\":0,\"target_count\":1,\"bool_values\":[{\"key\":\"local.cache.attempt\",\"value\":true},{\"key\":\"local.cache.miss\",\"value\":true},{\"key\":\"experimental.use_legacy_run_as\",\"value\":false},{\"key\":\"run_as_set\",\"value\":false},{\"key\":\"presets_name_prefix_is_set\",\"value\":false},{\"key\":\"python_wheel_wrapper_is_set\",\"value\":false},{\"key\":\"skip_artifact_cleanup\",\"value\":false},{\"key\":\"has_serverless_compute\",\"value\":false},{\"key\":\"has_classic_job_compute\",\"value\":false},{\"key\":\"has_classic_interactive_compute\",\"value\":false}],\"bundle_mode\":\"TYPE_UNSPECIFIED\",\"workspace_artifact_path_type\":\"WORKSPACE_FILE_SYSTEM\",\"bundle_mutator_execution_time_ms\":[{\"key\":\"terraform.(plan)\",\"value\":1310},{\"key\":\"terraform.(apply)\",\"value\":732},{\"key\":\"phases.Initialize\",\"value\":15},{\"key\":\"files.(upload)\",\"value\":7},{\"key\":\"resourcemutator.(processStaticResources)\",\"value\":5},{\"key\":\"mutator.(initializeCache)\",\"value\":2},{\"key\":\"mutator.(populateCurrentUser)\",\"value\":2},{\"key\":\"phases.Build\",\"value\":2},{\"key\":\"lock.(acquire)\",\"value\":2},{\"key\":\"artifacts.(build)\",\"value\":1},{\"key\":\"terraform.(interpolateMutator)\",\"value\":1},{\"key\":\"validate.FastValidate\",\"value\":0}],\"local_cache_measurements_ms\":[{\"key\":\"local.cache.compute_duration\",\"value\":0}]}}}}}"
12671267
]
12681268
}
12691269
}

0 commit comments

Comments
 (0)