@bedrock/kms-http 13.0.0 → 14.0.0

package/.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
@@ -24,12 +24,12 @@ jobs:
     timeout-minutes: 10
     services:
       mongodb:
-        image: mongo:4.2
+        image: mongo:4.4
         ports:
           - 27017:27017
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [14.x, 16.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
@@ -43,45 +43,19 @@ jobs:
     - name: Run test with Node.js ${{ matrix.node-version }}
       run: |
         cd test
-        npm run test-node
-  test-karma:
-    needs: [test-node]
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    services:
-      mongodb:
-        image: mongo:4.2
-        ports:
-          - 27017:27017
-    strategy:
-      matrix:
-        node-version: [14.x]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: |
-        npm install
-        cd test
-        npm install
-    - name: Run test with Node.js ${{ matrix.node-version }}
-      run: |
-        cd test
-        npm run test-karma
+        npm test
   coverage:
-    needs: [test-karma]
+    needs: [test-node]
     runs-on: ubuntu-latest
     timeout-minutes: 10
     services:
       mongodb:
-        image: mongo:4.2
+        image: mongo:4.4
         ports:
           - 27017:27017
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # bedrock-kms-http ChangeLog
 
+## 14.0.0 - 2022-04-29
+
+### Changed
+- **BREAKING**: Update peer deps:
+  - `@bedrock/core@6`
+  - `@bedrock/app-identity@3`
+  - `@bedrock/express@8`
+  - `@bedrock/kms@10`
+  - `@bedrock/meter-usage-reporter@7`
+  - `@bedrock/validation@7`
+  - `@bedrock/zcap-storage@7`.
+
 ## 13.0.0 - 2022-04-05
 
 ### Changed

package/lib/BedrockKeystoreConfigStorage.js

@@ -3,7 +3,7 @@
  */
 import * as bedrock from '@bedrock/core';
 import * as helpers from './helpers.js';
-import {createRequire} from 'module';
+import {createRequire} from 'node:module';
 import {keystores} from '@bedrock/kms';
 const require = createRequire(import.meta.url);
 const {KeystoreConfigStorage} = require('@digitalbazaar/webkms-switch');

package/lib/http.js

@@ -7,7 +7,7 @@ import * as helpers from './helpers.js';
 import * as middleware from './middleware.js';
 import {asyncHandler} from '@bedrock/express';
 import cors from 'cors';
-import {createRequire} from 'module';
+import {createRequire} from 'node:module';
 import {createValidateMiddleware as validate} from '@bedrock/validation';
 import {
   defaultModuleManager as moduleManager,

package/lib/middleware.js

@@ -6,7 +6,7 @@ import * as brZCapStorage from '@bedrock/zcap-storage';
 import * as helpers from './helpers.js';
 import {asyncHandler} from '@bedrock/express';
 import {BedrockKeystoreConfigStorage} from './BedrockKeystoreConfigStorage.js';
-import {createRequire} from 'module';
+import {createRequire} from 'node:module';
 import {
   defaultDocumentLoader as documentLoader,
   defaultModuleManager as moduleManager

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/kms-http",
-  "version": "13.0.0",
+  "version": "14.0.0",
   "type": "module",
   "description": "Bedrock KMS HTTP API",
   "main": "./lib/index.js",
@@ -35,13 +35,13 @@
     "netmask": "^2.0.2"
   },
   "peerDependencies": {
-    "@bedrock/core": "^5.0.0",
-    "@bedrock/app-identity": "^2.0.0",
-    "@bedrock/express": "^7.0.0",
-    "@bedrock/kms": "^9.0.0",
-    "@bedrock/meter-usage-reporter": "^6.0.0",
-    "@bedrock/validation": "^6.0.0",
-    "@bedrock/zcap-storage": "^6.0.0"
+    "@bedrock/app-identity": "^3.0.0",
+    "@bedrock/core": "^6.0.0",
+    "@bedrock/express": "^8.0.0",
+    "@bedrock/kms": "^10.0.0",
+    "@bedrock/meter-usage-reporter": "^7.0.0",
+    "@bedrock/validation": "^7.0.0",
+    "@bedrock/zcap-storage": "^7.0.0"
   },
   "directories": {
     "lib": "./lib"
@@ -49,7 +49,7 @@
   "devDependencies": {
     "eslint": "^7.32.0",
     "eslint-config-digitalbazaar": "^2.8.0",
-    "eslint-plugin-jsdoc": "^37.9.7",
+    "eslint-plugin-jsdoc": "^39.2.9",
     "jsdoc-to-markdown": "^7.1.1"
   },
   "engines": {

package/test/mocha/10-keystore.js

@@ -4,11 +4,11 @@
 import * as bedrock from '@bedrock/core';
 import * as helpers from './helpers.js';
 import {agent} from '@bedrock/https-agent';
-import {createRequire} from 'module';
+import {createRequire} from 'node:module';
+import {httpClient, DEFAULT_HEADERS} from '@digitalbazaar/http-client';
 import {mockData} from './mock.data.js';
 const require = createRequire(import.meta.url);
 const {CapabilityAgent} = require('@digitalbazaar/webkms-client');
-const {httpClient, DEFAULT_HEADERS} = require('@digitalbazaar/http-client');
 const {signCapabilityInvocation} = require(
   '@digitalbazaar/http-signature-zcap-invoke');
 const {ZcapClient} = require('@digitalbazaar/ezcap');
@@ -334,7 +334,7 @@ describe('bedrock-kms-http API', () => {
         should.exist(result);
         result.should.eql(expectedConfig);
       });
-      it('throw internal server error when attempting to update "meterId"',
+      it('throw operation error when attempting to update "meterId"',
         async () => {
           // TODO: Remove or update this test when the following is fixed
           // eslint-disable-next-line max-len
@@ -385,7 +385,7 @@ describe('bedrock-kms-http API', () => {
           should.not.exist(result);
           should.exist(err);
           err.status.should.equal(500);
-          err.data.type.should.equal('bedrock.InternalServerError');
+          err.data.type.should.equal('OperationError');
         });
       it('rejects config update for an invalid zcap', async () => {
         const secret = 'd852a72d-013f-4dd6-8ba2-588aaf601b66';

package/test/mocha/11-keystore-kms-client.js

@@ -3,7 +3,7 @@
  */
 import * as helpers from './helpers.js';
 import {httpsAgent} from '@bedrock/https-agent';
-import {createRequire} from 'module';
+import {createRequire} from 'node:module';
 const require = createRequire(import.meta.url);
 const {CapabilityAgent, KmsClient, KeystoreAgent} =
   require('@digitalbazaar/webkms-client');
@@ -55,7 +55,7 @@ describe('keystore API interactions using webkms-client', () => {
     should.not.exist(result);
     should.exist(err);
     err.status.should.equal(400);
-    err.data.should.have.keys('message', 'type', 'details', 'cause');
+    err.data.should.include.keys('message', 'name', 'type', 'details', 'cause');
     err.data.type.should.equal('URLMismatchError');
     err.data.details.should.have.keys(
       ['expected', 'httpStatusCode', 'actual', 'configId', 'requestUrl']);

package/test/mocha/20-revocation.js

@@ -3,7 +3,7 @@
  */
 import * as helpers from './helpers.js';
 import {httpsAgent} from '@bedrock/https-agent';
-import {createRequire} from 'module';
+import {createRequire} from 'node:module';
 const require = createRequire(import.meta.url);
 const {CapabilityAgent, KmsClient, KeystoreAgent} =
   require('@digitalbazaar/webkms-client');

package/test/mocha/21-revocation-ip-allow-list.js

@@ -3,7 +3,7 @@
  */
 import * as helpers from './helpers.js';
 import {httpsAgent} from '@bedrock/https-agent';
-import {createRequire} from 'module';
+import {createRequire} from 'node:module';
 const require = createRequire(import.meta.url);
 const {CapabilityAgent, KmsClient, KeystoreAgent} =
   require('@digitalbazaar/webkms-client');

package/test/mocha/30-operations-generate-key.js

@@ -2,12 +2,12 @@
  * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
  */
 import * as helpers from './helpers.js';
+import {httpClient, DEFAULT_HEADERS} from '@digitalbazaar/http-client';
 import {httpsAgent} from '@bedrock/https-agent';
-import {createRequire} from 'module';
+import {createRequire} from 'node:module';
 const require = createRequire(import.meta.url);
 const {CapabilityAgent, KmsClient, KeystoreAgent} =
   require('@digitalbazaar/webkms-client');
-const {httpClient, DEFAULT_HEADERS} = require('@digitalbazaar/http-client');
 const {signCapabilityInvocation} = require(
   '@digitalbazaar/http-signature-zcap-invoke');
 

package/test/mocha/31-operations-hmac.js

@@ -1,17 +1,15 @@
 /*!
  * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
 import * as helpers from './helpers.js';
 import {httpsAgent} from '@bedrock/https-agent';
-import {createRequire} from 'module';
+import {createRequire} from 'node:module';
 import pMap from 'p-map';
+import uuid from 'uuid-random';
 const require = createRequire(import.meta.url);
 const {CapabilityAgent, Hmac, KmsClient} = require(
   '@digitalbazaar/webkms-client');
 
-const {util: {uuid}} = bedrock;
-
 const ZCAP_ROOT_PREFIX = 'urn:zcap:root:';
 
 describe('bedrock-kms-http HMAC operations', () => {

package/test/mocha/helpers.js

@@ -2,11 +2,12 @@
  * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
  */
 import * as bedrock from '@bedrock/core';
-import {createRequire} from 'module';
+import {createRequire} from 'node:module';
 import {documentLoader} from '@bedrock/jsonld-document-loader';
 import {getAppIdentity} from '@bedrock/app-identity';
 import {httpsAgent} from '@bedrock/https-agent';
 import jsigs from 'jsonld-signatures';
+import uuid from 'uuid-random';
 const require = createRequire(import.meta.url);
 const {AsymmetricKey, CapabilityAgent, KeystoreAgent, KmsClient} =
   require('@digitalbazaar/webkms-client');
@@ -18,7 +19,6 @@ const {Ed25519Signature2020} = require('@digitalbazaar/ed25519-signature-2020');
 const {ZcapClient} = require('@digitalbazaar/ezcap');
 
 const {purposes: {AssertionProofPurpose}} = jsigs;
-const {util: {uuid}} = bedrock;
 const {ZCAP_CONTEXT_URL} = zcapConstants;
 
 export async function createMeter({capabilityAgent} = {}) {

package/test/mocha/mock.data.js

@@ -1,7 +1,7 @@
 /*!
  * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import {createRequire} from 'module';
+import {createRequire} from 'node:module';
 const require = createRequire(import.meta.url);
 const {constants: zcapConstants} = require('@digitalbazaar/zcap');
 

package/test/package.json

@@ -14,33 +14,33 @@
     "coverage-report": "c8 report"
   },
   "dependencies": {
-    "@bedrock/app-identity": "^2.0.0",
-    "@bedrock/core": "^5.0.0",
-    "@bedrock/did-context": "^3.0.0",
-    "@bedrock/did-io": "^7.0.0",
-    "@bedrock/express": "^7.0.0",
-    "@bedrock/https-agent": "^3.0.0",
-    "@bedrock/jsonld-document-loader": "^2.0.0",
-    "@bedrock/karma": "^3.0.0",
-    "@bedrock/kms": "^9.0.0",
+    "@bedrock/app-identity": "^3.0.0",
+    "@bedrock/core": "^6.0.0",
+    "@bedrock/did-context": "^4.0.0",
+    "@bedrock/did-io": "^8.0.0",
+    "@bedrock/express": "^8.0.0",
+    "@bedrock/https-agent": "^4.0.0",
+    "@bedrock/jsonld-document-loader": "^3.0.0",
+    "@bedrock/karma": "^4.0.0",
+    "@bedrock/kms": "^10.0.0",
     "@bedrock/kms-http": "file:..",
-    "@bedrock/ledger-context": "^22.0.0",
-    "@bedrock/meter": "^2.0.0",
-    "@bedrock/meter-http": "^7.0.0",
-    "@bedrock/meter-usage-reporter": "^6.0.0",
-    "@bedrock/mongodb": "^9.0.0",
-    "@bedrock/package-manager": "^2.0.0",
-    "@bedrock/security-context": "^6.0.0",
-    "@bedrock/server": "^4.0.0",
-    "@bedrock/ssm-mongodb": "^8.0.0",
-    "@bedrock/test": "^7.0.0",
-    "@bedrock/validation": "^6.0.0",
-    "@bedrock/veres-one-context": "^13.0.0",
-    "@bedrock/zcap-storage": "^6.0.0",
+    "@bedrock/ledger-context": "^23.0.0",
+    "@bedrock/meter": "^3.0.0",
+    "@bedrock/meter-http": "^8.0.0",
+    "@bedrock/meter-usage-reporter": "^7.0.0",
+    "@bedrock/mongodb": "^10.0.0",
+    "@bedrock/package-manager": "^3.0.0",
+    "@bedrock/security-context": "^7.0.0",
+    "@bedrock/server": "^5.0.0",
+    "@bedrock/ssm-mongodb": "^9.0.0",
+    "@bedrock/test": "^8.0.0",
+    "@bedrock/validation": "^7.0.0",
+    "@bedrock/veres-one-context": "^14.0.0",
+    "@bedrock/zcap-storage": "^7.0.0",
     "@digitalbazaar/did-method-key": "^2.0.0",
     "@digitalbazaar/ed25519-signature-2020": "^3.0.0",
     "@digitalbazaar/ezcap": "^2.0.0",
-    "@digitalbazaar/http-client": "^2.0.1",
+    "@digitalbazaar/http-client": "^3.0.1",
     "@digitalbazaar/http-signature-zcap-invoke": "^5.0.1",
     "@digitalbazaar/webkms-client": "^10.0.0",
     "@digitalbazaar/zcap": "^7.0.0",

package/test/test.config.js

@@ -2,8 +2,8 @@
  * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
  */
 import {config} from '@bedrock/core';
-import {fileURLToPath} from 'url';
-import path from 'path';
+import {fileURLToPath} from 'node:url';
+import path from 'node:path';
 import '@bedrock/https-agent';
 import '@bedrock/kms-http';
 import '@bedrock/mongodb';