Vector Search follow-up

acceptance/bundle/resources/vector_search_endpoints/recreate/name/databricks.yml.tmpl

@@ -0,0 +1,11 @@
+bundle:
+  name: recreate-vs-endpoint-name-$UNIQUE_NAME
+
+sync:
+  paths: []
+
+resources:
+  vector_search_endpoints:
+    my_endpoint:
+      name: vs-endpoint-$UNIQUE_NAME
+      endpoint_type: STANDARD

acceptance/bundle/resources/vector_search_endpoints/recreate/name/out.requests.create.direct.json

@@ -0,0 +1,8 @@
+{
+  "method": "POST",
+  "path": "/api/2.0/vector-search/endpoints",
+  "body": {
+    "endpoint_type": "STANDARD",
+    "name": "vs-endpoint-[UNIQUE_NAME]"
+  }
+}

acceptance/bundle/resources/vector_search_endpoints/recreate/name/out.requests.recreate.direct.json

@@ -0,0 +1,12 @@
+{
+  "method": "DELETE",
+  "path": "/api/2.0/vector-search/endpoints/vs-endpoint-[UNIQUE_NAME]"
+}
+{
+  "method": "POST",
+  "path": "/api/2.0/vector-search/endpoints",
+  "body": {
+    "endpoint_type": "STANDARD",
+    "name": "vs-endpoint-renamed-[UNIQUE_NAME]"
+  }
+}

acceptance/bundle/resources/vector_search_endpoints/recreate/name/output.txt

@@ -0,0 +1,40 @@
+
+=== Initial deployment
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-vs-endpoint-name-[UNIQUE_NAME]/default/files...
+Deploying resources...
+Updating deployment state...
+Deployment complete!
+
+>>> print_requests.py --keep //vector-search/endpoints
+
+=== Rename endpoint (should trigger recreation)
+>>> update_file.py databricks.yml name: vs-endpoint-[UNIQUE_NAME] name: vs-endpoint-renamed-[UNIQUE_NAME]
+
+>>> [CLI] bundle plan
+recreate vector_search_endpoints.my_endpoint
+
+Plan: 1 to add, 0 to change, 1 to delete, 0 unchanged
+
+>>> [CLI] bundle deploy --auto-approve
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-vs-endpoint-name-[UNIQUE_NAME]/default/files...
+Deploying resources...
+Updating deployment state...
+Deployment complete!
+
+>>> print_requests.py --keep //vector-search/endpoints
+
+>>> [CLI] vector-search-endpoints get-endpoint vs-endpoint-renamed-[UNIQUE_NAME]
+{
+  "name": "vs-endpoint-renamed-[UNIQUE_NAME]",
+  "endpoint_type": "STANDARD"
+}
+
+>>> [CLI] bundle destroy --auto-approve
+The following resources will be deleted:
+  delete resources.vector_search_endpoints.my_endpoint
+
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-vs-endpoint-name-[UNIQUE_NAME]/default
+
+Deleting files...
+Destroy complete!

acceptance/bundle/resources/vector_search_endpoints/recreate/name/script

@@ -0,0 +1,30 @@
+envsubst < databricks.yml.tmpl > databricks.yml
+
+cleanup() {
+    trace $CLI bundle destroy --auto-approve
+    rm -f out.requests.txt
+}
+trap cleanup EXIT
+
+print_requests() {
+    local label=$1
+    trace print_requests.py --keep '//vector-search/endpoints' > out.requests.${label}.$DATABRICKS_BUNDLE_ENGINE.json
+    rm -f out.requests.txt
+}
+
+title "Initial deployment"
+rm -f out.requests.txt
+trace $CLI bundle deploy
+
+print_requests create
+
+title "Rename endpoint (should trigger recreation)"
+trace update_file.py databricks.yml "name: vs-endpoint-$UNIQUE_NAME" "name: vs-endpoint-renamed-$UNIQUE_NAME"
+
+trace $CLI bundle plan
+rm -f out.requests.txt
+trace $CLI bundle deploy --auto-approve
+
+print_requests recreate
+
+trace $CLI vector-search-endpoints get-endpoint "vs-endpoint-renamed-${UNIQUE_NAME}" | jq '{name, endpoint_type}'

acceptance/bundle/resources/vector_search_endpoints/recreate/name/test.toml

@@ -0,0 +1 @@
+Cloud = false

acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt

@@ -71,6 +71,7 @@ Plan: 1 to add, 0 to change, 1 to delete, 1 unchanged
           ],
           "schema_json": "{\"id\":\"int\",\"vector\":\"array\u003cfloat\u003e\"}"
         },
+        "endpoint_id": "[UUID]",
         "endpoint_name": "vs-endpoint-[UNIQUE_NAME]",
         "endpoint_uuid": "[UUID]",
         "index_subtype": "HYBRID",

bundle/config/mutator/resourcemutator/apply_bundle_permissions_test.go

