agent-starter-pack 0.7.1__tar.gz → 0.8.0__tar.gz

agent_starter_pack-0.8.0/.claude/settings.local.json

@@ -0,0 +1,9 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(grep:*)",
+      "Bash(find:*)"
+    ],
+    "deny": []
+  }
+}

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/.cloudbuild/terraform/build_triggers.tf

@@ -92,6 +92,10 @@ locals {
       name  = "adk_gemini_fullstack-cloud_run"
       value = "adk_gemini_fullstack,cloud_run"
     },
+    {
+      name  = "adk_base-cloud_run-alloydb"
+      value = "adk_base,cloud_run,--session-type,alloydb"
+    },
   ]
 
   agent_testing_included_files = { for combo in local.agent_testing_combinations :
@@ -138,6 +142,10 @@ locals {
       name  = "adk_gemini_fullstack-agent_engine"
       value = "adk_gemini_fullstack,agent_engine"
     },
+    {
+      name  = "adk_base-cloud_run-alloydb"
+      value = "adk_base,cloud_run,--session-type,alloydb"
+    },
   ]
   # Create a safe trigger name by replacing underscores with hyphens and dots with hyphens
   # This ensures we have valid trigger names that don't exceed character limits

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/.gitignore

@@ -188,6 +188,7 @@ testem.log
 Thumbs.db
 *.vscode*
 
+.locust_env/
 .saved_chats
 .aider*
 target
@@ -196,4 +197,4 @@ delete_genai_repos.sh
 cleanup_e2e_projects.sh
 .cloudbuild/terraform/backend.tf
 .cloudbuild/terraform/vars/env.tfvars
-docs/.vitepress/cache
+docs/.vitepress/cache

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/PKG-INFO

@@ -1,17 +1,17 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.7.1
+Version: 0.8.0
 Summary: CLI to bootstrap production-ready Google Cloud GenAI agent projects from templates.
 Author-email: Google LLC <agent-starter-pack@google.com>
 License: Apache-2.0
 License-File: LICENSE
 Requires-Python: >=3.10
 Requires-Dist: backoff>=2.2.1
-Requires-Dist: click~=8.1.7
-Requires-Dist: cookiecutter~=2.5.0
+Requires-Dist: click>=8.1.7
+Requires-Dist: cookiecutter~=2.6.0
 Requires-Dist: google-cloud-aiplatform>=1.87.0
-Requires-Dist: pyyaml~=6.0.1
-Requires-Dist: rich~=13.7.0
+Requires-Dist: pyyaml>=6.0.1
+Requires-Dist: rich>=13.7.0
 Provides-Extra: jupyter
 Requires-Dist: ipykernel>=6.29.5; extra == 'jupyter'
 Requires-Dist: jupyter; extra == 'jupyter'

agent_starter_pack-0.8.0/agents/README.md

@@ -0,0 +1,7 @@
+# Agent Templates
+
+This directory contains template implementations for various agents designed to work with the Agent Starter Pack templating system.
+Feel free to browse through these folders to preview what each template offers.
+Direct cloning of this repository isn't necessary to utilize these templates.
+
+For setup instructions and getting started, please refer to the main [README](/README.md) which explains how to install and use the Agent Starter Pack.

{agent_starter_pack-0.7.1/agents/adk_gemini_fullstack → agent_starter_pack-0.8.0/agents/adk_base}/notebooks/adk_app_testing.ipynb

