From 1f66b5d69e20c69f084685c53026cc0401d80128 Mon Sep 17 00:00:00 2001 From: Joakim Tysseng Date: Fri, 3 Nov 2023 14:29:40 +0100 Subject: [PATCH] Changing to new gcp2 projects and removing old terraform env --- .env.terraform | 8 -------- package.json | 1 - scripts/debug.sh | 17 ++++++++++++++++- scripts/deploy.sh | 18 +++++++++++------- serviceAccountKeys/README.md | 6 +++--- src/utils/project.ts | 12 +++++++----- 6 files changed, 37 insertions(+), 25 deletions(-) delete mode 100644 .env.terraform diff --git a/.env.terraform b/.env.terraform deleted file mode 100644 index a0295a7..0000000 --- a/.env.terraform +++ /dev/null @@ -1,8 +0,0 @@ -ENVIRONMENT=terraform -KAFKA_BROKER=entur-kafka-test-int-entur-test.aivencloud.com:11877 -KAFKA_SCHEMA_REGISTRY=https://entur-kafka-test-int-entur-test.aivencloud.com:11867 - -KAFKA_TOPICS=payment-events-dev,ticket-distribution-events-dev,ticket-distribution-group-events-dev,customer-changed-dev - -ENTUR_POS_NATIVE = Entur App Terraform -ENTUR_POS_WEB = Entur Web Terraform diff --git a/package.json b/package.json index 4494978..09ffb9b 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "build:staging": "tsc && npm run populate-env-vars staging", "build:prod": "tsc && npm run populate-env-vars prod", "build:beta": "tsc && npm run populate-env-vars beta", - "build:terraform": "tsc && npm run populate-env-vars terraform", "deploy": "./scripts/deploy.sh", "ts": "tsc --noEmit", "transpile": "tsc", diff --git a/scripts/debug.sh b/scripts/debug.sh index 0e09177..08b0827 100755 --- a/scripts/debug.sh +++ b/scripts/debug.sh @@ -3,8 +3,23 @@ set -e ENV="${1:-dev}" +if ! [[ "$ENV" =~ ^(dev|staging|prod|beta)$ ]]; then + echo -e "๐Ÿ™ˆ Invalid ENV: $ENV\n" + exit 1 +fi + +if [[ $ENV = "dev" ]]; then + PROJECT="ent-enturapp-dev" +elif [[ $ENV = "staging" ]]; then + PROJECT="ent-enturapp-tst" +elif [[ $ENV = "beta" ]]; then + PROJECT="ent-enturbeta-prd" +elif [[ $ENV = "prod" ]]; then + PROJECT="entur-prod" +fi + # path to environment specific credential keys used when looking up secrets -export GOOGLE_APPLICATION_CREDENTIALS="$PWD/serviceAccountKeys/entur-$ENV.json" +export GOOGLE_APPLICATION_CREDENTIALS="$PWD/serviceAccountKeys/$PROJECT.json" # Run transpile in a forked process npm run transpile -- --watch & diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 58c3d03..111f938 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -14,15 +14,19 @@ fi function deploy { ENV="${1:-dev}" - if ! [[ "$ENV" =~ ^(dev|staging|prod|beta|terraform)$ ]]; then + if ! [[ "$ENV" =~ ^(dev|staging|prod|beta)$ ]]; then echo -e "๐Ÿ™ˆ Invalid ENV: $ENV\n" exit 1 fi - if [[ $ENV = "terraform" ]]; then - PROJECT="ent-selvbet-terraform-dev" - else - PROJECT="entur-$ENV" + if [[ $ENV = "dev" ]]; then + PROJECT="ent-enturapp-dev" + elif [[ $ENV = "staging" ]]; then + PROJECT="ent-enturapp-tst" + elif [[ $ENV = "beta" ]]; then + PROJECT="ent-enturbeta-prd" + elif [[ $ENV = "prod" ]]; then + PROJECT="entur-prod" fi echo " ๐Ÿงต Linting ..." @@ -38,7 +42,7 @@ function deploy { KEEPALIVE_JOB="bff-kafka-keepalive" if gcloud scheduler jobs list --project=$PROJECT | grep -c $KEEPALIVE_JOB; then echo " ๐Ÿ—‘๏ธ Deleting existing keep-alive cron job $HAS_KAFKA_KEEPALIVE..." - gcloud scheduler jobs delete $KEEPALIVE_JOB --quiet --location="us-central1" --project=$PROJECT + gcloud scheduler jobs delete $KEEPALIVE_JOB --quiet --location="europe-west1" --project=$PROJECT fi echo " ๐Ÿ‘ท๐Ÿปโ€โ™€๏ธ Creating keep-alive cron job ..." gcloud scheduler jobs create app-engine $KEEPALIVE_JOB --service="bff-kafka" --schedule="every 5 mins" --relative-url="/bff-kafka/keepalive" --http-method=GET --description="Tic, toc, I'm a clock. I prevent bff-kafka from idle timeouts." --project=$PROJECT @@ -46,7 +50,7 @@ function deploy { HEARTBEAT_JOB="bff-kafka-heartbeat" if gcloud scheduler jobs list --project=$PROJECT | grep -c $HEARTBEAT_JOB; then echo " ๐Ÿ—‘๏ธ Deleting existing heartbeat cron job ..." - gcloud scheduler jobs delete $HEARTBEAT_JOB --quiet --location="us-central1" --project=$PROJECT + gcloud scheduler jobs delete $HEARTBEAT_JOB --quiet --location="europe-west1" --project=$PROJECT fi echo " ๐Ÿ‘ท๐Ÿปโ€โ™€๏ธ Creating heartbeat cron job ..." gcloud scheduler jobs create app-engine $HEARTBEAT_JOB --service="bff-kafka" --schedule="every 1 mins" --relative-url="/bff-kafka/heartbeat" --http-method=GET --description="Can you feel a heartbeat, Doctor? No, he's dead, Jim." --project=$PROJECT diff --git a/serviceAccountKeys/README.md b/serviceAccountKeys/README.md index edcc77c..9b64e9e 100644 --- a/serviceAccountKeys/README.md +++ b/serviceAccountKeys/README.md @@ -1,12 +1,12 @@ -Put the Google Service Account Keys json files for entur-staging and entur-dev in this folder (serviceAccountKeys). +Put the Google Service Account Keys json files for ent-enturapp-tst and ent-enturapp-dev in this folder (serviceAccountKeys). Do NOT check in files (they are by default ignored by git). Files must be named -`entur-.json` +`.json` -for example `entur-staging.json` +for example `ent-enturapp-dev.json` For Entur employees, see the following page for more detailed setup instructions: https://enturas.atlassian.net/wiki/spaces/DK/pages/2704048286/Bff-kafka diff --git a/src/utils/project.ts b/src/utils/project.ts index d079032..46a6962 100644 --- a/src/utils/project.ts +++ b/src/utils/project.ts @@ -1,11 +1,13 @@ import { ENVIRONMENT } from '../config.js' export const getProjectId = (): string => { - if (ENVIRONMENT === 'nordic-dev') { - return 'ent-clients-nordic-dev' - } else if (ENVIRONMENT === 'terraform') { - return 'ent-selvbet-terraform-dev' + if (ENVIRONMENT === 'staging') { + return 'ent-enturapp-tst' + } else if (ENVIRONMENT === 'beta') { + return 'ent-enturbeta-prd' + } else if (ENVIRONMENT === 'prod') { + return 'entur-prod' } else { - return `entur-${ENVIRONMENT}` + return 'ent-enturapp-dev' } }