@hiiretail/gcp-infra-cli 0.83.1 → 0.83.3

package/generators/docs/rca/templates/docs/rca.md

@@ -6,27 +6,27 @@
 
 **Incident end**: <!-- The date and time when the incident was resolved, for example: 2022-06-14 14.53 CET -->
 
-**Problem statement**: <!-- Describe, in short, what the problem was -->
+**Problem statement**: <!-- Describe what the problem was. It is important to keep this short, one or two sentances are enough. Example: An Out of Memory error was thrown -->
 
 **Impacted customer(s)**: <!-- What customer(s) that were affected -->
 
-**Impact to customer**: <!-- Describe how the customer, and end customers, was affected by the incident -->
+**Impact to customer**: <!-- Describe how the customer, and end customers, was affected by the incident. Where they completely unable to use the system? Or was there some feature that wasn't working? -->
 
 **Ticket information**: <!-- Add link(s) to any Jira issues -->
 
-**Services involved**: <!-- List the services that were involved in the incident -->
+**Services involved**: <!-- List the Hii Retail-service(s) that were involved in the incident, for example checkout-poslog -->
 
 ## Sequence of Events
 
 <!--
-Describe the events that caused the incident, starting from first getting notified about the incident until the incident was resolved.
+Describe the events that caused the incident, starting from when the issues started up until the incident was resolved. If no alert was triggered, the first event would be when the issues first started.
 
 Example:
 
-2022-06-14 14.36 - Alert X was triggered
-2022-06-14 14.36 - Team started working on the incident
-2022-06-14 14.49 - A fix was pushed and deployed
-2022-06-14 14.53 - Incident was resolved
+  - 2022-06-14 14.36 - Alert X was triggered
+  - 2022-06-14 14.36 - Team started working on the incident
+  - 2022-06-14 14.49 - A fix was pushed and deployed
+  - 2022-06-14 14.53 - Incident was resolved
 -->
 
 ## Five Whys
@@ -54,22 +54,25 @@ Problem: The vehicle won't start
 ## Summary
 
 <!--
-Write a short summary of what the problem was, what the root cause was and what potentially action items that were taken.
+This section should be written last, when all of the other bullets in the RCA has been written. The summary should include:
+
+* What the problem statement was, what the root cause of it was and a short summary of the highest prioritized action points.
 -->
 
 ## Action items
 
 <!--
-A table that describes the different actions that was the outcome of the analysis, who is the owner of the task and the status of the task.
-The status should be updated until the action is completed.
+A table that describes the different actions that was the outcome of the analysis and who is the owner of the task. The table should be in order of priority.
+
+When creating Jira issues, add the label "RCA" to them.
 
 Example:
-| Description | Owner | Date | Status |
+| Description | Owner | Jira issue |
 |-------------|-------|------|--------|
-| Create alert for high CPU Usage | Bob the Builder | 2022-06-14 | Not started |
-|             |       |      |        |
+| Create alert for high CPU Usage | Bob the Builder | HII-1234 |
+|             |       |      |
 -->
 
-| Description | Owner | Date | Status |
-|-------------|-------|------|--------|
-|             |       |      |        |
+| Description | Owner | Jira issue |
+|-------------|-------|------------|
+|             |       |            |

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

