@architect/inventory 3.0.0-RC.8 → 3.1.0

package/changelog.md

@@ -2,6 +2,14 @@
 
 ---
 
+## [3.1.0] 2022-03-24
+
+### Added
+
+- Added support for configuring Lambda's ephemeral storage feature
+
+---
+
 ## [3.0.0] 2022-01-04
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@architect/inventory",
-  "version": "3.0.0-RC.8",
+  "version": "3.1.0",
   "description": "Architect project resource enumeration utility",
   "main": "src/index.js",
   "scripts": {
@@ -21,9 +21,9 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@architect/asap": "~5.0.0-RC.0",
-    "@architect/parser": "~6.0.0-RC.0",
-    "@architect/utils": "~3.1.0-RC.0",
+    "@architect/asap": "~5.0.0",
+    "@architect/parser": "~6.0.0",
+    "@architect/utils": "~3.1.0",
     "lambda-runtimes": "~1.1.1"
   },
   "devDependencies": {
@@ -31,13 +31,13 @@
     "aws-sdk": "2.1001.0",
     "aws-sdk-mock": "~5.6.2",
     "cross-env": "~7.0.3",
-    "dotenv": "~15.0.0",
-    "eslint": "~8.8.0",
+    "dotenv": "~16.0.0",
+    "eslint": "~8.9.0",
     "mock-fs": "~5.1.2",
     "mock-require": "~3.0.3",
     "nyc": "~15.1.0",
     "tap-spec": "^5.0.0",
-    "tape": "^5.5.0"
+    "tape": "^5.5.2"
   },
   "eslintConfig": {
     "extends": "@architect/eslint-config"

package/src/config/pragmas/plugins.js

@@ -1,6 +1,6 @@
 let { join } = require('path')
 let { existsSync } = require('fs')
-let { is, normalizeSrc, pragmas, validationPatterns } = require('../../lib')
+let { is, normalizeSrc, pragmas, tidyError, validationPatterns } = require('../../lib')
 let { lambdas } = pragmas
 let nonLambdaSetters = [ 'customLambdas', 'env', 'runtimes' ]
 let setters = [ ...lambdas, ...nonLambdaSetters ]
@@ -91,7 +91,7 @@ module.exports = function getPluginModules ({ arc, inventory, errors }) {
         })
       }
       catch (err) {
-        errors.push(`Unable to load plugin '${name}': ${err.message.split('\n')[0]}`)
+        errors.push(`Unable to load plugin '${name}': ${tidyError(err)}`)
       }
     }
     else errors.push(`Cannot find plugin '${name || plugin}'! Are you sure you have installed or created it correctly?`)

package/src/config/project/plugins/env.js

@@ -1,5 +1,5 @@
 let { deepFrozenCopy } = require('@architect/utils')
-let { is, validationPatterns: valid } = require('../../../lib')
+let { is, tidyError, validationPatterns: valid } = require('../../../lib')
 let envs = [ 'testing', 'staging', 'production' ]
 let str = value => {
   if (is.object(value) || is.array(value)) return JSON.stringify(value)
@@ -62,7 +62,7 @@ module.exports = function setEnvPlugins (params, project) {
         }
       }
       catch (err) {
-        errors.push(`Runtime plugin '${fn.plugin}' failed: ${err.message}`)
+        errors.push(`Runtime plugin '${fn.plugin}' failed: ${tidyError(err)}`)
       }
     })
     return env

package/src/config/project/prefs/dotenv.js

@@ -7,7 +7,7 @@
 var fs = require("fs");
 var path = require("path");
 var os = require("os");
