Skip to content

Commit fe0d8d0

Browse files
committed
chore: Revert to use secrets in GitHub; despite security issues, we already do so even more permissively in PR action
1 parent b2d2d25 commit fe0d8d0

3 files changed

Lines changed: 29 additions & 11 deletions

File tree

.github/scripts/deploy-app-engine.sh

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,34 @@ echo "Image: $IMAGE_NAME:$IMAGE_TAG"
2323
echo "Version: $IMAGE_TAG"
2424
echo "Service Account: $SERVICE_ACCOUNT"
2525
echo "App YAML: $APP_YAML_PATH"
26-
echo "Environment Variables: Will be loaded from Secret Manager via app.yaml"
26+
# Define environment variables to set
27+
declare -A ENV_VARS=(
28+
["AUTH0_ADDRESS_NO_DOMAIN"]="$AUTH0_ADDRESS_NO_DOMAIN"
29+
["AUTH0_AUDIENCE_NO_DOMAIN"]="$AUTH0_AUDIENCE_NO_DOMAIN"
30+
["USER_ANALYTICS_DB_USERNAME"]="$USER_ANALYTICS_DB_USERNAME"
31+
["USER_ANALYTICS_DB_PASSWORD"]="$USER_ANALYTICS_DB_PASSWORD"
32+
["USER_ANALYTICS_DB_CONNECTION_NAME"]="$USER_ANALYTICS_DB_CONNECTION_NAME"
33+
["ANTHROPIC_API_KEY"]="$ANTHROPIC_API_KEY"
34+
)
35+
36+
# Build the --set-env-vars string
37+
ENV_VARS_STRING=""
38+
for key in "${!ENV_VARS[@]}"; do
39+
if [ -n "${ENV_VARS[$key]}" ]; then
40+
ENV_VARS_STRING="$ENV_VARS_STRING --set-env-vars $key=${ENV_VARS[$key]}"
41+
else
42+
echo "Warning: $key is not set"
43+
fi
44+
done
45+
46+
echo "Environment Variables: ${#ENV_VARS[@]} variables will be set"
2747

2848
# Deploy to App Engine using the pre-built image
2949
gcloud app deploy "$APP_YAML_PATH" \
3050
--image-url="$IMAGE_NAME:$IMAGE_TAG" \
3151
--version="$IMAGE_TAG" \
3252
--service-account="$SERVICE_ACCOUNT" \
33-
--quiet
53+
--quiet \
54+
$ENV_VARS_STRING
3455

3556
echo "App Engine deployment completed successfully"

.github/workflows/deploy-production.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ jobs:
119119
IMAGE_TAG: ${{ github.sha }}
120120
SERVICE_ACCOUNT: github-deployment@policyengine-household-api.iam.gserviceaccount.com
121121
APP_YAML_PATH: ./gcp/policyengine_household_api/app.yaml
122+
AUTH0_ADDRESS_NO_DOMAIN: ${{ secrets.AUTH0_ADDRESS_NO_DOMAIN }}
123+
AUTH0_AUDIENCE_NO_DOMAIN: ${{ secrets.AUTH0_AUDIENCE_NO_DOMAIN }}
124+
USER_ANALYTICS_DB_USERNAME: ${{ secrets.USER_ANALYTICS_DB_USERNAME }}
125+
USER_ANALYTICS_DB_PASSWORD: ${{ secrets.USER_ANALYTICS_DB_PASSWORD }}
126+
USER_ANALYTICS_DB_CONNECTION_NAME: ${{ secrets.USER_ANALYTICS_DB_CONNECTION_NAME }}
127+
ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
122128
run: .github/scripts/deploy-app-engine.sh
123129

124130
- name: Set traffic to new version

gcp/policyengine_household_api/app.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,3 @@ liveness_check:
1818
readiness_check:
1919
path: "/readiness-check"
2020
app_start_timeout_sec: 600
21-
22-
# Environment variables loaded from Google Cloud Secret Manager
23-
env_variables:
24-
AUTH0_ADDRESS_NO_DOMAIN: "projects/policyengine-household-api/secrets/AUTH0_ADDRESS_NO_DOMAIN/versions/latest"
25-
AUTH0_AUDIENCE_NO_DOMAIN: "projects/policyengine-household-api/secrets/AUTH0_AUDIENCE_NO_DOMAIN/versions/latest"
26-
USER_ANALYTICS_DB_USERNAME: "projects/policyengine-household-api/secrets/USER_ANALYTICS_DB_USERNAME/versions/latest"
27-
USER_ANALYTICS_DB_PASSWORD: "projects/policyengine-household-api/secrets/USER_ANALYTICS_DB_PASSWORD/versions/latest"
28-
USER_ANALYTICS_DB_CONNECTION_NAME: "projects/policyengine-household-api/secrets/USER_ANALYTICS_DB_CONNECTION_NAME/versions/latest"
29-
ANTHROPIC_API_KEY: "projects/policyengine-household-api/secrets/ANTHROPIC_API_KEY/versions/latest"

0 commit comments

Comments
 (0)