@hiiretail/gcp-infra-cli 0.82.2 → 0.82.3

package/generators/organization/clan-project/templates/clan-project/terragrunt.hcl

@@ -1,5 +1,5 @@
 terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-project//?ref=v1.0.8"
+  source = "git::https://github.com/extenda/tf-module-gcp-project//?ref=v1.1.0"
 }
 
 dependency "parent_folder" {

package/generators/resources/pubsub/index.js

@@ -170,7 +170,7 @@ module.exports = class extends BaseGenerator {
       externalSub,
     } = this.answers;
 
-    const dlqTopicName = `${getProjectId('prod').split('-')[0]}-common-dlq`;
+    const dlqTopicName = `dlq.${getProjectId('prod').split('-')[0]}.common`;
     let dlqTopic = `projects/${getProjectId('prod')}/topics/${dlqTopicName}`;
 
     const dlqTopicDirPath = path.join(process.cwd(), 'infra', 'prod', 'pubsub', dlqTopicName);

package/generators/resources/pubsub/templates/pubsub-dlq/terragrunt.hcl

@@ -18,16 +18,17 @@ locals {
 inputs = merge (
     local.project_vars.locals,
     {
-      topic                = "${local.common_vars.locals.clan_name}-common-dlq"
+      topic                = "dlq.${local.common_vars.locals.clan_name}.common"
       create_subscriptions = true
       create_topic         = true
       push_subscriptions = [
           {
-          name                        = "dlq-message-handler-subscription",
+          name                        = "dlq.${local.common_vars.locals.clan_name}.common+dlq.message-handler",
           push_endpoint               = "https://europe-west1-sre-prod-5462.cloudfunctions.net/dlq-message-handler",
           audience                    = "https://europe-west1-sre-prod-5462.cloudfunctions.net/dlq-message-handler",
           expiration_policy           = "",
           oidc_service_account_email  = "pubsub-dlq-handler@${local.project_vars.locals.project_id}.iam.gserviceaccount.com",
+          filter                      = "attributes.Consumer = \"dlq.${local.common_vars.locals.clan_name}.common+dlq.message-handler OR NOT attributes:Consumer\"",
           },
         ],
       topic_labels = {

package/generators/tribe-resources/tribe-project/templates/project/terragrunt.hcl

@@ -1,5 +1,5 @@
 terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-project//?ref=v1.0.8"
+  source = "git::https://github.com/extenda/tf-module-gcp-project//?ref=v1.1.0"
 }
 
 dependency "tribe_folder" {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hiiretail/gcp-infra-cli",
-  "version": "0.82.2",
+  "version": "0.82.3",
   "description": "Infrastructure as code generator for GCP.",
   "main": "src/cli.js",
   "bin": {