Stop applying name prefix to vector_search_indexes

The 3-part UC name (catalog.schema.index) is the API primary key:
CreateIndex addresses by name and DoCreate returns it as the
deployment id. Prefixing it changed which remote object the bundle
addressed, not just its display label. Mirrors #5209's same change
for vector_search_endpoints.

Drop the leaf-only prefix loop and the vectorSearchIndexPrefixPos
helper in apply_presets.go, add VectorSearchIndex to the
no-rename carve-out in apply_target_mode_test.go, and remove the
now-obsolete TestVectorSearchIndexNamePrefixing.

Co-authored-by: Isaac

Author: janniklasrose

acceptance/bundle/validate/presets_name_prefix/output.txt

@@ -40,7 +40,7 @@
     "vs_index": {
       "endpoint_name": "vs_endpoint",
       "index_type": "DELTA_SYNC",
-      "name": "my_catalog.my_schema.prefixmy_index",
+      "name": "my_catalog.my_schema.my_index",
       "primary_key": "id"
     }
   },
@@ -95,7 +95,7 @@
     "vs_index": {
       "endpoint_name": "vs_endpoint",
       "index_type": "DELTA_SYNC",
-      "name": "my_catalog.my_schema.prefix_my_index",
+      "name": "my_catalog.my_schema.my_index",
       "primary_key": "id"
     }
   },

acceptance/bundle/validate/presets_name_prefix_vs_index_endpoint/output.txt

@@ -11,19 +11,19 @@
     "vs_index_literal": {
       "endpoint_name": "vs_endpoint",
       "index_type": "DELTA_SYNC",
-      "name": "my_catalog.my_schema.prefix_literal_index",
+      "name": "my_catalog.my_schema.literal_index",
       "primary_key": "id"
     },
     "vs_index_partial_ref": {
       "endpoint_name": "${resources.vector_search_endpoints.vs_endpoint.name}",
       "index_type": "DELTA_SYNC",
-      "name": "my_catalog.my_schema.prefix_partial_ref_index",
+      "name": "my_catalog.my_schema.partial_ref_index",
       "primary_key": "id"
     },
     "vs_index_ref": {
       "endpoint_name": "${resources.vector_search_endpoints.vs_endpoint.name}",
       "index_type": "DELTA_SYNC",
-      "name": "my_catalog.my_schema.prefix_ref_index",
+      "name": "my_catalog.my_schema.ref_index",
       "primary_key": "id"
     }
   }

bundle/config/mutator/resourcemutator/apply_presets.go

@@ -294,17 +294,10 @@ func (m *applyPresets) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnos
 	// (it's what GET/UPDATE/DELETE address by), so prefixing it would change
 	// the resource's identity rather than just its display name.
 
-	// Vector Search Indexes: Prefix
-	// The name is a 3-part UC identifier (catalog.schema.index); prefix only
-	// the last component since catalog and schema are external references.
-	for _, e := range r.VectorSearchIndexes {
-		if e == nil {
-			continue
-		}
-		if pos := vectorSearchIndexPrefixPos(e.Name); pos >= 0 {
-			e.Name = e.Name[:pos] + normalizePrefix(prefix) + e.Name[pos:]
-		}
-	}
+	// Vector Search Indexes: no prefix. The 3-part UC name (catalog.schema.index)
+	// is the API primary key (CreateIndex addresses by name and DoCreate returns
+	// it as the deployment id), so prefixing would change the resource's
+	// identity rather than just its display name.
 
 	return diags
 }
@@ -337,28 +330,6 @@ func toTagArray(tags map[string]string) []Tag {
 	return tagArray
 }
 
