Merge remote-tracking branch 'origin/main' into production

package.json

@@ -13,14 +13,14 @@
   },
   "dependencies": {
     "@escape.tech/graphql-armor-max-depth": "^2.3.0",
-    "@graphql-mesh/cache-localforage": "^0.99.0",
-    "@graphql-mesh/cache-redis": "^0.99.0",
-    "@graphql-mesh/cli": "^0.92.0",
-    "@graphql-mesh/graphql": "^0.99.0",
-    "@graphql-mesh/openapi": "^0.103.0",
-    "@graphql-mesh/plugin-response-cache": "^0.98.8",
-    "@graphql-mesh/runtime": "^0.100.0",
-    "@graphql-mesh/transform-prefix": "^0.99.0",
+    "@graphql-mesh/cache-localforage": "^0.100.0",
+    "@graphql-mesh/cache-redis": "^0.100.0",
+    "@graphql-mesh/cli": "^0.93.0",
+    "@graphql-mesh/graphql": "^0.100.0",
+    "@graphql-mesh/openapi": "^0.104.0",
+    "@graphql-mesh/plugin-response-cache": "^0.100.0",
+    "@graphql-mesh/runtime": "^0.101.0",
+    "@graphql-mesh/transform-prefix": "^0.100.0",
     "express": "^4.19.2",
     "graphql": "^16.8.2",
     "helmet": "^7.1.0",
@@ -46,5 +46,6 @@
     "supertest": "^7.0.0",
     "ts-jest": "^29.1.2",
     "typescript": "5.5.4"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }

renovate.json

@@ -9,13 +9,14 @@
       "automerge": true
     },
     {
-      "matchCategories": ["npm"],
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
+      "matchManagers": ["npm"],
+      "matchUpdateTypes": ["patch", "pin", "digest"],
       "automerge": true
     },
     {
       "matchDepTypes": ["devDependencies"],
       "automerge": true
     }
-  ]
+  ], 
+  "platformAutomerge": false
 }

terraform/environments/dns.tf

@@ -6,8 +6,3 @@ resource "google_dns_record_set" "holi_social_unified_api_domain_record_set" {
   ttl          = 300
   rrdatas      = [google_cloud_run_domain_mapping.holi_social_unified_api.status[0].resource_records[0].rrdata]
 }
-
-output "api_domain" {
-  value       = trimsuffix(google_dns_record_set.holi_social_unified_api_domain_record_set.name, ".")
-  description = "Domain where the app resides"
-}

terraform/environments/vars.tf

@@ -5,6 +5,9 @@ locals {
   # the dns name can be at most 64 chars in total. The environment passed in via gitlab is max 24 chars (CI_ENVIRONMENT_SLUG).
   dns_name = "${local.environment}.${data.terraform_remote_state.holi_unified_api_common_state.outputs.dns_unified_api_domain}"
 
+  api_domain            = trimsuffix(google_dns_record_set.holi_social_unified_api_domain_record_set.name, ".")
+  api_endpoint_url      = "https://${local.api_domain}/graphql"
+
   okuna_domain          = "https://${local.environment == "production" ? "production" : "staging"}.${data.terraform_remote_state.holi_okuna_common_state.outputs.dns_okuna_domain}"
   okuna_url             = "https://${local.environment == "production" ? "production" : "staging"}.${data.terraform_remote_state.holi_okuna_common_state.outputs.dns_okuna_domain}/graphql"
   donations_api_url     = "https://${local.environment == "production" ? "production" : "staging"}.${data.terraform_remote_state.holi_donations_api_common_state.outputs.dns_donations_api_domain}/graphql"
@@ -47,3 +50,13 @@ output "notifications_api_url" {
 output "translation_api_url" {
   value = local.translation_api_url
 }
+
+output "api_domain" {
+  value = local.api_domain
+  description = "Domain under which the unified API runs"
+}
+
+output "api_endpoint_url" {
+  value = local.api_endpoint_url
+  description = "GraphQL API endpoint URL of the unified API"
+}
\ No newline at end of file