@hiiretail/gcp-infra-cli 0.76.3 → 0.77.1

package/generators/resources/monitoring/index.js

@@ -51,7 +51,7 @@ module.exports = class extends BaseGenerator {
         type: 'input',
         name: 'runbookLink',
         message: 'Please provide the full URL to your runbook in confluence (Leave empty if none)',
-        validate: required && validate.url,
+        validate: required && validate.confluenceUrl,
       },
       {
         when: (response) => response.alertResource === 'cloud_scheduler',

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.0"
+  source = "git::https://github.com/extenda/tf-module-gcp-alert-policy//?ref=v0.1.1"
 }
 
 # Include all settings from the root terragrunt.hcl file

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.0"
+  source = "git::https://github.com/extenda/tf-module-gcp-uptime-check//?ref=v0.1.1"
 }
 
 # Include all settings from the root terragrunt.hcl file

package/generators/resources/monitoring/validate.js

@@ -2,9 +2,16 @@ const validate = {};
 
 const hasWhitespace = (str) => /\s/.test(str);
 
+const isUrl = (str) => {
+  try {
+    return Boolean(new URL(str));
+  } catch (error) {
+    return false;
+  }
+};
+
 validate.hostName = (input) => {
-  const regex = new RegExp(/^(?:[a-z-]+\.){1,3}[a-z-]+$/g);
-  if (input.match(regex)) return true;
+  if (input.split('.').at(-1) === 'com' && !hasWhitespace(input)) return true;
   return 'Hostname must not include path to the page to run the check against or spaces';
 };
 
@@ -13,10 +20,8 @@ validate.systemName = (input) => {
   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) && !hasWhitespace(input)) || input === '') return true;
+validate.confluenceUrl = (input) => {
+  if (input === '' || (isUrl(input) && !hasWhitespace(input))) return true;
   return 'You must enter a valid URL';
 };
 

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