Merge pull request #1437 from blackflux/dev

[Gally]: master <- dev

Author: simlu

.circleci/config.yml

@@ -2,30 +2,30 @@ workflows:
   node-multi-build:
     jobs:
       - gally-create-pr
-      - test-node-v18:
+      - test-node-v20:
           requires:
             - gally-create-pr
-      - test-node-v21:
+      - test-node-v23:
           requires:
             - gally-create-pr
-      - test-node-v20:
+      - test-node-v22:
           requires:
             - gally-create-pr
       - gally-auto-approve:
           requires:
             - gally-create-pr
-            - test-node-v18
-            - test-node-v21
             - test-node-v20
+            - test-node-v23
+            - test-node-v22
           filters:
             branches:
               only: /dependabot\/.*/
       - release:
           requires:
             - gally-create-pr
-            - test-node-v18
-            - test-node-v21
             - test-node-v20
+            - test-node-v23
+            - test-node-v22
           filters:
             branches:
               only: master
@@ -40,7 +40,7 @@ jobs:
       - run: ga promote $CIRCLE_BRANCH
   release:
     docker:
-      - image: cimg/node:20.11
+      - image: cimg/node:22.13
     steps:
       - checkout
       - run:
@@ -87,9 +87,9 @@ jobs:
       - run: >-
           ga approve $CIRCLE_PR_NUMBER --condition
           "base.ref=dev&state=open&user.login=dependabot-preview[bot]"
-  test-node-v18:
+  test-node-v20:
     docker:
-      - image: cimg/node:18.19
+      - image: cimg/node:20.18
     steps:
       - checkout
       - run:
@@ -119,9 +119,9 @@ jobs:
       - run: >-
           (git add . && git diff-index --quiet HEAD --) || (git status && exit
           1);
-  test-node-v20:
+  test-node-v23:
     docker:
-      - image: cimg/node:20.11
+      - image: cimg/node:23.6
     steps:
       - checkout
       - run:
@@ -151,9 +151,9 @@ jobs:
       - run: >-
           (git add . && git diff-index --quiet HEAD --) || (git status && exit
           1);
-  test-node-v21:
+  test-node-v22:
     docker:
-      - image: cimg/node:21.6
+      - image: cimg/node:22.13
     steps:
       - checkout
       - run:

.eslintrc.json

@@ -3,7 +3,7 @@
   "extends": [
     "airbnb-base",
     "plugin:mocha/recommended",
-    "plugin:markdown/recommended"
+    "plugin:markdown/recommended-legacy"
   ],
   "rules": {
     "@blackflux/rules/c8-prevent-ignore": 1,

.gally.json

@@ -23,9 +23,9 @@
         "strict": true,
         "contexts": [
           "ci/circleci: gally-create-pr",
-          "ci/circleci: test-node-v18",
-          "ci/circleci: test-node-v21",
-          "ci/circleci: test-node-v20"
+          "ci/circleci: test-node-v20",
+          "ci/circleci: test-node-v23",
+          "ci/circleci: test-node-v22"
         ]
       },
       "enforce_admins": false,

.roboconfig.json

@@ -8,7 +8,7 @@
       "packageName": "node-tdd",
       "projectName": "node-tdd",
       "owner": "simlu",
-      "nodeVersion": "18",
+      "nodeVersion": "20",
       "ownerName": "Lukas Siemon",
       "mergeBot": "MrsFlux",
       "nccEnabled": false

eslint.config.js

@@ -13,7 +13,7 @@ export default [
   ...compat.extends(
     'airbnb-base',
     'plugin:mocha/recommended',
-    'plugin:markdown/recommended'
+    'plugin:markdown/recommended-legacy'
   ),
   ...compat.env({ es6: true, node: true, mocha: true }),
   ...compat.plugins('json', 'mocha'),

package.json

@@ -14,7 +14,7 @@
     "t": "yarn test",
     "ts": "yarn run test-simple",
     "tsv": "yarn run test-simple --verbose",
-    "semantic-release": "yarn run build-clean && npx semantic-release",
+    "semantic-release": "yarn run build-clean && yarn exec semantic-release",
     "gardener": "node gardener.js",
     "u": "yarn upgrade --latest --force",
     "i": "yarn install --frozen-lockfile",
@@ -41,25 +41,25 @@
   },
   "homepage": "https://github.com/blackflux/node-tdd#readme",
   "devDependencies": {
-    "@aws-sdk/client-sqs": "3.523.0",
-    "@babel/core": "7.24.0",
-    "@babel/eslint-parser": "7.23.10",
-    "@babel/register": "7.23.7",
-    "@blackflux/eslint-plugin-rules": "3.0.1",
-    "@blackflux/robo-config-plugin": "9.3.2",
-    "aws-sdk-wrap": "13.2.1",
-    "axios": "1.6.7",
-    "c8": "9.1.0",
-    "chai": "5.1.0",
-    "eslint": "8.57.0",
+    "@aws-sdk/client-sqs": "3.734.0",
+    "@babel/core": "7.26.7",
+    "@babel/eslint-parser": "7.26.5",
+    "@babel/register": "7.25.9",
+    "@blackflux/eslint-plugin-rules": "4.0.0",
+    "@blackflux/robo-config-plugin": "10.0.0",
+    "aws-sdk-wrap": "13.3.2",
+    "axios": "1.7.9",
+    "c8": "10.1.3",
+    "chai": "5.1.2",
+    "eslint": "9.19.0",
     "eslint-config-airbnb-base": "15.0.0",
-    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-json": "3.1.0",
-    "eslint-plugin-markdown": "3.0.1",
-    "eslint-plugin-mocha": "10.3.0",
+    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-json": "4.0.1",
+    "eslint-plugin-markdown": "5.1.0",
+    "eslint-plugin-mocha": "10.5.0",
     "fancy-log": "2.0.0",
-    "js-gardener": "5.0.4",
-    "lambda-monitor-logger": "5.0.1"
+    "js-gardener": "6.0.2",
+    "lambda-monitor-logger": "5.1.1"
   },
   "licenses": [
     {
@@ -68,14 +68,14 @@
     }
   ],
   "engines": {
-    "node": ">= 18"
+    "node": ">= 20"
   },
   "files": [
     "lib"
   ],
   "dependencies": {
-    "callsites": "4.1.0",
-    "joi-strict": "3.0.1",
+    "callsites": "4.2.0",
+    "joi-strict": "4.0.0",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "4.4.2",
     "lru-cache-ext": "4.1.1",

src/modules/cache-clearer.js

@@ -15,7 +15,7 @@ const getFns = (obj) => {
       const value = LRU.prototype[key];
       assert(typeof value === 'function');
       result.push({ obj, key, value });
-    } catch (e) { /* ignored */ }
+    } catch { /* ignored */ }
   }
   return result;
 };

