[Exporter] Improve handling of dependencies for vector search index (#4989)

## Changes
<!-- Summary of your changes that are easy to understand -->

## Tests
<!--
How is this tested? Please see the checklist below and also describe any
other relevant tests
-->

- [x] `make test` run locally
- [ ] relevant change in `docs/` folder
- [ ] covered with integration tests in `internal/acceptance`
- [ ] using Go SDK
- [ ] using TF Plugin Framework
- [x] has entry in `NEXT_CHANGELOG.md` file

Author: alexott

NEXT_CHANGELOG.md

@@ -16,4 +16,6 @@
 
 ### Exporter
 
+* Improve handling of dependencies for vector search index ([#4989](https://github.com/databricks/terraform-provider-databricks/pull/4989)).
+
 ### Internal Changes

exporter/codegen.go

@@ -536,7 +536,6 @@ func (ic *importContext) generateVariables() error {
 				for _, block := range tbody.Blocks() {
 					typ := block.Type()
 					labels := block.Labels()
-					// log.Printf("[DEBUG] blockBody: %v %v\n", typ, labels)
 					_, present := ic.variables[labels[0]]
 					if typ == "variable" && present {
 						log.Printf("[DEBUG] Ignoring variable '%s' that will be re-exported", labels[0])

exporter/importables.go

@@ -2699,6 +2699,12 @@ var resourcesMap map[string]importable = map[string]importable{
 							ID:       col.EmbeddingModelEndpointName,
 						})
 					}
+					if col.ModelEndpointNameForQuery != "" {
+						ic.Emit(&resource{
+							Resource: "databricks_model_serving",
+							ID:       col.ModelEndpointNameForQuery,
+						})
+					}
 				}
 			}
 			if vsi.DirectAccessIndexSpec != nil {
@@ -2709,6 +2715,12 @@ var resourcesMap map[string]importable = map[string]importable{
 							ID:       col.EmbeddingModelEndpointName,
 						})
 					}
+					if col.ModelEndpointNameForQuery != "" {
+						ic.Emit(&resource{
+							Resource: "databricks_model_serving",
+							ID:       col.ModelEndpointNameForQuery,
+						})
+					}
 				}
 			}
 			return nil
@@ -2717,7 +2729,9 @@ var resourcesMap map[string]importable = map[string]importable{
 			{Path: "delta_sync_index_spec.source_table", Resource: "databricks_sql_table"},
 			{Path: "endpoint_name", Resource: "databricks_vector_search_endpoint"},
 			{Path: "delta_sync_index_spec.embedding_source_columns.embedding_model_endpoint_name", Resource: "databricks_model_serving"},
+			{Path: "delta_sync_index_spec.embedding_source_columns.model_endpoint_name_for_query", Resource: "databricks_model_serving"},
 			{Path: "direct_access_index_spec.embedding_source_columns.embedding_model_endpoint_name", Resource: "databricks_model_serving"},
+			{Path: "direct_access_index_spec.embedding_source_columns.model_endpoint_name_for_query", Resource: "databricks_model_serving"},
 		},
 	},
 	"databricks_mws_network_connectivity_config": {
@@ -2759,6 +2773,13 @@ var resourcesMap map[string]importable = map[string]importable{
 							Name:     nc.Name + "_" + resourceId + "_" + rule.GroupId,
 						})
 					}
+					for _, rule := range nc.EgressConfig.TargetRules.AwsPrivateEndpointRules {
+						ic.Emit(&resource{
+							Resource: "databricks_mws_ncc_private_endpoint_rule",
+							ID:       nc.NetworkConnectivityConfigId + "/" + rule.RuleId,
+							Name:     nc.Name + "_" + rule.EndpointService,
+						})
+					}
 				}
 			}
 			return nil