-// vectorSearchIndexPrefixPos returns the byte offset at which to insert the
-// name prefix into a vector search index name, or -1 to skip prefixing.
-//
-// ApplyPresets runs before reference/variable resolution, so the name may
-// still carry literal `${...}` tokens. We walk back from the end and prefix
-// at the first `.` we find, which is the catalog.schema.index separator
-// once the literal tail is non-empty. If we instead hit `$` or `}` first,
-// the tail is occluded by a `${...}` expression and prefixing would corrupt
-// it (e.g. `${var.full_name}` -> `${var.dev_user_full_name}`); in that case
-// skip and let the user compose the prefix into the variable.
-func vectorSearchIndexPrefixPos(name string) int {
-	for i := len(name) - 1; i >= 0; i-- {
-		switch name[i] {
-		case '.':
-			return i + 1
-		case '$', '}':
-			return -1
-		}
-	}
-	return 0
-}
-
 // normalizePrefix prefixes strings like '[dev lennart] ' to 'dev_lennart_'.
 // We leave unicode letters and numbers but remove all "special characters."
 func normalizePrefix(prefix string) string {

bundle/config/mutator/resourcemutator/apply_target_mode_test.go

@@ -316,8 +316,8 @@ func TestProcessTargetModeDevelopment(t *testing.T) {
 	// Vector search endpoint 1: name is the primary key, so it must not be prefixed.
 	assert.Equal(t, "vs_endpoint1", b.Config.Resources.VectorSearchEndpoints["vs_endpoint1"].Name)
 
-	// Vector search index 1: only the leaf name is prefixed, since catalog and schema are external
-	assert.Equal(t, "main.default.dev_lennart_vs_index1", b.Config.Resources.VectorSearchIndexes["vs_index1"].Name)
+	// Vector search index 1: name is the primary key, so it must not be prefixed.
+	assert.Equal(t, "main.default.vs_index1", b.Config.Resources.VectorSearchIndexes["vs_index1"].Name)
 
 	// Registered model 1
 	assert.Equal(t, "dev_lennart_registeredmodel1", b.Config.Resources.RegisteredModels["registeredmodel1"].Name)
@@ -440,6 +440,7 @@ func TestAppropriateResourcesAreRenamed(t *testing.T) {
 		reflect.TypeFor[*resources.ExternalLocation](),
 		reflect.TypeFor[*resources.Volume](),
 		reflect.TypeFor[*resources.VectorSearchEndpoint](),
+		reflect.TypeFor[*resources.VectorSearchIndex](),
 	}
 
 	// Resources whose Name is server-generated or otherwise not a user-facing
@@ -506,53 +507,6 @@ func TestDisableLockingDisabled(t *testing.T) {
 	assert.True(t, b.Config.Bundle.Deployment.Lock.IsEnabled(), "Deployment lock should remain enabled in development mode when explicitly enabled")
 }
 
-func TestVectorSearchIndexNamePrefixing(t *testing.T) {
-	cases := []struct {
-		key  string
-		name string
-		want string
-	}{
-		{
-			// Trailing component is a ref: skip, since prefixing would inject
-			// the prefix inside the ${var.index} expression.
-			key:  "vs_index_all_refs",
-			name: "${var.catalog}.${var.schema}.${var.index}",
-			want: "${var.catalog}.${var.schema}.${var.index}",
-		},
-		{
-			// Catalog and schema are refs but the leaf is literal: prefix the leaf.
-			key:  "vs_index_partial_ref",
-			name: "${var.catalog}.${var.schema}.non_ref_name",
-			want: "${var.catalog}.${var.schema}.dev_lennart_non_ref_name",
-		},
-		{
-			// Whole name is a single ref: skip.
-			key:  "vs_index_full_ref",
-			name: "${var.full_name}",
-			want: "${var.full_name}",
-		},
-	}
-
-	b := mockBundle(config.Development)
-	for _, c := range cases {
-		b.Config.Resources.VectorSearchIndexes[c.key] = &resources.VectorSearchIndex{
-			CreateVectorIndexRequest: vectorsearch.CreateVectorIndexRequest{
-				Name:         c.name,
-				EndpointName: "vs_endpoint1",
-				PrimaryKey:   "id",
-				IndexType:    vectorsearch.VectorIndexTypeDeltaSync,
-			},
-		}
-	}
-
-	diags := bundle.ApplySeq(t.Context(), b, ApplyTargetMode(), ApplyPresets())
-	require.NoError(t, diags.Error())
-
-	for _, c := range cases {
-		assert.Equal(t, c.want, b.Config.Resources.VectorSearchIndexes[c.key].Name, c.key)
-	}
-}
-
 func TestPrefixAlreadySet(t *testing.T) {
 	b := mockBundle(config.Development)
 	b.Config.Presets.NamePrefix = "custom_lennart_deploy_"