From a66aa2789d04a1bc4642d2f8523d514ca20d01df Mon Sep 17 00:00:00 2001 From: David Gamero Date: Sat, 15 Mar 2025 15:19:58 -0400 Subject: [PATCH 1/9] integration test for patch middleware --- examples/typescript/patch/patch-example.ts | 5 +- package-lock.json | 271 ++++++++++++++++++++- package.json | 1 + src/index.ts | 1 + src/middleware.ts | 34 +-- src/test/integration/index.ts | 5 + src/test/integration/patchNamespace.ts | 47 ++++ 7 files changed, 345 insertions(+), 19 deletions(-) create mode 100644 src/test/integration/index.ts create mode 100644 src/test/integration/patchNamespace.ts diff --git a/examples/typescript/patch/patch-example.ts b/examples/typescript/patch/patch-example.ts index 8056f2b17b..76f8f42e13 100644 --- a/examples/typescript/patch/patch-example.ts +++ b/examples/typescript/patch/patch-example.ts @@ -1,4 +1,5 @@ -import { CoreV1Api, KubeConfig, setHeaderOptions, JsonPatch } from '@kubernetes/client-node'; +import { CoreV1Api, KubeConfig, setHeaderOptions } from '@kubernetes/client-node'; +import { PatchStrategy } from '@kubernetes/client-node/patch'; const kc = new KubeConfig(); kc.loadFromDefault(); @@ -28,7 +29,7 @@ try { namespace: 'default', body: patch, }, - setHeaderOptions('Content-Type', JsonPatch), + setHeaderOptions('Content-Type', PatchStrategy.JsonPatch), ); console.log('Patched.'); diff --git a/package-lock.json b/package-lock.json index ea1e059cc0..391cc3647d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,8 @@ "prettier": "^3.0.0", "pretty-quick": "^4.0.0", "ts-mockito": "^2.3.1", - "tsx": "^4.19.1", + "ts-node": "^10.9.2", + "tsx": "^4.19.3", "typedoc": "^0.27.1", "typescript": "~5.8.2", "typescript-eslint": "^8.26.0" @@ -58,6 +59,30 @@ "node": ">=18" } }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.25.0", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz", @@ -927,6 +952,34 @@ "integrity": "sha512-jn7/7ky30idSkd/O5yDBfAnVt+JJpepofP/POZ1iMOxK59cOfqIgg/Dj0eFsjOTMw+4ycJN0uhZH/Eb0bs/EUA==", "dev": true }, + "node_modules/@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -1263,6 +1316,19 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/acorn-walk": { + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/agent-base": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", @@ -1334,6 +1400,13 @@ "node": ">= 8" } }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true, + "license": "MIT" + }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -1566,6 +1639,13 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true, + "license": "MIT" + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -1630,6 +1710,16 @@ "node": ">=0.4.0" } }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -2760,6 +2850,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true, + "license": "ISC" + }, "node_modules/markdown-it": { "version": "14.1.0", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", @@ -3900,6 +3997,50 @@ "lodash": "^4.17.5" } }, + "node_modules/ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -4044,6 +4185,13 @@ "punycode": "^2.1.0" } }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true, + "license": "MIT" + }, "node_modules/v8-to-istanbul": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", @@ -4221,6 +4369,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", @@ -4241,6 +4399,27 @@ "integrity": "sha512-W+a0/JpU28AqH4IKtwUPcEUnUyXMDLALcn5/JLczGGT9fHE2sIby/xP/oQnx3nxkForzgzPy201RAKcB4xPAFQ==", "dev": true }, + "@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "dependencies": { + "@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + } + } + }, "@esbuild/aix-ppc64": { "version": "0.25.0", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz", @@ -4715,6 +4894,30 @@ "integrity": "sha512-jn7/7ky30idSkd/O5yDBfAnVt+JJpepofP/POZ1iMOxK59cOfqIgg/Dj0eFsjOTMw+4ycJN0uhZH/Eb0bs/EUA==", "dev": true }, + "@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "dev": true + }, + "@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true + }, + "@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true + }, + "@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "dev": true + }, "@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -4946,6 +5149,15 @@ "dev": true, "requires": {} }, + "acorn-walk": { + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "dev": true, + "requires": { + "acorn": "^8.11.0" + } + }, "agent-base": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", @@ -4992,6 +5204,12 @@ "picomatch": "^2.0.4" } }, + "arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -5157,6 +5375,12 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true }, + "create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, "cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -5203,6 +5427,12 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" }, + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true + }, "dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -5981,6 +6211,12 @@ "semver": "^7.5.3" } }, + "make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, "markdown-it": { "version": "14.1.0", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", @@ -6744,6 +6980,27 @@ "lodash": "^4.17.5" } }, + "ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "dev": true, + "requires": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + } + }, "tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -6840,6 +7097,12 @@ "punycode": "^2.1.0" } }, + "v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true + }, "v8-to-istanbul": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", @@ -6954,6 +7217,12 @@ } } }, + "yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true + }, "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index 03cb12fc74..3310bd46ca 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "watch": "tsc --watch", "test": "c8 mocha", "test-transpiled": "mocha --no-config dist", + "integration-test": "tsx src/test/integration/index.ts", "prepare": "npm run build && husky", "prepack": "npm run build", "docs": "typedoc src/gen" diff --git a/src/index.ts b/src/index.ts index 75af4daf50..10fb300ede 100644 --- a/src/index.ts +++ b/src/index.ts @@ -16,6 +16,7 @@ export * from './metrics.js'; export * from './object.js'; export * from './health.js'; export * from './middleware.js'; +export * from './patch.js'; export { type ConfigOptions, type User, type Cluster, type Context } from './config_types.js'; // Export FetchError so that instanceof checks in user code will definitely use the same instance diff --git a/src/middleware.ts b/src/middleware.ts index 2ea2b51923..b1084dca63 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -1,27 +1,29 @@ -import type { RequestContext, ResponseContext, ConfigurationOptions, Middleware } from './gen/index.js'; -import { PromiseMiddleware } from './gen/middleware.js'; +import type { + RequestContext, + ResponseContext, + ConfigurationOptions, + ObservableMiddleware, +} from './gen/index.js'; +import { of } from './gen/rxjsStub.js'; -// setHeaderMiddleware returns Middleware[] that sets a header value -export function setHeaderMiddleware(key: string, value: string): Middleware[] { - return [ - { - pre: async (c: RequestContext) => { - c.setHeaderParam(key, value); - return c; - }, - post: async (c: ResponseContext) => { - return c; - }, +function setHeaderMiddleware(key: string, value: string): ObservableMiddleware { + return { + pre: (request: RequestContext) => { + request.setHeaderParam(key, value); + return of(request); + }, + post: (response: ResponseContext) => { + return of(response); }, - ]; + }; } // Returns ConfigurationOptions that set a header export function setHeaderOptions( key: string, value: string, - opt?: ConfigurationOptions, -): ConfigurationOptions { + opt?: ConfigurationOptions, +): ConfigurationOptions { const newMiddlware = setHeaderMiddleware(key, value); const existingMiddlware = opt?.middleware || []; return { diff --git a/src/test/integration/index.ts b/src/test/integration/index.ts new file mode 100644 index 0000000000..37a95809fe --- /dev/null +++ b/src/test/integration/index.ts @@ -0,0 +1,5 @@ +import patchNamespace from './patchNamespace'; + +console.log('Integration testing'); + +patchNamespace(); diff --git a/src/test/integration/patchNamespace.ts b/src/test/integration/patchNamespace.ts new file mode 100644 index 0000000000..0f84069d54 --- /dev/null +++ b/src/test/integration/patchNamespace.ts @@ -0,0 +1,47 @@ +import assert, { deepEqual } from 'node:assert'; +import { PatchStrategy, CoreV1Api, KubeConfig, setHeaderOptions, V1Namespace } from '../../index'; + +export default async function patchNamespace() { + const kc = new KubeConfig(); + kc.loadFromDefault(); + + const coreV1Client = kc.makeApiClient(CoreV1Api); + let newNS = new V1Namespace(); + const testNSName = 'integration-test-patch-ns'; + newNS.metadata = { + name: testNSName, + labels: { + initialLabel: 'initialValue', + }, + }; + console.log(`Creating namespace ${testNSName}`); + await coreV1Client.createNamespace({ body: newNS }); + newNS = await coreV1Client.readNamespace({ name: testNSName }); + assert(newNS.metadata?.name === testNSName); + deepEqual(newNS.metadata?.labels?.initialLabel, 'initialValue'); + console.log('Namespace created with initial label.'); + + const patch = [ + { + op: 'replace', + path: '/metadata/labels', + value: { + foo: 'bar', + }, + }, + ]; + + console.log(`Patching namespace ${testNSName} to replace labels`); + await coreV1Client.patchNamespace( + { + name: testNSName, + body: patch, + }, + setHeaderOptions('Content-Type', PatchStrategy.JsonPatch), + ); + + const patchedNS = await coreV1Client.readNamespace({ name: testNSName }); + deepEqual(patchedNS.metadata?.labels?.foo, 'bar'); + deepEqual(patchedNS.metadata?.labels?.initialLabel, undefined); + console.log('Namespace patched with new label.'); +} From acc225e2e48164f86a20dfa73b922c963f4591e9 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Sat, 15 Mar 2025 15:30:22 -0400 Subject: [PATCH 2/9] update middleware unit tests --- src/middleware.ts | 2 +- src/middleware_test.ts | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/middleware.ts b/src/middleware.ts index b1084dca63..0397e26674 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -6,7 +6,7 @@ import type { } from './gen/index.js'; import { of } from './gen/rxjsStub.js'; -function setHeaderMiddleware(key: string, value: string): ObservableMiddleware { +export function setHeaderMiddleware(key: string, value: string): ObservableMiddleware { return { pre: (request: RequestContext) => { request.setHeaderParam(key, value); diff --git a/src/middleware_test.ts b/src/middleware_test.ts index 51e8e63585..b4004ea5f3 100644 --- a/src/middleware_test.ts +++ b/src/middleware_test.ts @@ -1,7 +1,6 @@ -import { RequestContext, ConfigurationOptions, HttpMethod } from './gen/index.js'; +import { RequestContext, ConfigurationOptions, HttpMethod, ObservableMiddleware } from './gen/index.js'; import { deepStrictEqual } from 'node:assert'; import { setHeaderMiddleware, setHeaderOptions } from './middleware.js'; -import { PromiseMiddleware } from './gen/middleware.js'; describe('Middleware', async () => { describe('setHeaderMiddleware', async () => { @@ -9,8 +8,10 @@ describe('Middleware', async () => { const reqContext = new RequestContext('http://nowhere.com', HttpMethod.GET); deepStrictEqual(reqContext.getHeaders(), {}); const headerMiddleware = setHeaderMiddleware('test-key', 'test-value'); - const postMiddlewareRequest = await headerMiddleware[0].pre(reqContext); - deepStrictEqual(postMiddlewareRequest.getHeaders(), { 'test-key': 'test-value' }); + const postMiddlewareRequest = await headerMiddleware.pre(reqContext); + await postMiddlewareRequest.toPromise().then((request) => { + deepStrictEqual(request.getHeaders(), { 'test-key': 'test-value' }); + }); }); it('should replace a header if it is already specified', async () => { @@ -18,8 +19,10 @@ describe('Middleware', async () => { reqContext.setHeaderParam('test-key', 'wrong-value'); deepStrictEqual(reqContext.getHeaders(), { 'test-key': 'wrong-value' }); const headerMiddleware = setHeaderMiddleware('test-key', 'test-value'); - const postMiddlewareRequest = await headerMiddleware[0].pre(reqContext); - deepStrictEqual(postMiddlewareRequest.getHeaders(), { 'test-key': 'test-value' }); + const postMiddlewareRequest = await headerMiddleware.pre(reqContext); + await postMiddlewareRequest.toPromise().then((request) => { + deepStrictEqual(request.getHeaders(), { 'test-key': 'test-value' }); + }); }); }); @@ -27,7 +30,7 @@ describe('Middleware', async () => { it('should add middleware to set header with no input options arg', async () => { const reqContext = new RequestContext('http://nowhere.com', HttpMethod.GET); deepStrictEqual(reqContext.getHeaders(), {}); - const testConfigurationOptions: ConfigurationOptions = {}; + const testConfigurationOptions: ConfigurationOptions = {}; const headerConfigurationOptions = setHeaderOptions( 'test-key', 'test-value', @@ -40,7 +43,10 @@ describe('Middleware', async () => { throw new Error('missing middleware in ConfigurationOptions'); } const postMiddlewareRequest = await headerConfigurationOptions.middleware[0].pre(reqContext); - deepStrictEqual(postMiddlewareRequest.getHeaders(), { 'test-key': 'test-value' }); + + await postMiddlewareRequest.toPromise().then((request) => { + deepStrictEqual(request.getHeaders(), { 'test-key': 'test-value' }); + }); }); }); }); From 4254345ba3727ce9fff631f083d7964636f27a9d Mon Sep 17 00:00:00 2001 From: David Gamero Date: Sat, 15 Mar 2025 15:32:25 -0400 Subject: [PATCH 3/9] kind integration test in workflow --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3c56d87308..abf9756c6f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,3 +26,6 @@ jobs: - run: npm run lint - run: npm audit --audit-level=critical - run: npm run build-with-tests && npm run test-transpiled + - name: Create k8s Kind Cluster + uses: helm/kind-action@v1 + - run: npm run integration-test From 43b8ea6eec3ccdd9ff08f4d872e6691787fdca8e Mon Sep 17 00:00:00 2001 From: David Gamero Date: Sat, 15 Mar 2025 15:33:48 -0400 Subject: [PATCH 4/9] kind integration test in workflow --- src/test/integration/patchNamespace.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/integration/patchNamespace.ts b/src/test/integration/patchNamespace.ts index 0f84069d54..6a31a6804d 100644 --- a/src/test/integration/patchNamespace.ts +++ b/src/test/integration/patchNamespace.ts @@ -1,5 +1,5 @@ import assert, { deepEqual } from 'node:assert'; -import { PatchStrategy, CoreV1Api, KubeConfig, setHeaderOptions, V1Namespace } from '../../index'; +import { PatchStrategy, CoreV1Api, KubeConfig, setHeaderOptions, V1Namespace } from '../../index.js'; export default async function patchNamespace() { const kc = new KubeConfig(); From 4029d2e0b3fc76f53533df2aca0246ec07d3a5a9 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Sat, 15 Mar 2025 15:34:41 -0400 Subject: [PATCH 5/9] extension --- src/test/integration/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/integration/index.ts b/src/test/integration/index.ts index 37a95809fe..bda2b075d9 100644 --- a/src/test/integration/index.ts +++ b/src/test/integration/index.ts @@ -1,4 +1,4 @@ -import patchNamespace from './patchNamespace'; +import patchNamespace from './patchNamespace.js'; console.log('Integration testing'); From 7b19ee62a0d9176f8b101c1cac6ecd15678ee619 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Thu, 20 Mar 2025 08:44:29 +1300 Subject: [PATCH 6/9] update to strictequals, imports, and remove mixed then/await --- examples/typescript/patch/patch-example.ts | 3 +-- src/middleware_test.ts | 7 +++---- src/test/integration/index.ts | 2 +- src/test/integration/name.ts | 7 +++++++ src/test/integration/patchNamespace.ts | 11 ++++++----- 5 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 src/test/integration/name.ts diff --git a/examples/typescript/patch/patch-example.ts b/examples/typescript/patch/patch-example.ts index 76f8f42e13..f3d5c03d8e 100644 --- a/examples/typescript/patch/patch-example.ts +++ b/examples/typescript/patch/patch-example.ts @@ -1,5 +1,4 @@ -import { CoreV1Api, KubeConfig, setHeaderOptions } from '@kubernetes/client-node'; -import { PatchStrategy } from '@kubernetes/client-node/patch'; +import { CoreV1Api, KubeConfig, setHeaderOptions, PatchStrategy } from '@kubernetes/client-node'; const kc = new KubeConfig(); kc.loadFromDefault(); diff --git a/src/middleware_test.ts b/src/middleware_test.ts index b4004ea5f3..64b8ea6ad9 100644 --- a/src/middleware_test.ts +++ b/src/middleware_test.ts @@ -8,10 +8,9 @@ describe('Middleware', async () => { const reqContext = new RequestContext('http://nowhere.com', HttpMethod.GET); deepStrictEqual(reqContext.getHeaders(), {}); const headerMiddleware = setHeaderMiddleware('test-key', 'test-value'); - const postMiddlewareRequest = await headerMiddleware.pre(reqContext); - await postMiddlewareRequest.toPromise().then((request) => { - deepStrictEqual(request.getHeaders(), { 'test-key': 'test-value' }); - }); + const postMiddlewareRequestObservable = await headerMiddleware.pre(reqContext); + const postMiddlewareRequest = await postMiddlewareRequestObservable.toPromise(); + deepStrictEqual(postMiddlewareRequest.getHeaders(), { 'test-key': 'test-value' }); }); it('should replace a header if it is already specified', async () => { diff --git a/src/test/integration/index.ts b/src/test/integration/index.ts index bda2b075d9..5065dcd429 100644 --- a/src/test/integration/index.ts +++ b/src/test/integration/index.ts @@ -2,4 +2,4 @@ import patchNamespace from './patchNamespace.js'; console.log('Integration testing'); -patchNamespace(); +await patchNamespace(); diff --git a/src/test/integration/name.ts b/src/test/integration/name.ts new file mode 100644 index 0000000000..be6537ae26 --- /dev/null +++ b/src/test/integration/name.ts @@ -0,0 +1,7 @@ +/* + * This function is used to generate a random name for the resources created in the tests. + * This is to avoid conflicts with existing resources. + */ +export function generateName(name: string) { + return name + '-' + Math.random().toString(36).substring(7); +} diff --git a/src/test/integration/patchNamespace.ts b/src/test/integration/patchNamespace.ts index 6a31a6804d..3903a7ce99 100644 --- a/src/test/integration/patchNamespace.ts +++ b/src/test/integration/patchNamespace.ts @@ -1,5 +1,6 @@ import assert, { deepEqual } from 'node:assert'; import { PatchStrategy, CoreV1Api, KubeConfig, setHeaderOptions, V1Namespace } from '../../index.js'; +import { generateName } from './name.js'; export default async function patchNamespace() { const kc = new KubeConfig(); @@ -7,7 +8,7 @@ export default async function patchNamespace() { const coreV1Client = kc.makeApiClient(CoreV1Api); let newNS = new V1Namespace(); - const testNSName = 'integration-test-patch-ns'; + const testNSName = generateName('patch-ns'); newNS.metadata = { name: testNSName, labels: { @@ -17,8 +18,8 @@ export default async function patchNamespace() { console.log(`Creating namespace ${testNSName}`); await coreV1Client.createNamespace({ body: newNS }); newNS = await coreV1Client.readNamespace({ name: testNSName }); - assert(newNS.metadata?.name === testNSName); - deepEqual(newNS.metadata?.labels?.initialLabel, 'initialValue'); + assert.strictEqual(newNS.metadata?.name, testNSName); + assert.strictEqual(newNS.metadata?.labels?.initialLabel, 'initialValue'); console.log('Namespace created with initial label.'); const patch = [ @@ -41,7 +42,7 @@ export default async function patchNamespace() { ); const patchedNS = await coreV1Client.readNamespace({ name: testNSName }); - deepEqual(patchedNS.metadata?.labels?.foo, 'bar'); - deepEqual(patchedNS.metadata?.labels?.initialLabel, undefined); + assert.strictEqual(patchedNS.metadata?.labels?.foo, 'bar'); + assert.strictEqual(patchedNS.metadata?.labels?.initialLabel, undefined); console.log('Namespace patched with new label.'); } From 0dc4bbe95fabf8fa73fd351575592eab402155e9 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Thu, 20 Mar 2025 08:44:58 +1300 Subject: [PATCH 7/9] remove unused deepequal import --- src/test/integration/patchNamespace.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/integration/patchNamespace.ts b/src/test/integration/patchNamespace.ts index 3903a7ce99..5c575fcbd6 100644 --- a/src/test/integration/patchNamespace.ts +++ b/src/test/integration/patchNamespace.ts @@ -1,4 +1,4 @@ -import assert, { deepEqual } from 'node:assert'; +import assert from 'node:assert'; import { PatchStrategy, CoreV1Api, KubeConfig, setHeaderOptions, V1Namespace } from '../../index.js'; import { generateName } from './name.js'; From 75c11e23b659acdfffe9d4b7a71848bdf025639e Mon Sep 17 00:00:00 2001 From: David Gamero Date: Thu, 20 Mar 2025 08:48:34 +1300 Subject: [PATCH 8/9] checkout main package-lock --- package-lock.json | 271 +--------------------------------------------- 1 file changed, 1 insertion(+), 270 deletions(-) diff --git a/package-lock.json b/package-lock.json index 391cc3647d..ea1e059cc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,8 +43,7 @@ "prettier": "^3.0.0", "pretty-quick": "^4.0.0", "ts-mockito": "^2.3.1", - "ts-node": "^10.9.2", - "tsx": "^4.19.3", + "tsx": "^4.19.1", "typedoc": "^0.27.1", "typescript": "~5.8.2", "typescript-eslint": "^8.26.0" @@ -59,30 +58,6 @@ "node": ">=18" } }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, "node_modules/@esbuild/aix-ppc64": { "version": "0.25.0", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz", @@ -952,34 +927,6 @@ "integrity": "sha512-jn7/7ky30idSkd/O5yDBfAnVt+JJpepofP/POZ1iMOxK59cOfqIgg/Dj0eFsjOTMw+4ycJN0uhZH/Eb0bs/EUA==", "dev": true }, - "node_modules/@tsconfig/node10": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", - "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", - "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -1316,19 +1263,6 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/acorn-walk": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", - "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "acorn": "^8.11.0" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/agent-base": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", @@ -1400,13 +1334,6 @@ "node": ">= 8" } }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true, - "license": "MIT" - }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -1639,13 +1566,6 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true, - "license": "MIT" - }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -1710,16 +1630,6 @@ "node": ">=0.4.0" } }, - "node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -2850,13 +2760,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true, - "license": "ISC" - }, "node_modules/markdown-it": { "version": "14.1.0", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", @@ -3997,50 +3900,6 @@ "lodash": "^4.17.5" } }, - "node_modules/ts-node": { - "version": "10.9.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", - "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -4185,13 +4044,6 @@ "punycode": "^2.1.0" } }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true, - "license": "MIT" - }, "node_modules/v8-to-istanbul": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", @@ -4369,16 +4221,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", @@ -4399,27 +4241,6 @@ "integrity": "sha512-W+a0/JpU28AqH4IKtwUPcEUnUyXMDLALcn5/JLczGGT9fHE2sIby/xP/oQnx3nxkForzgzPy201RAKcB4xPAFQ==", "dev": true }, - "@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "dependencies": { - "@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "dev": true, - "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - } - } - }, "@esbuild/aix-ppc64": { "version": "0.25.0", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz", @@ -4894,30 +4715,6 @@ "integrity": "sha512-jn7/7ky30idSkd/O5yDBfAnVt+JJpepofP/POZ1iMOxK59cOfqIgg/Dj0eFsjOTMw+4ycJN0uhZH/Eb0bs/EUA==", "dev": true }, - "@tsconfig/node10": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", - "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", - "dev": true - }, - "@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true - }, - "@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true - }, - "@tsconfig/node16": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", - "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "dev": true - }, "@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -5149,15 +4946,6 @@ "dev": true, "requires": {} }, - "acorn-walk": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", - "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", - "dev": true, - "requires": { - "acorn": "^8.11.0" - } - }, "agent-base": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", @@ -5204,12 +4992,6 @@ "picomatch": "^2.0.4" } }, - "arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true - }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -5375,12 +5157,6 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true }, - "create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true - }, "cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -5427,12 +5203,6 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" }, - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true - }, "dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -6211,12 +5981,6 @@ "semver": "^7.5.3" } }, - "make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, "markdown-it": { "version": "14.1.0", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", @@ -6980,27 +6744,6 @@ "lodash": "^4.17.5" } }, - "ts-node": { - "version": "10.9.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", - "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", - "dev": true, - "requires": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - } - }, "tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -7097,12 +6840,6 @@ "punycode": "^2.1.0" } }, - "v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true - }, "v8-to-istanbul": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", @@ -7217,12 +6954,6 @@ } } }, - "yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true - }, "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", From 64ff97d8d4e8def5b90a27eccef926b8f96ecb46 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Tue, 25 Mar 2025 21:29:37 -0400 Subject: [PATCH 9/9] switch to await --- src/middleware_test.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/middleware_test.ts b/src/middleware_test.ts index 64b8ea6ad9..ec022dba62 100644 --- a/src/middleware_test.ts +++ b/src/middleware_test.ts @@ -18,10 +18,8 @@ describe('Middleware', async () => { reqContext.setHeaderParam('test-key', 'wrong-value'); deepStrictEqual(reqContext.getHeaders(), { 'test-key': 'wrong-value' }); const headerMiddleware = setHeaderMiddleware('test-key', 'test-value'); - const postMiddlewareRequest = await headerMiddleware.pre(reqContext); - await postMiddlewareRequest.toPromise().then((request) => { - deepStrictEqual(request.getHeaders(), { 'test-key': 'test-value' }); - }); + const postMiddlewareRequest = await headerMiddleware.pre(reqContext).toPromise(); + deepStrictEqual(postMiddlewareRequest.getHeaders(), { 'test-key': 'test-value' }); }); }); @@ -41,11 +39,11 @@ describe('Middleware', async () => { ) { throw new Error('missing middleware in ConfigurationOptions'); } - const postMiddlewareRequest = await headerConfigurationOptions.middleware[0].pre(reqContext); + const postMiddlewareRequest = await headerConfigurationOptions.middleware[0] + .pre(reqContext) + .toPromise(); - await postMiddlewareRequest.toPromise().then((request) => { - deepStrictEqual(request.getHeaders(), { 'test-key': 'test-value' }); - }); + deepStrictEqual(postMiddlewareRequest.getHeaders(), { 'test-key': 'test-value' }); }); }); });