diff --git a/acceptance/auth/credentials/basic/output.txt b/acceptance/auth/credentials/basic/output.txt index c5747c9e47..85d66a6a4f 100644 --- a/acceptance/auth/credentials/basic/output.txt +++ b/acceptance/auth/credentials/basic/output.txt @@ -1,4 +1,8 @@ { "id":"[USERID]", + "name": { + "familyName":"[USERNAME]", + "givenName":"[USERNAME]" + }, "userName":"[USERNAME]" } diff --git a/acceptance/auth/credentials/oauth/output.txt b/acceptance/auth/credentials/oauth/output.txt index c5747c9e47..85d66a6a4f 100644 --- a/acceptance/auth/credentials/oauth/output.txt +++ b/acceptance/auth/credentials/oauth/output.txt @@ -1,4 +1,8 @@ { "id":"[USERID]", + "name": { + "familyName":"[USERNAME]", + "givenName":"[USERNAME]" + }, "userName":"[USERNAME]" } diff --git a/acceptance/auth/credentials/pat/output.txt b/acceptance/auth/credentials/pat/output.txt index c5747c9e47..85d66a6a4f 100644 --- a/acceptance/auth/credentials/pat/output.txt +++ b/acceptance/auth/credentials/pat/output.txt @@ -1,4 +1,8 @@ { "id":"[USERID]", + "name": { + "familyName":"[USERNAME]", + "givenName":"[USERNAME]" + }, "userName":"[USERNAME]" } diff --git a/acceptance/auth/credentials/unified-host/output.txt b/acceptance/auth/credentials/unified-host/output.txt index 89aa4c891c..df19f6c94c 100644 --- a/acceptance/auth/credentials/unified-host/output.txt +++ b/acceptance/auth/credentials/unified-host/output.txt @@ -2,6 +2,10 @@ === With workspace_id { "id":"[USERID]", + "name": { + "familyName":"[USERNAME]", + "givenName":"[USERNAME]" + }, "userName":"[USERNAME]" } diff --git a/acceptance/bundle/deployment/bind/pipelines/update/out.summary.json b/acceptance/bundle/deployment/bind/pipelines/update/out.summary.json index d4d9b72a85..ed57f27a7b 100644 --- a/acceptance/bundle/deployment/bind/pipelines/update/out.summary.json +++ b/acceptance/bundle/deployment/bind/pipelines/update/out.summary.json @@ -40,6 +40,10 @@ "current_user": { "domain_friendly_name": "[USERNAME]", "id": "[USERID]", + "name": { + "familyName": "[USERNAME]", + "givenName": "[USERNAME]" + }, "short_name": "[USERNAME]", "userName": "[USERNAME]" }, diff --git a/acceptance/bundle/python/experimental-compatibility-both-equal/output.txt b/acceptance/bundle/python/experimental-compatibility-both-equal/output.txt index a649ac03b5..8296d8b419 100644 --- a/acceptance/bundle/python/experimental-compatibility-both-equal/output.txt +++ b/acceptance/bundle/python/experimental-compatibility-both-equal/output.txt @@ -57,14 +57,14 @@ [ 0, 1, - 880 + 942 ] ], "resources.jobs": [ [ 0, 1, - 889 + 951 ] ], "resources.jobs.my_job": [ diff --git a/acceptance/bundle/python/experimental-compatibility/output.txt b/acceptance/bundle/python/experimental-compatibility/output.txt index 40a5754e11..b7091d8b50 100644 --- a/acceptance/bundle/python/experimental-compatibility/output.txt +++ b/acceptance/bundle/python/experimental-compatibility/output.txt @@ -50,14 +50,14 @@ [ 0, 1, - 825 + 887 ] ], "resources.jobs": [ [ 0, 1, - 834 + 896 ] ], "resources.jobs.my_job": [ diff --git a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/output.txt b/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/output.txt index e2c200ce1d..b2d898bc7f 100644 --- a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/output.txt +++ b/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/output.txt @@ -2,5 +2,9 @@ >>> [CLI] bundle run --profile myprofile -- [CLI] current-user me { "id":"[USERID]", + "name": { + "familyName":"[USERNAME]", + "givenName":"[USERNAME]" + }, "userName":"[USERNAME]" } diff --git a/acceptance/bundle/run/scripts/basic/output.txt b/acceptance/bundle/run/scripts/basic/output.txt index 1ec8fd3be7..3349b0a3ff 100644 --- a/acceptance/bundle/run/scripts/basic/output.txt +++ b/acceptance/bundle/run/scripts/basic/output.txt @@ -5,6 +5,10 @@ hello >>> [CLI] bundle run me { "id":"[USERID]", + "name": { + "familyName":"[USERNAME]", + "givenName":"[USERNAME]" + }, "userName":"[USERNAME]" } diff --git a/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/output.txt b/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/output.txt index 2c0238ec30..0c1ab1d69c 100644 --- a/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/output.txt +++ b/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/output.txt @@ -2,5 +2,9 @@ >>> [CLI] bundle run me --profile myprofile { "id":"[USERID]", + "name": { + "familyName":"[USERNAME]", + "givenName":"[USERNAME]" + }, "userName":"[USERNAME]" } diff --git a/acceptance/bundle/validate/job-references/output.txt b/acceptance/bundle/validate/job-references/output.txt index 8f88ccee39..0a44b2ccff 100644 --- a/acceptance/bundle/validate/job-references/output.txt +++ b/acceptance/bundle/validate/job-references/output.txt @@ -57,6 +57,10 @@ "current_user": { "domain_friendly_name": "[USERNAME]", "id": "[USERID]", + "name": { + "familyName": "[USERNAME]", + "givenName": "[USERNAME]" + }, "short_name": "[USERNAME]", "userName": "[USERNAME]" }, diff --git a/acceptance/bundle/validate/presets_name_prefix_dev/out.with_empty_prefix.json b/acceptance/bundle/validate/presets_name_prefix_dev/out.with_empty_prefix.json index cf1745cc2f..a6db179754 100644 --- a/acceptance/bundle/validate/presets_name_prefix_dev/out.with_empty_prefix.json +++ b/acceptance/bundle/validate/presets_name_prefix_dev/out.with_empty_prefix.json @@ -77,6 +77,10 @@ "current_user": { "domain_friendly_name": "[USERNAME]", "id": "[USERID]", + "name": { + "familyName": "[USERNAME]", + "givenName": "[USERNAME]" + }, "short_name": "[USERNAME]", "userName": "[USERNAME]" }, diff --git a/acceptance/bundle/validate/presets_name_prefix_dev/out.with_nil_prefix.json b/acceptance/bundle/validate/presets_name_prefix_dev/out.with_nil_prefix.json index cf1745cc2f..a6db179754 100644 --- a/acceptance/bundle/validate/presets_name_prefix_dev/out.with_nil_prefix.json +++ b/acceptance/bundle/validate/presets_name_prefix_dev/out.with_nil_prefix.json @@ -77,6 +77,10 @@ "current_user": { "domain_friendly_name": "[USERNAME]", "id": "[USERID]", + "name": { + "familyName": "[USERNAME]", + "givenName": "[USERNAME]" + }, "short_name": "[USERNAME]", "userName": "[USERNAME]" }, diff --git a/acceptance/bundle/validate/presets_name_prefix_dev/out.with_static_prefix.json b/acceptance/bundle/validate/presets_name_prefix_dev/out.with_static_prefix.json index eff500341a..b290f33ebc 100644 --- a/acceptance/bundle/validate/presets_name_prefix_dev/out.with_static_prefix.json +++ b/acceptance/bundle/validate/presets_name_prefix_dev/out.with_static_prefix.json @@ -71,6 +71,10 @@ "current_user": { "domain_friendly_name": "[USERNAME]", "id": "[USERID]", + "name": { + "familyName": "[USERNAME]", + "givenName": "[USERNAME]" + }, "short_name": "[USERNAME]", "userName": "[USERNAME]" }, diff --git a/acceptance/bundle/validate/presets_name_prefix_dev/out.without_presets.json b/acceptance/bundle/validate/presets_name_prefix_dev/out.without_presets.json index cf1745cc2f..a6db179754 100644 --- a/acceptance/bundle/validate/presets_name_prefix_dev/out.without_presets.json +++ b/acceptance/bundle/validate/presets_name_prefix_dev/out.without_presets.json @@ -77,6 +77,10 @@ "current_user": { "domain_friendly_name": "[USERNAME]", "id": "[USERID]", + "name": { + "familyName": "[USERNAME]", + "givenName": "[USERNAME]" + }, "short_name": "[USERNAME]", "userName": "[USERNAME]" }, diff --git a/acceptance/selftest/diff/out_dir_a/output.txt b/acceptance/selftest/diff/out_dir_a/output.txt index 68650df4cc..86f8f1846d 100644 --- a/acceptance/selftest/diff/out_dir_a/output.txt +++ b/acceptance/selftest/diff/out_dir_a/output.txt @@ -1,6 +1,10 @@ Hello! 🚀 { "id": "[USERID]", + "name": { + "familyName": "[USERNAME]", + "givenName": "[USERNAME]" + }, "userName": "[USERNAME]" } diff --git a/acceptance/selftest/diff/output.txt b/acceptance/selftest/diff/output.txt index fec5241417..b224ec6e0b 100644 --- a/acceptance/selftest/diff/output.txt +++ b/acceptance/selftest/diff/output.txt @@ -4,10 +4,14 @@ Only in out_dir_a: only_in_a Only in out_dir_b: only_in_b --- out_dir_a/output.txt +++ out_dir_b/output.txt -@@ -1,5 +1,5 @@ +@@ -1,9 +1,5 @@ Hello! 🚀 { - "id": "[USERID]", +- "name": { +- "familyName": "[USERNAME]", +- "givenName": "[USERNAME]" +- }, + "id": "[UUID]", "userName": "[USERNAME]" } @@ -17,10 +21,14 @@ Only in .: only_in_a Only in ../out_dir_b: only_in_b --- output.txt +++ ../out_dir_b/output.txt -@@ -1,5 +1,5 @@ +@@ -1,9 +1,5 @@ Hello! 🚀 { - "id": "[USERID]", +- "name": { +- "familyName": "[USERNAME]", +- "givenName": "[USERNAME]" +- }, + "id": "[UUID]", "userName": "[USERNAME]" } @@ -28,10 +36,14 @@ Only in ../out_dir_b: only_in_b >>> diff.py out_dir_a/output.txt out_dir_b/output.txt --- out_dir_a/output.txt +++ out_dir_b/output.txt -@@ -1,5 +1,5 @@ +@@ -1,9 +1,5 @@ Hello! 🚀 { - "id": "[USERID]", +- "name": { +- "familyName": "[USERNAME]", +- "givenName": "[USERNAME]" +- }, + "id": "[UUID]", "userName": "[USERNAME]" } diff --git a/acceptance/selftest/record_cloud/basic/out.test.toml b/acceptance/selftest/record_cloud/basic/out.test.toml index f474b1b917..01ed6822af 100644 --- a/acceptance/selftest/record_cloud/basic/out.test.toml +++ b/acceptance/selftest/record_cloud/basic/out.test.toml @@ -1,4 +1,4 @@ -Local = false +Local = true Cloud = true [EnvMatrix] diff --git a/acceptance/selftest/record_cloud/basic/test.toml b/acceptance/selftest/record_cloud/basic/test.toml new file mode 100644 index 0000000000..2713ce3c61 --- /dev/null +++ b/acceptance/selftest/record_cloud/basic/test.toml @@ -0,0 +1 @@ +Local = true diff --git a/acceptance/selftest/server/output.txt b/acceptance/selftest/server/output.txt index 7147f9c9be..c111d00418 100644 --- a/acceptance/selftest/server/output.txt +++ b/acceptance/selftest/server/output.txt @@ -2,6 +2,10 @@ >>> curl -s [DATABRICKS_URL]/api/2.0/preview/scim/v2/Me { "id": "[USERID]", + "name": { + "familyName": "[USERNAME]", + "givenName": "[USERNAME]" + }, "userName": "[USERNAME]" } >>> curl -sD - [DATABRICKS_URL]/custom/endpoint?query=param diff --git a/libs/testserver/fake_workspace.go b/libs/testserver/fake_workspace.go index 9d132f5604..dc8fcea570 100644 --- a/libs/testserver/fake_workspace.go +++ b/libs/testserver/fake_workspace.go @@ -41,6 +41,10 @@ const ( var TestUser = iam.User{ Id: UserID, UserName: "tester@databricks.com", + Name: &iam.Name{ + GivenName: "Tester", + FamilyName: "McTesterson", + }, } var TestUserSP = iam.User{