Merge branch 'main' into production

terraform/environments/deployment.tf

@@ -116,6 +116,11 @@ resource "google_cloud_run_service" "goodnews_api" {
         # possible values: all-traffic/private-ranges-only(default) https://cloud.google.com/sdk/gcloud/reference/run/services/update#--vpc-egress
         "run.googleapis.com/vpc-access-egress" = "private-ranges-only"
       }
+      # labels set on the revision level
+      labels = {
+        "environment_type" = local.environment_type
+        "holi_service"     = "app-goodnews"
+      }
     }
   }
 
@@ -125,6 +130,11 @@ resource "google_cloud_run_service" "goodnews_api" {
       # possible values: all/internal/internal-and-cloud-load-balancing https://cloud.google.com/sdk/gcloud/reference/run/services/update#--ingress
       "run.googleapis.com/ingress" = "internal"
     }
+    # labels set on the service level
+    labels = {
+      "environment_type" = local.environment_type
+      "holi_service"     = "app-goodnews"
+    }
   }
 
   traffic {

terraform/environments/vars.tf

@@ -2,6 +2,7 @@ locals {
   # predefined environment names are staging, production, and <branchname>
   environment      = terraform.workspace
   environment_name = trim(substr(local.environment, 0, 22), ".-") # limits the length of the name that it fits constraints google imposes for some resources, e.g. project ids
+  environment_type = contains(["staging", "production"], local.environment) ? local.environment : "review"
 
   # the dns name can be at most 64 chars in total
   dns_name = "${trimsuffix(substr(local.environment, 0, 34), ".-")}.${data.terraform_remote_state.holi_goodnews_api_common_state.outputs.dns_goodnews_api_domain}"