@architect/inventory 3.6.4 → 3.6.6-RC.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@architect/inventory",
-  "version": "3.6.4",
+  "version": "3.6.6-RC.0",
   "description": "Architect project resource enumeration utility",
   "main": "src/index.js",
   "scripts": {
@@ -21,20 +21,21 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@architect/asap": "~6.0.4",
+    "@architect/asap": "~6.1.0-RC.0",
     "@architect/parser": "~6.0.3",
-    "@architect/utils": "~3.1.9",
-    "lambda-runtimes": "~1.1.6"
+    "@architect/utils": "~4.0.0-RC.1",
+    "@aws-lite/client": "~0.12.2",
+    "@aws-lite/ssm": "~0.2.1",
+    "lambda-runtimes": "~1.1.7"
   },
   "devDependencies": {
     "@architect/eslint-config": "~2.1.2",
-    "aws-sdk": "^2.1363.0",
-    "aws-sdk-mock": "~5.8.0",
     "cross-env": "~7.0.3",
     "dotenv": "~16.3.1",
     "eslint": "~8.55.0",
-    "mock-fs": "~5.2.0",
+    "mock-tmp": "~0.0.2",
     "nyc": "~15.1.0",
+    "proxyquire": "~2.1.3",
     "tap-arc": "^1.2.2",
     "tape": "^5.7.2"
   },

package/src/config/pragmas/shared.js

@@ -52,8 +52,8 @@ module.exports = function configureShared ({ arc, pragmas, inventory, errors })
   }
   else if (foundPluginSrc) {
     if (!required) {
-      if (!is.exists(shared.src)) shared.src = src
-      if (!is.exists(shared.src)) return null
+      if (!is.exists(shared.src) && !is.exists(join(cwd, shared.src))) shared.src = src
+      if (!is.exists(shared.src) && !is.exists(join(cwd, shared.src))) return null
     }
     validate.shared(shared.src, cwd, errors, required)
   }

package/src/config/pragmas/views.js

@@ -56,8 +56,8 @@ module.exports = function configureViews ({ arc, pragmas, inventory, errors }) {
   }
   else if (foundPluginSrc) {
     if (!required) {
-      if (!is.exists(views.src)) views.src = src
-      if (!is.exists(views.src)) return null
+      if (!is.exists(views.src) && !is.exists(join(cwd, views.src))) views.src = src
+      if (!is.exists(views.src) && !is.exists(join(cwd, views.src))) return null
     }
     validate.shared(views.src, cwd, errors, required)
   }

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

@@ -4,11 +4,11 @@ let read = require('../../../read')
 let validate = require('../validate')
 let { is, validationPatterns: valid } = require('../../../lib')
 let { parse } = require('./dotenv')
-let { homedir } = require('os')
+let os = require('os')
 
 module.exports = function getPrefs ({ scope, inventory, errors }) {
   let cwd = scope === 'global'
-    ? homedir()
+    ? os.homedir()
     : inventory._project.cwd
 
   let envFilepath = join(cwd, '.env')

package/src/env/index.js

@@ -8,68 +8,40 @@ module.exports = function env (params, inventory, callback) {
     return callback()
   }
 
-  /* istanbul ignore next */
-  try {
-    // eslint-disable-next-line
-    try { require('aws-sdk/lib/maintenance_mode_message').suppress = true }
-    catch { /* Noop */ }
-    // eslint-disable-next-line
-    var aws = require('aws-sdk')
-  }
-  catch (err) {
-    let msg = `'aws-sdk' not found, please install locally or globally (see also readme#aws-sdk-caveat)`
-    return callback(Error(msg))
-  }
+  let aws
   let name = inventory.app
   let { region } = inventory.aws
-  let ssm = new aws.SSM({ region })
   let result = []
+  // eslint-disable-next-line
+  let awsLite = require('@aws-lite/client')
+  /* istanbul ignore next */
+  awsLite({ region }).then(_aws => {
+    aws = _aws
 
-  function getSomeEnvVars (name, NextToken, callback) {
-    // Base query to ssm
-    let query = {
+    // Perform the query
+    let params = {
       Path: `/${name}`,
       Recursive: true,
       MaxResults: 10,
-      WithDecryption: true
+      WithDecryption: true,
+      paginate: true
     }
-
-    // Check if we're paginating
-    /* istanbul ignore if */
-    if (NextToken) query.NextToken = NextToken
-
-    // Perform the query
-    ssm.getParametersByPath(query, function _query (err, data) {
-      if (err) callback(err)
-      else {
-        // Tidy up the response
-        result = result.concat(data.Parameters.map(function (param) {
-          let bits = param.Name.split('/')
-          return {
-            app: name, // jic
-            env: bits[2],
-            name: bits[3],
-            value: param.Value,
-          }
-        }))
-        // Check for more data and, if so, recurse
-        /* istanbul ignore if: Sadly no way to easily mock this for testing */
-        if (data.NextToken) {
-          getSomeEnvVars(name, data.NextToken, callback)
+    aws.ssm.GetParametersByPath(params).then(data => {
+      // Tidy up the response
+      result = result.concat(data.Parameters.map(param => {
+        let bits = param.Name.split('/')
+        return {
+          app: name, // jic
+          env: bits[2],
+          name: bits[3],
+          value: param.Value,
         }
-        else callback(null, result)
-      }
-    })
-  }
+      }))
 
-  getSomeEnvVars(name, false, function done (err, result) {
-    if (err) callback(err)
-    else {
       let testing = null
       let staging = null
       let production = null
       if (result.length) {
-        // TODO refactor into a reducer?
         result.forEach(({ env, name: k, value: v }) => {
           if (env === 'testing') testing = Object.assign({}, testing, { [k]: v })
           if (env === 'staging') staging = Object.assign({}, staging, { [k]: v })
@@ -85,10 +57,9 @@ module.exports = function env (params, inventory, callback) {
         errors,
       })
       if (errors.length) {
-        callback(Error(errors[0]))
-        return
+        return callback(Error(errors[0]))
       }
       callback()
-    }
-  })
+    }).catch(err => callback(err))
+  }).catch(err => callback(err))
 }

package/src/lib/asap-src.js

@@ -1,23 +1,26 @@
 let { join } = require('path')
 let { existsSync } = require('fs')
 
-module.exports = function asapSrc () {
+module.exports = function asapSrc (params = {}) {
+  let { _testing } = params
+  let dirname = _testing ? _testing : __dirname
   // Inventory running as an arc/arc dependency (most common use case)
   let src = join(process.cwd(), 'node_modules', '@architect', 'asap', 'src')
   if (existsSync(src)) return src
 
   // Inventory running in arc/arc as a global install
-  let global = join(__dirname, '..', '..', '..', 'asap', 'src')
+  let global = join(dirname, '..', '..', '..', 'asap', 'src')
   if (existsSync(global)) return global
 
   // Inventory running from a local (symlink) context (usually testing/dev)
-  let local = join(__dirname, '..', '..', 'node_modules', '@architect', 'asap', 'src')
+  let local = join(dirname, '..', '..', 'node_modules', '@architect', 'asap', 'src')
   if (existsSync(local)) return local
 
   try {
     return require.resolve('@architect/asap')
   }
-  catch (err) {
+  catch {
+    /* istanbul ignore next */
     throw Error('Cannot find ASAP module!')
   }
 }

package/src/validate/index.js

@@ -39,5 +39,4 @@ module.exports = function finalValidation (params, inventory) {
   if (errors.length) {
     return errorFmt({ type: 'file path', errors })
   }
-
 }