-var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
+var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
 function parse(src) {
   const obj = {};
   let lines = src.toString();
@@ -18,7 +18,7 @@ function parse(src) {
     let value = match[2] || "";
     value = value.trim();
     const maybeQuote = value[0];
-    value = value.replace(/^(['"])([\s\S]+)\1$/mg, "$2");
+    value = value.replace(/^(['"`])([\s\S]*)\1$/mg, "$2");
     if (maybeQuote === '"') {
       value = value.replace(/\\n/g, "\n");
       value = value.replace(/\\r/g, "\r");

package/src/defaults/function-config.js

@@ -10,6 +10,7 @@ module.exports = function createDefaultFunctionConfig () {
     handler: 'index.handler',
     state: 'n/a',
     concurrency: 'unthrottled',
+    storage: 512,
     layers: [],
     policies: [],
     shared: true,

package/src/lib/get-lambda-dirs.js

@@ -1,4 +1,4 @@
-let { join } = require('path')
+let { isAbsolute, join } = require('path')
 
 /**
  * Get the src (and build) dirs for a Lambda
@@ -29,8 +29,8 @@ function getLambdaDirs (params, options) {
 }
 
 function normalizeSrc (cwd, dir) {
-  if (!dir.startsWith(cwd)) return join(cwd, dir)
-  return dir
+  if (isAbsolute(dir)) return dir
+  return join(cwd, dir)
 }
 
 getLambdaDirs.normalizeSrc = normalizeSrc

package/src/lib/index.js

@@ -24,6 +24,9 @@ let validationPatterns = {
   envVar: /^[a-zA-Z0-9_]+$/,
 }
 
+// Error tidier: remove the error name, just print the message + stack data
+let tidyError = err => err.message + `\n` + err.stack.split('\n').slice(1).join('\n')
+
 module.exports = {
   asapSrc,
   compiledRuntimes,
@@ -34,5 +37,6 @@ module.exports = {
   mergeEnvVars,
   normalizeSrc: getLambdaDirs.normalizeSrc,
   pragmas,
+  tidyError,
   validationPatterns,
 }

package/src/validate/config.js

@@ -9,7 +9,8 @@ module.exports = function configValidator (params, inventory, errors) {
   let {
     runtime: globalRuntime,
     memory: globalMemory,
-    timeout: globalTimeout
+    storage: globalStorage,
+    timeout: globalTimeout,
   } = inventory.aws
 
   let customRuntimes = inventory._project?.customRuntimes?.runtimes || []
@@ -28,6 +29,10 @@ module.exports = function configValidator (params, inventory, errors) {
        !aliases[globalRuntime] && !aliases[globalRuntime.toLowerCase()])) {
     errors.push(`Invalid project-level runtime: ${globalRuntime}`)
   }
+  // Storage
+  if (!is.nullish(globalStorage) && invalidStorage(globalStorage)) {
+    errors.push(invalidStorageMsg(`${globalStorage} MB (@aws)`))
+  }
   // Timeout
   if (!is.nullish(globalTimeout) && invalidTimeout(globalTimeout)) {
     errors.push(invalidTimeoutMsg(`${globalTimeout} seconds (@aws)`))
@@ -39,7 +44,7 @@ module.exports = function configValidator (params, inventory, errors) {
   lambdas.forEach(p => {
     let pragma = inventory[p]
     if (pragma) pragma.forEach(({ name, config }) => {
-      let { memory, runtime, timeout } = config
+      let { memory, runtime, storage, timeout } = config
 
       // Memory
       if (invalidMemory(memory) && memory !== globalMemory) {
@@ -49,6 +54,10 @@ module.exports = function configValidator (params, inventory, errors) {
       if (!allRuntimes.includes(runtime) && runtime !== globalRuntime) {
         errors.push(`Invalid runtime: ${runtime} (@${p} ${name})`)
       }
+      // Storage
+      if (invalidStorage(storage) && storage !== globalStorage) {
+        errors.push(invalidStorageMsg(`${storage} MB (@${p} ${name})`))
+      }
       // Timeout
       if (invalidTimeout(timeout) && timeout !== globalTimeout) {
         errors.push(invalidTimeoutMsg(`${timeout} seconds (@${p} ${name})`))
@@ -68,3 +77,9 @@ let minTimeout = 1
 let maxTimeout = 1 * 60 * 15 // 15 mins
 let invalidTimeout = timeout => !is.number(timeout) || (timeout < minTimeout) || (timeout > maxTimeout)
 let invalidTimeoutMsg = info => `Invalid Lambda timeout setting: ${info}, timeout must be between ${minTimeout} - ${maxTimeout} seconds`
+
+// Memory
+let minStorage = 512
+let maxStorage = 10240
+let invalidStorage = storage => !is.number(storage) || (storage < minStorage) || (storage > maxStorage)
+let invalidStorageMsg = info => `Invalid Lambda storage setting: ${info}, storage must be between ${minStorage} - ${maxStorage} MB`