agent-starter-pack 0.1.6__py3-none-any.whl → 0.2.0__py3-none-any.whl

src/base_template/deployment/terraform/dev/iam.tf

@@ -32,7 +32,14 @@ resource "google_project_iam_member" "default_compute_sa_storage_object_creator"
   depends_on = [resource.google_project_service.services]
 }
 
-{%- if cookiecutter.deployment_target == 'cloud_run' %}
+{% if cookiecutter.deployment_target == 'cloud_run' %}
+resource "google_service_account" "cloud_run_app_sa" {
+  account_id   = "${var.project_name}-cr"
+  display_name = "${var.project_name} Cloud Run App Service Account"
+  project      = var.dev_project_id
+  depends_on   = [resource.google_project_service.services]
+}
+
 # Grant Cloud Run SA the required permissions to run the application
 resource "google_project_iam_member" "cloud_run_app_sa_roles" {
   for_each = {
@@ -48,7 +55,7 @@ resource "google_project_iam_member" "cloud_run_app_sa_roles" {
   member     = "serviceAccount:${google_service_account.cloud_run_app_sa.email}"
   depends_on = [resource.google_project_service.services]
 }
-{%- elif cookiecutter.deployment_target == 'agent_engine' %}
+{% elif cookiecutter.deployment_target == 'agent_engine' %}
 # Grant required permissions to Vertex AI service account
 resource "google_project_iam_member" "vertex_ai_sa_permissions" {
   for_each = {
@@ -61,13 +68,13 @@ resource "google_project_iam_member" "vertex_ai_sa_permissions" {
   member  = google_project_service_identity.vertex_sa.member
   depends_on = [resource.google_project_service.services]
 }
-{%- endif %}
-{%- if cookiecutter.data_ingestion %}
+{% endif %}
+{% if cookiecutter.data_ingestion %}
 # Service account to run Vertex AI pipeline
 resource "google_service_account" "vertexai_pipeline_app_sa" {
   for_each = local.project_ids
 
-  account_id   = var.vertexai_pipeline_sa_name
+  account_id   = "${var.project_name}-rag"
   display_name = "Vertex AI Pipeline app SA"
   project      = each.value
   depends_on   = [resource.google_project_service.services]
@@ -87,4 +94,4 @@ resource "google_project_iam_member" "vertexai_pipeline_sa_roles" {
   member     = "serviceAccount:${google_service_account.vertexai_pipeline_app_sa[split(",", each.key)[0]].email}"
   depends_on = [resource.google_project_service.services]
 }
-{%- endif %}
+{% endif %}

src/base_template/deployment/terraform/dev/log_sinks.tf

@@ -19,26 +19,18 @@ resource "google_project_iam_member" "bigquery_data_editor" {
   member  = module.log_export_to_bigquery.writer_identity
 }
 
-
-module "log_export_to_bigquery" {
-
-  source  = "terraform-google-modules/log-export/google"
-  version = "10.0.0"
-
-  log_sink_name          = var.telemetry_sink_name
-  parent_resource_type   = "project"
-  parent_resource_id     = var.dev_project_id
-  destination_uri        = "bigquery.googleapis.com/projects/${var.dev_project_id}/datasets/${var.telemetry_bigquery_dataset_id}"
-  filter                 = var.telemetry_logs_filter
-  bigquery_options       = { use_partitioned_tables = true }
-  unique_writer_identity = true
-  depends_on             = [resource.google_project_service.services]
+resource "google_bigquery_dataset" "feedback_dataset" {
+  project       = var.dev_project_id
+  dataset_id    = replace("${var.project_name}_feedback", "-", "_")
+  friendly_name = "${var.project_name}_feedback"
+  location      = var.region
+  depends_on    = [resource.google_project_service.services]
 }
 
-resource "google_bigquery_dataset" "feedback_dataset" {
+resource "google_bigquery_dataset" "telemetry_logs_dataset" {
   project       = var.dev_project_id
-  dataset_id    = var.feedback_bigquery_dataset_id
-  friendly_name = var.feedback_bigquery_dataset_id
+  dataset_id    = replace("${var.project_name}_telemetry", "-", "_")
+  friendly_name = "${var.project_name}_telemetry"
   location      = var.region
   depends_on    = [resource.google_project_service.services]
 }
@@ -46,21 +38,26 @@ resource "google_bigquery_dataset" "feedback_dataset" {
 module "feedback_export_to_bigquery" {
   source                 = "terraform-google-modules/log-export/google"
   version                = "10.0.0"
-  log_sink_name          = var.feedback_sink_name
+  log_sink_name          = "${var.project_name}_feedback"
   parent_resource_type   = "project"
   parent_resource_id     = var.dev_project_id
-  destination_uri        = "bigquery.googleapis.com/projects/${var.dev_project_id}/datasets/${var.feedback_bigquery_dataset_id}"
+  destination_uri        = "bigquery.googleapis.com/projects/${var.dev_project_id}/datasets/${google_bigquery_dataset.feedback_dataset.dataset_id}"
   filter                 = var.feedback_logs_filter
   bigquery_options       = { use_partitioned_tables = true }
   unique_writer_identity = true
-  depends_on             = [resource.google_project_service.services]
-
+  depends_on             = [google_bigquery_dataset.feedback_dataset]
 }
 
-resource "google_bigquery_dataset" "telemetry_logs_dataset" {
-  project       = var.dev_project_id
-  dataset_id    = var.telemetry_bigquery_dataset_id
-  friendly_name = var.telemetry_bigquery_dataset_id
-  location      = var.region
-  depends_on    = [resource.google_project_service.services]
-}
+module "log_export_to_bigquery" {
+  source  = "terraform-google-modules/log-export/google"
+  version = "10.0.0"
+
+  log_sink_name          = "${var.project_name}_telemetry"
+  parent_resource_type   = "project"
+  parent_resource_id     = var.dev_project_id
+  destination_uri        = "bigquery.googleapis.com/projects/${var.dev_project_id}/datasets/${google_bigquery_dataset.telemetry_logs_dataset.dataset_id}"
+  filter                 = var.telemetry_logs_filter
+  bigquery_options       = { use_partitioned_tables = true }
+  unique_writer_identity = true
+  depends_on             = [google_bigquery_dataset.telemetry_logs_dataset]
+}

src/base_template/deployment/terraform/dev/providers.tf

@@ -25,5 +25,6 @@ terraform {
 provider "google" {
   alias                 = "dev_billing_override"
   billing_project       = var.dev_project_id
+  region = var.region
   user_project_override = true
 }

src/base_template/deployment/terraform/dev/storage.tf

@@ -12,22 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+provider "google" {
+  region = var.region
+  user_project_override = true
+}
+
 resource "google_storage_bucket" "logs_data_bucket" {
-  name                        = "${var.dev_project_id}-logs-data"
+  name                        = "${var.dev_project_id}-${var.project_name}-logs-data"
   location                    = var.region
   project                     = var.dev_project_id
   uniform_bucket_level_access = true
 
-  lifecycle {
-    prevent_destroy = false
-    ignore_changes  = all
-  }
   depends_on = [resource.google_project_service.services]
 }
 
-{%- if cookiecutter.data_ingestion %}
+{% if cookiecutter.data_ingestion %}
 resource "google_storage_bucket" "data_ingestion_PIPELINE_GCS_ROOT" {
-  name                        = "${var.dev_project_id}-pipeline-artifacts"
+  name                        = "${var.dev_project_id}-${var.project_name}-rag"
   location                    = var.region
   project                     = var.dev_project_id
   uniform_bucket_level_access = true
@@ -36,11 +37,12 @@ resource "google_storage_bucket" "data_ingestion_PIPELINE_GCS_ROOT" {
   depends_on = [resource.google_project_service.services]
 }
 
+{% if cookiecutter.datastore_type == "vertex_ai_search" %}
 resource "google_discovery_engine_data_store" "data_store_dev" {
   location                    = var.data_store_region
   project                     = var.dev_project_id
-  data_store_id               = "${var.datastore_name}"
-  display_name                = "${var.datastore_name}"
+  data_store_id               = "${var.project_name}-datastore"
+  display_name                = "${var.project_name}-datastore"
   industry_vertical           = "GENERIC"
   content_config              = "NO_CONTENT"
   solution_types              = ["SOLUTION_TYPE_SEARCH"]
@@ -51,7 +53,7 @@ resource "google_discovery_engine_data_store" "data_store_dev" {
 
 resource "google_discovery_engine_search_engine" "search_engine_dev" {
   project        = var.dev_project_id
-  engine_id      = "${var.search_engine_name}"
+  engine_id      = "${var.project_name}-search"
   collection_id  = "default_collection"
   location       = google_discovery_engine_data_store.data_store_dev.location
   display_name   = "Search Engine App Staging"
@@ -61,4 +63,60 @@ resource "google_discovery_engine_search_engine" "search_engine_dev" {
   }
   provider      = google.dev_billing_override
 }
-{%- endif %}
+{% elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+resource "google_vertex_ai_index" "vector_search_index" {
+  project = var.dev_project_id
+  region = var.region
+  display_name = "${var.project_name}-vector-search"
+  description = "vector search index for test"
+  metadata {
+    config {
+      dimensions = var.vector_search_embedding_size
+      distance_measure_type = "DOT_PRODUCT_DISTANCE"
+      approximate_neighbors_count = var.vector_search_approximate_neighbors_count
+      shard_size = var.vector_search_shard_size
+      algorithm_config {
+        tree_ah_config {
+        }
+      }
+    }
+  }
+  index_update_method = "STREAM_UPDATE"
+}
+
+resource "google_vertex_ai_index_endpoint" "vector_search_index_endpoint" {
+  project      = var.dev_project_id
+  region       = var.region
+  display_name = "${var.project_name}-vector-search-endpoint"
+  public_endpoint_enabled = true
+  depends_on = [google_vertex_ai_index.vector_search_index]
+}
+
+resource "google_vertex_ai_index_endpoint_deployed_index" "vector_search_index_deployment" {
+    index_endpoint = google_vertex_ai_index_endpoint.vector_search_index_endpoint.id
+    index = google_vertex_ai_index.vector_search_index.id
+    deployed_index_id = replace("${var.project_name}_deployed_index", "-", "_")
+    dedicated_resources {
+      machine_spec {
+        machine_type = var.vector_search_machine_type
+      }
+      min_replica_count = var.vector_search_min_replica_count
+      max_replica_count = var.vector_search_max_replica_count
+    }
+    depends_on = [
+      google_vertex_ai_index.vector_search_index,
+      google_vertex_ai_index_endpoint.vector_search_index_endpoint
+    ]
+}
+
+resource "google_storage_bucket" "vector_search_data_bucket" {
+  name                        = "${var.dev_project_id}-${var.project_name}-vs"
+  location                    = var.region
+  project                     = var.dev_project_id
+  uniform_bucket_level_access = true
+  force_destroy               = true
+
+  depends_on = [resource.google_project_service.services]
+}
+{% endif %}
+{% endif %}

src/base_template/deployment/terraform/dev/variables.tf

@@ -12,6 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+variable "project_name" {
+  type        = string
+  description = "Project name used as a base for resource naming"
+  default     = "{{ cookiecutter.project_name | replace('_', '-') }}"
+}
+
 variable "dev_project_id" {
   type        = string
   description = "**Dev** Google Cloud Project ID for resource deployment."
@@ -23,54 +29,25 @@ variable "region" {
   default     = "us-central1"
 }
 
-variable "telemetry_bigquery_dataset_id" {
-  type        = string
-  description = "BigQuery dataset ID for telemetry data export."
-  default     = "telemetry_genai_app_sample_sink"
-}
-
-variable "feedback_bigquery_dataset_id" {
-  type        = string
-  description = "BigQuery dataset ID for feedback data export."
-  default     = "feedback_genai_app_sample_sink"
-}
-
 variable "telemetry_logs_filter" {
   type        = string
   description = "Log Sink filter for capturing telemetry data. Captures logs with the `traceloop.association.properties.log_type` attribute set to `tracing`."
-  default     = "jsonPayload.attributes.\"traceloop.association.properties.log_type\"=\"tracing\" jsonPayload.resource.attributes.\"service.name\"=\"Sample Chatbot Application\""
+  default     = "jsonPayload.attributes.\"traceloop.association.properties.log_type\"=\"tracing\" jsonPayload.resource.attributes.\"service.name\"=\"{{cookiecutter.project_name}}\""
 }
 
 variable "feedback_logs_filter" {
   type        = string
   description = "Log Sink filter for capturing feedback data. Captures logs where the `log_type` field is `feedback`."
-  default     = "jsonPayload.log_type=\"feedback\""
-}
-
-variable "telemetry_sink_name" {
-  type        = string
-  description = "Name of the telemetry data Log Sink."
-  default     = "telemetry_logs_genai_app_sample"
-}
-
-variable "feedback_sink_name" {
-  type        = string
-  description = "Name of the feedback data Log Sink."
-  default     = "feedback_logs_genai_app_sample"
-}
-{%- if cookiecutter.deployment_target == 'cloud_run' %}
-variable "cloud_run_app_sa_name" {
-  description = "Service account name to be used for the Cloud Run service"
-  type        = string
-  default     = "{{cookiecutter.project_name}}-cr"
+  default     = "jsonPayload.log_type=\"feedback\" jsonPayload.service_name=\"{{cookiecutter.project_name}}\""
 }
 
+{% if cookiecutter.deployment_target == 'cloud_run' %}
 variable "cloud_run_app_roles" {
   description = "List of roles to assign to the Cloud Run app service account"
-{%- elif cookiecutter.deployment_target == 'agent_engine' %}
+{% elif cookiecutter.deployment_target == 'agent_engine' %}
 variable "agentengine_sa_roles" {
   description = "List of roles to assign to the Agent Engine app service account"
-{%- endif %}
+{% endif %}
   type        = list(string)
   default = [
     "roles/aiplatform.user",
@@ -81,18 +58,7 @@ variable "agentengine_sa_roles" {
   ]
 }
 
-{%- if cookiecutter.data_ingestion %}
-variable "vertexai_pipeline_sa_name" {
-  description = "Service account name to be used for the Vertex AI service"
-  type        = string
-  default     = "data-ingestion-vertexai-sa"
-}
-
-variable "data_store_region" {
-  type        = string
-  description = "Google Cloud region for resource deployment."
-  default     = "us"
-}
+{% if cookiecutter.data_ingestion %}
 
 variable "pipelines_roles" {
   description = "List of roles to assign to the Vertex AI runner service account"
@@ -111,16 +77,47 @@ variable "pipelines_roles" {
     "roles/resourcemanager.projectIamAdmin"
   ]
 }
+{% if cookiecutter.datastore_type == "vertex_ai_search" %}
+variable "data_store_region" {
+  type        = string
+  description = "Google Cloud region for resource deployment."
+  default     = "us"
+}
+{% elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+variable "vector_search_embedding_size" {
+  type = number
+  description = "The number of dimensions for the embeddings."
+  default = 768
+}
+
+variable "vector_search_approximate_neighbors_count" {
+  type = number
+  description = "The approximate number of neighbors to return."
+  default = 150
+}
+
+variable "vector_search_min_replica_count" {
+  type = number
+  description = "The min replica count for vector search instance"
+  default = 1
+}
+
+variable "vector_search_max_replica_count" {
+  type = number
+  description = "The max replica count for vector search instance"
+  default = 1
+}
 
-variable "datastore_name" {
-  description = "The name of the datastore"
+variable "vector_search_shard_size" {
+  description = "The shard size of the vector search instance"
   type = string
-  default = "my-datastore"
+  default = "SHARD_SIZE_SMALL"
 }
 
-variable "search_engine_name" {
-  description = "The name of the search engine"
+variable "vector_search_machine_type" {
+  description = "The machine type for the vector search instance"
   type = string
-  default = "my-search-engine"
+  default = "e2-standard-2"
 }
-{%- endif %}
+{% endif %}
+{% endif %}

src/base_template/deployment/terraform/dev/vars/env.tfvars

@@ -1,21 +1,23 @@
+# Project name used for resource naming
+project_name = "{{ cookiecutter.project_name | replace('_', '-') }}"
+
 # Your Dev Google Cloud project id
-dev_project_id =  "your-dev-project-id"
+dev_project_id = "your-dev-project-id"
 
 # The Google Cloud region you will use to deploy the infrastructure
 region = "us-central1"
 
-telemetry_bigquery_dataset_id = "telemetry_genai_app_sample_sink"
-telemetry_sink_name = "telemetry_logs_genai_app_sample"
 telemetry_logs_filter = "jsonPayload.attributes.\"traceloop.association.properties.log_type\"=\"tracing\" jsonPayload.resource.attributes.\"service.name\"=\"{{cookiecutter.project_name}}\""
-
-feedback_bigquery_dataset_id = "feedback_genai_app_sample_sink"
-feedback_sink_name = "feedback_logs_genai_app_sample"
 feedback_logs_filter = "jsonPayload.log_type=\"feedback\""
-{%- if cookiecutter.data_ingestion %}
-search_engine_name = "sample-search-engine"
-datastore_name = "sample-datastore"
-vertexai_pipeline_sa_name = "vertexai-pipelines-sa"
 
-#The value can only be one of "global", "us" and "eu".
+{%- if cookiecutter.data_ingestion %}
+{%- if cookiecutter.datastore_type == "vertex_ai_search" %}
+# The value can only be one of "global", "us" and "eu".
 data_store_region = "us"
+{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+vector_search_shard_size = "SHARD_SIZE_SMALL"
+vector_search_machine_type = "e2-standard-2"
+vector_search_min_replica_count = 1
+vector_search_max_replica_count = 1
+{%- endif %}
 {%- endif %}

src/base_template/deployment/terraform/iam.tf

@@ -44,7 +44,7 @@ resource "google_project_iam_member" "other_projects_roles" {
   member     = "serviceAccount:${resource.google_service_account.cicd_runner_sa.email}"
   depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
 }
-{%- if cookiecutter.deployment_target == 'cloud_run' %}
+{% if cookiecutter.deployment_target == 'cloud_run' %}
 # 3. Allow Cloud Run service SA to pull containers stored in the CICD project
 resource "google_project_iam_member" "cicd_run_invoker_artifact_registry_reader" {
   for_each = local.deploy_project_ids
@@ -71,7 +71,7 @@ resource "google_project_iam_member" "cloud_run_app_sa_roles" {
   member     = "serviceAccount:${google_service_account.cloud_run_app_sa[split(",", each.key)[0]].email}"
   depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
 }
-{%- elif cookiecutter.deployment_target == 'agent_engine' %}
+{% elif cookiecutter.deployment_target == 'agent_engine' %}
 resource "google_project_service_identity" "vertex_sa" {
   for_each = local.deploy_project_ids
   provider = google-beta
@@ -94,7 +94,7 @@ resource "google_project_iam_member" "vertex_ai_sa_permissions" {
   member      = "serviceAccount:service-${data.google_project.projects[split("_", each.key)[0]].number}@gcp-sa-aiplatform-re.iam.gserviceaccount.com"
   depends_on  = [resource.google_project_service.shared_services, resource.google_project_service_identity.vertex_sa]
 }
-{%- endif %}
+{% endif %}
 
 # Special assignment: Allow the CICD SA to create tokens
 resource "google_service_account_iam_member" "cicd_run_invoker_token_creator" {

src/base_template/deployment/terraform/log_sinks.tf

@@ -20,31 +20,38 @@ resource "google_project_iam_member" "bigquery_data_editor" {
   member  = module.log_export_to_bigquery[each.key].writer_identity
 }
 
+resource "google_bigquery_dataset" "feedback_dataset" {
+  for_each      = local.deploy_project_ids
+  project       = each.value
+  dataset_id    = replace("${var.project_name}_feedback", "-", "_")
+  friendly_name = "${var.project_name}_feedback"
+  location      = var.region
+  depends_on    = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
+}
+
+resource "google_bigquery_dataset" "telemetry_logs_dataset" {
+  for_each      = local.deploy_project_ids
+  project       = each.value
+  dataset_id    = replace("${var.project_name}_telemetry", "-", "_")
+  friendly_name = "${var.project_name}_telemetry"
+  location      = var.region
+  depends_on    = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
+}
+
 module "log_export_to_bigquery" {
   for_each = local.deploy_project_ids
 
   source  = "terraform-google-modules/log-export/google"
   version = "10.0.0"
 
-  log_sink_name          = var.telemetry_sink_name
+  log_sink_name          = "${var.project_name}_telemetry"
   parent_resource_type   = "project"
   parent_resource_id     = each.value
-  destination_uri        = "bigquery.googleapis.com/projects/${each.value}/datasets/${var.telemetry_bigquery_dataset_id}"
+  destination_uri        = "bigquery.googleapis.com/projects/${each.value}/datasets/${google_bigquery_dataset.telemetry_logs_dataset[each.key].dataset_id}"
   filter                 = var.telemetry_logs_filter
   bigquery_options       = { use_partitioned_tables = true }
   unique_writer_identity = true
-  depends_on             = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
-
-}
-
-resource "google_bigquery_dataset" "feedback_dataset" {
-  for_each      = local.deploy_project_ids
-  project       = each.value
-  dataset_id    = var.feedback_bigquery_dataset_id
-  friendly_name = var.feedback_bigquery_dataset_id
-  location      = var.region
-  depends_on    = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
-
+  depends_on             = [google_bigquery_dataset.telemetry_logs_dataset]
 }
 
 module "feedback_export_to_bigquery" {
@@ -52,21 +59,12 @@ module "feedback_export_to_bigquery" {
 
   source                 = "terraform-google-modules/log-export/google"
   version                = "10.0.0"
-  log_sink_name          = var.feedback_sink_name
+  log_sink_name          = "${var.project_name}_feedback"
   parent_resource_type   = "project"
   parent_resource_id     = each.value
-  destination_uri        = "bigquery.googleapis.com/projects/${each.value}/datasets/${var.feedback_bigquery_dataset_id}"
+  destination_uri        = "bigquery.googleapis.com/projects/${each.value}/datasets/${google_bigquery_dataset.feedback_dataset[each.key].dataset_id}"
   filter                 = var.feedback_logs_filter
   bigquery_options       = { use_partitioned_tables = true }
   unique_writer_identity = true
-  depends_on             = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services, google_bigquery_dataset.feedback_dataset]
+  depends_on             = [google_bigquery_dataset.feedback_dataset]
 }
-
-resource "google_bigquery_dataset" "telemetry_logs_dataset" {
-  depends_on    = [module.log_export_to_bigquery, module.feedback_export_to_bigquery, resource.google_project_service.shared_services]
-  for_each      = local.deploy_project_ids
-  project       = each.value
-  dataset_id    = var.telemetry_bigquery_dataset_id
-  friendly_name = var.telemetry_bigquery_dataset_id
-  location      = var.region
-}

src/base_template/deployment/terraform/providers.tf

@@ -25,11 +25,13 @@ terraform {
 provider "google" {
   alias                 = "staging_billing_override"
   billing_project       = var.staging_project_id
+  region = var.region
   user_project_override = true
 }
 
 provider "google" {
   alias                 = "prod_billing_override"
   billing_project       = var.prod_project_id
+  region = var.region
   user_project_override = true
 }

src/base_template/deployment/terraform/service_accounts.tf

@@ -13,30 +13,30 @@
 # limitations under the License.
 
 resource "google_service_account" "cicd_runner_sa" {
-  account_id   = var.cicd_runner_sa_name
+  account_id   = "${var.project_name}-cb"
   display_name = "CICD Runner SA"
   project      = var.cicd_runner_project_id
   depends_on   = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
 }
-{%- if cookiecutter.deployment_target == 'cloud_run' %}
+{% if cookiecutter.deployment_target == 'cloud_run' %}
 resource "google_service_account" "cloud_run_app_sa" {
   for_each = local.deploy_project_ids
 
-  account_id   = var.cloud_run_app_sa_name
+  account_id   = "${var.project_name}-cr"
   display_name = "Cloud Run Generative AI app SA"
   project      = each.value
   depends_on   = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
 }
-{%- endif %}
+{% endif %}
 
-{%- if cookiecutter.data_ingestion %}
+{% if cookiecutter.data_ingestion %}
 # Service account to run Vertex AI pipeline
 resource "google_service_account" "vertexai_pipeline_app_sa" {
   for_each = local.deploy_project_ids
 
-  account_id   = var.vertexai_pipeline_sa_name
+  account_id   = "${var.project_name}-rag"
   display_name = "Vertex AI Pipeline app SA"
   project      = each.value
   depends_on   = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
 }
-{%- endif %}
+{% endif %}