@@ -207,14 +207,15 @@
    "outputs": [],
    "source": [
     "user_id = \"test_user_123\"\n",
-    "session_id = \"test_session_456\"\n",
     "session_data = {\"state\": {\"preferred_language\": \"English\", \"visit_count\": 1}}\n",
     "\n",
-    "session_url = f\"{SERVICE_URL}/apps/app/users/{user_id}/sessions/{session_id}\"\n",
+    "session_url = f\"{SERVICE_URL}/apps/app/users/{user_id}/sessions\"\n",
     "headers = {\"Content-Type\": \"application/json\", \"Authorization\": f\"Bearer {ID_TOKEN}\"}\n",
     "\n",
     "session_response = requests.post(session_url, headers=headers, json=session_data)\n",
-    "print(f\"Session creation status code: {session_response.status_code}\")"
+    "print(f\"Session creation status code: {session_response.status_code}\")\n",
+    "print(f\"Session creation response: {session_response.json()}\")\n",
+    "session_id = session_response.json()[\"id\"]"
    ]
   },
   {
@@ -279,14 +280,15 @@
    "outputs": [],
    "source": [
     "user_id = \"test_user_123\"\n",
-    "session_id = \"test_session_456\"\n",
     "session_data = {\"state\": {\"preferred_language\": \"English\", \"visit_count\": 1}}\n",
     "\n",
-    "session_url = f\"http://127.0.0.1:8000/apps/app/users/{user_id}/sessions/{session_id}\"\n",
+    "session_url = f\"http://127.0.0.1:8000/apps/app/users/{user_id}/sessions\"\n",
     "headers = {\"Content-Type\": \"application/json\"}\n",
     "\n",
     "session_response = requests.post(session_url, headers=headers, json=session_data)\n",
-    "print(f\"Session creation status code: {session_response.status_code}\")"
+    "print(f\"Session creation status code: {session_response.status_code}\")\n",
+    "print(f\"Session creation response: {session_response.json()}\")\n",
+    "session_id = session_response.json()[\"id\"]"
    ]
   },
   {

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/agents/adk_base/template/.templateconfig.yaml

@@ -16,7 +16,9 @@ description: "A base ReAct agent built with Google's Agent Development Kit (ADK)
 example_question: "What's the weather in San Francisco?"
 settings:
   requires_data_ingestion: false
+  requires_session: true
   deployment_targets: ["agent_engine", "cloud_run"]
-  extra_dependencies: ["google-adk~=1.4.2"]
+  extra_dependencies: ["google-adk~=1.5.0"]
   tags: ["adk"]
   frontend_type: "None"
+    

{agent_starter_pack-0.7.1/agents/agentic_rag → agent_starter_pack-0.8.0/agents/adk_gemini_fullstack}/notebooks/adk_app_testing.ipynb

@@ -207,14 +207,15 @@
    "outputs": [],
    "source": [
     "user_id = \"test_user_123\"\n",
-    "session_id = \"test_session_456\"\n",
     "session_data = {\"state\": {\"preferred_language\": \"English\", \"visit_count\": 1}}\n",
     "\n",
-    "session_url = f\"{SERVICE_URL}/apps/app/users/{user_id}/sessions/{session_id}\"\n",
+    "session_url = f\"{SERVICE_URL}/apps/app/users/{user_id}/sessions\"\n",
     "headers = {\"Content-Type\": \"application/json\", \"Authorization\": f\"Bearer {ID_TOKEN}\"}\n",
     "\n",
     "session_response = requests.post(session_url, headers=headers, json=session_data)\n",
-    "print(f\"Session creation status code: {session_response.status_code}\")"
+    "print(f\"Session creation status code: {session_response.status_code}\")\n",
+    "print(f\"Session creation response: {session_response.json()}\")\n",
+    "session_id = session_response.json()[\"id\"]"
    ]
   },
   {
@@ -279,14 +280,15 @@
    "outputs": [],
    "source": [
     "user_id = \"test_user_123\"\n",
-    "session_id = \"test_session_456\"\n",
     "session_data = {\"state\": {\"preferred_language\": \"English\", \"visit_count\": 1}}\n",
     "\n",
-    "session_url = f\"http://127.0.0.1:8000/apps/app/users/{user_id}/sessions/{session_id}\"\n",
+    "session_url = f\"http://127.0.0.1:8000/apps/app/users/{user_id}/sessions\"\n",
     "headers = {\"Content-Type\": \"application/json\"}\n",
     "\n",
     "session_response = requests.post(session_url, headers=headers, json=session_data)\n",
-    "print(f\"Session creation status code: {session_response.status_code}\")"
+    "print(f\"Session creation status code: {session_response.status_code}\")\n",
+    "print(f\"Session creation response: {session_response.json()}\")\n",
+    "session_id = session_response.json()[\"id\"]"
    ]
   },
   {

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/agents/adk_gemini_fullstack/template/.templateconfig.yaml

@@ -16,8 +16,9 @@ description: "A production-ready fullstack research agent that uses Gemini to st
 example_question: "A report on the latest Google I/O event"
 settings:
   requires_data_ingestion: false
+  requires_session: true
   deployment_targets: ["agent_engine", "cloud_run"]
-  extra_dependencies: ["google-adk~=1.4.2"]
+  extra_dependencies: ["google-adk~=1.5.0"]
   tags: ["adk"]
   frontend_type: "adk_gemini_fullstack"
   commands:

{agent_starter_pack-0.7.1/agents/adk_base → agent_starter_pack-0.8.0/agents/agentic_rag}/notebooks/adk_app_testing.ipynb

@@ -207,14 +207,15 @@
    "outputs": [],
    "source": [
     "user_id = \"test_user_123\"\n",
-    "session_id = \"test_session_456\"\n",
     "session_data = {\"state\": {\"preferred_language\": \"English\", \"visit_count\": 1}}\n",
     "\n",
-    "session_url = f\"{SERVICE_URL}/apps/app/users/{user_id}/sessions/{session_id}\"\n",
+    "session_url = f\"{SERVICE_URL}/apps/app/users/{user_id}/sessions\"\n",
     "headers = {\"Content-Type\": \"application/json\", \"Authorization\": f\"Bearer {ID_TOKEN}\"}\n",
     "\n",
     "session_response = requests.post(session_url, headers=headers, json=session_data)\n",
-    "print(f\"Session creation status code: {session_response.status_code}\")"
+    "print(f\"Session creation status code: {session_response.status_code}\")\n",
+    "print(f\"Session creation response: {session_response.json()}\")\n",
+    "session_id = session_response.json()[\"id\"]"
    ]
   },
   {
@@ -279,14 +280,15 @@
    "outputs": [],
    "source": [
     "user_id = \"test_user_123\"\n",
-    "session_id = \"test_session_456\"\n",
     "session_data = {\"state\": {\"preferred_language\": \"English\", \"visit_count\": 1}}\n",
     "\n",
-    "session_url = f\"http://127.0.0.1:8000/apps/app/users/{user_id}/sessions/{session_id}\"\n",
+    "session_url = f\"http://127.0.0.1:8000/apps/app/users/{user_id}/sessions\"\n",
     "headers = {\"Content-Type\": \"application/json\"}\n",
     "\n",
     "session_response = requests.post(session_url, headers=headers, json=session_data)\n",
-    "print(f\"Session creation status code: {session_response.status_code}\")"
+    "print(f\"Session creation status code: {session_response.status_code}\")\n",
+    "print(f\"Session creation response: {session_response.json()}\")\n",
+    "session_id = session_response.json()[\"id\"]"
    ]
   },
   {

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/agents/agentic_rag/template/.templateconfig.yaml

@@ -16,9 +16,10 @@ description: "ADK RAG agent for document retrieval and Q&A. Includes a data pipe
 example_question: "How to save a pandas dataframe to CSV?"
 settings:
   requires_data_ingestion: true
+  requires_session: true
   deployment_targets: ["agent_engine", "cloud_run"]
   extra_dependencies: [
-    "google-adk~=1.4.2",
+    "google-adk~=1.5.0",
     "langchain-google-vertexai~=2.0.7",
     "langchain~=0.3.24",
     "langchain-core~=0.3.55",

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/agents/crewai_coding_crew/template/.templateconfig.yaml

@@ -22,6 +22,6 @@ settings:
     "langchain-community~=0.3.17", 
     "langchain-openai~=0.3.5",
     "langgraph~=0.4.8",
-    "crewai~=0.119.0"
+    "crewai~=0.140.0"
   ]
 example_question: "How can I implement a function to sort a list in Python?"

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/docs/cli/create.md

@@ -22,6 +22,7 @@ The following options will be prompted interactively if not provided via the com
 - `--deployment-target`, `-d`: Deployment target (`agent_engine` or `cloud_run`). Prompts if omitted.
 - `--datastore`, `-ds`: Datastore for RAG agents (`vertex_ai_search` or `vertex_ai_vector_search`). Prompted if `--include-data-ingestion` is specified, or if the selected agent (e.g., `agentic_rag`) requires data ingestion, and this option is omitted.
 - `--region`: GCP region for deployment (default: `us-central1`). Prompts for confirmation if not specified and `--auto-approve` is not used.
+- `--session-type`: Type of session storage to use (`in_memory` or `alloydb`). This is only applicable for agents that require session management and when the deployment target is `cloud_run`.
 
 GCP account and project ID are detected automatically (using your active `gcloud config` settings). You will be prompted to confirm or change them unless `--auto-approve` is used.
 

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/llm.txt

@@ -69,6 +69,7 @@ agent-starter-pack create PROJECT_NAME [OPTIONS]
 *   `-d, --deployment-target`: Target deployment environment (`cloud_run` or `agent_engine`).
 *   `-ds, --datastore`: For RAG agents, the datastore (`vertex_ai_search` or `vertex_ai_vector_search`).
 *   `-i, --include-data-ingestion`: Include data ingestion pipeline scaffolding.
+*   `--session-type`: For agents requiring session management on Cloud Run, specifies the storage type (`in_memory` or `alloydb`).
 *   `--region`: GCP region (e.g., `us-central1`).
 *   `--auto-approve`: **Skips all interactive prompts (crucial for automation).**
 *   `--debug`: Enables debug logging during creation.
@@ -186,6 +187,12 @@ uvx agent-starter-pack setup-cicd
 *   **Deploying with UI:** `make backend IAP=true`
 *   **Access Control:** After deploying with IAP, grant users the `IAP-secured Web App User` role in IAM to give them access.
 
+### Session Management
+
+For stateful agents, the starter pack supports persistent sessions.
+*   **Cloud Run:** Choose between `in_memory` (for testing) and durable `alloydb` sessions using the `--session-type` flag.
+*   **Agent Engine:** Provides session management automatically.
+
 ### Monitoring & Observability
 *   **Technology:** Uses OpenTelemetry to emit events to Google Cloud Trace and Logging.
 *   **Custom Tracer:** A custom tracer in `app/utils/tracing.py` handles large payloads by linking to GCS, overcoming default service limits.

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-starter-pack"
-version = "0.7.1"
+version = "0.8.0"
 description = "CLI to bootstrap production-ready Google Cloud GenAI agent projects from templates."
 authors = [
     { name = "Google LLC", email = "agent-starter-pack@google.com" },
@@ -9,11 +9,11 @@ license = {text = "Apache-2.0"}
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "click~=8.1.7",
-    "cookiecutter~=2.5.0",
+    "click>=8.1.7",
+    "cookiecutter~=2.6.0",
     "google-cloud-aiplatform>=1.87.0",
-    "rich~=13.7.0",
-    "pyyaml~=6.0.1",
+    "rich>=13.7.0",
+    "pyyaml>=6.0.1",
     "backoff>=2.2.1",
 ]
 

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/src/base_template/README.md

@@ -54,7 +54,7 @@ make install && make playground
 {%- endif %}
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
 | `make playground`    | Launch local development environment with backend and frontend{%- if "adk" in cookiecutter.tags %} - leveraging `adk web` command. {%- endif %}|
-| `make backend`       | Deploy agent to Cloud Run |
+| `make backend`       | Deploy agent to Cloud Run (use `IAP=true` to enable Identity-Aware Proxy) |
 | `make local-backend` | Launch local development server |
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
 {%- if cookiecutter.agent_name == 'live_api' %}
@@ -67,7 +67,7 @@ make install && make playground
 {%- endif %}
 | `make test`          | Run unit and integration tests                                                              |
 | `make lint`          | Run code quality checks (codespell, ruff, mypy)                                             |
-| `make setup-dev-env` | Set up development environment resources using Terraform                                    |
+| `make setup-dev-env` | Set up development environment resources using Terraform                         |
 {%- if cookiecutter.data_ingestion %}
 | `make data-ingestion`| Run data ingestion pipeline in the Dev environment                                           |
 {%- endif %}

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/src/base_template/deployment/cd/deploy-to-prod.yaml

@@ -55,22 +55,7 @@ steps:
       - "$_REGION"
       - "--project"
       - $_PROD_PROJECT_ID
-      - "--min-instances"
-      - "1"
-      - "--no-cpu-throttling"
-      - "--cpu"
-      - "4"
-      - "--memory"
-      - "4Gi"
-      - "--concurrency"
-      - "40"
-      - "--service-account"
-      - "${_CLOUD_RUN_APP_SA_EMAIL}"
-      - "--session-affinity"
-      - "--labels"
-      - "created-by=adk"
-      - "--set-env-vars"
-      - "COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID=${_DATA_STORE_ID},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX},VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT},VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET}{%- endif %}{%- endif %}"
+
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
   - name: "python:3.11-slim" 
     id: install-dependencies

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/src/base_template/deployment/cd/staging.yaml

@@ -46,6 +46,8 @@ steps:
         "build",
         "-t",
         "$_REGION-docker.pkg.dev/$PROJECT_ID/$_ARTIFACT_REGISTRY_REPO_NAME/$_CONTAINER_NAME",
+        "--build-arg",
+        "COMMIT_SHA=$COMMIT_SHA",
         ".",
       ]
   - name: "gcr.io/cloud-builders/docker"
