From 58ef34f320f4865d2a62d08b80798fdbdcf7294d Mon Sep 17 00:00:00 2001
From: Denis Bilenko <denis.bilenko@databricks.com>
Date: Wed, 29 Jan 2025 18:35:03 +0100
Subject: [PATCH] acc: Include "id" into /api/2.0/preview/scim/v2/Me response
 (#2266)

This is something terraform provider expects.

Related to https://github.com/databricks/cli/pull/2242
---
 acceptance/bundle/variables/git-branch/output.txt               | 2 ++
 acceptance/bundle/variables/prepend-workspace-var/output.txt    | 1 +
 acceptance/bundle/variables/resolve-builtin/output.txt          | 1 +
 .../bundle/variables/resolve-vars-in-root-path/output.txt       | 1 +
 acceptance/server_test.go                                       | 1 +
 5 files changed, 6 insertions(+)

diff --git a/acceptance/bundle/variables/git-branch/output.txt b/acceptance/bundle/variables/git-branch/output.txt
index d6d824394..fb3ab805a 100644
--- a/acceptance/bundle/variables/git-branch/output.txt
+++ b/acceptance/bundle/variables/git-branch/output.txt
@@ -29,6 +29,7 @@
   "workspace": {
     "artifact_path": "/Workspace/Users/$USERNAME/.bundle/git/prod/artifacts",
     "current_user": {
+      "id": "$USER.Id",
       "short_name": "$USERNAME",
       "userName": "$USERNAME"
     },
@@ -78,6 +79,7 @@ Validation OK!
   "workspace": {
     "artifact_path": "/Workspace/Users/$USERNAME/.bundle/git/dev/artifacts",
     "current_user": {
+      "id": "$USER.Id",
       "short_name": "$USERNAME",
       "userName": "$USERNAME"
     },
diff --git a/acceptance/bundle/variables/prepend-workspace-var/output.txt b/acceptance/bundle/variables/prepend-workspace-var/output.txt
index 706d134ff..fcaa25b4a 100644
--- a/acceptance/bundle/variables/prepend-workspace-var/output.txt
+++ b/acceptance/bundle/variables/prepend-workspace-var/output.txt
@@ -54,6 +54,7 @@
   "workspace": {
     "artifact_path": "/Users/$USERNAME/path/to/root/artifacts",
     "current_user": {
+      "id": "$USER.Id",
       "short_name": "$USERNAME",
       "userName": "$USERNAME"
     },
diff --git a/acceptance/bundle/variables/resolve-builtin/output.txt b/acceptance/bundle/variables/resolve-builtin/output.txt
index f060c472e..0c1678f84 100644
--- a/acceptance/bundle/variables/resolve-builtin/output.txt
+++ b/acceptance/bundle/variables/resolve-builtin/output.txt
@@ -1,6 +1,7 @@
 {
   "artifact_path": "TestResolveVariableReferences/bar/artifacts",
   "current_user": {
+    "id": "$USER.Id",
     "short_name": "$USERNAME",
     "userName": "$USERNAME"
   },
diff --git a/acceptance/bundle/variables/resolve-vars-in-root-path/output.txt b/acceptance/bundle/variables/resolve-vars-in-root-path/output.txt
index c56fbe415..51eb40c91 100644
--- a/acceptance/bundle/variables/resolve-vars-in-root-path/output.txt
+++ b/acceptance/bundle/variables/resolve-vars-in-root-path/output.txt
@@ -1,6 +1,7 @@
 {
   "artifact_path": "TestResolveVariableReferencesToBundleVariables/bar/artifacts",
   "current_user": {
+    "id": "$USER.Id",
     "short_name": "$USERNAME",
     "userName": "$USERNAME"
   },
diff --git a/acceptance/server_test.go b/acceptance/server_test.go
index 98e351739..4957a7668 100644
--- a/acceptance/server_test.go
+++ b/acceptance/server_test.go
@@ -54,6 +54,7 @@ func AddHandlers(server *testserver.Server) {
 
 	server.Handle("GET /api/2.0/preview/scim/v2/Me", func(r *http.Request) (any, error) {
 		return iam.User{
+			Id:       "1000012345",
 			UserName: "tester@databricks.com",
 		}, nil
 	})