@hiiretail/gcp-infra-cli 0.63.0 → 0.65.1

package/generators/init/clan-infra/templates/env/secrets/terragrunt.hcl

@@ -19,7 +19,7 @@ include {
 inputs = merge(
   {
    secrets = merge(yamldecode(file("${get_terragrunt_dir()}/secrets.yaml")).secrets,
-   { "clan_slack_channel" = local.common_vars.locals.clan_slack_channels[0] })
+   { "clan_slack_channel" = local.common_vars.locals.clan_slack_channels[0].name })
    project_id = local.project_vars.locals.project_id
    labels = {
       terraform = ""

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

@@ -5,7 +5,11 @@ locals {
   clan_name              = "<%-clan%>"
   region                 = "europe-west1"
   clan_group_email       = "tribe-<%-tribe%>-<%-clan%>@extendaretail.com"
-  clan_slack_channels    = ["#<%-tribe%>-<%-clan%>-monitor"]
+  clan_slack_channels    = [
+    {
+      name = "#<%-tribe%>-<%-clan%>-monitor"
+    }
+  ]
   project_id_slack_token = "tf-admin-90301274"
   cost_center            = "<%-costCenter%>"
 }

package/generators/resources/cloudsql/index.js

@@ -42,6 +42,13 @@ module.exports = class extends BaseGenerator {
         store: true,
         default: 10,
       },
+      {
+        type: 'list',
+        name: 'enableBackups',
+        message: 'Enable Databases backup?',
+        default: true,
+        choices: [true, false],
+      },
     ];
 
     return this.prompt(prompts).then((props) => {

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

@@ -12,7 +12,7 @@ include {
 dependency "notification_channels" {
   config_path  = "../notification-channels"
   mock_outputs = {
-    notification_channel_name = ["dummy-channel"]
+    notification_channels = ["dummy-channel"]
   }
 }
 
@@ -25,7 +25,7 @@ locals {
 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_channel_name
+    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/mssql/instance/spec.hcl

@@ -64,4 +64,13 @@ locals {
   #Type: String
   #Default: "PD_SSD"
   # disk_type = "PD_SSD"
+
+  #Description: The database backup configuration.
+  #Type: Map
+  backup_configuration = {
+    enabled                        = <%- enableBackups %>
+    binary_log_enabled             = enabled
+    start_time                     = "04:00"
+    point_in_time_recovery_enabled = true
+  }
 }

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

@@ -60,4 +60,14 @@ locals {
   #Type: String
   #Default: "PD_SSD"
   # disk_type = "PD_SSD"
+
+  #Description: The database backup configuration.
+  #Type: Map
+  #Default: missing
+  backup_configuration = {
+    enabled                        = <%- enableBackups %>
+    binary_log_enabled             = true
+    start_time                     = "04:00"
+    location                       = "europe-west1"
+  }
 }

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

@@ -60,4 +60,14 @@ locals {
   #Type: String
   #Default: "PD_SSD"
   # disk_type = "PD_SSD"
+
+  #Description: The database backup configuration.
+  #Type: Map
+  #Default: missing
+  backup_configuration = {
+    enabled                        = <%- enableBackups %>
+    start_time                     = "04:00"
+    location                       = "europe-west1"
+    point_in_time_recovery_enabled = true
+  }
 }

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

@@ -12,7 +12,7 @@ include {
 dependency "notification_channels" {
   config_path  = "../notification-channels"
   mock_outputs = {
-    notification_channel_name = ["dummy-channel"]
+    notification_channels = ["dummy-channel"]
   }
 }
 
@@ -25,7 +25,7 @@ locals {
 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_channel_name
+    notification_channels = dependency.notification_channels.outputs.notification_channels
     firestore_monitoring  = true
     user_labels           = {
       cc = local.common_vars.locals.cost_center

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

@@ -12,7 +12,7 @@ include {
 dependency "notification_channels" {
   config_path  = "../notification-channels"
   mock_outputs = {
-    notification_channel_name = ["dummy-channel"]
+    notification_channels = ["dummy-channel"]
   }
 }
 
@@ -25,7 +25,7 @@ locals {
 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_channel_name
+    notification_channels  = dependency.notification_channels.outputs.notification_channels
     memorystore_monitoring = true
     user_labels            = {
       cc = local.common_vars.locals.cost_center

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

@@ -12,7 +12,7 @@ include {
 dependency "notification_channels" {
   config_path  = "../notification-channels"
   mock_outputs = {
-    notification_channel_name = ["dummy-channel"]
+    notification_channels = ["dummy-channel"]
   }
 }
 
@@ -25,7 +25,7 @@ locals {
 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_channel_name
+    notification_channels    = dependency.notification_channels.outputs.notification_channels
     cloudfunction_monitoring = true
     user_labels           = {
       cc = local.common_vars.locals.cost_center

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

@@ -12,7 +12,7 @@ include {
 dependency "notification_channels" {
   config_path  = "../notification-channels"
   mock_outputs = {
-    notification_channel_name = ["dummy-channel"]
+    notification_channels = ["dummy-channel"]
   }
 }
 
@@ -25,7 +25,7 @@ locals {
 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_channel_name
+    notification_channels = dependency.notification_channels.outputs.notification_channels
     cloudrun_monitoring   = true
     user_labels           = {
       cc = local.common_vars.locals.cost_center

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

@@ -12,7 +12,7 @@ include {
 dependency "notification_channels" {
   config_path  = "../notification-channels"
   mock_outputs = {
-    notification_channel_name = ["dummy-channel"]
+    notification_channels = ["dummy-channel"]
   }
 }
 
@@ -25,7 +25,7 @@ locals {
 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_channel_name
+    notification_channels = dependency.notification_channels.outputs.notification_channels
     dataflow_monitoring   = true
     user_labels           = {
       cc = local.common_vars.locals.cost_center

package/generators/resources/pubsub/index.js

@@ -7,6 +7,7 @@ const {
   validSystemName,
   validVersion,
   validSubscriberName,
+  checkExistingTopicPath,
 } = require('./validate');
 const handleSubscribers = require('./handle-subscribers');
 const { getProjectId, getProdPushEndopint } = require('./get-gcp-projects');
@@ -117,7 +118,7 @@ module.exports = class extends BaseGenerator {
         type: 'input',
         name: 'existingTopic',
         message: 'Please provide the name of the existing topic you want to subscribe to',
-        validate: required,
+        validate: (input) => required(input) && checkExistingTopicPath(input),
       },
       {
         when: (response) => response.createResource === 'subscription' && response.pushOrPull === 'push',

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

@@ -12,7 +12,7 @@ include {
 dependency "notification_channels" {
   config_path  = "../notification-channels"
   mock_outputs = {
-    notification_channel_name = ["dummy-channel"]
+    notification_channels = ["dummy-channel"]
   }
 }
 
@@ -25,7 +25,7 @@ locals {
 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_channel_name
+    notification_channels = dependency.notification_channels.outputs.notification_channels
     pubsub_monitoring     = true
     user_labels           = {
       cc = local.common_vars.locals.cost_center

package/generators/resources/pubsub/validate.js

@@ -1,3 +1,6 @@
+const fs = require('fs');
+const path = require('path');
+
 const validSystemName = (input) => {
   if (input.replace(/\s/g, '').length === 3) {
     return true;
@@ -24,9 +27,18 @@ const validSubscriberName = (input) => {
   return 'Not supported input for subscriber name';
 };
 
+const checkExistingTopicPath = (input) => {
+  const topicDirPath = path.join(process.cwd(), 'infra', 'staging', 'pubsub', input);
+
+  if (fs.existsSync(topicDirPath)) {
+    return true;
+  }
+  return 'Topic does not exist. Check the spelling';
+};
 
 module.exports = {
   validSystemName,
   validVersion,
   validSubscriberName,
+  checkExistingTopicPath,
 };

package/package.json

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