Merge branch 'main' into production

.gitignore

@@ -16,4 +16,5 @@ node_modules/
 **/.yarn/install-state.gz
 **/.pnp.js
 
-.idea
+.idea
\ No newline at end of file
+terraform*.log

.gitlab/ci/deploy.yml

@@ -60,6 +60,13 @@ deploy:review:stop:
   needs:
     - "apps:build" # all the /dist folders, so that terraform can archive stuff
     - "deploy:review:infra" # the terraform hcl sources
+  artifacts:
+    paths:
+      - "terraform/environments/crash.log" # optional, only available in case of a crash/panic
+      - "terraform/environments/terraform-*.log" # separate log for every step/command
+    name: "${CI_JOB_NAME}_${CI_JOB_ID}"
+    when: on_failure
+    expire_in: 1 week
   script:
     - terraform/environments/scripts/destroy-env.sh $CI_ENVIRONMENT_NAME
   when: manual

apps/backend/package.json

 {
   "name": "@holi/moderation-backend",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "description": "",
   "author": "",
   "private": true,

apps/eventListener/package.json

 {
   "name": "@holi/moderation-event-listener",
   "main": "dist/index.js",
+  "version": "0.1.0",
   "packageManager": "yarn@4.4.1",
   "dependencies": {
     "@google-cloud/functions-framework": "3.4.2",

terraform/environments/scripts/destroy-env.sh

-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 # exit when any command fails
 set -ex
@@ -6,11 +6,36 @@ set -ex
 # enable debug output in terraform
 export TF_LOG=DEBUG
 
-cd terraform/environments
+# retry logic for destroy: sometimes, a full workspace destroy does not work. This can be due to e.g.:
+# * implicit dependencies between terraform resources not declared with depends_on,
+# * unclean shutdown of resources, e.g. service does not close db connections, db still sees clients connected,
+# * GCP stuff not allowing our resources to be deleted.
+# Most of the time, retrying a destroy fixes these causes.
+retry() {
+  for i in {1..3}; do
+    set +e
+    "$@"
+    retval=$?
+    set -e
+    if [ "$retval" -ne "0" ]; then
+      if [ "$i" -lt "3" ]; then
+        echo "command '$*' failed in try $i, retrying after 60 seconds"
+        sleep 60 # let things settle a bit
+      else
+        echo "command '$*' failed in try $i, giving up"
+        exit $retval
+      fi
+    else
+      break # success
+    fi
+  done
+}
+
+cd "$(dirname "$0")"/..
 
 TF_LOG_PATH=terraform-init.log       terraform init
 TF_LOG_PATH=terraform-version.log    terraform version
 TF_LOG_PATH=terraform-workspace.log  terraform workspace select -or-create=true "$1"
-TF_LOG_PATH=terraform-destroy.log    terraform destroy -auto-approve -var="backend_image_tag=dummy" -var "frontend_image_tag=dumm" -var "federator_image_tag=dummy"
+TF_LOG_PATH=terraform-destroy.log    retry terraform destroy -auto-approve -var="backend_image_tag=dummy" -var "frontend_image_tag=dummy" -var "federator_image_tag=dummy"
 TF_LOG_PATH=terraform-ws-default.log terraform workspace select default
 TF_LOG_PATH=terraform-ws-delete.log  terraform workspace delete "$1"