From e8374dcfd0c0749a0d64f586ddfd4c9471783ba9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Oct 2026 16:36:35 +0000 Subject: [PATCH 1/3] chore(deps): update rhdh orchestrator dependencies (minor) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../.changeset/renovate-92d7eb2.md | 5 + workspaces/orchestrator/package.json | 2 +- .../packages/app-legacy/package.json | 2 +- .../orchestrator/packages/app/package.json | 2 +- .../plugins/orchestrator-common/package.json | 2 +- workspaces/orchestrator/yarn.lock | 452 ++++++++++-------- 6 files changed, 254 insertions(+), 211 deletions(-) create mode 100644 workspaces/orchestrator/.changeset/renovate-92d7eb2.md diff --git a/workspaces/orchestrator/.changeset/renovate-92d7eb2.md b/workspaces/orchestrator/.changeset/renovate-92d7eb2.md new file mode 100644 index 00000000000..cda4762088b --- /dev/null +++ b/workspaces/orchestrator/.changeset/renovate-92d7eb2.md @@ -0,0 +1,5 @@ +--- +'@red-hat-developer-hub/backstage-plugin-orchestrator-common': patch +--- + +Updated dependency `@openapitools/openapi-generator-cli` to `2.41.0`. diff --git a/workspaces/orchestrator/package.json b/workspaces/orchestrator/package.json index 27c6a48c3a3..0679e90a94a 100644 --- a/workspaces/orchestrator/package.json +++ b/workspaces/orchestrator/package.json @@ -51,7 +51,7 @@ "@changesets/cli": "^2.27.1", "@ianvs/prettier-plugin-sort-imports": "^4.4.0", "@jest/environment-jsdom-abstract": "^30.3.0", - "@playwright/test": "1.61.1", + "@playwright/test": "1.64.0", "@types/jest": "^30.0.0", "@types/jsdom": "^27.0.0", "jest": "^30.3.0", diff --git a/workspaces/orchestrator/packages/app-legacy/package.json b/workspaces/orchestrator/packages/app-legacy/package.json index 409aee84834..005988e8542 100644 --- a/workspaces/orchestrator/packages/app-legacy/package.json +++ b/workspaces/orchestrator/packages/app-legacy/package.json @@ -65,7 +65,7 @@ "devDependencies": { "@axe-core/playwright": "^4.10.0", "@backstage/test-utils": "^1.7.21", - "@playwright/test": "1.60.0", + "@playwright/test": "1.64.0", "@testing-library/dom": "^9.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^14.0.0", diff --git a/workspaces/orchestrator/packages/app/package.json b/workspaces/orchestrator/packages/app/package.json index 907101ae4bc..6eb2522390a 100644 --- a/workspaces/orchestrator/packages/app/package.json +++ b/workspaces/orchestrator/packages/app/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@axe-core/playwright": "^4.10.0", "@backstage/test-utils": "^1.7.21", - "@playwright/test": "1.60.0", + "@playwright/test": "1.64.0", "@testing-library/dom": "^9.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^14.0.0", diff --git a/workspaces/orchestrator/plugins/orchestrator-common/package.json b/workspaces/orchestrator/plugins/orchestrator-common/package.json index ff8b09b2b54..22ad0ee0762 100644 --- a/workspaces/orchestrator/plugins/orchestrator-common/package.json +++ b/workspaces/orchestrator/plugins/orchestrator-common/package.json @@ -64,7 +64,7 @@ }, "devDependencies": { "@backstage/cli": "^0.36.5", - "@openapitools/openapi-generator-cli": "2.30.2", + "@openapitools/openapi-generator-cli": "2.41.0", "@spotify/prettier-config": "^15.0.0", "@types/js-yaml": "^4.0.0", "@types/json-schema": "7.0.15", diff --git a/workspaces/orchestrator/yarn.lock b/workspaces/orchestrator/yarn.lock index c2c83002fa1..34ee3bba5fb 100644 --- a/workspaces/orchestrator/yarn.lock +++ b/workspaces/orchestrator/yarn.lock @@ -6052,7 +6052,7 @@ __metadata: "@changesets/cli": "npm:^2.27.1" "@ianvs/prettier-plugin-sort-imports": "npm:^4.4.0" "@jest/environment-jsdom-abstract": "npm:^30.3.0" - "@playwright/test": "npm:1.61.1" + "@playwright/test": "npm:1.64.0" "@types/jest": "npm:^30.0.0" "@types/jsdom": "npm:^27.0.0" enquirer: "npm:^2.4.1" @@ -7743,11 +7743,11 @@ __metadata: languageName: node linkType: hard -"@nestjs/common@npm:11.1.16": - version: 11.1.16 - resolution: "@nestjs/common@npm:11.1.16" +"@nestjs/common@npm:11.2.1": + version: 11.2.1 + resolution: "@nestjs/common@npm:11.2.1" dependencies: - file-type: "npm:21.3.0" + file-type: "npm:21.3.4" iterare: "npm:1.2.1" load-esm: "npm:1.0.3" tslib: "npm:2.8.1" @@ -7762,18 +7762,17 @@ __metadata: optional: true class-validator: optional: true - checksum: 10c0/bcc2a22e47f9ad49ade83e299e832183a83782e3fa9f81c0cd9d00b494a1f0193e88c6379e9aa193527dcc959d6de10c795d343af5185a1c085bea0533497bf1 + checksum: 10c0/3d3d45e420468ab80247a05db7607a0558f4d4d97c3a41d8b97630d3ad3b99f9e4bc34ec24955500de62e8d36da2c4ce22401be445db72fe48c754f4b87c80ba languageName: node linkType: hard -"@nestjs/core@npm:11.1.16": - version: 11.1.16 - resolution: "@nestjs/core@npm:11.1.16" +"@nestjs/core@npm:11.2.1": + version: 11.2.1 + resolution: "@nestjs/core@npm:11.2.1" dependencies: - "@nuxt/opencollective": "npm:0.4.1" fast-safe-stringify: "npm:2.1.1" iterare: "npm:1.2.1" - path-to-regexp: "npm:8.3.0" + path-to-regexp: "npm:8.4.2" tslib: "npm:2.8.1" uid: "npm:2.0.2" peerDependencies: @@ -7790,7 +7789,7 @@ __metadata: optional: true "@nestjs/websockets": optional: true - checksum: 10c0/1bbd899da0bd1cdde3053c258099e27aa8abb6a87e3fa2d58ebbfb74d2fab4d291ad818719eaef2a0eb0e447dbb24d5d4c1f704e5ff1029937a76aa2af0763ae + checksum: 10c0/f38952f931c71347b6658f2718639451567291c22ebea25a4b232a244a5e36b2457dc5bd37eab277dd98df1c0e120d9e9d21589c94294e666532687d85472e57 languageName: node linkType: hard @@ -7911,17 +7910,6 @@ __metadata: languageName: node linkType: hard -"@nuxt/opencollective@npm:0.4.1": - version: 0.4.1 - resolution: "@nuxt/opencollective@npm:0.4.1" - dependencies: - consola: "npm:^3.2.3" - bin: - opencollective: bin/opencollective.js - checksum: 10c0/ef2835d8635d2928152eff8b5a1ec42c145e2ab00cb02ff4bb61f0a6f5528afc9b169c06c32308c783779fe26855ebc67419743046caa80e582e814cff73187d - languageName: node - linkType: hard - "@nuxtjs/opencollective@npm:0.3.2": version: 0.3.2 resolution: "@nuxtjs/opencollective@npm:0.3.2" @@ -8519,30 +8507,30 @@ __metadata: languageName: node linkType: hard -"@openapitools/openapi-generator-cli@npm:2.30.2, @openapitools/openapi-generator-cli@npm:^2.7.0": - version: 2.30.2 - resolution: "@openapitools/openapi-generator-cli@npm:2.30.2" +"@openapitools/openapi-generator-cli@npm:2.41.0, @openapitools/openapi-generator-cli@npm:^2.7.0": + version: 2.41.0 + resolution: "@openapitools/openapi-generator-cli@npm:2.41.0" dependencies: "@inquirer/select": "npm:1.3.3" "@nestjs/axios": "npm:4.0.1" - "@nestjs/common": "npm:11.1.16" - "@nestjs/core": "npm:11.1.16" + "@nestjs/common": "npm:11.2.1" + "@nestjs/core": "npm:11.2.1" "@nuxtjs/opencollective": "npm:0.3.2" - axios: "npm:^1.13.6" + axios: "npm:^1.19.0" chalk: "npm:4.1.2" commander: "npm:8.3.0" compare-versions: "npm:6.1.1" - concurrently: "npm:9.2.1" + concurrently: "npm:^10.0.5" console.table: "npm:0.10.0" - fs-extra: "npm:11.3.4" + fs-extra: "npm:11.4.0" glob: "npm:13.0.6" - proxy-agent: "npm:6.5.0" + proxy-agent: "npm:8.0.2" reflect-metadata: "npm:0.2.2" rxjs: "npm:7.8.2" tslib: "npm:2.8.1" bin: openapi-generator-cli: main.js - checksum: 10c0/19061232ed03d575a0a3650b2d4d698a7f2b913f936233a04b32a662175f79479cbc512957461730813346dea27b2a9254d652bb0027a459c9d63dde0de1f60f + checksum: 10c0/f94f5dd49350dfb92d865adf85fde74741cd87b20a792525c81a0b5191017696f79114f64a1f0f1ca8a4a2ce77ddfbfa5e89a84e5cc582dd7cf62092bbff4040 languageName: node linkType: hard @@ -8721,25 +8709,14 @@ __metadata: languageName: node linkType: hard -"@playwright/test@npm:1.60.0": - version: 1.60.0 - resolution: "@playwright/test@npm:1.60.0" - dependencies: - playwright: "npm:1.60.0" - bin: - playwright: cli.js - checksum: 10c0/86b06e6437933e741c7cd43f362024e857e7bc28a55fcbb0553ef55e01a2a403c64f4786868de8af86a6e303fe99e98a18a42ba19489f43ae122e457f9e2d189 - languageName: node - linkType: hard - -"@playwright/test@npm:1.61.1": - version: 1.61.1 - resolution: "@playwright/test@npm:1.61.1" +"@playwright/test@npm:1.64.0": + version: 1.64.0 + resolution: "@playwright/test@npm:1.64.0" dependencies: - playwright: "npm:1.61.1" + playwright: "npm:1.64.0" bin: playwright: cli.js - checksum: 10c0/45004139eaa7c7ec8129e4ed77a9d734aa09ed40b69162b871e4123f1d70217b7b73651431a9343ed5090d5fed11c6df1bff2a56ff4b87dc7b0371b5da87cf9c + checksum: 10c0/96db203daa9e5aa5fcbec3f8bc92074346334980961dcc2ef6e660add5ad4647037f98f3a84ba1ec431bfb6e6368df0fd53e7dbdd427560627deef978c762f0c languageName: node linkType: hard @@ -9657,7 +9634,7 @@ __metadata: "@backstage/cli": "npm:^0.36.5" "@backstage/plugin-permission-common": "npm:^0.9.10" "@backstage/types": "npm:^1.2.2" - "@openapitools/openapi-generator-cli": "npm:2.30.2" + "@openapitools/openapi-generator-cli": "npm:2.41.0" "@serverlessworkflow/sdk-typescript": "npm:^0.8.4" "@spotify/prettier-config": "npm:^15.0.0" "@types/js-yaml": "npm:^4.0.0" @@ -14852,6 +14829,13 @@ __metadata: languageName: node linkType: hard +"agent-base@npm:9.0.0": + version: 9.0.0 + resolution: "agent-base@npm:9.0.0" + checksum: 10c0/0274cd9a2a0ee78e3fbe0e80e7e0c41df27102466f7f7b3a67c045bb4c00fc517ce0496de3045b55f5eeec1a0e77d9d0a9b9320b0362bfe61e0c9e6d7ebaee76 + languageName: node + linkType: hard + "agent-base@npm:^7.1.0, agent-base@npm:^7.1.2": version: 7.1.3 resolution: "agent-base@npm:7.1.3" @@ -15165,7 +15149,7 @@ __metadata: "@mui/lab": "npm:5.0.0-alpha.177" "@mui/material": "npm:5.18.0" "@mui/styles": "npm:5.18.0" - "@playwright/test": "npm:1.60.0" + "@playwright/test": "npm:1.64.0" "@red-hat-developer-hub/backstage-plugin-orchestrator": "workspace:^" "@red-hat-developer-hub/backstage-plugin-orchestrator-form-widgets": "workspace:^" "@red-hat-developer-hub/backstage-plugin-theme": "npm:^1.2.2" @@ -15218,7 +15202,7 @@ __metadata: "@backstage/ui": "npm:^0.17.1" "@mui/icons-material": "npm:^5.17.1" "@mui/material": "npm:^5.17.1" - "@playwright/test": "npm:1.60.0" + "@playwright/test": "npm:1.64.0" "@red-hat-developer-hub/backstage-plugin-app-defaults": "npm:^1.8.1" "@red-hat-developer-hub/backstage-plugin-orchestrator": "workspace:^" "@red-hat-developer-hub/backstage-plugin-orchestrator-form-widgets": "workspace:^" @@ -15717,15 +15701,15 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.0.0, axios@npm:^1.13.6, axios@npm:^1.15.0, axios@npm:^1.18.0": - version: 1.18.1 - resolution: "axios@npm:1.18.1" +"axios@npm:^1.0.0, axios@npm:^1.15.0, axios@npm:^1.18.0, axios@npm:^1.19.0": + version: 1.20.0 + resolution: "axios@npm:1.20.0" dependencies: follow-redirects: "npm:^1.16.0" - form-data: "npm:^4.0.5" + form-data: "npm:^4.0.6" https-proxy-agent: "npm:^5.0.1" proxy-from-env: "npm:^2.1.0" - checksum: 10c0/9d9378a3af0d0ad730a52ad9d15ec7201f3926ad6e7e8bbffc5ae21ca2835ad11d1d9598698f5dd9718917486039f55ea1d7dc23d8e44fa827a55cc3262c02fc + checksum: 10c0/976088acf532286356f4c2e65df1ef47ba7da3936d83e928d0d64357bbf5370456abd3eb5826c15df322335fcb1fe200d4a84b4fcf20ffccdd63b40d80fa495c languageName: node linkType: hard @@ -16040,7 +16024,7 @@ __metadata: languageName: node linkType: hard -"basic-ftp@npm:^5.0.2": +"basic-ftp@npm:^5.0.2, basic-ftp@npm:^5.3.1": version: 5.3.1 resolution: "basic-ftp@npm:5.3.1" checksum: 10c0/03511b488cd292abfa82a8c0ea3b9573b40d12d2f1518d6f41a9461b012b3376d3e6d50679b38d9b2b4f48fd6e8e0418ac196312ee7e2da13cb801169940d1c3 @@ -16753,6 +16737,13 @@ __metadata: languageName: node linkType: hard +"chalk@npm:5.6.2, chalk@npm:^5.4.1": + version: 5.6.2 + resolution: "chalk@npm:5.6.2" + checksum: 10c0/99a4b0f0e7991796b1e7e3f52dceb9137cae2a9dfc8fc0784a550dc4c558e15ab32ed70b14b21b52beb2679b4892b41a0aa44249bcb996f01e125d58477c6976 + languageName: node + linkType: hard + "chalk@npm:^3.0.0": version: 3.0.0 resolution: "chalk@npm:3.0.0" @@ -16763,13 +16754,6 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^5.4.1": - version: 5.6.2 - resolution: "chalk@npm:5.6.2" - checksum: 10c0/99a4b0f0e7991796b1e7e3f52dceb9137cae2a9dfc8fc0784a550dc4c558e15ab32ed70b14b21b52beb2679b4892b41a0aa44249bcb996f01e125d58477c6976 - languageName: node - linkType: hard - "char-regex@npm:^1.0.2": version: 1.0.2 resolution: "char-regex@npm:1.0.2" @@ -17493,20 +17477,20 @@ __metadata: languageName: node linkType: hard -"concurrently@npm:9.2.1": - version: 9.2.1 - resolution: "concurrently@npm:9.2.1" +"concurrently@npm:^10.0.5": + version: 10.0.6 + resolution: "concurrently@npm:10.0.6" dependencies: - chalk: "npm:4.1.2" + chalk: "npm:5.6.2" rxjs: "npm:7.8.2" - shell-quote: "npm:1.8.3" - supports-color: "npm:8.1.1" + shell-quote: "npm:1.12.0" + supports-color: "npm:10.2.2" tree-kill: "npm:1.2.2" - yargs: "npm:17.7.2" + yargs: "npm:18.0.0" bin: - conc: dist/bin/concurrently.js - concurrently: dist/bin/concurrently.js - checksum: 10c0/da37f239f82eb7ac24f5ddb56259861e5f1d6da2ade7602b6ea7ad3101b13b5ccec02a77b7001402d1028ff2fdc38eed55644b32853ad5abf30e057002a963aa + conc: dist/bin/index.js + concurrently: dist/bin/index.js + checksum: 10c0/08b03d53f81c0e159ac92f80005a04ed9c970b6ed4875e99fbf27f4a2f3ae142b83a76cc30580c8c9f4d75942b501cba2c6f8ae433709e045efbaa5f8faeb743 languageName: node linkType: hard @@ -17546,13 +17530,6 @@ __metadata: languageName: node linkType: hard -"consola@npm:^3.2.3": - version: 3.4.2 - resolution: "consola@npm:3.4.2" - checksum: 10c0/7cebe57ecf646ba74b300bcce23bff43034ed6fbec9f7e39c27cee1dc00df8a21cd336b466ad32e304ea70fba04ec9e890c200270de9a526ce021ba8a7e4c11a - languageName: node - linkType: hard - "console-browserify@npm:^1.1.0": version: 1.2.0 resolution: "console-browserify@npm:1.2.0" @@ -18366,6 +18343,13 @@ __metadata: languageName: node linkType: hard +"data-uri-to-buffer@npm:8.0.0": + version: 8.0.0 + resolution: "data-uri-to-buffer@npm:8.0.0" + checksum: 10c0/ecfb39bae2b9238dbfd16d9a5abe9f13a89decbacddaaf7ae7eb99e0488d3283dd9222c9c2d937de647fab57b816b415fed64b1e239b249d7895535a2f9db616 + languageName: node + linkType: hard + "data-uri-to-buffer@npm:^6.0.2": version: 6.0.2 resolution: "data-uri-to-buffer@npm:6.0.2" @@ -18672,6 +18656,19 @@ __metadata: languageName: node linkType: hard +"degenerator@npm:7.0.1": + version: 7.0.1 + resolution: "degenerator@npm:7.0.1" + dependencies: + ast-types: "npm:^0.13.4" + escodegen: "npm:^2.1.0" + esprima: "npm:^4.0.1" + peerDependencies: + quickjs-wasi: ^2.2.0 + checksum: 10c0/1a074949a9d9fa105aa09a7f719dbe9deb5c66aaa5262411eeaacde7f423d1a160287f23e4e5cfea033879cf7eced6b8a70c7f5b05a6f81a8c330fae5f56c9f9 + languageName: node + linkType: hard + "degenerator@npm:^5.0.0": version: 5.0.1 resolution: "degenerator@npm:5.0.1" @@ -20611,15 +20608,15 @@ __metadata: languageName: node linkType: hard -"file-type@npm:21.3.0": - version: 21.3.0 - resolution: "file-type@npm:21.3.0" +"file-type@npm:21.3.4": + version: 21.3.4 + resolution: "file-type@npm:21.3.4" dependencies: "@tokenizer/inflate": "npm:^0.4.1" strtok3: "npm:^10.3.4" token-types: "npm:^6.1.1" uint8array-extras: "npm:^1.4.0" - checksum: 10c0/1b1fa909e6063044a6da1d2ea348ee4d747ed9286382d3f0d4d6532c11fb2ea9f2e7e67b2bc7d745d1bc937e05dee1aa8cb912c64250933bcb393a3744f4e284 + checksum: 10c0/6f15e7538c5d73f9308d2e897365d253a6647a6751bb1b0d85c78aebc02b8976afb7c6c9b3759687a064b1b3d60246e5504746b8f11e38b0d5a1b339087e00d2 languageName: node linkType: hard @@ -20891,7 +20888,7 @@ __metadata: languageName: node linkType: hard -"form-data@npm:^4.0.0, form-data@npm:^4.0.1, form-data@npm:^4.0.5": +"form-data@npm:^4.0.0, form-data@npm:^4.0.1, form-data@npm:^4.0.5, form-data@npm:^4.0.6": version: 4.0.6 resolution: "form-data@npm:4.0.6" dependencies: @@ -21032,14 +21029,14 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:11.3.4, fs-extra@npm:^11.0.0, fs-extra@npm:^11.2.0, fs-extra@npm:~11.3.0": - version: 11.3.4 - resolution: "fs-extra@npm:11.3.4" +"fs-extra@npm:11.4.0, fs-extra@npm:^11.0.0, fs-extra@npm:^11.2.0": + version: 11.4.0 + resolution: "fs-extra@npm:11.4.0" dependencies: graceful-fs: "npm:^4.2.0" jsonfile: "npm:^6.0.1" universalify: "npm:^2.0.0" - checksum: 10c0/e08276f767a62496ae97d711aaa692c6a478177f24a85979b6a2881c9db9c68b8c2ad5da0bcf92c0b2a474cea6e935ec245656441527958fd8372cb647087df0 + checksum: 10c0/1e311eca820a12d3d795f2043dcd5628d017f4d21e634f3f9ef314ae68bee9979758262fb9cb35ffa6f26454c3fffe8b15558733e91e8fc729b07b10bb98d8b6 languageName: node linkType: hard @@ -21088,6 +21085,17 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:~11.3.0": + version: 11.3.4 + resolution: "fs-extra@npm:11.3.4" + dependencies: + graceful-fs: "npm:^4.2.0" + jsonfile: "npm:^6.0.1" + universalify: "npm:^2.0.0" + checksum: 10c0/e08276f767a62496ae97d711aaa692c6a478177f24a85979b6a2881c9db9c68b8c2ad5da0bcf92c0b2a474cea6e935ec245656441527958fd8372cb647087df0 + languageName: node + linkType: hard + "fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -21127,16 +21135,6 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:2.3.2": - version: 2.3.2 - resolution: "fsevents@npm:2.3.2" - dependencies: - node-gyp: "npm:latest" - checksum: 10c0/be78a3efa3e181cda3cf7a4637cb527bcebb0bd0ea0440105a3bb45b86f9245b307dc10a2507e8f4498a7d4ec349d1910f4d73e4d4495b16103106e07eee735b - conditions: os=darwin - languageName: node - linkType: hard - "fsevents@npm:^2.3.3, fsevents@npm:~2.3.2": version: 2.3.3 resolution: "fsevents@npm:2.3.3" @@ -21147,15 +21145,6 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin": - version: 2.3.2 - resolution: "fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin::version=2.3.2&hash=df0bf1" - dependencies: - node-gyp: "npm:latest" - conditions: os=darwin - languageName: node - linkType: hard - "fsevents@patch:fsevents@npm%3A^2.3.3#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" @@ -21368,6 +21357,17 @@ __metadata: languageName: node linkType: hard +"get-uri@npm:8.0.1": + version: 8.0.1 + resolution: "get-uri@npm:8.0.1" + dependencies: + basic-ftp: "npm:^5.3.1" + data-uri-to-buffer: "npm:8.0.0" + debug: "npm:^4.3.4" + checksum: 10c0/d5916692ecaf441e59dd1bee6719a277c418f00cd0944f1f5755113248d49db40f34facba67070f41cac7b4c1e4f738926878b274510da7f9ba831532c9eaecc + languageName: node + linkType: hard + "get-uri@npm:^6.0.1": version: 6.0.3 resolution: "get-uri@npm:6.0.3" @@ -22299,6 +22299,17 @@ __metadata: languageName: node linkType: hard +"http-proxy-agent@npm:9.1.0": + version: 9.1.0 + resolution: "http-proxy-agent@npm:9.1.0" + dependencies: + agent-base: "npm:9.0.0" + debug: "npm:^4.3.4" + proxy-agent-negotiate: "npm:1.1.0" + checksum: 10c0/1dff8eaef76b154545c1a7492fa01305dda393efba53d894f5fc45992d711fa4036bdc64a61e0bc76bb7531513a4f8ddcccdf81d1476ddcc9cbf621735d397e4 + languageName: node + linkType: hard + "http-proxy-agent@npm:^5.0.0": version: 5.0.0 resolution: "http-proxy-agent@npm:5.0.0" @@ -22310,7 +22321,7 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^7.0.0, http-proxy-agent@npm:^7.0.1, http-proxy-agent@npm:^7.0.2": +"http-proxy-agent@npm:^7.0.0, http-proxy-agent@npm:^7.0.2": version: 7.0.2 resolution: "http-proxy-agent@npm:7.0.2" dependencies: @@ -22366,6 +22377,17 @@ __metadata: languageName: node linkType: hard +"https-proxy-agent@npm:9.1.0": + version: 9.1.0 + resolution: "https-proxy-agent@npm:9.1.0" + dependencies: + agent-base: "npm:9.0.0" + debug: "npm:^4.3.4" + proxy-agent-negotiate: "npm:1.1.0" + checksum: 10c0/95ca9504944e0b6d214f9da0b4d747512bf79187b4c6f69db667049bdcc43e2b67c7932ad2c4bd6952e99e83de9a7d42dafff63672d7898da297b2736f4b42bd + languageName: node + linkType: hard + "https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1": version: 5.0.1 resolution: "https-proxy-agent@npm:5.0.1" @@ -27830,7 +27852,23 @@ __metadata: languageName: node linkType: hard -"pac-proxy-agent@npm:^7.0.0, pac-proxy-agent@npm:^7.1.0": +"pac-proxy-agent@npm:9.1.0": + version: 9.1.0 + resolution: "pac-proxy-agent@npm:9.1.0" + dependencies: + agent-base: "npm:9.0.0" + debug: "npm:^4.3.4" + get-uri: "npm:8.0.1" + http-proxy-agent: "npm:9.1.0" + https-proxy-agent: "npm:9.1.0" + pac-resolver: "npm:9.0.1" + quickjs-wasi: "npm:^2.2.0" + socks-proxy-agent: "npm:10.1.0" + checksum: 10c0/0866c2a5816a974a87bf0924cd1b78491ea462378b2da15f6413857531520eb99f136fc879b9c2ef593891e53f683781273e4d55b9a252764431c855165ad77a + languageName: node + linkType: hard + +"pac-proxy-agent@npm:^7.0.0": version: 7.1.0 resolution: "pac-proxy-agent@npm:7.1.0" dependencies: @@ -27846,6 +27884,18 @@ __metadata: languageName: node linkType: hard +"pac-resolver@npm:9.0.1": + version: 9.0.1 + resolution: "pac-resolver@npm:9.0.1" + dependencies: + degenerator: "npm:7.0.1" + netmask: "npm:^2.0.2" + peerDependencies: + quickjs-wasi: ^2.2.0 + checksum: 10c0/65341f7d2075c281672283825939d0f08a855ac2934f3cd86eb6fd68970e765b6ceee52de791dfbd0cd70d97e64e3e170d47ea31969a2d33ba9a7df9c6504917 + languageName: node + linkType: hard + "pac-resolver@npm:^7.0.1": version: 7.0.1 resolution: "pac-resolver@npm:7.0.1" @@ -28173,14 +28223,7 @@ __metadata: languageName: node linkType: hard -"path-to-regexp@npm:8.3.0": - version: 8.3.0 - resolution: "path-to-regexp@npm:8.3.0" - checksum: 10c0/ee1544a73a3f294a97a4c663b0ce71bbf1621d732d80c9c9ed201b3e911a86cb628ebad691b9d40f40a3742fe22011e5a059d8eed2cf63ec2cb94f6fb4efe67c - languageName: node - linkType: hard - -"path-to-regexp@npm:^8.0.0, path-to-regexp@npm:^8.2.0": +"path-to-regexp@npm:8.4.2, path-to-regexp@npm:^8.0.0, path-to-regexp@npm:^8.2.0": version: 8.4.2 resolution: "path-to-regexp@npm:8.4.2" checksum: 10c0/05b115c49b47ad252ce05faa32930f643f23769c68b8bcfe78ad833545140c48bbffb3266986d6c8d5db13a64cf12e07e0d72d9882cab830efeefa553533ebaf @@ -28507,51 +28550,23 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.60.0": - version: 1.60.0 - resolution: "playwright-core@npm:1.60.0" +"playwright-core@npm:1.64.0": + version: 1.64.0 + resolution: "playwright-core@npm:1.64.0" bin: playwright-core: cli.js - checksum: 10c0/99ccd43923b6e9355e0723b7fe221e6326efd4687f8dafff951313662aea11db51f542a9c2122c704c445fb9baae1c9ec9fa6f895126bbddd9fe92313f6942c9 - languageName: node - linkType: hard - -"playwright-core@npm:1.61.1": - version: 1.61.1 - resolution: "playwright-core@npm:1.61.1" - bin: - playwright-core: cli.js - checksum: 10c0/c28896ba82a602182e240ed4f9c467fb0dd9cb57d510f8aba9f25183fe1cde3a0105725a29baffa4157fe885bbb11e228032a2aad0424111584fde45303f07bd - languageName: node - linkType: hard - -"playwright@npm:1.60.0": - version: 1.60.0 - resolution: "playwright@npm:1.60.0" - dependencies: - fsevents: "npm:2.3.2" - playwright-core: "npm:1.60.0" - dependenciesMeta: - fsevents: - optional: true - bin: - playwright: cli.js - checksum: 10c0/714ad76d85b4865d7e43c0012f9039800c1485373388973ed39d79339cee5ad467052d1e2f1eaeca107a1cb6e65342186a8578a4c3504853d84c3a691250d5db + checksum: 10c0/fe3237282ada99d634e4d002efd3db6aa51218f7f4f3b1bc31515d30fa6eec5ec940d425e035db2af4e2856d9cae30b7a27bd167870b3285d40bdffd399ab286 languageName: node linkType: hard -"playwright@npm:1.61.1": - version: 1.61.1 - resolution: "playwright@npm:1.61.1" +"playwright@npm:1.64.0": + version: 1.64.0 + resolution: "playwright@npm:1.64.0" dependencies: - fsevents: "npm:2.3.2" - playwright-core: "npm:1.61.1" - dependenciesMeta: - fsevents: - optional: true + playwright-core: "npm:1.64.0" bin: playwright: cli.js - checksum: 10c0/cea1bc4d2a64ec3ef683891606774029da7b8a8036ed98332565cec2f8e89549ca1fab9a89fbfba4e08e27e0d7e7d148031e965af66d5ff97bb3c34058cfcad0 + checksum: 10c0/f1ee856c280af2ac256225a1cc5e957847f0d2c56a039c89f02e31b0c9928c44e04311923a1b315bea16e3b26e5124e7c296644ad3c05e4c0a6aaa9584009933 languageName: node linkType: hard @@ -29328,30 +29343,35 @@ __metadata: languageName: node linkType: hard -"proxy-agent@npm:6.5.0": - version: 6.5.0 - resolution: "proxy-agent@npm:6.5.0" - dependencies: - agent-base: "npm:^7.1.2" - debug: "npm:^4.3.4" - http-proxy-agent: "npm:^7.0.1" - https-proxy-agent: "npm:^7.0.6" - lru-cache: "npm:^7.14.1" - pac-proxy-agent: "npm:^7.1.0" - proxy-from-env: "npm:^1.1.0" - socks-proxy-agent: "npm:^8.0.5" - checksum: 10c0/7fd4e6f36bf17098a686d4aee3b8394abfc0b0537c2174ce96b0a4223198b9fafb16576c90108a3fcfc2af0168bd7747152bfa1f58e8fee91d3780e79aab7fd8 +"proxy-agent-negotiate@npm:1.1.0": + version: 1.1.0 + resolution: "proxy-agent-negotiate@npm:1.1.0" + peerDependencies: + kerberos: ^2.0.0 + peerDependenciesMeta: + kerberos: + optional: true + checksum: 10c0/e1c89e46b739a790335555c8182ed919f6fa16ca244cd4c01a9806a1c471af785b3beff8bd8a891422bedfffb0f43115333d98ad426f9bc82e7cd20c6a15ceb0 languageName: node linkType: hard -"proxy-from-env@npm:^1.1.0": - version: 1.1.0 - resolution: "proxy-from-env@npm:1.1.0" - checksum: 10c0/fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b +"proxy-agent@npm:8.0.2": + version: 8.0.2 + resolution: "proxy-agent@npm:8.0.2" + dependencies: + agent-base: "npm:9.0.0" + debug: "npm:^4.3.4" + http-proxy-agent: "npm:9.1.0" + https-proxy-agent: "npm:9.1.0" + lru-cache: "npm:^7.14.1" + pac-proxy-agent: "npm:9.1.0" + proxy-from-env: "npm:^2.0.0" + socks-proxy-agent: "npm:10.1.0" + checksum: 10c0/afd4c16ffb56f9cc7fb9bcf9989f8e50da269c8fb79f81f111e969777b8670d8bf34e7461e7af63d8585180fcac43b5843ab19510facd350b8729dbe63ebce0d languageName: node linkType: hard -"proxy-from-env@npm:^2.1.0": +"proxy-from-env@npm:^2.0.0, proxy-from-env@npm:^2.1.0": version: 2.1.0 resolution: "proxy-from-env@npm:2.1.0" checksum: 10c0/ed01729fd4d094eab619cd7e17ce3698b3413b31eb102c4904f9875e677cd207392795d5b4adee9cec359dfd31c44d5ad7595a3a3ad51c40250e141512281c58 @@ -29488,6 +29508,13 @@ __metadata: languageName: node linkType: hard +"quickjs-wasi@npm:^2.2.0": + version: 2.2.0 + resolution: "quickjs-wasi@npm:2.2.0" + checksum: 10c0/ed6bcd6415db0f89a7a6e81167ad435212b62a6214a98507c38ae8d7644e987c4d96cb0a7cd3bbd85f7458629cab72da811686c8303d7b4d384d082c059821fe + languageName: node + linkType: hard + "raf-schd@npm:^4.0.2": version: 4.0.3 resolution: "raf-schd@npm:4.0.3" @@ -31674,17 +31701,10 @@ __metadata: languageName: node linkType: hard -"shell-quote@npm:1.8.3": - version: 1.8.3 - resolution: "shell-quote@npm:1.8.3" - checksum: 10c0/bee87c34e1e986cfb4c30846b8e6327d18874f10b535699866f368ade11ea4ee45433d97bf5eada22c4320c27df79c3a6a7eb1bf3ecfc47f2c997d9e5e2672fd - languageName: node - linkType: hard - -"shell-quote@npm:^1.7.3, shell-quote@npm:^1.8.4, shell-quote@npm:^1.9.0": - version: 1.10.0 - resolution: "shell-quote@npm:1.10.0" - checksum: 10c0/46ee59bfd972ce6a45500c44ed130dff2d0a7d6fbac9841e59d548518cad8060a06393c9a5dcbc0cede294ad80b2a2cd8c904679e09265f53efc0a0879f30961 +"shell-quote@npm:1.12.0, shell-quote@npm:^1.7.3, shell-quote@npm:^1.8.4, shell-quote@npm:^1.9.0": + version: 1.12.0 + resolution: "shell-quote@npm:1.12.0" + checksum: 10c0/1605a4ed6a758bf13de7cb8197a4184d8015f7a4dbdcd6cd4a717d5b30b3ae7666300cc4ae7f3155cf80ace9739e9e82061ee5aa1a648f53f5fab31a220816d0 languageName: node linkType: hard @@ -31851,6 +31871,17 @@ __metadata: languageName: node linkType: hard +"socks-proxy-agent@npm:10.1.0": + version: 10.1.0 + resolution: "socks-proxy-agent@npm:10.1.0" + dependencies: + agent-base: "npm:9.0.0" + debug: "npm:^4.3.4" + socks: "npm:^2.8.3" + checksum: 10c0/48125e2bb3c14796110bf8ab7d84c4db1ad950ad3360e32199cb7524365a84c1ea9c513976701724b7ed182ed6fc32f1740d37756ef618d377cb8533b76f250a + languageName: node + linkType: hard + "socks-proxy-agent@npm:^7.0.0": version: 7.0.0 resolution: "socks-proxy-agent@npm:7.0.0" @@ -32655,12 +32686,10 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:8.1.1, supports-color@npm:^8.0.0, supports-color@npm:^8.1.1, supports-color@npm:~8.1.1": - version: 8.1.1 - resolution: "supports-color@npm:8.1.1" - dependencies: - has-flag: "npm:^4.0.0" - checksum: 10c0/ea1d3c275dd604c974670f63943ed9bd83623edc102430c05adb8efc56ba492746b6e95386e7831b872ec3807fd89dd8eb43f735195f37b5ec343e4234cc7e89 +"supports-color@npm:10.2.2": + version: 10.2.2 + resolution: "supports-color@npm:10.2.2" + checksum: 10c0/fb28dd7e0cdf80afb3f2a41df5e068d60c8b4f97f7140de2eaed5b42e075d82a0e980b20a2c0efd2b6d73cfacb55555285d8cc719fa0472220715aefeaa1da7c languageName: node linkType: hard @@ -32682,6 +32711,15 @@ __metadata: languageName: node linkType: hard +"supports-color@npm:^8.0.0, supports-color@npm:^8.1.1, supports-color@npm:~8.1.1": + version: 8.1.1 + resolution: "supports-color@npm:8.1.1" + dependencies: + has-flag: "npm:^4.0.0" + checksum: 10c0/ea1d3c275dd604c974670f63943ed9bd83623edc102430c05adb8efc56ba492746b6e95386e7831b872ec3807fd89dd8eb43f735195f37b5ec343e4234cc7e89 + languageName: node + linkType: hard + "supports-hyperlinks@npm:^3.1.0": version: 3.2.0 resolution: "supports-hyperlinks@npm:3.2.0" @@ -35439,18 +35477,17 @@ __metadata: languageName: node linkType: hard -"yargs@npm:17.7.2, yargs@npm:^17.7.2": - version: 17.7.2 - resolution: "yargs@npm:17.7.2" +"yargs@npm:18.0.0, yargs@npm:^18.0.0": + version: 18.0.0 + resolution: "yargs@npm:18.0.0" dependencies: - cliui: "npm:^8.0.1" + cliui: "npm:^9.0.1" escalade: "npm:^3.1.1" get-caller-file: "npm:^2.0.5" - require-directory: "npm:^2.1.1" - string-width: "npm:^4.2.3" + string-width: "npm:^7.2.0" y18n: "npm:^5.0.5" - yargs-parser: "npm:^21.1.1" - checksum: 10c0/ccd7e723e61ad5965fffbb791366db689572b80cca80e0f96aad968dfff4156cd7cd1ad18607afe1046d8241e6fb2d6c08bf7fa7bfb5eaec818735d8feac8f05 + yargs-parser: "npm:^22.0.0" + checksum: 10c0/bf290e4723876ea9c638c786a5c42ac28e03c9ca2325e1424bf43b94e5876456292d3ed905b853ebbba6daf43ed29e772ac2a6b3c5fb1b16533245d6211778f3 languageName: node linkType: hard @@ -35469,17 +35506,18 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^18.0.0": - version: 18.0.0 - resolution: "yargs@npm:18.0.0" +"yargs@npm:^17.7.2": + version: 17.7.2 + resolution: "yargs@npm:17.7.2" dependencies: - cliui: "npm:^9.0.1" + cliui: "npm:^8.0.1" escalade: "npm:^3.1.1" get-caller-file: "npm:^2.0.5" - string-width: "npm:^7.2.0" + require-directory: "npm:^2.1.1" + string-width: "npm:^4.2.3" y18n: "npm:^5.0.5" - yargs-parser: "npm:^22.0.0" - checksum: 10c0/bf290e4723876ea9c638c786a5c42ac28e03c9ca2325e1424bf43b94e5876456292d3ed905b853ebbba6daf43ed29e772ac2a6b3c5fb1b16533245d6211778f3 + yargs-parser: "npm:^21.1.1" + checksum: 10c0/ccd7e723e61ad5965fffbb791366db689572b80cca80e0f96aad968dfff4156cd7cd1ad18607afe1046d8241e6fb2d6c08bf7fa7bfb5eaec818735d8feac8f05 languageName: node linkType: hard From 7607013a9cd0a49413d9dab1a2875542e8bfe732 Mon Sep 17 00:00:00 2001 From: Lucas Holmquist Date: Tue, 13 Oct 2026 09:17:44 -0400 Subject: [PATCH 2/3] squash: update openapi script to modify and patch the tsc axios error --- .../orchestrator-common/scripts/openapi.sh | 1 + .../scripts/patch-openapi-client.js | 36 +++++++++++++++++++ .../src/generated/client/common.ts | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 workspaces/orchestrator/plugins/orchestrator-common/scripts/patch-openapi-client.js diff --git a/workspaces/orchestrator/plugins/orchestrator-common/scripts/openapi.sh b/workspaces/orchestrator/plugins/orchestrator-common/scripts/openapi.sh index 1b43cd1d36b..259020ee371 100755 --- a/workspaces/orchestrator/plugins/orchestrator-common/scripts/openapi.sh +++ b/workspaces/orchestrator/plugins/orchestrator-common/scripts/openapi.sh @@ -15,6 +15,7 @@ openapi_generate() { # TypeScript Client generation rm -rf ${CLIENT_FOLDER} openapi-generator-cli generate -g typescript-axios -i ${OPENAPI_SPEC_FILE} -o ${CLIENT_FOLDER} + node ./scripts/patch-openapi-client.js "${CLIENT_FOLDER}/common.ts" # Docs generation rm -rf ./src/generated/docs/markdown ./src/generated/docs/html ./src/generated/docs/api-doc diff --git a/workspaces/orchestrator/plugins/orchestrator-common/scripts/patch-openapi-client.js b/workspaces/orchestrator/plugins/orchestrator-common/scripts/patch-openapi-client.js new file mode 100644 index 00000000000..a33bd37c282 --- /dev/null +++ b/workspaces/orchestrator/plugins/orchestrator-common/scripts/patch-openapi-client.js @@ -0,0 +1,36 @@ +/* + * Copyright Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +const fs = require('node:fs'); +const path = require('node:path'); + +const generatedFile = path.resolve( + process.argv[2] || path.join(__dirname, '../src/generated/client/common.ts'), +); +const source = fs.readFileSync(generatedFile, 'utf8'); +const unpatched = 'return axios.request(axiosRequestArgs);'; +const patched = 'return axios.request(axiosRequestArgs) as Promise;'; +const matches = source.split(unpatched).length - 1; + +if (matches === 0 && source.includes(patched)) { + process.exit(0); +} +if (matches !== 1) { + throw new Error( + `Expected exactly one unpatched createRequestFunction return in ${generatedFile}`, + ); +} + +fs.writeFileSync(generatedFile, source.replace(unpatched, patched)); diff --git a/workspaces/orchestrator/plugins/orchestrator-common/src/generated/client/common.ts b/workspaces/orchestrator/plugins/orchestrator-common/src/generated/client/common.ts index 1bc8f42351a..6b9571e7c20 100644 --- a/workspaces/orchestrator/plugins/orchestrator-common/src/generated/client/common.ts +++ b/workspaces/orchestrator/plugins/orchestrator-common/src/generated/client/common.ts @@ -145,6 +145,6 @@ export const toPathString = function (url: URL) { export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) { return >(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs = {...axiosArgs.options, url: (axios.defaults.baseURL ? '' : configuration?.basePath ?? basePath) + axiosArgs.url}; - return axios.request(axiosRequestArgs); + return axios.request(axiosRequestArgs) as Promise; }; } From 977c1c129a522898431a488876a071f23bddcd27 Mon Sep 17 00:00:00 2001 From: Lucas Holmquist Date: Tue, 13 Oct 2026 09:30:53 -0400 Subject: [PATCH 3/3] squash: rebuilding report --- .../plugins/orchestrator-common/report.api.md | 28 +++++++++---------- .../orchestrator-common/scripts/openapi.sh | 2 +- .../scripts/patch-openapi-client.js | 8 ++++-- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/workspaces/orchestrator/plugins/orchestrator-common/report.api.md b/workspaces/orchestrator/plugins/orchestrator-common/report.api.md index a7e62917e7e..632350eb919 100644 --- a/workspaces/orchestrator/plugins/orchestrator-common/report.api.md +++ b/workspaces/orchestrator/plugins/orchestrator-common/report.api.md @@ -191,7 +191,7 @@ export class DefaultApi extends BaseAPI { abortWorkflow( instanceId: string, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-undefined-tag) The TSDoc tag "@summary" is not defined in this configuration // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}' @@ -207,7 +207,7 @@ export class DefaultApi extends BaseAPI { workflowId: string, executeWorkflowRequestDTO: ExecuteWorkflowRequestDTO, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-undefined-tag) The TSDoc tag "@summary" is not defined in this configuration // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}' @@ -220,7 +220,7 @@ export class DefaultApi extends BaseAPI { getInstanceById( instanceId: string, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-undefined-tag) The TSDoc tag "@summary" is not defined in this configuration // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-optional-name) The @param should not include a JSDoc-style optional name; it must not be enclosed in '[ ]' brackets. @@ -234,7 +234,7 @@ export class DefaultApi extends BaseAPI { getInstances( searchRequest?: SearchRequest, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}' // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen @@ -250,7 +250,7 @@ export class DefaultApi extends BaseAPI { workflowId: string, instanceId?: string, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-undefined-tag) The TSDoc tag "@summary" is not defined in this configuration // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}' @@ -267,7 +267,7 @@ export class DefaultApi extends BaseAPI { workflowId: string, searchRequest?: SearchRequest, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}' // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen @@ -283,7 +283,7 @@ export class DefaultApi extends BaseAPI { instanceId: string, rawlog?: boolean, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}' // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen @@ -295,7 +295,7 @@ export class DefaultApi extends BaseAPI { getWorkflowOverviewById( workflowId: string, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}' // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen @@ -307,7 +307,7 @@ export class DefaultApi extends BaseAPI { getWorkflowSourceById( workflowId: string, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-optional-name) The @param should not include a JSDoc-style optional name; it must not be enclosed in '[ ]' brackets. // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}' @@ -320,7 +320,7 @@ export class DefaultApi extends BaseAPI { getWorkflowsOverview( searchRequest?: SearchRequest, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-optional-name) The @param should not include a JSDoc-style optional name; it must not be enclosed in '[ ]' brackets. // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}' @@ -333,7 +333,7 @@ export class DefaultApi extends BaseAPI { getWorkflowsOverviewForEntity( getWorkflowsOverviewForEntityRequest?: GetWorkflowsOverviewForEntityRequest, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-undefined-tag) The TSDoc tag "@summary" is not defined in this configuration // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-optional-name) The @param should not include a JSDoc-style optional name; it must not be enclosed in '[ ]' brackets. @@ -343,7 +343,7 @@ export class DefaultApi extends BaseAPI { // Warning: (tsdoc-undefined-tag) The TSDoc tag "@memberof" is not defined in this configuration getWorkflowStatuses( options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}' // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen @@ -355,7 +355,7 @@ export class DefaultApi extends BaseAPI { pingWorkflowServiceById( workflowId: string, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; // Warning: (tsdoc-undefined-tag) The TSDoc tag "@summary" is not defined in this configuration // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen // Warning: (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}' @@ -374,7 +374,7 @@ export class DefaultApi extends BaseAPI { instanceId: string, retriggerInstanceRequestDTO: RetriggerInstanceRequestDTO, options?: RawAxiosRequestConfig, - ): Promise>; + ): Promise>; } // Warning: (tsdoc-undefined-tag) The TSDoc tag "@export" is not defined in this configuration diff --git a/workspaces/orchestrator/plugins/orchestrator-common/scripts/openapi.sh b/workspaces/orchestrator/plugins/orchestrator-common/scripts/openapi.sh index 259020ee371..0c6e98faf89 100755 --- a/workspaces/orchestrator/plugins/orchestrator-common/scripts/openapi.sh +++ b/workspaces/orchestrator/plugins/orchestrator-common/scripts/openapi.sh @@ -15,7 +15,7 @@ openapi_generate() { # TypeScript Client generation rm -rf ${CLIENT_FOLDER} openapi-generator-cli generate -g typescript-axios -i ${OPENAPI_SPEC_FILE} -o ${CLIENT_FOLDER} - node ./scripts/patch-openapi-client.js "${CLIENT_FOLDER}/common.ts" + node ./scripts/patch-openapi-client.js # Docs generation rm -rf ./src/generated/docs/markdown ./src/generated/docs/html ./src/generated/docs/api-doc diff --git a/workspaces/orchestrator/plugins/orchestrator-common/scripts/patch-openapi-client.js b/workspaces/orchestrator/plugins/orchestrator-common/scripts/patch-openapi-client.js index a33bd37c282..dee4f150dca 100644 --- a/workspaces/orchestrator/plugins/orchestrator-common/scripts/patch-openapi-client.js +++ b/workspaces/orchestrator/plugins/orchestrator-common/scripts/patch-openapi-client.js @@ -16,9 +16,11 @@ const fs = require('node:fs'); const path = require('node:path'); -const generatedFile = path.resolve( - process.argv[2] || path.join(__dirname, '../src/generated/client/common.ts'), -); +if (process.argv.length > 2) { + throw new Error('patch-openapi-client.js does not accept arguments'); +} + +const generatedFile = path.join(__dirname, '../src/generated/client/common.ts'); const source = fs.readFileSync(generatedFile, 'utf8'); const unpatched = 'return axios.request(axiosRequestArgs);'; const patched = 'return axios.request(axiosRequestArgs) as Promise;';