Merge branch 'main' into production

.envrc

@@ -7,6 +7,3 @@ fi
 
 # loads personal (secret) data from separate env file (not checked in)
 source_env_if_exists .envrc.local
-
-type yarn >/dev/null 2>&1 && PATH="$PATH:$(yarn global bin)"
-export PATH
\ No newline at end of file

.gitlab-ci.yml

@@ -4,7 +4,7 @@ default:
     - env
   interruptible: true
   tags:
-    - holi-small # build on smaller machine
+    - 1cpu-4gb # build on smaller machine
 
 variables:
   API_DOMAIN_PATH: "$CI_PROJECT_DIR/api_domain"

.husky/pre-commit

-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-gitleaks protect --staged -v -c ../.gitleaks.toml

.pre-commit-config.yaml

+repos:
+-   repo: local
+    hooks:
+    -   id: gitleaks
+        name: gitleaks
+        language: system
+        entry: gitleaks protect --staged -v -c ../.gitleaks.toml
+        pass_filenames: false
+        always_run: true

terraform/environments/deployment.tf

@@ -66,7 +66,7 @@ resource "google_cloud_run_service" "geo_api" {
             memory = local.environment == "production" ? "512Mi" : "256Mi"
           }
           requests = {
-            cpu    = local.environment == "production" ? "1000m" : "10m"
+            cpu    = local.environment == "production" ? "1000m" : "1000m"
             memory = local.environment == "production" ? "512Mi" : "256Mi"
           }
         }