fix: delete unused datastore terraform files in agentic_rag projects (#797)

Both vertex_ai_search and vector_search terraform files were being
included in generated agentic_rag projects regardless of the selected
--datastore flag. The Jinja2 conditionals rendered the file contents
as empty but the files themselves remained.

Add conditional file deletion entries for all datastore-specific
terraform files so only the selected datastore's files are kept.

Also fix Makefile template where the Infrastructure Setup section
was nested inside an elif for datastore_type instead of being a
separate conditional block for cicd_runner.

Author: eliasecchig

agent_starter_pack/base_templates/python/Makefile

@@ -351,7 +351,8 @@ sync-data:
 	PROJECT_ID=$$(gcloud config get-value project) && \
 	DATA_STORE_REGION=$$(grep 'data_store_region' deployment/terraform/dev/vars/env.tfvars | sed 's/.*= *"//;s/".*//') && \
 	uv run deployment/terraform/scripts/start_connector_run.py $$PROJECT_ID $$DATA_STORE_REGION {{cookiecutter.project_name}}-collection --wait
-{%- elif cookiecutter.cicd_runner != 'skip' %}
+{%- endif %}
+{%- if cookiecutter.cicd_runner != 'skip' %}
 
 # ==============================================================================
 # Infrastructure Setup

agent_starter_pack/cli/utils/template.py

@@ -123,6 +123,46 @@ def _exclude_adk_live_agent_engine(c: dict) -> bool:
     "deployment/terraform/dev/service.tf": _exclude_adk_live_agent_engine,
     # Data ingestion conditional (only for vertex_ai_vector_search)
     "data_ingestion": lambda c: c.get("datastore_type") == "vertex_ai_vector_search",
+    # Datastore-specific terraform files (vertex_ai_search vs vertex_ai_vector_search)
+    "deployment/terraform/vertex_ai_search.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_search"
+    ),
+    "deployment/terraform/vertex_ai_search_variables.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_search"
+    ),
+    "deployment/terraform/vertex_ai_search_github.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_search"
+    ),
+    "deployment/terraform/dev/vertex_ai_search.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_search"
+    ),
+    "deployment/terraform/dev/vertex_ai_search_variables.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_search"
+    ),
+    "deployment/terraform/vector_search.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_vector_search"
+    ),
+    "deployment/terraform/vector_search_variables.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_vector_search"
+    ),
+    "deployment/terraform/vector_search_github.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_vector_search"
+    ),
+    "deployment/terraform/vector_search_iam.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_vector_search"
+    ),
+    "deployment/terraform/vector_search_service_accounts.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_vector_search"
+    ),
+    "deployment/terraform/dev/vector_search.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_vector_search"
+    ),
+    "deployment/terraform/dev/vector_search_variables.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_vector_search"
+    ),
+    "deployment/terraform/dev/vector_search_iam.tf": (
+        lambda c: c.get("datastore_type") == "vertex_ai_vector_search"
+    ),
 }