@hiiretail/gcp-infra-cli 0.86.1 → 0.87.1

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

@@ -29,6 +29,6 @@ inputs = merge(<% if (createResource == 'topic') { %><% } else { %>
     {
       topic_labels = local.labels<% if (createResource == 'topic') { %><% } else { %>
       subscription_labels = local.labels<% } %>
-      grant_token_creator = false
+      grant_token_creator = true
     }
 )

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

@@ -37,6 +37,6 @@ inputs = merge(
     ],
     topic_labels        = local.labels,
     subscription_labels = local.labels,
-    grant_token_creator = false,
+    grant_token_creator = true,
   }
 )

package/generators/resources/spanner/append.js

@@ -0,0 +1,26 @@
+const fs = require('fs');
+const yaml = require('js-yaml');
+
+const appendToDatabasesYaml = (databasesYamlPath, newDbEntry) => {
+  const databases = [];
+  if (fs.existsSync(databasesYamlPath)) {
+    const existingContent = fs.readFileSync(databasesYamlPath, 'utf8');
+    const existingDatabases = yaml.load(existingContent).databases;
+    databases.push(...existingDatabases);
+  }
+
+  // Exclude empty fields from newDbEntry
+  const cleanNewDatabaseEntry = {
+    name: newDbEntry.name,
+    ...(newDbEntry.ddl ? { ddl: newDbEntry.ddl } : {}),
+    ...(newDbEntry.retentionPeriod ? { retentionPeriod: newDbEntry.retentionPeriod } : {}),
+  };
+
+  databases.push(cleanNewDatabaseEntry);
+
+  const newYamlContent = yaml.dump({ databases }, { lineWidth: -1 });
+
+  fs.writeFileSync(databasesYamlPath, newYamlContent, 'utf8');
+};
+
+module.exports = appendToDatabasesYaml;

package/generators/resources/spanner/index.js

@@ -1,24 +1,37 @@
 const path = require('path');
 const chalk = require('chalk');
+const fs = require('fs');
 const BaseGenerator = require('../../../src/BaseGenerator');
 const { required } = require('../../../src/validators');
