@hiiretail/gcp-infra-cli 0.82.2 → 0.83.0

package/generators/init/clan-infra/index.js

@@ -37,6 +37,24 @@ module.exports = class extends BaseGenerator {
         message: 'Provide the cost center your tribe belongs to',
         validate: required,
       },
+      {
+        type: 'input',
+        name: 'product',
+        message: 'Provide the product your resources belongs to. Can be modified for a specific resource later on',
+        validate: required,
+      },
+      {
+        type: 'input',
+        name: 'component',
+        message: 'Provide the component your resources belongs to. Can be modified for a specific resource later on',
+        validate: required,
+      },
+      {
+        type: 'input',
+        name: 'tenantAlias',
+        message: 'Provide the tenant alias for the resources or use \'multi-tenant\'. Can be modified for a specific resource later on.',
+        validate: required,
+      },
       {
         type: 'input',
         name: 'jiraProjectKey',

package/generators/init/clan-infra/templates/infra/common.hcl

@@ -13,4 +13,7 @@ locals {
   project_id_slack_token = "tf-admin-90301274"
   cost_center            = "<%-costCenter%>"
   jira_project_key       = "<%-jiraProjectKey%>"
+  component              = "<%-costCenter%>"
+  product                = "<%-product%>"
+  tenant_alias           = "<%-tenantAlias%>"
 }

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/cloud-storage/templates/cloud-storage/storage.yaml

@@ -8,16 +8,16 @@ versioning:
   "<%-bucketName%>": <%-versioning%>
 set_viewer_roles: true <% if (lifecycleRules == 'true') { %>
 lifecycle_rules:
-  action:
-    type: "<%-action%>" <% if (action == 'SetStorageClass') { %>
-    storage_class: "<%-storageClass%>" <% } else { %>
-    storage_class: null <% } %>
-  condition:
-    age: <%-age%> <% if (createdBefore != 'null') { %>
-    created_before: "<%-createdBefore%>" <% } else { %>
-    created_before: null <% } %> <% if (withState != 'null') { %>
-    with_state: "<%-withState%>" <% } else { %>
-    with_state: null <% } %> <% if (matchesStorageClass != 'null') { %>
-    matches_storage_class: "<%-matchesStorageClass%>" <% } else { %>
-    matches_storage_class: null <% } %>
-    num_newer_versions: <%-numNewerVersions%> <% } %>
+  - action:
+      type: "<%-action%>" <% if (action == 'SetStorageClass') { %>
+      storage_class: "<%-storageClass%>" <% } else { %>
+      storage_class: null <% } %>
+    condition:
+      age: <%-age%> <% if (createdBefore != 'null') { %>
+      created_before: "<%-createdBefore%>" <% } else { %>
+      created_before: null <% } %> <% if (withState != 'null') { %>
+      with_state: "<%-withState%>" <% } else { %>
+      with_state: null <% } %> <% if (matchesStorageClass != 'null') { %>
+      matches_storage_class: "<%-matchesStorageClass%>" <% } else { %>
+      matches_storage_class: null <% } %>
+      num_newer_versions: <%-numNewerVersions%> <% } %>

package/generators/resources/cloud-storage/templates/cloud-storage/terragrunt.hcl

@@ -23,7 +23,11 @@ inputs = merge(
     # IAM-style members who will be granted roles/storage.objectViewer on all buckets.
     viewers    = ["group:${local.common_vars.locals.clan_group_email}"]
     labels     = {
-      cc = local.common_vars.locals.cost_center
+      cc           = local.common_vars.locals.cost_center
+      component    = local.common_vars.locals.component
+      product      = local.common_vars.locals.product
+      tenant-alias = local.common_vars.locals.tenant_alias
+      environment  = local.project_vars.locals.project_env
     }
   }
 )

package/generators/resources/cloudsql/templates/mssql/instance/terragrunt.hcl

@@ -29,7 +29,11 @@ inputs = merge(
     ## Uncomment and apply it before destroy in case of necessary to delete the instance
     # deletion_protection = false
     user_labels = {
-      cc = local.common_vars.locals.cost_center
+      cc           = local.common_vars.locals.cost_center
+      component    = local.common_vars.locals.component
+      product      = local.common_vars.locals.product
+      tenant-alias = local.common_vars.locals.tenant_alias
+      environment  = local.project_vars.locals.project_env
     }
   }
 )

package/generators/resources/cloudsql/templates/mssql/instance-secrets/terragrunt.hcl

@@ -30,8 +30,12 @@ inputs = merge(
       mssql-common-address = dependency.mssql_address.outputs.private_address
     }
     labels = {
-      terraform = ""
-      cc        = local.common_vars.locals.cost_center
+      terraform    = ""
+      cc           = local.common_vars.locals.cost_center
+      component    = local.common_vars.locals.component
+      product      = local.common_vars.locals.product
+      tenant-alias = local.common_vars.locals.tenant_alias
+      environment  = local.project_vars.locals.project_env
     }
   }
 )