@@ -149,12 +149,12 @@ func TestApplyBundlePermissions(t *testing.T) {
 	require.Contains(t, b.Config.Resources.Apps["app_1"].Permissions, resources.AppPermission{Level: "CAN_USE", GroupName: "TestGroup"})
 
 	require.Len(t, b.Config.Resources.VectorSearchEndpoints["vs_1"].Permissions, 2)
-	require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_1"].Permissions, resources.Permission{Level: "CAN_MANAGE", UserName: "TestUser"})
-	require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_1"].Permissions, resources.Permission{Level: "CAN_USE", GroupName: "TestGroup"})
+	require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_1"].Permissions, resources.VectorSearchEndpointPermission{Level: "CAN_MANAGE", UserName: "TestUser"})
+	require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_1"].Permissions, resources.VectorSearchEndpointPermission{Level: "CAN_USE", GroupName: "TestGroup"})
 
 	require.Len(t, b.Config.Resources.VectorSearchEndpoints["vs_2"].Permissions, 2)
-	require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_2"].Permissions, resources.Permission{Level: "CAN_MANAGE", UserName: "TestUser"})
-	require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_2"].Permissions, resources.Permission{Level: "CAN_USE", GroupName: "TestGroup"})
+	require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_2"].Permissions, resources.VectorSearchEndpointPermission{Level: "CAN_MANAGE", UserName: "TestUser"})
+	require.Contains(t, b.Config.Resources.VectorSearchEndpoints["vs_2"].Permissions, resources.VectorSearchEndpointPermission{Level: "CAN_USE", GroupName: "TestGroup"})
 }
 
 func TestWarningOnOverlapPermission(t *testing.T) {

bundle/config/resources/permission_types.go

@@ -9,6 +9,7 @@ import (
 	"github.com/databricks/databricks-sdk-go/service/pipelines"
 	"github.com/databricks/databricks-sdk-go/service/serving"
 	"github.com/databricks/databricks-sdk-go/service/sql"
+	"github.com/databricks/databricks-sdk-go/service/vectorsearch"
 )
 
 // Each resource defines its own permission type so that the JSON schema names them distinctly.
@@ -32,4 +33,5 @@ type (
 	ModelServingEndpointPermission PermissionT[serving.ServingEndpointPermissionLevel]
 	PipelinePermission             PermissionT[pipelines.PipelinePermissionLevel]
 	SqlWarehousePermission         PermissionT[sql.WarehousePermissionLevel]
+	VectorSearchEndpointPermission PermissionT[vectorsearch.VectorSearchEndpointPermissionLevel]
 )

bundle/config/resources/vector_search_endpoint.go

@@ -16,7 +16,7 @@ type VectorSearchEndpoint struct {
 	BaseResource
 	vectorsearch.CreateEndpoint
 
-	Permissions []Permission `json:"permissions,omitempty"`
+	Permissions []VectorSearchEndpointPermission `json:"permissions,omitempty"`
 }
 
 func (e *VectorSearchEndpoint) UnmarshalJSON(b []byte) error {

bundle/direct/dresources/vector_search_index.go

@@ -24,7 +24,7 @@ const deleteIndexTimeout = 15 * time.Minute
 // createIndexTimeout caps the wait for an index to become ready after creation.
 // Delta sync indexes do an initial sync from the source table, which can stretch
 // out for large tables. Matches the terraform provider's defaultIndexProvisionTimeout.
-// https://github.com/databricks/terraform-provider-databricks/blob/c61a32300445f84efb2bb6827dee35e6e523f4ff/vectorsearch/resource_vector_search_index.go#L19
+// https://github.com/databricks/terraform-provider-databricks/blob/c79d82d9582ab6670468bbff303199906d47905f/vectorsearch/resource_vector_search_index.go#L19
 const createIndexTimeout = 75 * time.Minute
 
 // VectorSearchIndexState tracks the UUID of the endpoint the index is attached

bundle/internal/schema/annotations.yml

@@ -1639,6 +1639,19 @@ resources:
         "permissions":
           "description": |-
             PLACEHOLDER
+          "$fields":
+            "group_name":
+              "description": |-
+                PLACEHOLDER
+            "level":
+              "description": |-
+                PLACEHOLDER
+            "service_principal_name":
+              "description": |-
+                PLACEHOLDER
+            "user_name":
+              "description": |-
+                PLACEHOLDER
     "vector_search_indexes":
       "description": |-
         PLACEHOLDER

libs/testserver/fake_workspace.go

@@ -153,7 +153,7 @@ type FakeWorkspace struct {
 	RegisteredModels      map[string]catalog.RegisteredModelInfo
 	ServingEndpoints      map[string]serving.ServingEndpointDetailed
 	VectorSearchEndpoints map[string]vectorsearch.EndpointInfo
-	VectorSearchIndexes   map[string]fakeVectorSearchIndex
+	VectorSearchIndexes   map[string]vectorsearch.VectorIndex
 
 	SecretScopes map[string]workspace.SecretScope
 	Secrets      map[string]map[string]string // scope -> key -> value
@@ -301,7 +301,7 @@ func NewFakeWorkspace(url, token string) *FakeWorkspace {
 		},
 		ServingEndpoints:          map[string]serving.ServingEndpointDetailed{},
 		VectorSearchEndpoints:     map[string]vectorsearch.EndpointInfo{},
-		VectorSearchIndexes:       map[string]fakeVectorSearchIndex{},
+		VectorSearchIndexes:       map[string]vectorsearch.VectorIndex{},
 		Repos:                     map[string]workspace.RepoInfo{},
 		SecretScopes:              map[string]workspace.SecretScope{},
 		Secrets:                   map[string]map[string]string{},