@@ -69,22 +71,6 @@ steps:
       - "${_REGION}"
       - "--project"
       - "${_STAGING_PROJECT_ID}"
-      - "--min-instances"
-      - "1"
-      - "--no-cpu-throttling"
-      - "--cpu"
-      - "4"
-      - "--memory"
-      - "4Gi"
-      - "--concurrency"
-      - "40"
-      - "--service-account"
-      - "${_CLOUD_RUN_APP_SA_EMAIL}"
-      - "--session-affinity"
-      - "--labels"
-      - "created-by=adk"
-      - "--set-env-vars"
-      - "COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID=${_DATA_STORE_ID},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX},VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT},VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET}{%- endif %}{%- endif %}"
 
   # Fetch Staging Service URL
   - name: "gcr.io/cloud-builders/gcloud"
@@ -149,12 +135,11 @@ steps:
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
         export _ID_TOKEN=$(cat id_token.txt)
         export _STAGING_URL=$(cat staging_url.txt)
-        pip install uv==0.6.12 --user && uv sync --locked
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
         export _AUTH_TOKEN=$(cat auth_token.txt)
 {%- endif %}
-        uv add locust==2.32.6
-        uv run locust -f tests/load_test/load_test.py \
+        pip install locust==2.31.1 --user
+        locust -f tests/load_test/load_test.py \
         --headless \
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
         -H $$_STAGING_URL \

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/src/base_template/deployment/terraform/apis.tf

