Fix containers env and workflow cancel on push (#222)

Author: theolemague

.github/workflows/docker-build-push.yml

@@ -16,6 +16,10 @@ on:
     types: [completed]
     branches: [staging]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
   packages: write
@@ -93,11 +97,9 @@ jobs:
           if [[ "${{ needs.set-env.outputs.environment_name }}" == 'production' ]]; then
             echo "API_URL=${{ vars.API_URL_PRODUCTION }}" >> $GITHUB_OUTPUT
             echo "SENTRY_DSN=${{ secrets.SENTRY_DSN_PRODUCTION }}" >> $GITHUB_OUTPUT
-            echo "GOOGLE_FOR_JOB_KEY=${{ secrets.GOOGLE_FOR_JOB_KEY_PRODUCTION }}" >> $GITHUB_OUTPUT
           else
             echo "API_URL=${{ vars.API_URL_STAGING }}" >> $GITHUB_OUTPUT
             echo "SENTRY_DSN=${{ secrets.SENTRY_DSN_STAGING }}" >> $GITHUB_OUTPUT
-            echo "GOOGLE_FOR_JOB_KEY=${{ secrets.GOOGLE_FOR_JOB_KEY_STAGING }}" >> $GITHUB_OUTPUT
           fi
 
       - name: Set widget-volontariat build args
@@ -135,7 +137,6 @@ jobs:
             ${{ matrix.service == 'widget-benevolat' && format('ENV={0}', steps.widget_benevolat_args.outputs.ENV) || '' }}
             ${{ matrix.service == 'widget-benevolat' && format('API_URL={0}', steps.widget_benevolat_args.outputs.API_URL) || '' }}
             ${{ matrix.service == 'widget-benevolat' && format('SENTRY_DSN={0}', steps.widget_benevolat_args.outputs.SENTRY_DSN) || '' }}
-            ${{ matrix.service == 'widget-benevolat' && format('GOOGLE_FOR_JOB_KEY={0}', steps.widget_benevolat_args.outputs.GOOGLE_FOR_JOB_KEY) || '' }}
 
             # Widget Volontariat variables
             ${{ matrix.service == 'widget-volontariat' && format('ENV={0}', steps.widget_volontariat_args.outputs.ENV) || '' }}

.github/workflows/lint.yml

@@ -6,6 +6,10 @@ on:
   push:
     branches: [main, staging]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     name: Run ESLint

.github/workflows/terraform-deploy.yml

@@ -6,6 +6,10 @@ on:
     types: [completed]
     branches: [staging]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
   workflow_dispatch:
     inputs:
       environment:

.github/workflows/tests.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [main, staging]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   api-tests:
     name: API Tests

process/src/services/slack.ts

@@ -1,7 +1,7 @@
 import { ENVIRONMENT, SLACK_TOKEN } from "../config";
 
 export const postMessage = async ({ title, text, author_name, color }: { title?: string; text: string; author_name?: string; color?: string }, channelId: string) => {
-  if (ENVIRONMENT !== "production") {
+  if (ENVIRONMENT !== "production" || !channelId) {
     console.log(`[Slack] ${text}`);
     return { ok: true };
   }

terraform/main.tf

@@ -138,14 +138,17 @@ resource "scaleway_container" "process" {
     "ENV"           = terraform.workspace
     "API_URL"       = "https://${local.api_hostname}"
     "BUCKET_NAME"   = local.bucket_name
+    "SLACK_WARNING_CHANNEL_ID"   = terraform.workspace == "production" ? "C052V2UF918" : "C08QQT4702D"
+    "SLACK_LBC_CHANNEL_ID"       = terraform.workspace == "production" ? "C07SPFG724V" : ""
+    "SLACK_PRODUCT_CHANNEL_ID"   = terraform.workspace == "production" ? "C019LKL5N69" : ""
+    "SLACK_CRON_CHANNEL_ID"      = terraform.workspace == "production" ? "C085S6M2K5J" : ""
   }
 
   secret_environment_variables = {
     "DB_ENDPOINT"                = local.secrets.DB_ENDPOINT
     "ES_ENDPOINT"                = local.secrets.ES_ENDPOINT
     "PG_ENDPOINT"                = local.secrets.PG_ENDPOINT
     "SENTRY_DSN"                 = local.secrets.SENTRY_DSN
-    "SLACK_WARNING_CHANNEL_ID"   = local.secrets.SLACK_WARNING_CHANNEL_ID
     "SCW_ACCESS_KEY"             = local.secrets.SCW_ACCESS_KEY
     "SCW_SECRET_KEY"             = local.secrets.SCW_SECRET_KEY
     "DATA_SUBVENTION_TOKEN"      = local.secrets.DATA_SUBVENTION_TOKEN
@@ -259,7 +262,6 @@ resource "scaleway_container" "benevolat" {
 
   secret_environment_variables = {
     "SENTRY_DSN"         = local.secrets.SENTRY_DSN
-    "GOOGLE_FOR_JOB_KEY" = local.secrets.GOOGLE_FOR_JOB_KEY
   }
 }
 

widget-benevolat/Dockerfile.production

@@ -6,12 +6,10 @@ WORKDIR /app
 ARG ENV=development
 ARG API_URL=http://localhost:9001
 ARG SENTRY_DSN=
-ARG GOOGLE_FOR_JOB_KEY=
 
 ENV ENV=$ENV
 ENV API_URL=$API_URL
 ENV SENTRY_DSN=$SENTRY_DSN
-ENV GOOGLE_FOR_JOB_KEY=$GOOGLE_FOR_JOB_KEY
 
 COPY package*.json ./
 

widget-benevolat/config.js

@@ -1,7 +1,6 @@
 const ENV = process.env.ENV || "development";
 const API_URL = process.env.API_URL || "http://localhost:4000";
 const SENTRY_DSN = process.env.SENTRY_DSN || "";
-const GOOGLE_FOR_JOB_KEY = process.env.GOOGLE_FOR_JOB_KEY || "";
 
 const DOMAINES = {
   environnement: "Environnement",
@@ -25,5 +24,4 @@ module.exports = {
   API_URL,
   SENTRY_DSN,
   DOMAINES,
-  GOOGLE_FOR_JOB_KEY,
 };