Merge pull request #407 from ilteoood/master

BREAKING CHANGE: fastify v5 and node test runner
nearform · Dec 9, 2024 · 901ac26 · 901ac26
2 parents fae2648 + b16ed1e
commit 901ac26
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 48 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc b/.eslintrc
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,6 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 18
           - 20
           - 22
     steps:
@@ -28,7 +27,7 @@ jobs:
         with:
           role-to-assume: ${{ vars.AWS_ROLE_TO_ASSUME }}
           aws-region: ${{ vars.AWS_REGION }}
-      - run: npm run test:ci
+      - run: npm run test
   automerge:
     needs: build
     runs-on: ubuntu-latest

diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,17 @@
+const js = require('@eslint/js')
+const prettierRecommended = require('eslint-plugin-prettier/recommended')
+const globals = require('globals')
+
+module.exports = [
+  js.configs.recommended,
+  prettierRecommended,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node
+      },
+      ecmaVersion: 'latest',
+      sourceType: 'module'
+    }
+  }
+]
diff --git a/lib/client.js b/lib/client.js
@@ -16,7 +16,7 @@ class AwsClient {
       } else {
         return Buffer.from(data.SecretBinary, 'base64').toString('utf8')
       }
-    } catch (err) {
+    } catch {
       throw new Error(`Secret not found: ${name}`)
     }
   }

diff --git a/package.json b/package.json
@@ -7,8 +7,7 @@
     "lint": "eslint .",
     "lint:fix": "npm run lint -- --fix",
     "lint:staged": "lint-staged",
-    "test": "tap --reporter=spec --coverage-report=html --coverage-report=text --100 --no-browser test/*.test.js test/**/*.test.js",
-    "test:ci": "tap --no-color --reporter=spec --coverage-report=json --coverage-report=text --100 test/*.test.js test/**/*.test.js",
+    "test": "node --test",
     "prepare": "husky"
   },
   "repository": {
@@ -31,22 +30,20 @@
     "node": ">=18"
   },
   "devDependencies": {
-    "eslint": "^8.18.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^16.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-promise": "^6.0.0",
+    "eslint": "^9.16.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-n": "^17.14.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-standard": "^5.0.0",
-    "fastify": "^4.0.3",
-    "husky": "^9.0.11",
-    "lint-staged": "^15.0.1",
-    "prettier": "^3.0.1",
+    "fastify": "^5.1.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^15.2.10",
+    "prettier": "^3.4.2",
     "proxyquire": "^2.1.3",
     "sinon": "^19.0.2",
-    "tap": "^16.0.1",
-    "uuid": "^11.0.2"
+    "uuid": "^11.0.3"
   },
   "lint-staged": {
     "*.js": [

diff --git a/test/client.test.js b/test/client.test.js
@@ -1,6 +1,7 @@
 'use strict'
 
-const { test, beforeEach } = require('tap')
+const { test, beforeEach } = require('node:test')
+
 const sinon = require('sinon')
 const proxyquire = require('proxyquire')
 
@@ -37,10 +38,13 @@ test('get', (t) => {
     SMStub.resolves({ SecretString: 'secret payload' })
 
     const secret = await client.get('secret/name')
-    t.ok(GSVCStub.call, 'new instance of GetSecretValueCommand')
-    t.ok(SMStub.called, 'calls send')
-    t.ok(SMStub.calledWith(sinon.match({ input: { SecretId: 'secret/name' } })), 'provides name as SecretId to send')
-    t.equal(secret, 'secret payload', 'extracts SecretString')
+    t.assert.ok(GSVCStub.call, 'new instance of GetSecretValueCommand')
+    t.assert.ok(SMStub.called, 'calls send')
+    t.assert.ok(
+      SMStub.calledWith(sinon.match({ input: { SecretId: 'secret/name' } })),
+      'provides name as SecretId to send'
+    )
+    t.assert.equal(secret, 'secret payload', 'extracts SecretString')
   })
 
   t.test('SecretBinary', async (t) => {
@@ -50,9 +54,12 @@ test('get', (t) => {
       SecretBinary: Buffer.from('secret payload').toString('base64')
     })
     const secret = await client.get('secret/name')
-    t.ok(SMStub.called, 'calls send')
-    t.ok(SMStub.calledWith(sinon.match({ input: { SecretId: 'secret/name' } })), 'provides name as SecretId to send')
-    t.equal(secret, 'secret payload', 'extracts SecretBinary')
+    t.assert.ok(SMStub.called, 'calls send')
+    t.assert.ok(
+      SMStub.calledWith(sinon.match({ input: { SecretId: 'secret/name' } })),
+      'provides name as SecretId to send'
+    )
+    t.assert.equal(secret, 'secret payload', 'extracts SecretBinary')
   })
 
   t.test('sdk error', async (t) => {
@@ -63,6 +70,6 @@ test('get', (t) => {
 
     const promise = client.get('secret/name')
 
-    await t.rejects(promise, 'throws error')
+    await t.assert.rejects(promise, 'throws error')
   })
 })