From ab4db36445cb687981499854e7e388f556b015b6 Mon Sep 17 00:00:00 2001 From: Carlos Mesquita Date: Wed, 4 Sep 2024 11:55:58 +0100 Subject: [PATCH 1/3] Switched cli token to GOOGLE_APPLICATION_CREDENTIALS --- Dockerfile | 2 ++ modules/batch_users/service.py | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 939b732..243c05c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,8 @@ FROM python:3.11-slim # Allow statements and log messages to immediately appear in the logs ENV PYTHONUNBUFFERED True +ENV GOOGLE_APPLICATION_CREDENTIALS=/app/firebase-configs/encoach-staging.json + # Copy local code to the container image. ENV APP_HOME /app WORKDIR $APP_HOME diff --git a/modules/batch_users/service.py b/modules/batch_users/service.py index f4550f4..8cca45e 100644 --- a/modules/batch_users/service.py +++ b/modules/batch_users/service.py @@ -118,7 +118,6 @@ class BatchUsers: f'--rounds={os.getenv("FIREBASE_SCRYPT_ROUNDS")} ' f'--mem-cost={os.getenv("FIREBASE_SCRYPT_MEM_COST")} ' f'--project={os.getenv("FIREBASE_PROJECT_ID")} ' - f'--token={os.getenv("FIREBASE_CLI_TOKEN")}' ) result = subprocess.run(command, shell=True, cwd=directory, capture_output=True, text=True) From cffec795a76003fccde9ef0b127e2c6ea53fe799 Mon Sep 17 00:00:00 2001 From: Carlos Mesquita Date: Wed, 4 Sep 2024 16:59:47 +0100 Subject: [PATCH 2/3] Swapped .env vars --- .env | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 0368d65..9c43834 100644 --- a/.env +++ b/.env @@ -5,9 +5,8 @@ GOOGLE_APPLICATION_CREDENTIALS=firebase-configs/storied-phalanx-349916.json HEY_GEN_TOKEN=MjY4MDE0MjdjZmNhNDFmYTlhZGRkNmI3MGFlMzYwZDItMTY5NTExNzY3MA== GPT_ZERO_API_KEY=0195b9bb24c5439899f71230809c74af -FIREBASE_SCRYPT_B64_SIGNER_KEY="qjo/b5U5oNxA8o+PHFMZx/ZfG8ZQ7688zYmwMOcfZvVjOM6aHe4Jf270xgyrVArqLIQwFi7VkFnbysBjueMbVw==" +FIREBASE_SCRYPT_B64_SIGNER_KEY="vbO3Xii2lajSeSkCstq3s/dCwpXP7J2YN9rP/KRreU2vGOT1fg+wzSuy1kIhBECqJHG82tmwAilSxLFFtNKVMA==" FIREBASE_SCRYPT_B64_SALT_SEPARATOR="Bw==" FIREBASE_SCRYPT_ROUNDS=8 FIREBASE_SCRYPT_MEM_COST=14 -FIREBASE_PROJECT_ID=encoach-staging -FIREBASE_CLI_TOKEN="1//03QsSa_vSDOqoCgYIARAAGAMSNwF-L9IrA0nxAZtglYBbiYqnKB9dayShPlN6xMQVI4PALPGIwr8hSpcyRuaZL0dUH-Qa7pohefo" +FIREBASE_PROJECT_ID=storied-phalanx-349916 From bb26282d25605b31c54006a1e8bf351ee38eb83a Mon Sep 17 00:00:00 2001 From: Carlos Mesquita Date: Wed, 4 Sep 2024 17:09:51 +0100 Subject: [PATCH 3/3] Forgot to change this, should not affect, but still --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 243c05c..0aed909 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM python:3.11-slim # Allow statements and log messages to immediately appear in the logs ENV PYTHONUNBUFFERED True -ENV GOOGLE_APPLICATION_CREDENTIALS=/app/firebase-configs/encoach-staging.json +ENV GOOGLE_APPLICATION_CREDENTIALS=/app/firebase-configs/storied-phalanx-349916.json # Copy local code to the container image. ENV APP_HOME /app