@architect/inventory 6.1.0-RC.0 → 6.1.0-RC.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@architect/inventory",
-  "version": "6.1.0-RC.0",
+  "version": "6.1.0-RC.1",
   "description": "Architect project resource enumeration utility",
   "main": "src/index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "test": "npm run lint && npm run test:integration && npm run test:coverage",
     "test:integration": "node --test --test-reporter=spec test/integration/*-test.js",
     "test:coverage": "node --test --test-reporter=spec --experimental-test-coverage --test-coverage-lines=100 --test-coverage-exclude='test/**/*' 'test/unit/**/*-test.js'",
-    "test:unit": "node --test --test-reporter=spec --test-coverage-exclude='test/**/*' 'test/unit/**/*-test.js'",
+    "test:unit": "node --test --test-reporter=spec 'test/unit/**/*-test.js'",
     "rc": "npm version prerelease --preid RC",
     "vendor": "scripts/vendor"
   },

package/src/config/pragmas/populate-lambda/_scheduled.js

@@ -33,12 +33,14 @@ module.exports = function populateScheduled (params) {
   let { item, errors, plugin } = params
   let rate = null
   let cron = null
+  let timezone = null
   if (plugin) {
     let { name, src } = item
     if (name && src && (item.rate || item.cron)) {
       if (item.rate) rate = get.rate(item.rate)
       if (item.cron) cron = get.cron(item.cron)
-      return { ...item, rate, cron, ...getLambdaDirs(params, { plugin }) }
+      if (item.timezone) timezone = item.timezone
+      return { ...item, rate, cron, timezone, ...getLambdaDirs(params, { plugin }) }
     }
     errors.push(`Invalid plugin-generated @scheduled item: name: ${name}, rate: ${item.rate}, cron: ${item.cron}, src: ${src}`)
     return
@@ -57,12 +59,12 @@ module.exports = function populateScheduled (params) {
     if (isCron) cron = get.cron(clean(isCron))
 
     let dirs = getLambdaDirs(params, { name })
-    return { name, rate, cron, ...dirs }
+    return { name, rate, cron, timezone, ...dirs }
   }
   else if (is.object(item)) {
     let name = Object.keys(item)[0]
 
-    // Handle rate + cron props
+    // Handle rate + cron + timezone props
     if (item[name].rate) {
       let itemRate = item[name].rate
       let exp = is.array(itemRate) ? itemRate.join(' ') : itemRate
@@ -73,9 +75,12 @@ module.exports = function populateScheduled (params) {
       let exp = is.array(itemCron) ? itemCron.join(' ') : itemCron
       cron = get.cron(exp)
     }
+    if (item[name].timezone) {
+      timezone = item[name].timezone
+    }
 
     let dirs = getLambdaDirs(params, { name, customSrc: item[name].src })
-    return { name, rate, cron, ...dirs }
+    return { name, rate, cron, timezone, ...dirs }
   }
   errors.push(`Invalid @scheduled item: ${item}`)
 }

package/src/config/pragmas/populate-lambda/index.js

@@ -174,7 +174,7 @@ function populate (type, pragma, inventory, errors, plugin) {
 let normalize = path => path.replace(/[\\\/]/g, sep)
 
 // Lambda setter plugins can technically return anything, so this ensures everything is tidy
-let lambdaProps = [ 'cron', 'batchSize', 'batchWindow', 'fifo', 'method', 'path', 'plugin', 'rate', 'route', 'table', 'type' ]
+let lambdaProps = [ 'cron', 'batchSize', 'batchWindow', 'fifo', 'method', 'path', 'plugin', 'rate', 'route', 'table', 'timezone', 'type' ]
 let configProps = [ ...Object.keys(defaultFunctionConfig()), 'fifo', 'views' ]
 let getKnownProps = (knownProps, raw = {}) => {
   let props = knownProps.flatMap(prop => is.defined(raw[prop]) ? [ [ prop, raw[prop] ] ] : [])

package/src/config/pragmas/validate/_events.js

@@ -43,13 +43,13 @@ module.exports = function validateEventsAndQueues (pragma, pragmaName, errors) {
       if (event.pragma === 'queues') {
         let { fifo, batchSize, batchWindow } = event
         if (!is.nullish(fifo) && !is.bool(fifo)) {
-          errors.push(`Invalid  ${pragmaName} item (fifo must be a boolean): ${name}`)
+          errors.push(`Invalid ${pragmaName} item (fifo must be a boolean): ${name}`)
         }
         if (!is.nullish(batchSize) && !is.number(batchSize)) {
-          errors.push(`Invalid  ${pragmaName} item (batchSize must be a number): ${name}`)
+          errors.push(`Invalid ${pragmaName} item (batchSize must be a number): ${name}`)
         }
         if (!is.nullish(batchWindow) && !is.number(batchWindow)) {
-          errors.push(`Invalid  ${pragmaName} item (batchWindow must be a number): ${name}`)
+          errors.push(`Invalid ${pragmaName} item (batchWindow must be a number): ${name}`)
         }
       }
     })

package/src/config/pragmas/validate/_scheduled.js

@@ -14,7 +14,7 @@ module.exports = function validateScheduled (scheduled, errors) {
     unique(scheduled, '@scheduled', errors)
 
     scheduled.forEach(schedule => {
-      let { name, rate, cron } = schedule
+      let { name, rate, cron, timezone } = schedule
       regex(name, 'veryLooseName', '@scheduled', errors)
 
       // Assume 14 chars are taken up by resource naming in arc/package
@@ -22,6 +22,7 @@ module.exports = function validateScheduled (scheduled, errors) {
 
       if (cron) validateCron(schedule, errors)
       if (rate) validateRate(schedule, errors)
+      if (timezone) validateTimezone(schedule, errors)
 
       if (!cron && !rate) errors.push(`Invalid @scheduled item (no cron or rate expression found): ${name}`)
       if (cron && rate) errors.push(`Invalid @scheduled item (use either cron or rate, not both): ${name}`)
@@ -53,6 +54,22 @@ function validateCron (schedule, errors) {
   if (!year.toString().match(minHrYr))    expErr('year', year)
 }
 
+function validateTimezone (schedule, errors) {
+  let { name, timezone } = schedule
+  if (!is.string(timezone) || !timezone.length) {
+    errors.push(`Invalid @scheduled item (timezone must be a non-empty string): ${name}`)
+  }
+  else {
+    // AWS EventBridge accepts IANA timezone identifiers (e.g., America/New_York, Europe/London)
+    try {
+      Intl.DateTimeFormat(undefined, { timeZone: timezone })
+    }
+    catch {
+      errors.push(`Invalid @scheduled item (timezone must be a valid IANA timzone identifier): ${name}`)
+    }
+  }
+}
+
 let singular = [ 'minute', 'hour', 'day' ]
 let plural = [ 'minutes', 'hours', 'days' ]
 function validateRate (schedule, errors) {