@bedrock/kms 10.0.0 → 10.3.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # bedrock-kms ChangeLog
 
+## 10.3.0 - 2022-06-19
+
+### Added
+- Cache KMS module APIs as imported.
+
+## 10.2.0 - 2022-05-13
+
+### Added
+- Expose `_disableClearCacheOnUpdate` for testing cache busting only; do not use in
+  production.
+
+## 10.1.0 - 2022-05-13
+
+### Added
+- Add `fresh` option to `keystores.get()` API to allow for retrieving a fresh
+  (not previously cached) keystore config record.
+
 ## 10.0.0 - 2022-04-29
 
 ### Changed

package/lib/BedrockKmsModuleManager.js

@@ -6,11 +6,18 @@ import * as brPackageManager from '@bedrock/package-manager';
 // load config defaults
 import './config.js';
 
+const importMap = new Map();
+
 export class BedrockKmsModuleManager {
   async get({id}) {
     const {packageName} = brPackageManager.get(
       {alias: id, type: 'webkms-module'});
-    const api = await import(packageName);
+    let api = await importMap.get(packageName);
+    if(!api) {
+      const promise = import(packageName);
+      importMap.set(packageName, promise);
+      api = await promise;
+    }
     return api.default || api;
   }
 }

package/lib/keystores.js

@@ -16,6 +16,10 @@ import './config.js';
 
 const USAGE_COUNTER_MAX_CONCURRENCY = 100;
 let KEYSTORE_CONFIG_CACHE;
+let DISABLE_CLEAR_CACHE_ON_UPDATE = false;
+
+// cache only exported for testing purposes
+export {KEYSTORE_CONFIG_CACHE as _KEYSTORE_CONFIG_CACHE};
 
 bedrock.events.on('bedrock.init', async () => {
   const cfg = bedrock.config.kms;
@@ -100,8 +104,7 @@ export async function insert({config} = {}) {
     config
   };
   try {
-    const result = await database.collections['kms-keystore'].insertOne(
-      record, database.writeOptions);
+    const result = await database.collections['kms-keystore'].insertOne(record);
     return result.ops[0];
   } catch(e) {
     if(!database.isDuplicateError(e)) {
@@ -180,7 +183,7 @@ export async function update({config, explain = false} = {}) {
       config,
       'meta.updated': Date.now()
     }
-  }, database.writeOptions);
+  });
 
   if(result.result.n === 0) {
     // no records changed...
@@ -196,8 +199,10 @@ export async function update({config, explain = false} = {}) {
       });
   }
 
-  // delete record from cache
-  KEYSTORE_CONFIG_CACHE.delete(config.id);
+  if(!DISABLE_CLEAR_CACHE_ON_UPDATE) {
+    // delete record from cache
+    KEYSTORE_CONFIG_CACHE.delete(config.id);
+  }
 
   return true;
 }
@@ -207,11 +212,16 @@ export async function update({config, explain = false} = {}) {
  *
  * @param {object} options - The options to use.
  * @param {string} options.id - The ID of the keystore.
+ * @param {boolean} [options.fresh=false] - False if it is safe to use a
+ *   potentially cached value, true to always get a fresh value.
  *
  * @returns {Promise<object>} Resolves to `{config, meta}`.
  */
-export async function get({id} = {}) {
+export async function get({id, fresh = false} = {}) {
   assert.string(id, 'id');
+  if(fresh) {
+    KEYSTORE_CONFIG_CACHE.delete(id);
+  }
   const fn = () => _getUncachedRecord({id});
   return KEYSTORE_CONFIG_CACHE.memoize({key: id, fn});
 }
@@ -328,3 +338,8 @@ export async function _getUncachedRecord({id, explain = false} = {}) {
   }
   return record;
 }
+
+// exported for testing purposes
+export function _disableClearCacheOnUpdate(disable) {
+  DISABLE_CLEAR_CACHE_ON_UPDATE = disable;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/kms",
-  "version": "10.0.0",
+  "version": "10.3.0",
   "type": "module",
   "description": "Key management for Bedrock applications",
   "main": "./lib/index.js",

package/test/mocha/13-keystores-update-api.js

@@ -24,6 +24,12 @@ describe('keystores APIs', () => {
     controller: 'f2da13ee-50d2-46ab-865d-ee23d609edbd',
     sequence: 0,
   };
+  const mockConfigDelta = {
+    id: 'https://example.com/keystores/f9da6f23-6e13-42e9-88d3-5c03011ecbbf',
+    kmsModule: 'ssm-v1',
+    controller: '17e77da1-bb7e-4fe2-b4dd-1c4bba933d7c',
+    sequence: 0,
+  };
 
   before(async () => {
     let err;
@@ -31,6 +37,7 @@ describe('keystores APIs', () => {
       await keystores.insert({config: mockConfigAlpha});
       await keystores.insert({config: mockConfigBeta});
       await keystores.insert({config: mockConfigGamma});
+      await keystores.insert({config: mockConfigDelta});
     } catch(e) {
       err = e;
     }
@@ -93,6 +100,39 @@ describe('keystores APIs', () => {
       result.should.be.a('boolean');
       result.should.be.true;
     });
+    it('successfully updates a keystore and gets a fresh value', async () => {
+      const config = klona(mockConfigDelta);
+
+      // get keystore config to prime cache
+      await keystores.get({id: config.id});
+
+      // now update config
+      let err;
+      let result;
+      config.sequence++;
+      config.controller = 'someOtherController';
+      const oldDelete = keystores._KEYSTORE_CONFIG_CACHE.delete;
+      try {
+        // remove cache delete functionality to test fresh API
+        keystores._KEYSTORE_CONFIG_CACHE.delete = () => {};
+        result = await keystores.update({config});
+      } catch(e) {
+        err = e;
+      } finally {
+        keystores._KEYSTORE_CONFIG_CACHE.delete = oldDelete;
+      }
+      assertNoError(err);
+      result.should.be.a('boolean');
+      result.should.be.true;
+
+      // get keystore config, should be stale
+      const stale = await keystores.get({id: config.id});
+      stale.config.controller.should.not.equal(config.controller);
+
+      // get fresh config
+      const fresh = await keystores.get({id: config.id, fresh: true});
+      fresh.config.controller.should.equal(config.controller);
+    });
     it('fails to updates a keystore using wrong sequence number', async () => {
       let err;
       let result;