+const { validName, validRetentionPeriod } = require('./validate');
+const appendToDatabasesYaml = require('./append');
 
 module.exports = class extends BaseGenerator {
   prompting() {
     const prompts = [
       {
+        type: 'list',
+        name: 'resourceType',
+        message: 'Select the resource you want to create',
+        default: 'database',
+        choices: ['instance', 'database'],
+      },
+      {
+        when: (response) => response.resourceType === 'instance',
         type: 'input',
         name: 'instanceName',
-        message: 'Please provide a name for the instance. The name must be between 6 and 30 characters in length',
-        validate: required,
+        message: 'Please provide a name for the instance',
+        validate: (input) => required(input) && validName(input),
       },
       {
+        when: (response) => response.resourceType === 'instance',
         type: 'input',
         name: 'displayName',
-        message: 'Please provide the descriptive name for this instance. Unique per project and between 4 and 30 characters in length',
-        validate: required,
+        message: 'Please provide the descriptive name for this instance. Unique per project.',
+        validate: (input) => required(input) && validName(input),
       },
       {
+        when: (response) => response.resourceType === 'instance',
         type: 'list',
         name: 'instanceAllocation',
         message: 'Select the specified config you want to add for the instance. Only one of these can be present in terraform node_count or processing_units',
@@ -26,34 +39,38 @@ module.exports = class extends BaseGenerator {
         choices: ['processing_units', 'num_nodes'],
       },
       {
-        when: (response) => response.instanceAllocation === 'processing_units',
+        when: (response) => response.instanceAllocation === 'processing_units' && response.resourceType === 'instance',
         type: 'input',
         name: 'processingUnits',
         message: 'Please provide the number of processing units allocated to the instance',
         validate: required,
       },
       {
-        when: (response) => response.instanceAllocation === 'num_nodes',
+        when: (response) => response.instanceAllocation === 'num_nodes' && response.resourceType === 'instance',
         type: 'input',
         name: 'numNodes',
         message: 'Please provide the number of nodes allocated to the instance',
         validate: required,
       },
       {
+        when: (response) => response.resourceType === 'database',
         type: 'input',
         name: 'databaseName',
         message: 'Please provide a name for the database',
-        validate: required,
+        validate: (input) => required(input) && validName(input),
       },
       {
+        when: (response) => response.resourceType === 'database',
         type: 'input',
         name: 'ddl',
         message: 'Please provide an optional list of DDL statements to run inside the newly created database. Leave empty to add them later.',
       },
       {
+        when: (response) => response.resourceType === 'database',
         type: 'input',
         name: 'retentionPeriod',
         message: 'Please provide version retention period. Maximum value 7d, possible values include 84000s, 1h, 2d. Leave empty for default value 1h.',
+        validate: (input) => required(input) && validRetentionPeriod(input),
       },
     ];
 
@@ -64,6 +81,7 @@ module.exports = class extends BaseGenerator {
 
   writing() {
     const {
+      resourceType,
       instanceName,
       displayName,
       instanceAllocation,
@@ -73,26 +91,58 @@ module.exports = class extends BaseGenerator {
     } = this.answers;
 
     ['prod', 'staging'].forEach((env) => {
-      this.copyDir(
-        'spanner',
-        path.join('infra', env, 'spanner'),
-        {
-          ...this.answers,
-          env,
-          instanceName,
-          displayName,
-          instanceAllocation,
-          databaseName,
+      const spannerPath = path.join('infra', env, 'spanner');
+      const databasesYamlPath = path.join(spannerPath, 'databases.yaml');
+      const specPath = path.join(spannerPath, 'spec.hcl');
+
+      if (!fs.existsSync(specPath)) {
+        ['terragrunt.hcl', 'spec.hcl'].forEach((file) => {
+          this.fs.copyTpl(
+            this.templatePath(`spanner/${file}`),
+            this.destinationPath(`${spannerPath}/${file}`),
+            {
+              ...this.answers,
+              resourceType,
+              env,
+              instanceName,
+              displayName,
+              instanceAllocation,
+              databaseName,
+              ddl,
+              retentionPeriod,
+            },
+          );
+        });
+      }
+
+      if (!fs.existsSync(databasesYamlPath) && resourceType === 'database') {
+        this.fs.copyTpl(
+          this.templatePath('spanner/databases.yaml'),
+          this.destinationPath(databasesYamlPath),
+          {
+            ...this.answers,
+            databaseName,
+            ddl,
+            retentionPeriod,
+          },
+        );
+      }
+
+      if (fs.existsSync(databasesYamlPath) && resourceType === 'database') {
+        const newDatabaseEntry = {
+          name: databaseName,
           ddl,
           retentionPeriod,
-        },
-      );
+        };
+        appendToDatabasesYaml(databasesYamlPath, newDatabaseEntry);
+      }
     });
   }
 
   end() {
     this.log(`
-${chalk.green('Your Cloud Spanner resources have now been created. Please add any other specifications supported by the module if needed')}
+${chalk.green('Your Cloud Spanner resources have now been created.')}
+${chalk.green('Make sure to create a database for your instance. Please add any other specifications supported by the module if needed')}
 ${chalk.green('1.')} Push this change in a feature branch and open a pull request.`);
   }
 };

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

@@ -22,9 +22,9 @@ locals {
 }
 
 # These are the variables we have to pass in to use the module specified in the terragrunt configuration above
-inputs = merge(
+inputs = merge(<% if (resourceType == 'instance') { %><% } else { %>
   yamldecode(
-  file("${get_terragrunt_dir()}/databases.yaml")),
+  file("${get_terragrunt_dir()}/databases.yaml")),<% } %>
   local.spec_vars.locals,
   local.project_vars.locals,
   {

package/generators/resources/spanner/validate.js

@@ -0,0 +1,28 @@
+const validName = (input) => {
+  if (input.replace(/\s/g, '').length >= 6 && input.length <= 30) {
+    return { valid: true };
+  }
+  return { valid: false, message: 'Name must be between 6 and 30 characters in length' };
+};
+
+const validRetentionPeriod = (input) => {
+  const validFormats = /^(84000s|1h|2d|7d)$/;
+
+  if (input === '') {
+    // Empty input, using default value
+    return { valid: true };
+  }
+  if (validFormats.test(input)) {
+    return { valid: true };
+  }
+
+  return {
+    valid: false,
+    message: 'Invalid retention period format. Possible values include 84000s, 1h, 2d, or leave empty for default value 1h',
+  };
+};
+
+module.exports = {
+  validName,
+  validRetentionPeriod,
+};

package/package.json

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