@hiiretail/gcp-infra-cli 0.87.2 → 0.87.3

package/generators/resources/spanner/append.js

@@ -12,8 +12,8 @@ const appendToDatabasesYaml = (databasesYamlPath, newDbEntry) => {
   // Exclude empty fields from newDbEntry
   const cleanNewDatabaseEntry = {
     name: newDbEntry.name,
-    ...(newDbEntry.ddl ? { ddl: newDbEntry.ddl } : {}),
-    ...(newDbEntry.retentionPeriod ? { retentionPeriod: newDbEntry.retentionPeriod } : {}),
+    ...(newDbEntry.ddl ? { ddl: [newDbEntry.ddl] } : {}),
+    ...(newDbEntry.retentionPeriod ? { version_retention_period: newDbEntry.retentionPeriod } : {}),
   };
 
   databases.push(cleanNewDatabaseEntry);

package/generators/resources/spanner/index.js

@@ -21,14 +21,20 @@ module.exports = class extends BaseGenerator {
         type: 'input',
         name: 'instanceName',
         message: 'Please provide a name for the instance',
-        validate: (input) => required(input) && validName(input),
+        validate: (input) => {
+          const validation = validName(input);
+          return validation.valid ? true : validation.message;
+        },
       },
       {
         when: (response) => response.resourceType === 'instance',
         type: 'input',
         name: 'displayName',
         message: 'Please provide the descriptive name for this instance. Unique per project.',
-        validate: (input) => required(input) && validName(input),
+        validate: (input) => {
+          const validation = validName(input);
+          return validation.valid ? true : validation.message;
+        },
       },
       {
         when: (response) => response.resourceType === 'instance',
@@ -57,7 +63,10 @@ module.exports = class extends BaseGenerator {
         type: 'input',
         name: 'databaseName',
         message: 'Please provide a name for the database',
-        validate: (input) => required(input) && validName(input),
+        validate: (input) => {
+          const validation = validName(input);
+          return validation.valid ? true : validation.message;
+        },
       },
       {
         when: (response) => response.resourceType === 'database',
@@ -70,7 +79,10 @@ module.exports = class extends BaseGenerator {
         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),
+        validate: (input) => {
+          const validation = validRetentionPeriod(input);
+          return validation.valid ? true : validation.message;
+        },
       },
     ];
 
@@ -116,16 +128,18 @@ module.exports = class extends BaseGenerator {
       }
 
       if (!fs.existsSync(databasesYamlPath) && resourceType === 'database') {
-        this.fs.copyTpl(
-          this.templatePath('spanner/databases.yaml'),
-          this.destinationPath(databasesYamlPath),
-          {
-            ...this.answers,
-            databaseName,
-            ddl,
-            retentionPeriod,
-          },
-        );
+        ['terragrunt.hcl', 'databases.yaml'].forEach((file) => {
+          this.fs.copyTpl(
+            this.templatePath(`spanner/${file}`),
+            this.destinationPath(`${spannerPath}/${file}`),
+            {
+              ...this.answers,
+              databaseName,
+              ddl,
+              retentionPeriod,
+            },
+          );
+        });
       }
 
       if (fs.existsSync(databasesYamlPath) && resourceType === 'database') {

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

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

package/generators/resources/spanner/validate.js

@@ -9,7 +9,6 @@ const validRetentionPeriod = (input) => {
   const validFormats = /^(84000s|1h|2d|7d)$/;
 
   if (input === '') {
-    // Empty input, using default value
     return { valid: true };
   }
   if (validFormats.test(input)) {
@@ -18,7 +17,7 @@ const validRetentionPeriod = (input) => {
 
   return {
     valid: false,
-    message: 'Invalid retention period format. Possible values include 84000s, 1h, 2d, or leave empty for default value 1h',
+    message: 'Invalid retention period format. Possible values are 84000s, 1h, 2d, or leave empty for default value 1h',
   };
 };
 

package/package.json

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