package/generators/resources/cloudsql/templates/mysql/instance/terragrunt.hcl

@@ -30,7 +30,11 @@ inputs = merge(
     ## Uncomment and apply it before destroy in case of necessary to delete the instance
     # deletion_protection = false
     user_labels = {
-      cc = local.common_vars.locals.cost_center
+      cc           = local.common_vars.locals.cost_center
+      component    = local.common_vars.locals.component
+      product      = local.common_vars.locals.product
+      tenant-alias = local.common_vars.locals.tenant_alias
+      environment  = local.project_vars.locals.project_env
     }
   }
 )

package/generators/resources/cloudsql/templates/mysql/instance-secrets/terragrunt.hcl

@@ -30,8 +30,12 @@ inputs = merge(
       mysql_private_address = dependency.instance.outputs.private_ip_address
     }
     labels = {
-      terraform = ""
-      cc        = local.common_vars.locals.cost_center
+      terraform    = ""
+      cc           = local.common_vars.locals.cost_center
+      component    = local.common_vars.locals.component
+      product      = local.common_vars.locals.product
+      tenant-alias = local.common_vars.locals.tenant_alias
+      environment  = local.project_vars.locals.project_env
     }
   }
 )

package/generators/resources/cloudsql/templates/postgres/instance/terragrunt.hcl

@@ -29,7 +29,11 @@ inputs = merge(
     ## Uncomment and apply it before destroy in case of necessary to delete the instance
     # deletion_protection = false
     user_labels = {
-      cc = local.common_vars.locals.cost_center
+      cc           = local.common_vars.locals.cost_center
+      component    = local.common_vars.locals.component
+      product      = local.common_vars.locals.product
+      tenant-alias = local.common_vars.locals.tenant_alias
+      environment  = local.project_vars.locals.project_env
     }
   }
 )

package/generators/resources/cloudsql/templates/postgres/instance-secrets/terragrunt.hcl

@@ -30,8 +30,12 @@ inputs = merge(
       postgresql_private_address = dependency.instance.outputs.private_ip_address
     }
     labels = {
-      terraform = ""
-      cc        = local.common_vars.locals.cost_center
+      terraform    = ""
+      cc           = local.common_vars.locals.cost_center
+      component    = local.common_vars.locals.component
+      product      = local.common_vars.locals.product
+      tenant-alias = local.common_vars.locals.tenant_alias
+      environment  = local.project_vars.locals.project_env
     }
   }
 )

package/generators/resources/kms/templates/kms/terragrunt.hcl

@@ -21,7 +21,11 @@ inputs = merge(
   local.project_vars.locals,
   {
     labels = {
-      cc = local.common_vars.locals.cost_center
+      cc           = local.common_vars.locals.cost_center
+      component    = local.common_vars.locals.component
+      product      = local.common_vars.locals.product
+      tenant-alias = local.common_vars.locals.tenant_alias
+      environment  = local.project_vars.locals.project_env
     }
     project_id      = local.project_vars.locals.project_id
     prevent_destroy = false

package/generators/resources/memorystore/templates/redis-instance/terragrunt.hcl

@@ -26,8 +26,12 @@ inputs = merge(
     enable_apis        = false
 
     labels = {
-      project = local.project_vars.locals.project_name
-      cc      = local.common_vars.locals.cost_center
+      project      = local.project_vars.locals.project_name
+      cc           = local.common_vars.locals.cost_center
+      component    = local.common_vars.locals.component
+      product      = local.common_vars.locals.product
+      tenant-alias = local.common_vars.locals.tenant_alias
+      environment  = local.project_vars.locals.project_env
     }
   }
 )

package/generators/resources/memorystore/templates/secrets/terragrunt.hcl

@@ -25,7 +25,11 @@ inputs = merge(
    }
    labels = {
       terraform = ""
-      cc        = local.common_vars.locals.cost_center
+      cc           = local.common_vars.locals.cost_center
+      component    = local.common_vars.locals.component
+      product      = local.common_vars.locals.product
+      tenant-alias = local.common_vars.locals.tenant_alias
+      environment  = local.project_vars.locals.project_env
     }
   }
 )

package/generators/resources/monitoring/templates/alerts/terragrunt.hcl

