@hiiretail/gcp-infra-cli 0.83.1 → 0.83.3

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

@@ -7,6 +7,12 @@ terraform {
 locals {
   project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
   common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
+  labels = merge(local.common_vars.locals.default_user_labels, local.project_vars.locals.default_user_labels, {
+    component    = local.common_vars.locals.component
+    product      = local.common_vars.locals.product
+    tenant-alias = local.common_vars.locals.tenant_alias
+    terraform    = ""
+  })
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -17,19 +23,9 @@ include {
 <%-dependencies%>
 
 # 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
-
-   secrets = {<%-secrets%>
+inputs = {
+  project_id = local.project_vars.locals.project_id
+  secrets = {<%-secrets%>
    }
-   labels = {
-      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
-    }
-  }
-)
+  labels = local.labels
+}

package/generators/resources/monitoring/handle-yaml.js

@@ -1,10 +1,23 @@
 const ejs = require('ejs');
+const _ = require('lodash');
+
+function cleanAlerts(alerts) {
+  const copy = [...alerts];
+  return copy.map((obj) => {
+    /* eslint-disable no-param-reassign */
+    if (_.get(obj, 'documentation.content') === ' ') delete obj.documentation;
+    if (_.get(obj, 'enabled') === true) delete obj.enabled;
+
+    return obj;
+  });
+}
 
 const handleAlerts = (alerts, templates, answers) => {
-  const template = templates[`${answers.alertResource}`][`${answers.alert}`];
+  const template = templates[`${answers.alert}`];
   const newAlert = JSON.parse(ejs.render(JSON.stringify(template), answers));
 
   alerts.push(newAlert);
+  alerts = cleanAlerts(alerts);
   return alerts;
 };
 
@@ -12,7 +25,7 @@ const handleSlos = (slos, templates, answers) => {
   const template = templates[`${answers.sli}`];
   const newSLO = JSON.parse(ejs.render(JSON.stringify(template), answers));
 
-  if (answers.burnRateAlert === 'no') newSLO.alert = {};
+  if (answers.burnRateAlert === 'no') newSLO.alert = false;
 
   slos.push(newSLO);
   return slos;
@@ -25,4 +38,9 @@ const handleUptimeChecks = (slos, templates, answers) => {
   return slos;
 };
 
-module.exports = { handleAlerts, handleSlos, handleUptimeChecks };
+module.exports = {
+  handleAlerts,
+  handleSlos,
+  handleUptimeChecks,
+  cleanAlerts,
+};

package/generators/resources/monitoring/index.js

@@ -6,14 +6,10 @@ const BaseGenerator = require('../../../src/BaseGenerator');
 const { required } = require('../../../src/validators');
 const validate = require('./validate');
 const { handleSlos, handleAlerts, handleUptimeChecks } = require('./handle-yaml');
-const { getProjectId } = require('../pubsub/get-gcp-projects');
-const getTribeAndClanName = require('../../init/clan-infra/tribe-clan-repo');
 
 const uptimeCheckTemplates = yaml.load(fs.readFileSync(`${__dirname}/templates/uptime-checks/uptime-checks.yaml`));
-const alertTemplates = yaml.load(fs.readFileSync(`${__dirname}/templates/alerts/alerts.yaml`));
+const alertTemplates = yaml.load(fs.readFileSync(`${__dirname}/templates/alerts/service.yaml`));
 const sloTemplates = yaml.load(fs.readFileSync(`${__dirname}/templates/slos/slos.yaml`));
-const { clan: defaultClan } = getTribeAndClanName();
-const projectId = getProjectId('prod');
 
 module.exports = class extends BaseGenerator {
   async prompting() {
@@ -24,27 +20,21 @@ module.exports = class extends BaseGenerator {
         message: 'Select the resource you want to create',
         choices: ['alerts', 'uptime-checks', 'slos'],
       },
-      {
-        when: (response) => response.monitoringResource === 'alerts',
-        type: 'list',
-        name: 'alertResource',
-        choices: Object.keys(alertTemplates),
-      },
       {
         when: (response) => response.monitoringResource === 'alerts',
         type: 'list',
         name: 'alert',
-        choices: (answers) => Object.keys(alertTemplates[`${answers.alertResource}`]),
+        choices: Object.keys(alertTemplates),
       },
       {
-        when: (response) => ['slos', 'uptime-checks'].includes(response.monitoringResource) || response.alertResource === 'cloud_run',
+        when: (response) => ['slos', 'uptime-checks', 'alerts'].includes(response.monitoringResource),
         type: 'input',
         name: 'systemName',
         message: 'Please provide three-letter system name as defined in Styra (example: sre, ptf, sda, che, pnp, iam...)',
         validate: required && validate.systemName,
       },
       {
-        when: (response) => ['slos', 'uptime-checks'].includes(response.monitoringResource) || response.alertResource === 'cloud_run',
+        when: (response) => ['slos', 'uptime-checks', 'alerts'].includes(response.monitoringResource),
         type: 'input',
         name: 'serviceName',
         message: 'Please provide the namespace where the service resides',
@@ -57,13 +47,6 @@ module.exports = class extends BaseGenerator {
         message: 'Please provide the full URL to your runbook in confluence (Leave empty if none)',
         validate: required && validate.confluenceUrl,
       },
-      {
-        when: (response) => response.monitoringResource === 'alerts',
-        type: 'list',
-        name: 'projectId',
-        message: 'Please select clan project id',
-        choices: [`${projectId}`],
-      },
       {
         when: (response) => response.monitoringResource === 'uptime-checks',
         type: 'input',
@@ -120,13 +103,13 @@ module.exports = class extends BaseGenerator {
       }
     };
 
-    if (monitoringResource === 'uptime-checks') {
-      const yamlPath = `${resourceDir}/uptime-checks.yaml`;
+    if (monitoringResource === 'alerts') {
+      const yamlPath = `${resourceDir}/${serviceName}.yaml`;
 
-      copyTemplate('uptime-checks', resourceDir, yamlPath);
+      copyTemplate('alerts', resourceDir, yamlPath);
 
       const oldYaml = yaml.load(fs.readFileSync(yamlPath, 'utf8')) || [];
-      const newYaml = await handleUptimeChecks(oldYaml, uptimeCheckTemplates, this.answers);
+      const newYaml = await handleAlerts(oldYaml, alertTemplates, this.answers);
 
       fs.writeFileSync(yamlPath, yaml.dump(newYaml, { lineWidth: 250, noArrayIndent: true }));
     }
@@ -144,14 +127,13 @@ module.exports = class extends BaseGenerator {
       fs.writeFileSync(yamlPath, yaml.dump(newYaml, { lineWidth: 250, noArrayIndent: true }));
     }
 
-    if (monitoringResource === 'alerts') {
-      const yamlPath = `${resourceDir}/alerts.yaml`;
+    if (monitoringResource === 'uptime-checks') {
+      const yamlPath = `${resourceDir}/uptime-checks.yaml`;
 
-      copyTemplate('alerts', resourceDir, yamlPath);
+      copyTemplate('uptime-checks', resourceDir, yamlPath);
 
       const oldYaml = yaml.load(fs.readFileSync(yamlPath, 'utf8')) || [];
-      const newYaml = await handleAlerts(oldYaml, alertTemplates,
-        { ...this.answers, clan: defaultClan });
+      const newYaml = await handleUptimeChecks(oldYaml, uptimeCheckTemplates, this.answers);
 
       fs.writeFileSync(yamlPath, yaml.dump(newYaml, { lineWidth: 250, noArrayIndent: true }));
     }

package/generators/resources/monitoring/templates/alerts/{alerts.yaml → generic-infra.yaml}

@@ -1,21 +1,3 @@
-cloud_run:
-  request_latency:
-    display_name: "[P3] <%-systemName%>.<%-serviceName%> | High Request Latency"
-    conditions:
-      - display_name: Cloud Run Anthos - Response Time (95%) above 1s for 5 min
-        condition_threshold:
-          filter: |
-            resource.type="knative_revision"
-            resource.labels.service_name="<%-serviceName%>"
-            metric.type="knative.dev/serving/revision/request_latencies"
-            resource.labels.project_id="<%-projectId%>"
-          threshold_value: 1000
-          duration: 300s
-          aggregations:
-            - alignment_period: 60s
-              per_series_aligner: ALIGN_PERCENTILE_95
-    documentation:
-      content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
 cloud_scheduler:
   failed_job:
     display_name: "[P4] <%-clan%> - Cloud Scheduler | Job Failed"

package/generators/resources/monitoring/templates/alerts/service.yaml

@@ -0,0 +1,16 @@
+request_latency:
+  display_name: "[P3] <%-systemName%>.<%-serviceName%> | High Request Latency"
+  conditions:
+  - display_name: Cloud Run Anthos - Response Time (95%) above 1s for 5 min
+    condition_threshold:
+      filter: |
+        resource.type="knative_revision"
+        metric.type="knative.dev/serving/revision/request_latencies"
+        resource.labels.service_name="<%-serviceName%>"
+      threshold_value: 1000
+      duration: 300s
+      aggregations:
+      - alignment_period: 60s
+        per_series_aligner: ALIGN_PERCENTILE_95
+  documentation:
+    content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>

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

@@ -1,7 +1,7 @@
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-alert-policy//?ref=v0.1.1"
+  source = "git::https://github.com/extenda/tf-module-gcp-alert-policy//?ref=v1.1.1"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -10,7 +10,7 @@ include {
 }
 
 dependency "notification_channels" {
-  config_path  = "../notification-channels"
+  config_path = "../notification-channels"
   mock_outputs = {
     notification_channels = ["dummy-channel"]
   }
@@ -19,20 +19,19 @@ dependency "notification_channels" {
 locals {
   project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
   common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
+  alerts       = flatten([for file in fileset(get_terragrunt_dir(), "./*.yaml") : yamldecode(file(file))])
+  labels = merge(local.common_vars.locals.default_user_labels, local.project_vars.locals.default_user_labels, {
+    component    = local.common_vars.locals.component
+    product      = local.common_vars.locals.product
+    tenant-alias = local.common_vars.locals.tenant_alias
+  })
 }
 
 # 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)
-    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                        = local.project_vars.locals.tribe_project_id,
+  policies                       = local.alerts,
+  notification_channel_ids       = dependency.notification_channels.outputs.notification_channels,
+  fallback_notification_channels = dependency.notification_channels.outputs.fallback_channels_ids,
+  default_user_labels            = local.labels,
 }

package/generators/resources/monitoring/templates/slos/slos.yaml

@@ -1,7 +1,7 @@
 availability:
   display_name: Month - Availability
   slo_id: month-availability
-  goal: 0.999
+  goal: 0.998
   calendar_period: MONTH
   type: windows_based_sli
   method: boolean_filter
@@ -13,7 +13,7 @@ availability:
 error-rate:
   display_name: Month - Error rate
   slo_id: month-error-rate
-  goal: 0.999
+  goal: 0.998
   calendar_period: MONTH
   type: request_based_sli
   method: good_total_ratio
@@ -34,7 +34,7 @@ latency:
   type: request_based_sli
   method: distribution_cut
   range_min: 0
-  range_max: 100
+  range_max: 500
   metric_filter: |
     metric.type="knative.dev/serving/revision/request_latencies"
     resource.type="knative_revision"

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

@@ -1,7 +1,7 @@
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-slo//?ref=v0.1.0"
+  source = "git::https://github.com/extenda/tf-module-gcp-slo//?ref=v1.0.1"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -10,7 +10,7 @@ include {
 }
 
 dependency "notification_channels" {
-  config_path  = "../../notification-channels"
+  config_path = "../../notification-channels"
   mock_outputs = {
     notification_channels = ["dummy-channel"]
   }
@@ -19,22 +19,23 @@ dependency "notification_channels" {
 locals {
   project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
   common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
+  service_name = basename(get_terragrunt_dir())
+  system_name  = "<%-systemName%>"
+  labels = merge(local.common_vars.locals.default_user_labels, local.project_vars.locals.default_user_labels, {
+    component    = local.common_vars.locals.component
+    product      = local.common_vars.locals.product
+    tenant-alias = local.common_vars.locals.tenant_alias
+  })
 }
 
 # These are the variables we have to pass in to use the module specified in the terragrunt configuration above
-inputs = merge(
-  local.project_vars.locals,
-  {
-    service_name            = "<%-systemName%>.<%-serviceName%>"
-    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,
-    telemetry_resource_name = "//container.googleapis.com/projects/${lookup(local.project_vars.locals, "monitoring_project_id", local.project_vars.locals.tribe_project_id)}/locations/europe-west1/clusters/k8s-cluster/k8s/namespaces/<%-serviceName%>"
-    slos                    = yamldecode(file("${get_terragrunt_dir()}/slos.yaml")),
-    documentation           = "[Alerting guidelines](https://confluence.extendaretail.com/x/71fhBg)"
-    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)
-    },
-  }
-)
+inputs = {
+  service_name                   = "${local.system_name}.${local.service_name}"
+  project                        = local.project_vars.locals.tribe_project_id,
+  slos                           = yamldecode(file("${get_terragrunt_dir()}/slos.yaml"))
+  telemetry_resource_name        = "//container.googleapis.com/projects/${local.project_vars.locals.tribe_project_id}/locations/europe-west1/clusters/k8s-cluster/k8s/namespaces/${local.service_name}"
+  notification_channel_ids       = dependency.notification_channels.outputs.notification_channels,
+  fallback_notification_channels = dependency.notification_channels.outputs.fallback_channels_ids,
+  default_user_labels            = local.labels,
+  documentation                  = "[Alerting guidelines](https://confluence.extendaretail.com/x/71fhBg)"
+}

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

@@ -1,7 +1,7 @@
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-uptime-check//?ref=v0.1.3"
+  source = "git::https://github.com/extenda/tf-module-gcp-uptime-check//?ref=v1.0.1"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -10,7 +10,7 @@ include {
 }
 
 dependency "notification_channels" {
-  config_path  = "../notification-channels"
+  config_path = "../notification-channels"
   mock_outputs = {
     notification_channels = ["dummy-channel"]
   }
@@ -19,22 +19,19 @@ dependency "notification_channels" {
 locals {
   project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
   common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
+  labels = merge(local.common_vars.locals.default_user_labels, local.project_vars.locals.default_user_labels, {
+    component    = local.common_vars.locals.component
+    product      = local.common_vars.locals.product
+    tenant-alias = local.common_vars.locals.tenant_alias
+  })
 }
 
 # 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                = {
-      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
-    }
-  }
-)
+inputs = {
+  project                        = local.project_vars.locals.project_id,
+  default_alert_project          = local.project_vars.locals.tribe_project_id,
+  uptime_checks                  = yamldecode(file("${get_terragrunt_dir()}/uptime-checks.yaml"))
+  notification_channel_ids       = dependency.notification_channels.outputs.notification_channels,
+  fallback_notification_channels = dependency.notification_channels.outputs.fallback_channels_ids,
+  default_user_labels            = local.labels
+}

package/generators/resources/pubsub/index.js

@@ -303,13 +303,6 @@ module.exports = class extends BaseGenerator {
         );
       }
     });
-
-    ['prod', 'staging'].forEach((env) => {
-      this.copyDir(
-        path.join('monitoring'),
-        path.join('infra', env, 'monitoring'),
-      );
-    });
   }
 
   end() {

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

@@ -13,6 +13,11 @@ locals {
   spec_vars    = read_terragrunt_config("${get_terragrunt_dir()}/spec.hcl")
   project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
   common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
+  labels = merge(local.common_vars.locals.default_user_labels, local.project_vars.locals.default_user_labels, {
+    component    = local.common_vars.locals.component
+    product      = local.common_vars.locals.product
+    tenant-alias = local.common_vars.locals.tenant_alias
+  })
 }
 
 # These are the variables we have to pass in to use the module specified in the terragrunt configuration above
@@ -22,20 +27,8 @@ inputs = merge(<% if (createResource == 'topic') { %><% } else { %>
     local.spec_vars.locals,
     local.project_vars.locals,
     {
-      topic_labels = {
-        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
-        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
-      }<% } %>
+      topic_labels = local.labels<% if (createResource == 'topic') { %><% } else { %>
+      subscription_labels = local.labels<% } %>
       grant_token_creator = false
     }
 )

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

@@ -12,39 +12,32 @@ include {
 locals {
   project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
   common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
+  labels = merge(local.common_vars.locals.default_user_labels, local.project_vars.locals.default_user_labels, {
+    component    = local.common_vars.locals.component
+    product      = local.common_vars.locals.product
+    tenant-alias = local.common_vars.locals.tenant_alias
+  })
 }
 
 # These are the variables we have to pass in to use the module specified in the terragrunt configuration above
-inputs = merge (
-    local.project_vars.locals,
-    {
-      topic                = "dlq.${local.common_vars.locals.clan_name}.common"
-      create_subscriptions = true
-      create_topic         = true
-      push_subscriptions = [
-          {
-          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
-        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
-        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,
-    }
+inputs = merge(
+  local.project_vars.locals,
+  {
+    topic                = "dlq.${local.common_vars.locals.clan_name}.common"
+    create_subscriptions = true
+    create_topic         = true
+    push_subscriptions = [
+      {
+        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        = local.labels,
+    subscription_labels = local.labels,
+    grant_token_creator = false,
+  }
 )

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

@@ -10,25 +10,24 @@ include {
 }
 
 locals {
-  spec_vars    = read_terragrunt_config("${get_terragrunt_dir()}/spec.hcl")
-  project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
-  common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
+  spec_vars           = read_terragrunt_config("${get_terragrunt_dir()}/spec.hcl")
+  project_vars        = read_terragrunt_config(find_in_parent_folders("project.hcl"))
+  common_vars         = read_terragrunt_config(find_in_parent_folders("common.hcl"))
+  labels = merge(local.common_vars.locals.default_user_labels, local.project_vars.locals.default_user_labels, {
+    component    = local.common_vars.locals.component
+    created      = "terraform"
+    product      = local.common_vars.locals.product
+    tenant-alias = local.common_vars.locals.tenant_alias
+  })
 }
 
 # These are the variables we have to pass in to use the module specified in the terragrunt configuration above
 inputs = merge(
-   yamldecode(
-    file("${get_terragrunt_dir()}/databases.yaml")),
-    local.spec_vars.locals,
-    local.project_vars.locals,
-    {
-      instance_labels = {
-        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"
-      }
-    }
+  yamldecode(
+  file("${get_terragrunt_dir()}/databases.yaml")),
+  local.spec_vars.locals,
+  local.project_vars.locals,
+  {
+    instance_labels = local.labels
+  }
 )

package/package.json

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

package/generators/resources/cloudsql/templates/monitoring/cloud-sql/terragrunt.hcl

@@ -1,34 +0,0 @@
-# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
-# working directory, into a temporary folder, and execute your Terraform commands in that folder.
-terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-monitoring//?ref=v0.1.6"
-}
-
-# Include all settings from the root terragrunt.hcl file
-include {
-  path = find_in_parent_folders("terragrunt_root.hcl")
-}
-
-dependency "notification_channels" {
-  config_path  = "../notification-channels"
-  mock_outputs = {
-    notification_channels = ["dummy-channel"]
-  }
-}
-
-locals {
-  project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
-  common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
-}
-
-# These are the variables we have to pass in to use the module specified in the terragrunt configuration above
-inputs = merge(local.project_vars.locals, local.common_vars.locals,
-  {
-    clan_project_id       = local.project_vars.locals.project_id
-    notification_channels = dependency.notification_channels.outputs.notification_channels
-    cloudsql_monitoring   = true
-    user_labels           = {
-      cc = local.common_vars.locals.cost_center
-    }
-  }
-)

package/generators/resources/cloudsql/templates/monitoring/notification-channels/terragrunt.hcl

@@ -1,22 +0,0 @@
-# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
-# working directory, into a temporary folder, and execute your Terraform commands in that folder.
-terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-notification-channels//?ref=v0.1.1"
-}
-
-# Include all settings from the root terragrunt.hcl file
-include {
-  path = find_in_parent_folders("terragrunt_root.hcl")
-}
-
-locals {
-  project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
-  common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
-}
-
-# These are the variables we have to pass in to use the module specified in the terragrunt configuration above
-inputs = merge(local.project_vars.locals, local.common_vars.locals,
-  {
-    clan_project_id  = local.project_vars.locals.project_id
-  }
-)