fx secrets.

Author: azep-ninja

Dockerfile

@@ -57,9 +57,6 @@ RUN mkdir -p characters
 # Add debugging and error handling to startup command
 CMD sh -c '\
     echo "Debug: Starting container" && \
-    echo "Debug: Environment variables:" && \
-    echo "SMALL_GOOGLE_MODEL=${SMALL_GOOGLE_MODEL}" && \
-    echo "MEDIUM_GOOGLE_MODEL=${MEDIUM_GOOGLE_MODEL}" && \
     echo "Debug: AGENTS_BUCKET_NAME=${AGENTS_BUCKET_NAME}" && \
     echo "Debug: CHARACTER_FILE=${CHARACTER_FILE}" && \
     echo "Debug: Full GCS path=gs://${AGENTS_BUCKET_NAME}/${CHARACTER_FILE}" && \
@@ -71,5 +68,12 @@ CMD sh -c '\
     fi && \
     echo "Debug: Attempting to copy character file..." && \
     gsutil cp gs://${AGENTS_BUCKET_NAME}/${CHARACTER_FILE} characters/${CHARACTER_FILE} && \
+    # Get secrets directly when starting the application
+    export SMALL_GOOGLE_MODEL=$(gcloud secrets versions access latest --secret="small-google-model") && \
+    export MEDIUM_GOOGLE_MODEL=$(gcloud secrets versions access latest --secret="medium-google-model") && \
+    export GOOGLE_GENERATIVE_AI_API_KEY=$(gcloud secrets versions access latest --secret="google-generative-ai-key") && \
+    echo "Debug: Environment variables:" && \
+    echo "SMALL_GOOGLE_MODEL=${SMALL_GOOGLE_MODEL}" && \
+    echo "MEDIUM_GOOGLE_MODEL=${MEDIUM_GOOGLE_MODEL}" && \
     echo "Debug: Starting application..." && \
     pnpm start --non-interactive --characters=characters/${CHARACTER_FILE}'

cloudbuild.yaml

@@ -88,20 +88,13 @@ steps:
     full_name=$(cat /workspace/full_name)
     version=$(cat /workspace/version)
     bucket_name=$(gcloud secrets versions access latest --secret="agents-bucket-name")
-    small_google_model=$(gcloud secrets versions access latest --secret="small-google-model")
-    medium_google_model=$(gcloud secrets versions access latest --secret="medium-google-model")
-    google_generative_api_key=$(gcloud secrets versions access latest --secret="google-generative-ai-key")
     echo "Working with instance: ${full_name}"
     echo "Checking for existing instance..."
     if [[ $(gcloud compute instances list --filter="name=${full_name}" --format="get(name)") ]]; then
       echo "Updating existing instance ${full_name}"
       gcloud compute instances update-container ${full_name} \
         --container-image us-central1-docker.pkg.dev/$PROJECT_ID/qi-agents/${full_name}:${version} \
-        --container-env AGENTS_BUCKET_NAME=${bucket_name},\
-    CHARACTER_FILE=${_CHARACTER_FILE},\
-    SMALL_GOOGLE_MODEL=${small_google_model},\
-    MEDIUM_GOOGLE_MODEL=${medium_google_model},\
-    GOOGLE_GENERATIVE_AI_API_KEY=${google_generative_api_key} \
+        --container-env AGENTS_BUCKET_NAME=${bucket_name},CHARACTER_FILE=${_CHARACTER_FILE} \
         --zone $_ZONE || { echo "Instance update failed"; exit 1; }
       echo "Instance update completed"
     else
@@ -114,11 +107,7 @@ steps:
         --subnet $_SUBNET \
         --no-address \
         --boot-disk-size $_DISK_SIZE \
-        --container-env AGENTS_BUCKET_NAME=${bucket_name},\
-    CHARACTER_FILE=${_CHARACTER_FILE},\
-    SMALL_GOOGLE_MODEL=${small_google_model},\
-    MEDIUM_GOOGLE_MODEL=${medium_google_model},\
-    GOOGLE_GENERATIVE_AI_API_KEY=${google_generative_api_key} \
+        --container-env AGENTS_BUCKET_NAME=${bucket_name},CHARACTER_FILE=${_CHARACTER_FILE} \
         --metadata-from-file startup-script=startup.sh || { echo "Instance creation failed"; exit 1; }
       echo "Instance creation completed"
     fi