@hiiretail/gcp-infra-cli 0.99.12 → 0.100.0

package/generators/common-resources/cloudsql/templates/postgres-clan/instance/spec.hcl

@@ -94,7 +94,7 @@ locals {
   #Default: missing
   backup_configuration = {
     enabled                        = <%- enableBackups %>
-    start_time                     = "04:00"
+    start_time                     = "00:00"
     location                       = "europe-west1"
     point_in_time_recovery_enabled = true
   }

package/generators/common-resources/spanner/append.js

@@ -14,6 +14,7 @@ const appendToDatabasesYaml = (databasesYamlPath, newDbEntry) => {
     name: newDbEntry.name,
     ...(newDbEntry.ddl ? { ddl: [newDbEntry.ddl] } : {}),
     ...(newDbEntry.retentionPeriod ? { version_retention_period: newDbEntry.retentionPeriod } : {}),
+    ...(newDbEntry.backupSchedule ? { backup_schedule: newDbEntry.backupSchedule } : {}),
   };
 
   databases.push(cleanNewDatabaseEntry);

package/generators/common-resources/spanner/index.js

@@ -3,7 +3,7 @@ const chalk = require('chalk');
 const fs = require('fs');
 const BaseGenerator = require('../../../src/BaseGenerator');
 const { required } = require('../../../src/validators');
-const { validName, validRetentionPeriod } = require('./validate');
+const { validName, validRetentionPeriod, validBackupSchedule } = require('./validate');
 const appendToDatabasesYaml = require('./append');
 
 module.exports = class extends BaseGenerator {
@@ -80,6 +80,13 @@ module.exports = class extends BaseGenerator {
         message: 'Please provide version retention period. Maximum value 7d, possible values include 84000s, 1h, 2d. Leave empty for default value 1h.',
         validate: validRetentionPeriod,
       },
+      {
+        when: (response) => response.resourceType === 'database',
+        type: 'input',
+        name: 'backupSchedule',
+        message: 'Please provide backup schedule. Possible values are valid cron expressions like "0 2 * * *". Leave empty to add later.',
+        validate: validBackupSchedule,
+      },
     ];
 
     return this.prompt(prompts).then((props) => {
@@ -96,6 +103,7 @@ module.exports = class extends BaseGenerator {
       databaseName,
       ddl,
       retentionPeriod,
+      backupSchedule,
     } = this.answers;
 
     ['prod', 'staging'].forEach((env) => {
@@ -118,6 +126,7 @@ module.exports = class extends BaseGenerator {
               databaseName,
               ddl,
               retentionPeriod,
+              backupSchedule,
             },
           );
         });
@@ -133,6 +142,7 @@ module.exports = class extends BaseGenerator {
               databaseName,
               ddl,
               retentionPeriod,
+              backupSchedule,
             },
           );
         });
@@ -143,6 +153,7 @@ module.exports = class extends BaseGenerator {
           name: databaseName,
           ddl,
           retentionPeriod,
+          backupSchedule,
         };
         appendToDatabasesYaml(databasesYamlPath, newDatabaseEntry);
       }

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

package/generators/common-resources/spanner/validate.js

@@ -18,7 +18,21 @@ const validRetentionPeriod = (input) => {
   return 'Invalid retention period format. Possible values are 84000s, 1h, 2d, or leave empty for default value 1h';
 };
 
+const validBackupSchedule = (input) => {
+  const validFormats = /^(((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*) ?){5}$/;
+
+  if (input === '') {
+    return true;
+  }
+  if (validFormats.test(input)) {
+    return true;
+  }
+
+  return 'Invalid backup schedule format. Possible values are cron expressions like "0 2 * * *"';
+};
+
 module.exports = {
   validName,
   validRetentionPeriod,
+  validBackupSchedule,
 };

package/package.json

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