agent-starter-pack 0.18.2__py3-none-any.whl → 0.21.0__py3-none-any.whl

agent_starter_pack/deployment_targets/cloud_run/deployment/terraform/dev/service.tf

@@ -18,83 +18,53 @@ data "google_project" "project" {
 }
 
 
-{%- if cookiecutter.is_adk and cookiecutter.session_type == "alloydb" %}
+{%- if cookiecutter.is_adk and cookiecutter.session_type == "cloud_sql" %}
 
-# VPC Network for AlloyDB
-resource "google_compute_network" "default" {
-  name                    = "${var.project_name}-alloydb-network"
-  project                 = var.dev_project_id
-  auto_create_subnetworks = false
-  depends_on = [resource.google_project_service.services]
+# Generate a random password for the database user
+resource "random_password" "db_password" {
+  length           = 16
+  special          = true
+  override_special = "!#$%&*()-_=+[]{}<>:?"
 }
 
-# Subnet for AlloyDB
-resource "google_compute_subnetwork" "default" {
-  name          = "${var.project_name}-alloydb-network"
-  ip_cidr_range = "10.0.0.0/24"
-  region        = var.region
-  network       = google_compute_network.default.id
-  project       = var.dev_project_id
-
-  # This is required for Cloud Run VPC connectors
-  purpose       = "PRIVATE"
+# Cloud SQL Instance
+resource "google_sql_database_instance" "session_db" {
+  project          = var.dev_project_id
+  name             = "${var.project_name}-db-dev"
+  database_version = "POSTGRES_15"
+  region           = var.region
+  deletion_protection = false
 
-  private_ip_google_access = true
-}
+  settings {
+    tier = "db-f1-micro"
 
-# Private IP allocation for AlloyDB
-resource "google_compute_global_address" "private_ip_alloc" {
-  name          = "${var.project_name}-private-ip"
-  project       = var.dev_project_id
-  address_type  = "INTERNAL"
-  purpose       = "VPC_PEERING"
-  prefix_length = 16
-  network       = google_compute_network.default.id
+    backup_configuration {
+      enabled = false # No backups for dev
+    }
+    
+    # Enable IAM authentication
+    database_flags {
+      name  = "cloudsql.iam_authentication"
+      value = "on"
+    }
+  }
 
   depends_on = [resource.google_project_service.services]
 }
 
-# VPC connection for AlloyDB
-resource "google_service_networking_connection" "vpc_connection" {
-  network                 = google_compute_network.default.id
-  service                 = "servicenetworking.googleapis.com"
-  reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
+# Cloud SQL Database
+resource "google_sql_database" "database" {
+  project  = var.dev_project_id
+  name     = "${var.project_name}" # Use project name for DB to avoid conflict with default 'postgres'
+  instance = google_sql_database_instance.session_db.name
 }
 
-# AlloyDB Cluster
-resource "google_alloydb_cluster" "session_db_cluster" {
-  project         = var.dev_project_id
-  cluster_id      = "${var.project_name}-alloydb-cluster"
-  location        = var.region
-  deletion_policy = "FORCE"
-
-  network_config {
-    network = google_compute_network.default.id
-  }
-
-  depends_on = [
-    google_service_networking_connection.vpc_connection
-  ]
-}
-
-# AlloyDB Instance
-resource "google_alloydb_instance" "session_db_instance" {
-  cluster       = google_alloydb_cluster.session_db_cluster.name
-  instance_id   = "${var.project_name}-alloydb-instance"
-  instance_type = "PRIMARY"
-
-  availability_type = "REGIONAL" # Regional redundancy
-
-  machine_config {
-    cpu_count = 2
-  }
-}
-
-# Generate a random password for the database user
-resource "random_password" "db_password" {
-  length           = 16
-  special          = true
-  override_special = "!#$%&*()-_=+[]{}<>:?"
+# Cloud SQL User
+resource "google_sql_user" "db_user" {
+  project  = var.dev_project_id
+  name     = "${var.project_name}" # Use project name for user to avoid conflict with default 'postgres'
+  instance = google_sql_database_instance.session_db.name
+  password = google_secret_manager_secret_version.db_password.secret_data
 }
 
 # Store the password in Secret Manager
@@ -114,16 +84,6 @@ resource "google_secret_manager_secret_version" "db_password" {
   secret_data = random_password.db_password.result
 }
 
-resource "google_alloydb_user" "db_user" {
-  cluster        = google_alloydb_cluster.session_db_cluster.name
-  user_id        = "postgres"
-  user_type      = "ALLOYDB_BUILT_IN"
-  password       = random_password.db_password.result
-  database_roles = ["alloydbsuperuser"]
-
-  depends_on = [google_alloydb_instance.session_db_instance]
-}
-
 {%- endif %}
 
 
@@ -150,6 +110,13 @@ resource "google_cloud_run_v2_service" "app" {
     containers {
       image = "us-docker.pkg.dev/cloudrun/container/hello"
 
+{%- if cookiecutter.is_a2a %}
+      env {
+        name  = "APP_URL"
+        value = "https://${var.project_name}-${data.google_project.project.number}.${var.region}.run.app"
+      }
+
+{%- endif %}
       resources {
         limits = {
           cpu    = "4"
@@ -186,11 +153,17 @@ resource "google_cloud_run_v2_service" "app" {
 {%- endif %}
 {%- endif %}
 
-{%- if cookiecutter.is_adk and cookiecutter.session_type == "alloydb" %}
+{%- if cookiecutter.is_adk and cookiecutter.session_type == "cloud_sql" %}
+      # Mount the volume
+      volume_mounts {
+        name       = "cloudsql"
+        mount_path = "/cloudsql"
+      }
 
+      # Environment variables
       env {
-        name  = "DB_HOST"
-        value = google_alloydb_instance.session_db_instance.ip_address
+        name  = "INSTANCE_CONNECTION_NAME"
+        value = google_sql_database_instance.session_db.connection_name
       }
 
       env {
@@ -202,7 +175,27 @@ resource "google_cloud_run_v2_service" "app" {
           }
         }
       }
+
+      env {
+        name  = "DB_NAME"
+        value = "${var.project_name}"
+      }
+
+      env {
+        name  = "DB_USER"
+        value = "${var.project_name}"
+      }
 {%- endif %}
+
+      env {
+        name  = "LOGS_BUCKET_NAME"
+        value = google_storage_bucket.logs_data_bucket.name
+      }
+
+      env {
+        name  = "OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"
+        value = "NO_CONTENT"
+      }
     }
 
     service_account = google_service_account.app_sa.email
@@ -215,12 +208,12 @@ resource "google_cloud_run_v2_service" "app" {
 
     session_affinity = true
 
-{%- if cookiecutter.is_adk and cookiecutter.session_type == "alloydb" %}
-    # VPC access for AlloyDB connectivity
-    vpc_access {
-      network_interfaces {
-        network    = google_compute_network.default.id
-        subnetwork = google_compute_subnetwork.default.id
+{%- if cookiecutter.is_adk and cookiecutter.session_type == "cloud_sql" %}
+    # Cloud SQL volume
+    volumes {
+      name = "cloudsql"
+      cloud_sql_instance {
+        instances = [google_sql_database_instance.session_db.connection_name]
       }
     }
 {%- endif %}
@@ -240,5 +233,11 @@ resource "google_cloud_run_v2_service" "app" {
   }
 
   # Make dependencies conditional to avoid errors.
-  depends_on = [resource.google_project_service.services]
+  depends_on = [
+    resource.google_project_service.services,
+{%- if cookiecutter.is_adk and cookiecutter.session_type == "cloud_sql" %}
+    google_sql_user.db_user,
+    google_secret_manager_secret_version.db_password,
+{%- endif %}
+  ]
 }

agent_starter_pack/deployment_targets/cloud_run/deployment/terraform/service.tf

@@ -19,98 +19,64 @@ data "google_project" "project" {
   project_id = local.deploy_project_ids[each.key]
 }
 
-{%- if cookiecutter.is_adk and cookiecutter.session_type == "alloydb" %}
 
-# VPC Network for AlloyDB
-resource "google_compute_network" "default" {
-  for_each = local.deploy_project_ids
-  
-  name                    = "${var.project_name}-alloydb-network"
-  project                 = local.deploy_project_ids[each.key]
-  auto_create_subnetworks = false
-  
-  depends_on = [google_project_service.deploy_project_services]
-}
 
-# Subnet for AlloyDB
-resource "google_compute_subnetwork" "default" {
-  for_each = local.deploy_project_ids
-  
-  name          = "${var.project_name}-alloydb-network"
-  ip_cidr_range = "10.0.0.0/24"
-  region        = var.region
-  network       = google_compute_network.default[each.key].id
-  project       = local.deploy_project_ids[each.key]
-
-  # This is required for Cloud Run VPC connectors
-  purpose       = "PRIVATE"
+{%- if cookiecutter.is_adk and cookiecutter.session_type == "cloud_sql" %}
 
-  private_ip_google_access = true
-}
-
-# Private IP allocation for AlloyDB
-resource "google_compute_global_address" "private_ip_alloc" {
+# Generate a random password for the database user
+resource "random_password" "db_password" {
   for_each = local.deploy_project_ids
-  
-  name          = "${var.project_name}-private-ip"
-  project       = local.deploy_project_ids[each.key]
-  address_type  = "INTERNAL"
-  purpose       = "VPC_PEERING"
-  prefix_length = 16
-  network       = google_compute_network.default[each.key].id
 
-  depends_on = [google_project_service.deploy_project_services]
+  length           = 16
+  special          = true
+  override_special = "!#$%&*()-_=+[]{}<>:?"
 }
 
-# VPC connection for AlloyDB
-resource "google_service_networking_connection" "vpc_connection" {
+# Cloud SQL Instance
+resource "google_sql_database_instance" "session_db" {
   for_each = local.deploy_project_ids
-  
-  network                 = google_compute_network.default[each.key].id
-  service                 = "servicenetworking.googleapis.com"
-  reserved_peering_ranges = [google_compute_global_address.private_ip_alloc[each.key].name]
-}
 
-# AlloyDB Cluster
-resource "google_alloydb_cluster" "session_db_cluster" {
-  for_each = local.deploy_project_ids
-  
-  project         = local.deploy_project_ids[each.key]
-  cluster_id      = "${var.project_name}-alloydb-cluster"
-  location        = var.region
-  deletion_policy = "FORCE"
+  project          = local.deploy_project_ids[each.key]
+  name             = "${var.project_name}-db-${each.key}"
+  database_version = "POSTGRES_15"
+  region           = var.region
+  deletion_protection = false # For easier teardown in starter packs
 
-  network_config {
-    network = google_compute_network.default[each.key].id
+  settings {
+    tier = each.key == "prod" ? "db-custom-1-3840" : "db-f1-micro" # Use a custom machine type for prod to avoid tier restrictions
+
+    backup_configuration {
+      enabled = true
+      start_time = "03:00"
+    }
+    
+    # Enable IAM authentication
+    database_flags {
+      name  = "cloudsql.iam_authentication"
+      value = "on"
+    }
   }
 
-  depends_on = [
-    google_service_networking_connection.vpc_connection
-  ]
+  depends_on = [google_project_service.deploy_project_services]
 }
 
-# AlloyDB Instance
-resource "google_alloydb_instance" "session_db_instance" {
+# Cloud SQL Database
+resource "google_sql_database" "database" {
   for_each = local.deploy_project_ids
-  
-  cluster       = google_alloydb_cluster.session_db_cluster[each.key].name
-  instance_id   = "${var.project_name}-alloydb-instance"
-  instance_type = "PRIMARY"
-
-  availability_type = "REGIONAL" # Regional redundancy
 
-  machine_config {
-    cpu_count = 2
-  }
+  project  = local.deploy_project_ids[each.key]
+  name     = "${var.project_name}" # Use project name for DB to avoid conflict with default 'postgres'
+  instance = google_sql_database_instance.session_db[each.key].name
 }
 
-# Generate a random password for the database user
-resource "random_password" "db_password" {
+# Cloud SQL User
+resource "google_sql_user" "db_user" {
   for_each = local.deploy_project_ids
-  
-  length           = 16
-  special          = true
-  override_special = "!#$%&*()-_=+[]{}<>:?"
+
+  project  = local.deploy_project_ids[each.key]
+  name     = "${var.project_name}" # Use project name for user to avoid conflict with default 'postgres'
+  instance = google_sql_database_instance.session_db[each.key].name
+  password = random_password.db_password[each.key].result
 }
 
 # Store the password in Secret Manager
@@ -134,21 +100,9 @@ resource "google_secret_manager_secret_version" "db_password" {
   secret_data = random_password.db_password[each.key].result
 }
 
-resource "google_alloydb_user" "db_user" {
-  for_each = local.deploy_project_ids
-  
-  cluster        = google_alloydb_cluster.session_db_cluster[each.key].name
-  user_id        = "postgres"
-  user_type      = "ALLOYDB_BUILT_IN"
-  password       = random_password.db_password[each.key].result
-  database_roles = ["alloydbsuperuser"]
-
-  depends_on = [google_alloydb_instance.session_db_instance]
-}
-
 {%- endif %}
 
-resource "google_cloud_run_v2_service" "app_staging" {  
+resource "google_cloud_run_v2_service" "app_staging" {
   name                = var.project_name
   location            = var.region
   project             = var.staging_project_id
@@ -172,6 +126,13 @@ resource "google_cloud_run_v2_service" "app_staging" {
       # Placeholder, will be replaced by the CI/CD pipeline
       image = "us-docker.pkg.dev/cloudrun/container/hello"
 
+{%- if cookiecutter.is_a2a %}
+      env {
+        name  = "APP_URL"
+        value = "https://${var.project_name}-${data.google_project.project["staging"].number}.${var.region}.run.app"
+      }
+
+{%- endif %}
       resources {
         limits = {
           cpu    = "4"
@@ -209,11 +170,17 @@ resource "google_cloud_run_v2_service" "app_staging" {
 {%- endif %}
 {%- endif %}
 
-{%- if cookiecutter.is_adk and cookiecutter.session_type == "alloydb" %}
+{%- if cookiecutter.is_adk and cookiecutter.session_type == "cloud_sql" %}
+      # Mount the volume
+      volume_mounts {
+        name       = "cloudsql"
+        mount_path = "/cloudsql"
+      }
 
+      # Environment variables
       env {
-        name  = "DB_HOST"
-        value = google_alloydb_instance.session_db_instance["staging"].ip_address
+        name  = "INSTANCE_CONNECTION_NAME"
+        value = google_sql_database_instance.session_db["staging"].connection_name
       }
 
       env {
@@ -225,7 +192,27 @@ resource "google_cloud_run_v2_service" "app_staging" {
           }
         }
       }
+
+      env {
+        name  = "DB_NAME"
+        value = "${var.project_name}"
+      }
+
+      env {
+        name  = "DB_USER"
+        value = "${var.project_name}"
+      }
 {%- endif %}
+
+      env {
+        name  = "LOGS_BUCKET_NAME"
+        value = google_storage_bucket.logs_data_bucket[var.staging_project_id].name
+      }
+
+      env {
+        name  = "OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"
+        value = "NO_CONTENT"
+      }
     }
 
     service_account                = google_service_account.app_sa["staging"].email
@@ -238,12 +225,12 @@ resource "google_cloud_run_v2_service" "app_staging" {
 
     session_affinity = true
 
-{%- if cookiecutter.is_adk and cookiecutter.session_type == "alloydb" %}
-    # VPC access for AlloyDB connectivity
-    vpc_access {
-      network_interfaces {
-        network    = google_compute_network.default["staging"].id
-        subnetwork = google_compute_subnetwork.default["staging"].id
+{%- if cookiecutter.is_adk and cookiecutter.session_type == "cloud_sql" %}
+    # Cloud SQL volume
+    volumes {
+      name = "cloudsql"
+      cloud_sql_instance {
+        instances = [google_sql_database_instance.session_db["staging"].connection_name]
       }
     }
 {%- endif %}
@@ -263,10 +250,16 @@ resource "google_cloud_run_v2_service" "app_staging" {
   }
 
   # Make dependencies conditional to avoid errors.
-  depends_on = [google_project_service.deploy_project_services]
+  depends_on = [
+    google_project_service.deploy_project_services,
+{%- if cookiecutter.is_adk and cookiecutter.session_type == "cloud_sql" %}
+    google_sql_user.db_user,
+    google_secret_manager_secret_version.db_password,
+{%- endif %}
+  ]
 }
 
-resource "google_cloud_run_v2_service" "app_prod" {  
+resource "google_cloud_run_v2_service" "app_prod" {
   name                = var.project_name
   location            = var.region
   project             = var.prod_project_id
@@ -290,6 +283,13 @@ resource "google_cloud_run_v2_service" "app_prod" {
       # Placeholder, will be replaced by the CI/CD pipeline
       image = "us-docker.pkg.dev/cloudrun/container/hello"
 
+{%- if cookiecutter.is_a2a %}
+      env {
+        name  = "APP_URL"
+        value = "https://${var.project_name}-${data.google_project.project["prod"].number}.${var.region}.run.app"
+      }
+
+{%- endif %}
       resources {
         limits = {
           cpu    = "4"
@@ -327,11 +327,17 @@ resource "google_cloud_run_v2_service" "app_prod" {
 {%- endif %}
 {%- endif %}
 
-{%- if cookiecutter.is_adk and cookiecutter.session_type == "alloydb" %}
+{%- if cookiecutter.is_adk and cookiecutter.session_type == "cloud_sql" %}
+      # Mount the volume
+      volume_mounts {
+        name       = "cloudsql"
+        mount_path = "/cloudsql"
+      }
 
+      # Environment variables
       env {
-        name  = "DB_HOST"
-        value = google_alloydb_instance.session_db_instance["prod"].ip_address
+        name  = "INSTANCE_CONNECTION_NAME"
+        value = google_sql_database_instance.session_db["prod"].connection_name
       }
 
       env {
@@ -343,7 +349,27 @@ resource "google_cloud_run_v2_service" "app_prod" {
           }
         }
       }
+
+      env {
+        name  = "DB_NAME"
+        value = "${var.project_name}"
+      }
+
+      env {
+        name  = "DB_USER"
+        value = "${var.project_name}"
+      }
 {%- endif %}
+
+      env {
+        name  = "LOGS_BUCKET_NAME"
+        value = google_storage_bucket.logs_data_bucket[var.prod_project_id].name
+      }
+
+      env {
+        name  = "OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"
+        value = "NO_CONTENT"
+      }
     }
 
     service_account                = google_service_account.app_sa["prod"].email
@@ -356,12 +382,12 @@ resource "google_cloud_run_v2_service" "app_prod" {
 
     session_affinity = true
 
-{%- if cookiecutter.is_adk and cookiecutter.session_type == "alloydb" %}
-    # VPC access for AlloyDB connectivity
-    vpc_access {
-      network_interfaces {
-        network    = google_compute_network.default["prod"].id
-        subnetwork = google_compute_subnetwork.default["prod"].id
+{%- if cookiecutter.is_adk and cookiecutter.session_type == "cloud_sql" %}
+    # Cloud SQL volume
+    volumes {
+      name = "cloudsql"
+      cloud_sql_instance {
+        instances = [google_sql_database_instance.session_db["prod"].connection_name]
       }
     }
 {%- endif %}
@@ -381,5 +407,11 @@ resource "google_cloud_run_v2_service" "app_prod" {
   }
 
   # Make dependencies conditional to avoid errors.
-  depends_on = [google_project_service.deploy_project_services]
+  depends_on = [
+    google_project_service.deploy_project_services,
+{%- if cookiecutter.is_adk and cookiecutter.session_type == "cloud_sql" %}
+    google_sql_user.db_user,
+    google_secret_manager_secret_version.db_password,
+{%- endif %}
+  ]
 }