@hiiretail/gcp-infra-cli 0.76.2 → 0.77.0

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

@@ -4,6 +4,7 @@ const BaseGenerator = require('../../../src/BaseGenerator');
 const { chain, required } = require('../../../src/validators');
 const { getGcpProjects, validateGcpProjects } = require('./gcp-projects');
 const getTribeAndClanName = require('./tribe-clan-repo');
+const validate = require('./validate');
 
 module.exports = class extends BaseGenerator {
   prompting() {
@@ -36,6 +37,12 @@ module.exports = class extends BaseGenerator {
         message: 'Provide the cost center your tribe belongs to',
         validate: required,
       },
+      {
+        type: 'input',
+        name: 'jiraProjectKey',
+        message: 'Provide the "jira project key" for your clan (the uppercase prefix in your task names, example: SRT)',
+        validate: required && validate.jiraProjectKey,
+      },
       {
         type: 'input',
         name: 'repoName',

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

@@ -12,4 +12,5 @@ locals {
   ]
   project_id_slack_token = "tf-admin-90301274"
   cost_center            = "<%-costCenter%>"
+  jira_project_key       = "<%-jiraProjectKey%>"
 }

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

@@ -0,0 +1,8 @@
+const validate = {};
+
+validate.jiraProjectKey = (input) => {
+  if (!/\s/.test(input) && input === input.toUpperCase()) return true;
+  return 'Must be uppercase and not contain any whitepace';
+};
+
+module.exports = validate;

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

@@ -29,6 +29,6 @@ inputs = {
   user_labels             = {
     cc                = local.common_vars.locals.cost_center
     clan              = local.common_vars.locals.clan_name
-    jira_project_key  = lookup(local.project_vars.locals, "jira_project_key", null)
+    jira_project_key  = lookup(local.common_vars.locals, "jira_project_key", null)
   },
 }

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

@@ -1,7 +1,7 @@
 availability:
   display_name: Month - Availability
   slo_id: month-availability
-  goal: 0.998
+  goal: 0.999
   calendar_period: MONTH
   type: windows_based_sli
   method: boolean_filter

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

@@ -9,6 +9,13 @@ 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"))
 }
@@ -19,7 +26,8 @@ inputs = merge(
   {
     service_name            = "<%-systemName%>.<%-serviceName%>"
     monitoring_project_id   = lookup(local.project_vars.locals, "monitoring_project_id", local.project_vars.locals.tribe_project_id),
-    slos                    = yamldecode(file("${get_terragrunt_dir()}/slos.yaml")),
+    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")),
   }
 )

package/generators/resources/monitoring/validate.js

@@ -1,5 +1,7 @@
 const validate = {};
 
+const hasWhitespace = (str) => /\s/.test(str);
+
 validate.hostName = (input) => {
   const regex = new RegExp(/^(?:[a-z-]+\.){1,3}[a-z-]+$/g);
   if (input.match(regex)) return true;
@@ -7,29 +9,29 @@ validate.hostName = (input) => {
 };
 
 validate.systemName = (input) => {
-  if (input.replace(/\s/g, '').length === 3) return true;
+  if (input.length === 3 && !hasWhitespace(input)) return true;
   return 'System name must be 3 characters';
 };
 
 validate.url = (input) => {
   // eslint-disable-next-line no-useless-escape
   const regex = new RegExp(/^https:\/\/[a-zA-Z]*.[a-zA-Z]*.[a-zA-Z]*\/[a-zA-Z\/+_-]*.$/g);
-  if (regex.test(input) || input === '') return true;
+  if ((regex.test(input) && !hasWhitespace(input)) || input === '') return true;
   return 'You must enter a valid URL';
 };
 
 validate.instanceID = (input) => {
-  if (input.split('/').length === 6) return true;
+  if (input.split('/').length === 6 && !hasWhitespace(input)) return true;
   return 'You must enter the full instance path (example: projects/example/locations/europe-west1/instances/instanceID)';
 };
 
 validate.databaseId = (input) => {
-  if (input.split(':').length === 2) return true;
+  if (input.split(':').length === 2 && !hasWhitespace(input)) return true;
   return 'You must enter the full database path (example: my-project:databaseID)';
 };
 
 validate.pubSubSubscription = (input) => {
-  if (input.split('/').length === 4) return true;
+  if (input.split('/').length === 4 && !hasWhitespace(input)) return true;
   return 'You must enter the full subscription path (example: projects/example/subscriptions/subscriptionId)';
 };
 

package/generators/resources/pubsub/index.js

@@ -200,7 +200,7 @@ module.exports = class extends BaseGenerator {
         });
       }
 
-      const projectId = getProjectId(env);
+      let projectId = getProjectId(env);
       let oidcEmail = `${oidcName}@${projectId}.iam.gserviceaccount.com`;
       let pushEndpoint = '';
       if (env === 'prod' && pushOrPull === 'push') {
@@ -245,8 +245,8 @@ module.exports = class extends BaseGenerator {
         await handleSubscribers(env, this.answers, oidcEmail, pushEndpoint, `${subscriptionDirPath}/subscribers.yaml`, dlqTopic);
       }
       if (createResource === 'subscription' && externalSub === 'yes') {
-        const externalDirPath = path.join(process.cwd(), 'infra', env, 'pubsub', existingTopic, clanName);
-
+        const externalDirPath = path.join(process.cwd(), 'infra', 'prod', 'pubsub', existingTopic, `${clanName}-${env}`);
+        projectId = getProjectId('prod');
         if (!fs.existsSync(externalDirPath)) {
           fs.mkdirSync(externalDirPath);
         }

package/package.json

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