@aws-sdk/client-ssm / aws-sdk/clients/ssm → @aws-lite/ssm

Author: ryanblock

package.json

@@ -25,6 +25,8 @@
   "author": "Brian LeRoux <b@brian.io>",
   "license": "Apache-2.0",
   "dependencies": {
+    "@aws-lite/client": "^0.8.1",
+    "@aws-lite/ssm": "^0.1.0",
     "cookie": "^0.5.0",
     "cookie-signature": "^1.2.1",
     "csrf": "^3.1.0",
@@ -42,7 +44,6 @@
     "@aws-sdk/client-dynamodb": "^3.319.0",
     "@aws-sdk/client-sns": "^3.319.0",
     "@aws-sdk/client-sqs": "^3.319.0",
-    "@aws-sdk/client-ssm": "^3.319.0",
     "@aws-sdk/lib-dynamodb": "^3.319.0",
     "@smithy/node-http-handler": "^2.1.7",
     "@types/aws-lambda": "^8.10.119",

src/discovery/index.js

@@ -1,5 +1,5 @@
-let { isNode18, useAWS } = require('../lib')
-let ssm, ssmClient
+let { callbackify } = require('util')
+let { getAwsClient, useAWS } = require('../lib')
 
 /**
  * @param {string} type - events, queues, or tables
@@ -19,11 +19,7 @@ module.exports = function lookup (callback) {
     app = 'arc-app'
   }
 
-  let Path = `/${stack || toLogicalID(`${app}-${env}`)}`
-  let Recursive = true
-  let values = []
-  let config
-
+  let config = {}
   if (local) {
     let port = 2222
     if (ARC_SANDBOX) {
@@ -34,71 +30,53 @@ module.exports = function lookup (callback) {
       port = ports._arc
     }
     config = {
-      endpoint: `http://localhost:${port}/_arc/ssm`,
+      endpointPrefix: '/_arc/ssm',
+      host: `localhost`,
+      port,
+      protocol: 'http',
       region: AWS_REGION || 'us-west-2',
     }
   }
 
-  // shim v2 and v3
-  if (!ssmClient) {
-    if (isNode18) {
-      let { SSMClient: SSM, GetParametersByPathCommand: cmd } = require('@aws-sdk/client-ssm')
-      let GetParametersByPathCommand = cmd
-      ssm = new SSM(config)
-      ssmClient = (params, callback) => {
-        let command = new GetParametersByPathCommand(params)
-        return ssm.send(command, callback)
-      }
-    }
+  getAwsClient(config, (err, client) => {
+    if (err) callback(err)
     else {
-      let SSM = require('aws-sdk/clients/ssm')
-      ssm = new SSM(config)
-      ssmClient = (params, callback) => {
-        return ssm.getParametersByPath(params, callback)
-      }
+      let Path = `/${stack || toLogicalID(`${app}-${env}`)}`
+      let GetParametersByPath = callbackify(client.ssm.GetParametersByPath)
+      GetParametersByPath({ Path, paginate: true }, function done (err, result) {
+        if (err && local &&
+            err.message.includes('Inaccessible host') &&
+            err.message.includes('localhost')) {
+          let msg = 'Sandbox internal services are unavailable, please ensure Sandbox is running'
+          callback(ReferenceError(msg))
+        }
+        else if (err) {
+          callback(err)
+        }
+        else {
+          let services = result.Parameters.reduce((a, b) => {
+            let hierarchy = b.Name.split('/')
+            hierarchy.shift() // leading slash
+            hierarchy.shift() // stack name
+            let type = hierarchy.shift() // i.e. tables, events, queues, plugins
+            if (!a[type]) a[type] = {}
+            let parent = a[type]
+            let child, lastChild, lastParent
+            /* eslint-disable-next-line */
+            while (child = hierarchy.shift()) {
+              if (!parent[child]) parent[child] = {}
+              lastParent = parent
+              parent = parent[child]
+              lastChild = child
+            }
+            lastParent[lastChild] = b.Value
+            return a
+          }, {})
+          callback(null, services)
+        }
+      })
     }
