testserver: volumes: include volume_id (#4224)

## Why
Makes it more similar to real volumes, helps with local+cloud tests.

Author: denik

acceptance/bundle/migrate/basic/out.plan_update.json

@@ -209,6 +209,7 @@
         "schema_name": "myschema",
         "storage_location": "s3://deco-uc-prod-isolated-aws-us-east-1/metastore/[UUID]/volumes/[UUID]",
         "updated_at": [UNIX_TIME_MILLIS][2],
+        "volume_id": "[UUID]",
         "volume_type": "MANAGED"
       },
       "changes": {

acceptance/bundle/resources/volumes/change-comment/output.txt

@@ -50,6 +50,7 @@ Deployment complete!
   "schema_name":"myschema",
   "storage_location":"s3://deco-uc-prod-isolated-aws-us-east-1/metastore/[UUID]/volumes/[UUID]",
   "updated_at":[UNIX_TIME_MILLIS][0],
+  "volume_id":"[UUID]",
   "volume_type":"MANAGED"
 }
 

acceptance/bundle/resources/volumes/change-name/out.plan.direct.json

@@ -26,6 +26,7 @@
         "schema_name": "myschema",
         "storage_location": "s3://deco-uc-prod-isolated-aws-us-east-1/metastore/[UUID]/volumes/[UUID]",
         "updated_at": [UNIX_TIME_MILLIS][0],
+        "volume_id": "[UUID]",
         "volume_type": "MANAGED"
       },
       "changes": {

acceptance/bundle/resources/volumes/change-name/output.txt

@@ -70,6 +70,7 @@ Deployment complete!
   "storage_location":"s3://deco-uc-prod-isolated-aws-us-east-1/metastore/[UUID]/volumes/[UUID]",
   "updated_at":[UNIX_TIME_MILLIS][1],
   "updated_by":"[USERNAME]",
+  "volume_id":"[UUID]",
   "volume_type":"MANAGED"
 }
 

acceptance/bundle/resources/volumes/remote-change-name/output.txt

@@ -17,6 +17,7 @@ Deployment complete!
   "storage_location":"s3://deco-uc-prod-isolated-aws-us-east-1/metastore/[UUID]/volumes/[UUID]",
   "updated_at":[UNIX_TIME_MILLIS][1],
   "updated_by":"[USERNAME]",
+  "volume_id":"[UUID]",
   "volume_type":"MANAGED"
 }
 
@@ -32,6 +33,7 @@ Deployment complete!
   "storage_location":"s3://deco-uc-prod-isolated-aws-us-east-1/metastore/[UUID]/volumes/[UUID]",
   "updated_at":[UNIX_TIME_MILLIS][1],
   "updated_by":"[USERNAME]",
+  "volume_id":"[UUID]",
   "volume_type":"MANAGED"
 }
 

libs/testserver/handlers.go

@@ -388,6 +388,14 @@ func AddDefaultHandlers(server *Server) {
 		return req.Workspace.VolumesCreate(req)
 	})
 
+	server.Handle("PATCH", "/api/2.1/unity-catalog/volumes/{full_name}", func(req Request) any {
+		return req.Workspace.VolumesUpdate(req, req.Vars["full_name"])
+	})
+
+	server.Handle("DELETE", "/api/2.1/unity-catalog/volumes/{full_name}", func(req Request) any {
+		return MapDelete(req.Workspace, req.Workspace.Volumes, req.Vars["full_name"])
+	})
+
 	// Repos:
 
 	server.Handle("POST", "/api/2.0/repos", func(req Request) any {
@@ -406,14 +414,6 @@ func AddDefaultHandlers(server *Server) {
 		return req.Workspace.ReposDelete(req)
 	})
 
-	server.Handle("PATCH", "/api/2.1/unity-catalog/volumes/{full_name}", func(req Request) any {
-		return req.Workspace.VolumesUpdate(req, req.Vars["full_name"])
-	})
-
-	server.Handle("DELETE", "/api/2.1/unity-catalog/volumes/{full_name}", func(req Request) any {
-		return MapDelete(req.Workspace, req.Workspace.Volumes, req.Vars["full_name"])
-	})
-
 	// SQL Warehouses:
 
 	server.Handle("GET", "/api/2.0/sql/warehouses/{warehouse_id}", func(req Request) any {

libs/testserver/volumes.go

@@ -29,8 +29,8 @@ func (s *FakeWorkspace) VolumesCreate(req Request) Response {
 			},
 		}
 	}
-	// QQQ first UUID should be constant per workspace?
-	volume.StorageLocation = fmt.Sprintf("s3://deco-uc-prod-isolated-aws-us-east-1/metastore/%s/volumes/%s", nextUUID(), nextUUID())
+	volume.VolumeId = nextUUID()
+	volume.StorageLocation = fmt.Sprintf("s3://deco-uc-prod-isolated-aws-us-east-1/metastore/%s/volumes/%s", TestMetastore.MetastoreId, volume.VolumeId)
 
 	volume.CreatedAt = nowMilli()
 	volume.UpdatedAt = volume.CreatedAt