@@ -58,7 +58,7 @@ module.exports = class extends BaseGenerator {
       {
         type: 'input',
         name: 'jiraProjectKey',
-        message: 'Provide the "jira project key" for your clan (the uppercase prefix in your task names, example: SRT)',
+        message: 'Provide the "jira project key" for your clan, which is the prefix of your task names (e.g. srt, hii, hcc)',
         validate: required && validate.jiraProjectKey,
       },
       {
@@ -135,16 +135,10 @@ module.exports = class extends BaseGenerator {
     createEnv('staging', tribeStaging, clanStaging);
 
     // Init notification channels for clan
-    ['prod', 'staging'].forEach((env) => {
-      this.copyDir(
-        'notification-channels',
-        path.join('infra', env, 'monitoring', 'notification-channels'),
-        {
-          ...this.answers,
-          env,
-        },
-      );
-    });
+    this.copyDir('notification-channels',
+      path.join('infra', 'prod', 'monitoring', 'notification-channels'),
+      this.answers);
+
     this.copyDir('github',
       this.destinationPath(path.join('.github')),
       {

package/generators/init/clan-infra/templates/env/project.hcl

@@ -8,5 +8,8 @@ locals {
   project               = local.project_id
   network               = "tribe-network"
   tribe_project_id      = "<%-tribeProject%>"
-  monitoring_project_id = "<%-tribeProject%>" #  possibly will be changed to hiiretail-monitoring-prod-6500 later
+
+  default_user_labels = {
+    environment = local.project_env,
+  }
 }

package/generators/init/clan-infra/templates/env/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
@@ -14,16 +20,12 @@ include {
   path = find_in_parent_folders("terragrunt_root.hcl")
 }
 
-
 # These are the variables we have to pass in to use the module specified in the terragrunt configuration above
 inputs = merge(
   {
-   secrets = merge(yamldecode(file("${get_terragrunt_dir()}/secrets.yaml")).secrets,
-   { "clan_slack_channel" = local.common_vars.locals.clan_slack_channels[0].name })
-   project_id = local.project_vars.locals.project_id
-   labels = {
-      terraform = ""
-      cc        = local.common_vars.locals.cost_center
-    }
+    secrets = merge(yamldecode(file("${get_terragrunt_dir()}/secrets.yaml")).secrets,
+    { "clan_slack_channel" = local.common_vars.locals.clan_slack_channels[0].name })
+    project_id = local.project_vars.locals.project_id
+    labels     = local.labels
   }
 )

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

@@ -1,19 +1,24 @@
 # Set clan-wide variables here. These are automatically pulled in at the root terragrunt.hcl configuration to
 # set the remote state configuration and to feed variables forward to the child modules.
 locals {
-  tribe_name             = "<%-tribe%>"
-  clan_name              = "<%-clan%>"
-  region                 = "europe-west1"
-  clan_group_email       = "tribe-<%-tribe%>-<%-clan%>@extendaretail.com"
-  clan_slack_channels    = [
-    {
-      name = "#<%-tribe%>-<%-clan%>-monitor"
-    }
-  ]
-  project_id_slack_token = "tf-admin-90301274"
-  cost_center            = "<%-costCenter%>"
-  jira_project_key       = "<%-jiraProjectKey%>"
-  component              = "<%-costCenter%>"
-  product                = "<%-product%>"
-  tenant_alias           = "<%-tenantAlias%>"
+  tribe_name       = "<%-tribe%>"
+  clan_name        = "<%-clan%>"
+  region           = "europe-west1"
+  cost_center      = "<%-costCenter%>"
+  jira_project_key = "<%-jiraProjectKey%>"
+  component        = "<%-component%>"
+  product          = "<%-product%>"
+  tenant_alias     = "<%-tenantAlias%>"
+
+  project_id_slack_token  = "tf-admin-90301274"
+  slack_token_secret_name = "monitoring-slack-token"
+
+  clan_group_email    = "tribe-<%-tribe%>-<%-clan%>@extendaretail.com"
+  clan_slack_channels = [{ name = "#<%-tribe%>-<%-clan%>-monitor" }]
+
+  default_user_labels = {
+    clan             = local.clan_name
+    cc               = local.cost_center
+    jira_project_key = local.jira_project_key
+  }
 }

package/generators/init/clan-infra/templates/notification-channels/notification-channels.yaml

@@ -0,0 +1,7 @@
+slack:
+- channel_name: "#<%-tribe%>-<%-clan%>-monitor"
+  fallback_channel: true
+
+email:
+- email_address: tribe-<%-tribe%>-<%-clan%>@extendaretail.com
+  fallback_channel: true

package/generators/init/clan-infra/templates/notification-channels/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-notification-channels//?ref=v0.1.1"
+  source = "git::https://github.com/extenda/tf-module-gcp-notification-channels//?ref=v1.0.1"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -12,11 +12,18 @@ 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, local.common_vars.locals,
-  {
-    clan_project_id  = local.project_vars.locals.project_id
-  }
-)
+inputs = {
+  project                       = local.project_vars.locals.tribe_project_id,
+  notification_channels         = yamldecode(file("${get_terragrunt_dir()}/notification-channels.yaml"))
+  slack_token_secret_project_id = local.common_vars.locals.project_id_slack_token,
+  slack_token_secret_name       = local.common_vars.locals.slack_token_secret_name,
+  default_user_labels           = local.labels,
+}

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

@@ -12,6 +12,11 @@ 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
@@ -21,13 +26,7 @@ inputs = merge(
   {
     project_id = local.project_vars.locals.project_id
     # 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
-      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
-    }
+    viewers = ["group:${local.common_vars.locals.clan_group_email}"]
+    labels  = local.labels,
   }
 )

package/generators/resources/cloudsql/index.js

@@ -73,14 +73,6 @@ module.exports = class extends BaseGenerator {
       );
     });
 
-    // CloudSQL Monitoring
-    ['prod', 'staging'].forEach((env) => {
-      this.copyDir(
-        path.join('monitoring'),
-        path.join('infra', env, 'monitoring'),
-      );
-    });
-
     // CloudSQL Instance secrets
     ['prod', 'staging'].forEach((env) => {
       this.copyDir(

package/generators/resources/cloudsql/templates/mssql/instance/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
@@ -20,20 +25,14 @@ inputs = merge(
   local.spec_vars.locals,
   {
     name = "mssql-${local.project_vars.locals.project_name}"
-    ip_configuration   = {
-      "authorized_networks": [],
-      "ipv4_enabled": true,
-      "private_network": "https://www.googleapis.com/compute/v1/projects/${local.project_vars.locals.tribe_project_id}/global/networks/${local.project_vars.locals.network}",
-      "require_ssl": false
+    ip_configuration = {
+      "authorized_networks" : [],
+      "ipv4_enabled" : true,
+      "private_network" : "https://www.googleapis.com/compute/v1/projects/${local.project_vars.locals.tribe_project_id}/global/networks/${local.project_vars.locals.network}",
+      "require_ssl" : false
     }
     ## 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
-      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
-    }
+    user_labels = local.labels,
   }
 )

package/generators/resources/cloudsql/templates/mssql/instance-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
@@ -22,20 +28,10 @@ dependency "mssql_address" {
 }
 
 # 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 = {
-      mssql-common-address = dependency.mssql_address.outputs.private_address
-    }
-    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
-    }
+inputs = {
+  project_id = local.project_vars.locals.project_id
+  secrets = {
+    mssql-common-address = dependency.mssql_address.outputs.private_address
   }
-)
+  labels = local.labels,
+}

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

@@ -10,9 +10,15 @@ 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
+    product      = local.common_vars.locals.product
+    tenant-alias = local.common_vars.locals.tenant_alias
+    terraform    = ""
+  })
 }
 
 # These are the variables we have to pass in to use the module specified in the terragrunt configuration above