-  }
-
-  function getParams (params) {
-    ssmClient(params, function done (err, result) {
-      if (err && local &&
-          err.message.includes('Inaccessible host') &&
-          err.message.includes('localhost')) {
-        let msg = 'Sandbox internal services are unavailable, please ensure Sandbox is running'
-        callback(ReferenceError(msg))
-      }
-      else if (err) {
-        callback(err)
-      }
-      else if (result.NextToken) {
-        values = values.concat(result.Parameters)
-        getParams({ Path, Recursive, NextToken: result.NextToken })
-      }
-      else {
-        values = values.concat(result.Parameters)
-        let services = values.reduce((a, b) => {
-          let hierarchy = b.Name.split('/')
-          hierarchy.shift() // leading slash
-          hierarchy.shift() // stack name
-          let type = hierarchy.shift() // i.e. tables, events, queues, plugins
-          if (!a[type]) a[type] = {}
-          let parent = a[type]
-          let child, lastChild, lastParent
-          /* eslint-disable-next-line */
-          while (child = hierarchy.shift()) {
-            if (!parent[child]) parent[child] = {}
-            lastParent = parent
-            parent = parent[child]
-            lastChild = child
-          }
-          lastParent[lastChild] = b.Value
-          return a
-        }, {})
-        callback(null, services)
-      }
-    })
-  }
-  getParams({ Path, Recursive })
+  })
 }
 
 function toLogicalID (str) {

src/lib/index.js

@@ -4,6 +4,14 @@ let sandboxVersionAtLeast = require('./_sandbox-version')
 let isNode18 = Number(process.version.replace('v', '').split('.')[0]) >= 18
 
 let nonLocalEnvs = [ 'staging', 'production' ]
+
+function getAwsClient (params, callback) {
+  let { callbackify } = require('util')
+  let _awsLite = require('@aws-lite/client')
+  let awsLite = callbackify(_awsLite)
+  awsLite(params, callback)
+}
+
 function useAWS () {
   let { ARC_ENV, ARC_LOCAL, ARC_SANDBOX } = process.env
   // Testing is always local
@@ -15,6 +23,7 @@ function useAWS () {
 }
 
 module.exports = {
+  getAwsClient,
   getPorts,
   isNode18,
   sandboxVersionAtLeast,

test/integration/discovery-test.js

@@ -0,0 +1,33 @@
+let { join } = require('path')
+let test = require('tape')
+let sandbox = require('@architect/sandbox')
+let cwd = process.cwd()
+let mock = join(cwd, 'test', 'mock', 'project')
+let discovery = require('../../src/discovery')
+
+test('Set up env', async t => {
+  t.plan(2)
+  await sandbox.start({ cwd: mock, quiet: true })
+  t.pass('Set up ARC_APP_NAME env var')
+  t.pass('Sandbox started')
+})
+
+test('discovery should parse hierarchical SSM parameters into a service map object', t => {
+  t.plan(6)
+  discovery((err, services) => {
+    t.notOk(err, 'No error passed to callback')
+    t.equal(services.tables['arc-sessions'], 'test-only-staging-arc-sessions', 'Table value set up in correct place of service map')
+    t.equal(services.tables.things, 'test-only-staging-things', 'Table value set up in correct place of service map')
+
+    // Check deeper depths
+    t.ok(services.services.cloudwatch.metrics, 'Deeply nested object exists')
+    t.equal(services.services.cloudwatch.metrics.foo, 'bar', 'variable has correct value')
+    t.ok(services.services.cloudwatch.metrics.fiz, 'buz', 'variable has correct value')
+  })
+})
+
+test('Teardown', async t => {
+  t.plan(1)
+  await sandbox.end()
+  t.pass('Sandbox ended')
+})

test/mock/project/app.arc

@@ -1,6 +1,9 @@
 @app
 test-only
 
+@plugins
+services
+
 @http
 get /http-session
 get /http-async-session
@@ -22,3 +25,5 @@ async-queue
 arc-sessions
   _idx *String
   _ttl TTL
+things
+  thing *String

test/mock/project/src/plugins/services.js

@@ -0,0 +1,15 @@
+module.exports = {
+  deploy: {
+    services: async () => {
+      return {
+        tables: {
+          stuff: 'so-very-much-stuff'
+        },
+        'cloudwatch/metrics': {
+          foo: 'bar',
+          fiz: 'buz',
+        }
+      }
+    }
+  }
+}