Merge branch 'main' into production

.gitlab-ci.yml

@@ -61,7 +61,7 @@ build:
 .deploy:
   stage: 'deploy'
   image:
-    name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.6.1'
+    name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.6.6'
     # default entrypoint is terraform command, but we want to run shell scripts
     entrypoint: ['/bin/sh', '-c']
   artifacts:

terraform/environments/function.tf

@@ -22,13 +22,15 @@ data "google_secret_manager_secret" "chat_admin_access_token" {
 }
 
 resource "google_cloudfunctions2_function" "holi-chat-integration" {
-  project  = data.terraform_remote_state.holi_infra_state.outputs.shared_project_id
-  name     = random_id.main.hex
-  location = local.default_region
+  project      = data.terraform_remote_state.holi_infra_state.outputs.shared_project_id
+  name         = random_id.main.hex
+  location     = local.default_region
+  kms_key_name = data.terraform_remote_state.holi_infra_state.outputs.artifact_registry_cloudfunctions_key_id
 
   build_config {
-    runtime     = "nodejs18"
-    entry_point = "receiveEvent"
+    runtime           = "nodejs18"
+    entry_point       = "receiveEvent"
+    docker_repository = data.terraform_remote_state.holi_infra_state.outputs.cloudfunctions_repository_id
 
     source {
       storage_source {