src/modules/request-recorder/heal-sqs/migration.js

@@ -8,7 +8,7 @@ const tryParseXML = (body) => {
     xml2js.parseString(body, (err, result) => {
       parsed = JSON.parse(JSON.stringify(result));
     });
-  } catch (e) {
+  } catch {
     return null;
   }
   return parsed;

src/modules/request-recorder/util.js

@@ -6,7 +6,7 @@ export const tryParseJson = (value) => {
   }
   try {
     return JSON.parse(value);
-  } catch (e) {
+  } catch {
     return value;
   }
 };

test/modules/request-recorder.spec.js

@@ -255,7 +255,7 @@ describe('Testing RequestRecorder', { useTmpDir: true, timestamp: 0 }, () => {
           accept: 'application/json, text/plain, */*',
           'content-type': 'application/json',
           'accept-encoding': 'gzip, compress, deflate, br',
-          'user-agent': 'axios/1.6.7',
+          'user-agent': 'axios/1.7.9',
           'content-length': '59'
         },
         response: { data: `${id}` },
@@ -329,7 +329,7 @@ describe('Testing RequestRecorder', { useTmpDir: true, timestamp: 0 }, () => {
         reqheaders: {
           accept: 'application/json, text/plain, */*',
           'content-type': 'application/json',
-          'user-agent': 'axios/1.6.7',
+          'user-agent': 'axios/1.7.9',
           'content-length': '^\\d+$',
           'accept-encoding': 'gzip, compress, deflate, br'
         },
@@ -475,7 +475,7 @@ describe('Testing RequestRecorder', { useTmpDir: true, timestamp: 0 }, () => {
             host: server.host,
             'content-length': '59',
             'accept-encoding': 'gzip, compress, deflate, br',
-            'user-agent': 'axios/1.6.7'
+            'user-agent': 'axios/1.7.9'
           }
         }),
         makeCassetteEntry(3)
@@ -505,7 +505,7 @@ describe('Testing RequestRecorder', { useTmpDir: true, timestamp: 0 }, () => {
             host: server.host,
             'content-length': '59',
             'accept-encoding': 'gzip, compress, deflate, br',
-            'user-agent': 'axios/1.6.7'
+            'user-agent': 'axios/1.7.9'
           }
         }),
         makeCassetteEntry(3)
@@ -527,7 +527,7 @@ describe('Testing RequestRecorder', { useTmpDir: true, timestamp: 0 }, () => {
           accept: 'application/json, text/plain, */*',
           host: server.host,
           'accept-encoding': 'gzip, compress, deflate, br',
-          'user-agent': 'axios/1.6.7'
+          'user-agent': 'axios/1.7.9'
         },
         response: {},
         responseIsBinary: false,
@@ -578,7 +578,7 @@ describe('Testing RequestRecorder', { useTmpDir: true, timestamp: 0 }, () => {
         reqheaders: {
           accept: 'application/json, text/plain, */*',
           'accept-encoding': 'gzip, compress, deflate, br',
-          host: `${server2.host} @ axios/1.6.7`,
+          host: `${server2.host} @ axios/1.7.9`,
           'user-agent': '^axios/.*$'
         },
         response: {
@@ -642,7 +642,7 @@ describe('Testing RequestRecorder', { useTmpDir: true, timestamp: 0 }, () => {
         reqheaders: {
           accept: 'application/json, text/plain, */*',
           'accept-encoding': 'gzip, compress, deflate, br',
-          'user-agent': 'axios/1.6.7'
+          'user-agent': 'axios/1.7.9'
         },
         response: {},
         responseIsBinary: false,

test/modules/request-recorder.spec.js__fixtures/post-questionmark.json

@@ -11,7 +11,7 @@
       "content-type": "application/x-www-form-urlencoded",
       "host": "test.com",
       "accept-encoding": "gzip, compress, deflate, br",
-      "user-agent": "axios/1.6.7"
+      "user-agent": "axios/1.7.9"
     },
     "response": "ok"
   }

test/modules/request-recorder.spec.js__fixtures/post.json

@@ -11,7 +11,7 @@
       "content-type": "application/x-www-form-urlencoded",
       "host": "test.com",
       "accept-encoding": "gzip, compress, deflate, br",
-      "user-agent": "axios/1.6.7"
+      "user-agent": "axios/1.7.9"
     },
     "response": "ok"
   }

test/modules/response-healing.spec.js__fixtures/json_bad-md5.json__expected.json

@@ -42,7 +42,8 @@
       "x-amz-content-sha256": "^[a-f0-9]{64}$",
       "x-amz-date": "^[0-9]{8}T[0-9]{6}Z$",
       "x-amz-target": "AmazonSQS.SendMessageBatch",
-      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$"
+      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$",
+      "x-amzn-query-mode": "true"
     }
   }
 ]

