@hiiretail/gcp-infra-cli 0.84.5 → 0.86.0

package/generators/resources/scheduler/append.js

@@ -0,0 +1,83 @@
+const fs = require('fs');
+
+const findScheduledJobs = (schedulerPath) => {
+  const fileContent = fs.readFileSync(schedulerPath, 'utf8');
+  const regex = /scheduled_jobs\s*=\s*\[\s*([\s\S]*?)\s*\]/;
+  const match = regex.exec(fileContent);
+  if (match) {
+    const scheduledJobsText = match[1];
+    return scheduledJobsText;
+  }
+  return '';
+};
+
+const writeScheduledJobs = (schedulerPath, scheduledJobs) => {
+  const fileContent = fs.readFileSync(schedulerPath, 'utf8');
+  const updatedContent = fileContent.replace(
+    /scheduled_jobs\s*=\s*\[([\s\S]*?)\]/,
+    `scheduled_jobs = [\n      ${scheduledJobs}\n    ]`,
+  );
+  fs.writeFileSync(schedulerPath, updatedContent);
+};
+
+const scheduledJobsToHCL = (scheduledJobs) => `${scheduledJobs.map((job) => {
+  const httpTargetBlock = job.http_target
+    ? `
+        http_target = {
+          uri         = "${job.http_target.uri}"
+          http_method = "${job.http_target.http_method}"
+        }
+      }`
+    : '';
+  const pubsubTargetBlock = job.pubsub_target
+    ? `
+        pubsub_target = {
+          topic_name = "${job.pubsub_target.topic_name}"
+          data       = "${job.pubsub_target.data}"
+        }
+      }`
+    : '';
+  return `
+      {
+        name        = "${job.name}"
+        description = "${job.description}"
+        schedule    = "${job.schedule}"
+${httpTargetBlock}${pubsubTargetBlock}`;
+})
+  .join('\n')}`;
+
+const handleJobs = (schedulerPath, answers) => {
+  const oldJobs = findScheduledJobs(schedulerPath);
+  const allJobs = [oldJobs];
+
+  if (answers.target === 'http') {
+    const newHttpJob = {
+      name: answers.name,
+      description: answers.description,
+      schedule: answers.schedule,
+      http_target: {
+        uri: answers.uri,
+        http_method: answers.httpMethod,
+      },
+    };
+
+    const newHttpJobHcl = scheduledJobsToHCL([newHttpJob]);
+    allJobs.push(newHttpJobHcl);
+  } else {
+    const newPubsubJob = {
+      name: answers.name,
+      description: answers.description,
+      schedule: answers.schedule,
+      pubsub_target: {
+        topic_name: answers.topicName,
+        data: answers.data,
+      },
+    };
+    const newPubsubJobHcl = scheduledJobsToHCL([newPubsubJob]);
+    allJobs.push(newPubsubJobHcl);
+  }
+
+  writeScheduledJobs(schedulerPath, allJobs);
+};
+
+module.exports = handleJobs;

package/generators/resources/scheduler/index.js

@@ -1,7 +1,9 @@
 const path = require('path');
 const chalk = require('chalk');
+const fs = require('fs');
 const BaseGenerator = require('../../../src/BaseGenerator');
 const { required } = require('../../../src/validators');
+const handleJobs = require('./append');
 
 module.exports = class extends BaseGenerator {
   prompting() {
@@ -74,14 +76,22 @@ module.exports = class extends BaseGenerator {
 
   writing() {
     ['prod', 'staging'].forEach((env) => {
-      this.copyDir(
-        'scheduler',
-        path.join('infra', env, 'scheduler'),
-        {
-          ...this.answers,
-          env,
-        },
-      );
+      const schedulerPath = path.join(process.cwd(), 'infra', env, 'scheduler', 'terragrunt.hcl');
+      if (!fs.existsSync(schedulerPath)) {
+        this.copyDir(
+          'scheduler',
+          path.join('infra', env, 'scheduler'),
+          {
+            ...this.answers,
+            env,
+          },
+        );
+      } else {
+        handleJobs(
+          schedulerPath,
+          this.answers,
+        );
+      }
     });
   }
 

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

@@ -22,23 +22,23 @@ locals {
 
 # 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,
-    {
-      scheduled_jobs = [
-       {
-          name        = "<%-name%>"
-          description = "<%-description%>"
-          schedule    = "<%-schedule%>"
-          <% if (target == 'http') { %>
-          http_target = {
-            uri         = "<%-uri%>"
-            http_method = "<%-httpMethod%>"
-          } <% } else { %>
-          pubsub_target = {
-            topic_name = "projects/${local.project_vars.locals.project_id}/topics/${dependency.topic.outputs.topic}"
-            data       = "${base64encode("<%-data%>")}"
-          }<% } %>
-        },
-      ]
-    },
+  local.project_vars.locals,
+  {
+    scheduled_jobs = [
+      {
+        name        = "<%-name%>"
+        description = "<%-description%>"
+        schedule    = "<%-schedule%>"
+        <% if (target == 'http') { %>
+        http_target = {
+          uri         = "<%-uri%>"
+          http_method = "<%-httpMethod%>"
+        } <% } else { %>
+        pubsub_target = {
+          topic_name = "projects/${local.project_vars.locals.project_id}/topics/${dependency.topic.outputs.topic}"
+          data       = "${base64encode("<%-data%>")}"
+        }<% } %>
+      }
+    ],
+  },
 )

package/generators/resources/spanner/index.js

@@ -52,7 +52,7 @@ module.exports = class extends BaseGenerator {
       },
       {
         type: 'input',
-        name: 'versionRetentionPeriod',
+        name: 'retentionPeriod',
         message: 'Please provide version retention period. Maximum value 7d, possible values include 84000s, 1h, 2d. Leave empty for default value 1h.',
       },
     ];
@@ -69,7 +69,7 @@ module.exports = class extends BaseGenerator {
       instanceAllocation,
       databaseName,
       ddl,
-      versionRetentionPeriod,
+      retentionPeriod,
     } = this.answers;
 
     ['prod', 'staging'].forEach((env) => {
@@ -84,7 +84,7 @@ module.exports = class extends BaseGenerator {
           instanceAllocation,
           databaseName,
           ddl,
-          versionRetentionPeriod,
+          retentionPeriod,
         },
       );
     });

package/generators/resources/spanner/templates/spanner/databases.yaml

@@ -1,4 +1,4 @@
 databases:
   - name: "<%-databaseName%>" <% if (ddl == '') { %><% } else { %>
-    ddl:
-      - "<%-ddl%>" <% } %>
+    ddl: "<%-ddl%>" <% } %> <% if (retentionPeriod == '') { %><% } else { %>
+    version_retention_period: "<%-retentionPeriod%>" <% } %>

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

@@ -17,8 +17,4 @@ locals {
   # The number of processing units allocated to this instance.
   # At most one of either num_nodes or processing_units can be present in terraform.
   processing_units = "<%-processingUnits%>" <% } %>
-  # The time frame it will be possible to restore the database to a point in time.
-  # Values from 1h up to max 7d
-  <% if (versionRetentionPeriod !== '') { %>
-  version_retention_period = "<%-versionRetentionPeriod%>" <% } %>
 }

package/generators/resources/spanner/templates/spanner/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-spanner//?ref=v0.1.2"
+  source = "git::https://github.com/extenda/tf-module-gcp-spanner//?ref=v0.1.3"
 }
 
 # Include all settings from the root terragrunt.hcl file

package/package.json

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