presidium 0.29.10 → 0.29.12

package/AwsCredentials.js

@@ -24,6 +24,17 @@ const pathResolve = require('./internal/pathResolve')
  */
 
 const AwsCredentials = async function (options = {}) {
+  if (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) {
+    const awsCreds = {
+      accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+      secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+    }
+    if (process.env.AWS_REGION) {
+      awsCreds.region = process.env.AWS_REGION
+    }
+    return awsCreds
+  }
+
   const profile = (
     typeof options == 'string' ? options : options.profile
   ) ?? 'default'

package/AwsCredentials.test.js

@@ -35,6 +35,24 @@ aws_secret_access_key = FFF
     assert.equal(awsCreds.secretAccessKey, 'FFF')
   }
 
+  {
+    process.env.AWS_ACCESS_KEY_ID = 'AA2'
+    process.env.AWS_SECRET_ACCESS_KEY = 'FF2'
+    const awsCreds = await AwsCredentials()
+    assert.equal(awsCreds.accessKeyId, 'AA2')
+    assert.equal(awsCreds.secretAccessKey, 'FF2')
+  }
+
+  {
+    process.env.AWS_ACCESS_KEY_ID = 'AA2'
+    process.env.AWS_SECRET_ACCESS_KEY = 'FF2'
+    process.env.AWS_REGION = 'us-east-2'
+    const awsCreds = await AwsCredentials()
+    assert.equal(awsCreds.accessKeyId, 'AA2')
+    assert.equal(awsCreds.secretAccessKey, 'FF2')
+    assert.equal(awsCreds.region, 'us-east-2')
+  }
+
   await fs.promises.rm(`${__dirname}/../.aws`, { recursive: true })
 }).case()
 

package/Dependency.js

@@ -39,6 +39,9 @@ Dependency.teardown = async function teardown(dependency) {
     dependency.close()
     await dependency.delete()
   }
+  else if (typeof dependency.destroy == 'function') {
+    await dependency.destroy()
+  }
 
   dependency?.timers?.forEach(clearInterval)
 }

package/Dependency.test.js

@@ -1,4 +1,5 @@
 const Test = require('thunk-test')
+const assert = require('assert')
 const DynamoTable = require('./DynamoTable')
 const DynamoStream = require('./DynamoStream')
 const ElasticsearchIndex = require('./ElasticsearchIndex')
@@ -48,12 +49,22 @@ const test = new Test('Dependency.teardown', async function () {
   })
   await myKinesisStream.ready
 
+  let didDestroyMyCache = false
+  const myCache = {
+    destroy() {
+      didDestroyMyCache = true
+    }
+  }
+
   await Dependency.teardown(null)
   await Dependency.teardown(myDynamoTable)
   await Dependency.teardown(myDynamoStream)
   await Dependency.teardown(myElasticsearchIndex)
   await Dependency.teardown(myS3Bucket)
   await Dependency.teardown(myKinesisStream)
+  await Dependency.teardown(myCache)
+  assert(didDestroyMyCache)
+
 }).case()
 
 if (process.argv[1] == __filename) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "presidium",
-  "version": "0.29.10",
+  "version": "0.29.12",
   "description": "A library for creating web services",
   "author": "Richard Tong",
   "license": "MIT",