test/modules/response-healing.spec.js__fixtures/json_get-queue-url.json__expected.json

@@ -22,7 +22,8 @@
       "x-amz-content-sha256": "^[a-f0-9]{64}$",
       "x-amz-date": "^[0-9]{8}T[0-9]{6}Z$",
       "x-amz-target": "AmazonSQS.GetQueueUrl",
-      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$"
+      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$",
+      "x-amzn-query-mode": "true"
     }
   }
 ]

test/modules/response-healing.spec.js__fixtures/xml_create-queue.json__expected.json

@@ -35,7 +35,8 @@
       "x-amz-content-sha256": "^[a-f0-9]{64}$",
       "x-amz-date": "^[0-9]{8}T[0-9]{6}Z$",
       "x-amz-target": "AmazonSQS.CreateQueue",
-      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$"
+      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$",
+      "x-amzn-query-mode": "true"
     }
   }
 ]

test/modules/response-healing.spec.js__fixtures/xml_create-queue_bad-xml.json__expected.json

@@ -33,7 +33,8 @@
       "x-amz-content-sha256": "^[a-f0-9]{64}$",
       "x-amz-date": "^[0-9]{8}T[0-9]{6}Z$",
       "x-amz-target": "AmazonSQS.CreateQueue",
-      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$"
+      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$",
+      "x-amzn-query-mode": "true"
     }
   }
 ]

test/modules/response-healing.spec.js__fixtures/xml_create-queue_error.json__expected.json

@@ -36,7 +36,8 @@
       "x-amz-content-sha256": "^[a-f0-9]{64}$",
       "x-amz-date": "^[0-9]{8}T[0-9]{6}Z$",
       "x-amz-target": "AmazonSQS.CreateQueue",
-      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$"
+      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$",
+      "x-amzn-query-mode": "true"
     }
   }
 ]

test/modules/response-healing.spec.js__fixtures/xml_get-queue-attributes.json__expected.json

@@ -32,7 +32,8 @@
       "x-amz-content-sha256": "^[a-f0-9]{64}$",
       "x-amz-date": "^[0-9]{8}T[0-9]{6}Z$",
       "x-amz-target": "AmazonSQS.GetQueueAttributes",
-      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$"
+      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$",
+      "x-amzn-query-mode": "true"
     }
   }
 ]

test/modules/response-healing.spec.js__fixtures/xml_get-queue-url.json__expected.json

@@ -22,7 +22,8 @@
       "x-amz-content-sha256": "^[a-f0-9]{64}$",
       "x-amz-date": "^[0-9]{8}T[0-9]{6}Z$",
       "x-amz-target": "AmazonSQS.GetQueueUrl",
-      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$"
+      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$",
+      "x-amzn-query-mode": "true"
     }
   }
 ]

test/modules/response-healing.spec.js__fixtures/xml_get-queue-url_error.json__expected.json

@@ -23,7 +23,8 @@
       "x-amz-content-sha256": "^[a-f0-9]{64}$",
       "x-amz-date": "^[0-9]{8}T[0-9]{6}Z$",
       "x-amz-target": "AmazonSQS.GetQueueUrl",
-      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$"
+      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$",
+      "x-amzn-query-mode": "true"
     }
   }
 ]

test/modules/response-healing.spec.js__fixtures/xml_list-queue-tags.json__expected.json

@@ -26,7 +26,8 @@
       "x-amz-content-sha256": "^[a-f0-9]{64}$",
       "x-amz-date": "^[0-9]{8}T[0-9]{6}Z$",
       "x-amz-target": "AmazonSQS.ListQueueTags",
-      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$"
+      "x-amz-user-agent": "^aws-sdk-js/[0-9]+.[0-9]+.[0-9]+$",
+      "x-amzn-query-mode": "true"
     }
   }
 ]