@@ -29,12 +35,6 @@ 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
-      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
-    }
+    user_labels = local.labels,
   }
 )

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

@@ -11,6 +11,12 @@ 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
+    terraform    = ""
+  })
 }
 
 dependency "instance" {
@@ -22,20 +28,11 @@ dependency "instance" {
 }
 
 # 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 = {
-      mysql_master_password = dependency.instance.outputs.generated_user_password
-      mysql_private_address = dependency.instance.outputs.private_ip_address
-    }
-    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
-    }
+inputs = {
+  project_id = local.project_vars.locals.project_id
+  secrets = {
+    mysql_master_password = dependency.instance.outputs.generated_user_password
+    mysql_private_address = dependency.instance.outputs.private_ip_address
   }
-)
+  labels = local.labels,
+}

package/generators/resources/cloudsql/templates/postgres/instance/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
@@ -28,12 +33,6 @@ 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
-      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
-    }
+    user_labels = local.labels,
   }
 )

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

@@ -11,6 +11,12 @@ 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
+    terraform    = ""
+  })
 }
 
 dependency "instance" {
@@ -29,13 +35,6 @@ inputs = merge(
       postgresql_master_password = dependency.instance.outputs.generated_user_password
       postgresql_private_address = dependency.instance.outputs.private_ip_address
     }
-    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/cloudsql-database/templates/mysql/secrets/terragrunt.hcl

@@ -11,19 +11,20 @@ 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
+    terraform    = ""
+  })
 }
 
 <%-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
-    }
-  }
-)
+  labels = local.labels
+}

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

@@ -11,19 +11,20 @@ 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
+    terraform    = ""
+  })
 }
 
 <%-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
-    }
-  }
-)
+  labels = local.labels,
+}

package/generators/resources/firestore/index.js

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

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

@@ -10,9 +10,15 @@ 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
+    product      = local.common_vars.locals.product
+    tenant-alias = local.common_vars.locals.tenant_alias
+    terraform    = ""
+  })
 }
 
 # These are the variables we have to pass in to use the module specified in the terragrunt configuration above
@@ -20,13 +26,7 @@ inputs = merge(
   local.spec_vars.locals,
   local.project_vars.locals,
   {
-    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
-    }
+    labels          = local.labels
     project_id      = local.project_vars.locals.project_id
     prevent_destroy = false
   }

package/generators/resources/memorystore/index.js

@@ -64,13 +64,6 @@ module.exports = class extends SecretsGenerator {
     selectTier('prod', prodTier);
     selectTier('staging', stagingTier);
 
-    ['prod', 'staging'].forEach((env) => {
-      this.copyDir(
-        path.join('monitoring'),
-        path.join('infra', env, 'monitoring'),
-      );
-    });
-
     this.writeSecrets('memorystore', '', '', name === '' ? 'redis-instance' : name);
   }
 };

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

@@ -14,6 +14,12 @@ 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())
+  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
+    project      = local.project_vars.locals.project_name
+    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
@@ -24,14 +30,6 @@ inputs = merge(
     project            = local.project_vars.locals.project_id
     authorized_network = "projects/${local.project_vars.locals.tribe_project_id}/global/networks/${local.project_vars.locals.network}"
     enable_apis        = false
-
-    labels = {
-      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
-    }
+    labels             = local.labels
   }
 )