@@ -23,12 +23,16 @@ locals {
 
 # These are the variables we have to pass in to use the module specified in the terragrunt configuration above
 inputs = {
-  monitoring_project_id   = lookup(local.project_vars.locals, "monitoring_project_id", local.project_vars.locals.tribe_project_id),
-  notification_channels   = dependency.notification_channels.outputs.notification_channels,
-  policies                = yamldecode(file("${get_terragrunt_dir()}/alerts.yaml")),
-  user_labels             = {
-    cc                = local.common_vars.locals.cost_center
-    clan              = local.common_vars.locals.clan_name
-    jira_project_key  = lookup(local.common_vars.locals, "jira_project_key", null)
+  monitoring_project_id = lookup(local.project_vars.locals, "monitoring_project_id", local.project_vars.locals.tribe_project_id),
+  notification_channels = dependency.notification_channels.outputs.notification_channels,
+  policies              = yamldecode(file("${get_terragrunt_dir()}/alerts.yaml")),
+  user_labels           = {
+    cc               = local.common_vars.locals.cost_center
+    clan             = local.common_vars.locals.clan_name
+    jira_project_key = lookup(local.common_vars.locals, "jira_project_key", null)
+    component        = local.common_vars.locals.component
+    product          = local.common_vars.locals.product
+    tenant-alias     = local.common_vars.locals.tenant_alias
+    environment      = local.project_vars.locals.project_env
   },
 }

package/generators/resources/monitoring/templates/uptime-checks/terragrunt.hcl

@@ -23,14 +23,18 @@ locals {
 
 # These are the variables we have to pass in to use the module specified in the terragrunt configuration above
 inputs = merge({
-    project_id              = local.project_vars.locals.project_id,
-    project_id_alert        = local.project_vars.locals.tribe_project_id,
-    notification_channels   = dependency.notification_channels.outputs.notification_channels,
-    uptime_checks           = yamldecode(file("${get_terragrunt_dir()}/uptime-checks.yaml")),
-    labels                  = {
-      clan              = local.common_vars.locals.clan_name
-      cc                = local.common_vars.locals.cost_center
-      jira_project_key  = lookup(local.project_vars.locals, "jira_project_key", null)
+    project_id            = local.project_vars.locals.project_id,
+    project_id_alert      = local.project_vars.locals.tribe_project_id,
+    notification_channels = dependency.notification_channels.outputs.notification_channels,
+    uptime_checks         = yamldecode(file("${get_terragrunt_dir()}/uptime-checks.yaml")),
+    labels                = {
+      cc               = local.common_vars.locals.cost_center
+      clan             = local.common_vars.locals.clan_name
+      jira_project_key = lookup(local.common_vars.locals, "jira_project_key", null)
+      component        = local.common_vars.locals.component
+      product          = local.common_vars.locals.product
+      tenant-alias     = local.common_vars.locals.tenant_alias
+      environment      = local.project_vars.locals.project_env
     }
   }
 )

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/terragrunt.hcl

@@ -23,10 +23,18 @@ inputs = merge(<% if (createResource == 'topic') { %><% } else { %>
     local.project_vars.locals,
     {
       topic_labels = {
-        cc = local.common_vars.locals.cost_center
+        cc           = local.common_vars.locals.cost_center
+        component    = local.common_vars.locals.component
+        product      = local.common_vars.locals.product
+        tenant-alias = local.common_vars.locals.tenant_alias
+        environment  = local.project_vars.locals.project_env
       }<% if (createResource == 'topic') { %><% } else { %>
       subscription_labels = {
-        cc = local.common_vars.locals.cost_center
+        cc           = local.common_vars.locals.cost_center
+        component    = local.common_vars.locals.component
+        product      = local.common_vars.locals.product
+        tenant-alias = local.common_vars.locals.tenant_alias
+        environment  = local.project_vars.locals.project_env
       }<% } %>
       grant_token_creator = false
     }

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

@@ -18,23 +18,32 @@ 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 = {
-        cc = local.common_vars.locals.cost_center
+        cc           = local.common_vars.locals.cost_center
+        component    = local.common_vars.locals.component
+        product      = local.common_vars.locals.product
+        tenant-alias = local.common_vars.locals.tenant_alias
+        environment  = local.project_vars.locals.project_env
       }
       subscription_labels = {
-        cc = local.common_vars.locals.cost_center
+        cc           = local.common_vars.locals.cost_center
+        component    = local.common_vars.locals.component
+        product      = local.common_vars.locals.product
+        tenant-alias = local.common_vars.locals.tenant_alias
+        environment  = local.project_vars.locals.project_env
       }
       grant_token_creator = false,
     }

package/generators/resources/spanner/templates/spanner/terragrunt.hcl

@@ -23,8 +23,12 @@ inputs = merge(
     local.project_vars.locals,
     {
       instance_labels = {
-        cc = local.common_vars.locals.cost_center
-        "created" = "terraform"
+        cc           = local.common_vars.locals.cost_center
+        component    = local.common_vars.locals.component
+        product      = local.common_vars.locals.product
+        tenant-alias = local.common_vars.locals.tenant_alias
+        environment  = local.project_vars.locals.project_env
+        "created"    = "terraform"
       }
     }
 )

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.83.0",
   "description": "Infrastructure as code generator for GCP.",
   "main": "src/cli.js",
   "bin": {