@@ -19,9 +19,9 @@ resource "google_project_service" "cicd_services" {
   disable_on_destroy = false
 }
 
-resource "google_project_service" "shared_services" {
+resource "google_project_service" "deploy_project_services" {
   for_each = {
-    for pair in setproduct(keys(local.deploy_project_ids), local.shared_services) :
+    for pair in setproduct(keys(local.deploy_project_ids), local.deploy_project_services) :
     "${pair[0]}_${replace(pair[1], ".", "_")}" => {
       project = local.deploy_project_ids[pair[0]]
       service = pair[1]

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/src/base_template/deployment/terraform/build_triggers.tf

@@ -39,7 +39,7 @@ resource "google_cloudbuild_trigger" "pr_checks" {
   {% endif %}
   ]
   include_build_logs = "INCLUDE_BUILD_LOGS_WITH_STATUS"
-  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 
 # b. Create CD pipeline trigger
@@ -85,13 +85,13 @@ resource "google_cloudbuild_trigger" "cd_pipeline" {
 {% elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
     _VECTOR_SEARCH_INDEX           = resource.google_vertex_ai_index.vector_search_index_staging.id
     _VECTOR_SEARCH_INDEX_ENDPOINT  = resource.google_vertex_ai_index_endpoint.vector_search_index_endpoint_staging.id
-    _VECTOR_SEARCH_BUCKET          = "gs://${resource.google_storage_bucket.vector_search_data_bucket["staging"].name}"
+    _VECTOR_SEARCH_BUCKET          = resource.google_storage_bucket.vector_search_data_bucket["staging"].url
 
 {% endif %}
 {% endif %}
     # Your other CD Pipeline substitutions
   }
-  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 
 }
 
@@ -128,11 +128,11 @@ resource "google_cloudbuild_trigger" "deploy_to_prod_pipeline" {
 {% elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
     _VECTOR_SEARCH_INDEX           = resource.google_vertex_ai_index.vector_search_index_prod.id
     _VECTOR_SEARCH_INDEX_ENDPOINT  = resource.google_vertex_ai_index_endpoint.vector_search_index_endpoint_prod.id
-    _VECTOR_SEARCH_BUCKET          = "gs://${resource.google_storage_bucket.vector_search_data_bucket["prod"].name}"
+    _VECTOR_SEARCH_BUCKET          = resource.google_storage_bucket.vector_search_data_bucket["prod"].url
 {% endif %}
 {% endif %}
     # Your other Deploy to Prod Pipeline substitutions
   }
-  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 
 }

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/src/base_template/deployment/terraform/dev/apis.tf

@@ -24,7 +24,14 @@ locals {
     "bigquery.googleapis.com",
     "serviceusage.googleapis.com",
     "logging.googleapis.com",
-    "cloudtrace.googleapis.com"
+    "cloudtrace.googleapis.com",
+{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+    "compute.googleapis.com",
+    "servicenetworking.googleapis.com",
+    "alloydb.googleapis.com",
+    "secretmanager.googleapis.com",
+    "dns.googleapis.com"
+{%- endif %}
   ]
 }
 

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/src/base_template/deployment/terraform/dev/variables.tf

@@ -54,6 +54,9 @@ variable "agentengine_sa_roles" {
 {% endif %}
   type        = list(string)
   default = [
+{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+    "roles/secretmanager.secretAccessor",
+{%- endif %}
     "roles/aiplatform.user",
     "roles/discoveryengine.editor",
     "roles/logging.logWriter",
@@ -61,7 +64,6 @@ variable "agentengine_sa_roles" {
     "roles/storage.admin"
   ]
 }
-
 {% if cookiecutter.data_ingestion %}
 
 variable "pipelines_roles" {

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/src/base_template/deployment/terraform/iam.tf

@@ -25,7 +25,7 @@ resource "google_project_iam_member" "cicd_project_roles" {
   project    = var.cicd_runner_project_id
   role       = each.value
   member     = "serviceAccount:${resource.google_service_account.cicd_runner_sa.email}"
-  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 
 }
 
@@ -42,7 +42,7 @@ resource "google_project_iam_member" "other_projects_roles" {
   project    = each.value.project_id
   role       = each.value.role
   member     = "serviceAccount:${resource.google_service_account.cicd_runner_sa.email}"
-  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 {% if cookiecutter.deployment_target == 'cloud_run' %}
 # 3. Allow Cloud Run service SA to pull containers stored in the CICD project
@@ -52,7 +52,7 @@ resource "google_project_iam_member" "cicd_run_invoker_artifact_registry_reader"
 
   role       = "roles/artifactregistry.reader"
   member     = "serviceAccount:service-${data.google_project.projects[each.key].number}@serverless-robot-prod.iam.gserviceaccount.com"
-  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 
 }
 
@@ -69,7 +69,7 @@ resource "google_project_iam_member" "cloud_run_app_sa_roles" {
   project    = each.value.project
   role       = each.value.role
   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]
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 {% elif cookiecutter.deployment_target == 'agent_engine' %}
 resource "google_project_service_identity" "vertex_sa" {
@@ -92,7 +92,7 @@ resource "google_project_iam_member" "vertex_ai_sa_permissions" {
   project     = each.value.project
   role        = each.value.role
   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]
+  depends_on  = [resource.google_project_service.deploy_project_services, resource.google_project_service_identity.vertex_sa]
 }
 {% endif %}
 
@@ -101,14 +101,14 @@ resource "google_service_account_iam_member" "cicd_run_invoker_token_creator" {
   service_account_id = google_service_account.cicd_runner_sa.name
   role               = "roles/iam.serviceAccountTokenCreator"
   member             = "serviceAccount:${resource.google_service_account.cicd_runner_sa.email}"
-  depends_on         = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
+  depends_on         = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 # Special assignment: Allow the CICD SA to impersonate himself for trigger creation
 resource "google_service_account_iam_member" "cicd_run_invoker_account_user" {
   service_account_id = google_service_account.cicd_runner_sa.name
   role               = "roles/iam.serviceAccountUser"
   member             = "serviceAccount:${resource.google_service_account.cicd_runner_sa.email}"
-  depends_on         = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
+  depends_on         = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 
 {%- if cookiecutter.data_ingestion %}
@@ -125,6 +125,6 @@ resource "google_project_iam_member" "vertexai_pipeline_sa_roles" {
   project    = each.value.project
   role       = each.value.role
   member     = "serviceAccount:${google_service_account.vertexai_pipeline_app_sa[split(",", each.key)[0]].email}"
-  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 {%- endif %}

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/src/base_template/deployment/terraform/locals.tf

@@ -23,7 +23,7 @@ locals {
     "cloudtrace.googleapis.com"
   ]
 
-  shared_services = [
+  deploy_project_services = [
     "aiplatform.googleapis.com",
     "run.googleapis.com",
     "discoveryengine.googleapis.com",
@@ -32,7 +32,14 @@ locals {
     "bigquery.googleapis.com",
     "serviceusage.googleapis.com",
     "logging.googleapis.com",
-    "cloudtrace.googleapis.com"
+    "cloudtrace.googleapis.com",
+{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+    "compute.googleapis.com",
+    "servicenetworking.googleapis.com",
+    "alloydb.googleapis.com",
+    "secretmanager.googleapis.com",
+    "dns.googleapis.com"
+{%- endif %}
   ]
 
   deploy_project_ids = {

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/src/base_template/deployment/terraform/log_sinks.tf

@@ -26,7 +26,7 @@ resource "google_bigquery_dataset" "feedback_dataset" {
   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]
+  depends_on    = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 
 resource "google_bigquery_dataset" "telemetry_logs_dataset" {
@@ -35,7 +35,7 @@ resource "google_bigquery_dataset" "telemetry_logs_dataset" {
   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]
+  depends_on    = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 
 module "log_export_to_bigquery" {

{agent_starter_pack-0.7.1 → agent_starter_pack-0.8.0}/src/base_template/deployment/terraform/service_accounts.tf

@@ -16,7 +16,7 @@ resource "google_service_account" "cicd_runner_sa" {
   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]
+  depends_on   = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 {% if cookiecutter.deployment_target == 'cloud_run' %}
 resource "google_service_account" "cloud_run_app_sa" {
@@ -25,7 +25,7 @@ resource "google_service_account" "cloud_run_app_sa" {
   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]
+  depends_on   = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 {% endif %}
 
@@ -37,6 +37,6 @@ resource "google_service_account" "vertexai_pipeline_app_sa" {
   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]
+  depends_on   = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 {% endif %}