Merge pull request #69 from PolicyEngine/fix/fix_env_vars

Fix environment variables
PolicyEngine · Jan 25, 2024 · 83a944d · 83a944d
2 parents a35e703 + 5285acc
commit 83a944d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -56,4 +56,4 @@ jobs:
           AUTH0_TEST_TOKEN_NO_DOMAIN: ${{ secrets.AUTH0_TEST_TOKEN_NO_DOMAIN }}
           USER_ANALYTICS_DB_USERNAME: ${{ secrets.USER_ANALYTICS_DB_USERNAME }}
           USER_ANALYTICS_DB_PASSWORD: ${{ secrets.USER_ANALYTICS_DB_PASSWORD }}
-          USER_ANALYTICS_CONNECTION_NAME: ${{ secrets.USER_ANALYTICS_CONNECTION_NAME }}
+          USER_ANALYTICS_DB_CONNECTION_NAME: ${{ secrets.USER_ANALYTICS_DB_CONNECTION_NAME }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -73,4 +73,4 @@ jobs:
           AUTH0_TEST_TOKEN_NO_DOMAIN: ${{ secrets.AUTH0_TEST_TOKEN_NO_DOMAIN }}
           USER_ANALYTICS_DB_USERNAME: ${{ secrets.USER_ANALYTICS_DB_USERNAME }}
           USER_ANALYTICS_DB_PASSWORD: ${{ secrets.USER_ANALYTICS_DB_PASSWORD }}
-          USER_ANALYTICS_CONNECTION_NAME: ${{ secrets.USER_ANALYTICS_CONNECTION_NAME }}
+          USER_ANALYTICS_DB_CONNECTION_NAME: ${{ secrets.USER_ANALYTICS_DB_CONNECTION_NAME }}
diff --git a/changelog_entry.yaml b/changelog_entry.yaml
@@ -0,0 +1,4 @@
+- bump: minor
+  changes:
+    added:
+    - Fix environment variables
diff --git a/gcp/export.py b/gcp/export.py
@@ -14,7 +14,7 @@
 TEST_TOKEN = os.environ["AUTH0_TEST_TOKEN_NO_DOMAIN"]
 DB_USER = os.environ["USER_ANALYTICS_DB_USERNAME"]
 DBPW = os.environ["USER_ANALYTICS_DB_PASSWORD"]
-DB_CONN = os.environ["USER_ANALYTICS_DB_CONNECTION"]
+DB_CONN = os.environ["USER_ANALYTICS_DB_CONNECTION_NAME"]
 
 # Export GAE to to .gac.json
 

diff --git a/gcp/policyengine_household_api/Dockerfile b/gcp/policyengine_household_api/Dockerfile
@@ -5,7 +5,7 @@ ENV AUTH0_AUDIENCE_NO_DOMAIN .audience
 ENV AUTH0_TEST_TOKEN_NO_DOMAIN .test-token
 ENV USER_ANALYTICS_DB_PASSWORD .dbpw
 ENV USER_ANALYTICS_DB_USERNAME .dbuser
-ENV USER_ANALYTICS_CONNECTION_NAME .dbconn
+ENV USER_ANALYTICS_DB_CONNECTION_NAME .dbconn
 ADD . /app
 RUN cd /app && make install && make test
 CMD ./start.sh 
diff --git a/policyengine_household_api/data/setup.py b/policyengine_household_api/data/setup.py
@@ -12,7 +12,7 @@
 def getconn():
 
     conn = connector.connect(
-        os.getenv("USER_ANALYTICS_CONNECTION_NAME"),
+        os.getenv("USER_ANALYTICS_DB_CONNECTION_NAME"),
         "pymysql",
         user=os.getenv("USER_ANALYTICS_DB_USERNAME"),
         password=os.getenv("USER_ANALYTICS_DB_PASSWORD"),