@hiiretail/gcp-infra-generators 1.15.0 → 1.16.0

package/dist/generators/common-resources/firestore/index.js

@@ -80,6 +80,10 @@ module.exports = class extends BaseGenerator {
           return `Please provide backup retention in seconds (e.g., "${seconds}" is ${days}).`;
         },
         validate: required,
+        filter: (input) => {
+          const trimmed = input.trim();
+          return /^\d+$/.test(trimmed) ? `${trimmed}s` : trimmed;
+        },
       },
       {
         type: 'input',

package/dist/generators/common-resources/firestore/templates/firestore/terragrunt.hcl

@@ -39,19 +39,29 @@ locals {
     for db in local.all_databases : db.name => try(db.collections, [])
   }
 
+  # Decode each collection's schema file once (if referenced), merged over any inline definition
+  databases_collections_resolved = {
+    for db_name, collections in local.databases_collections : db_name => [
+      for collection in collections : merge(
+        collection,
+        merge([
+          for schema_path in (try(collection.schema, null) != null ? [collection.schema] : []) :
+          yamldecode(file("${get_terragrunt_dir()}/${schema_path}"))
+        ]...)
+      )
+    ]
+  }
+
   # Load collection schemas from referenced files OR inline definitions
   collection_schemas = {
-    for db_name, collections in local.databases_collections : db_name => {
-      for collection in collections :
-      (try(collection.schema, null) != null ? yamldecode(file("${get_terragrunt_dir()}/${collection.schema}")).name : collection.name) => merge(
-        {
-          name        = try(collection.schema, null) != null ? yamldecode(file("${get_terragrunt_dir()}/${collection.schema}")).name : collection.name
-          description = try(collection.schema, null) != null ? yamldecode(file("${get_terragrunt_dir()}/${collection.schema}")).description : try(collection.description, "")
-          ttl_field   = try(collection.schema, null) != null ? try(yamldecode(file("${get_terragrunt_dir()}/${collection.schema}")).ttl_field, null) : try(collection.ttl_field, null)
-          indexes     = try(collection.schema, null) != null ? try(yamldecode(file("${get_terragrunt_dir()}/${collection.schema}")).indexes, []) : try(collection.indexes, [])
-          fields      = try(collection.schema, null) != null ? try(yamldecode(file("${get_terragrunt_dir()}/${collection.schema}")).fields, []) : try(collection.fields, [])
-        }
-      )
+    for db_name, collections in local.databases_collections_resolved : db_name => {
+      for collection in collections : collection.name => {
+        name        = collection.name
+        description = try(collection.description, "")
+        ttl_field   = try(collection.ttl_field, null)
+        indexes     = try(collection.indexes, [])
+        fields      = try(collection.fields, [])
+      }
     }
   }
 
@@ -91,7 +101,7 @@ locals {
   databases_composite_index_configuration = {
     for db_name, schemas in local.collection_schemas : db_name => flatten([
       for schema_name, schema in schemas : [
-        for idx, index in try(schema.indexes, []) :
+        for index in try(schema.indexes, []) :
         {
           index_id   = index.name
           collection = schema_name

package/dist/node_modules/.package-lock.json

@@ -11528,7 +11528,7 @@
     },
     "packages/generators": {
       "name": "@hiiretail/gcp-infra-generators",
-      "version": "1.15.0",
+      "version": "1.16.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/storage": "^7.18.0",

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hiiretail/gcp-infra-generators",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "Infrastructure as code generator for GCP.",
   "scripts": {
     "build": "node esbuild.js && npm run build:deps",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hiiretail/gcp-infra-generators",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "Infrastructure as code generator for GCP.",
   "scripts": {
     "build": "node esbuild.js && npm run build:deps",