From 51f323dd87b6a2f43f7b0ebf0b7b0d7f70baa76a Mon Sep 17 00:00:00 2001 From: hkobew Date: Tue, 11 Mar 2025 11:22:20 -0400 Subject: [PATCH 1/4] deps: install sdkv3 client --- package-lock.json | 540 +++++++++++++++++++++++++++++++++++++ packages/core/package.json | 1 + 2 files changed, 541 insertions(+) diff --git a/package-lock.json b/package-lock.json index c78d59f157f..2de5fd58fc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -146,6 +146,530 @@ "tslib": "^2.6.2" } }, + "node_modules/@aws-sdk/client-api-gateway": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-api-gateway/-/client-api-gateway-3.693.0.tgz", + "integrity": "sha512-6Fz0YF4aQc1mrW5rGYYwXGntUDILsIkWgZvUkTDIVT5Hwyz9CmSeKOJCh8oESucEX6/N0UzVWnpW+Z36pElQUQ==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sso-oidc": "3.693.0", + "@aws-sdk/client-sts": "3.693.0", + "@aws-sdk/core": "3.693.0", + "@aws-sdk/credential-provider-node": "3.693.0", + "@aws-sdk/middleware-host-header": "3.693.0", + "@aws-sdk/middleware-logger": "3.693.0", + "@aws-sdk/middleware-recursion-detection": "3.693.0", + "@aws-sdk/middleware-sdk-api-gateway": "3.693.0", + "@aws-sdk/middleware-user-agent": "3.693.0", + "@aws-sdk/region-config-resolver": "3.693.0", + "@aws-sdk/types": "3.692.0", + "@aws-sdk/util-endpoints": "3.693.0", + "@aws-sdk/util-user-agent-browser": "3.693.0", + "@aws-sdk/util-user-agent-node": "3.693.0", + "@smithy/config-resolver": "^3.0.11", + "@smithy/core": "^2.5.2", + "@smithy/fetch-http-handler": "^4.1.0", + "@smithy/hash-node": "^3.0.9", + "@smithy/invalid-dependency": "^3.0.9", + "@smithy/middleware-content-length": "^3.0.11", + "@smithy/middleware-endpoint": "^3.2.2", + "@smithy/middleware-retry": "^3.0.26", + "@smithy/middleware-serde": "^3.0.9", + "@smithy/middleware-stack": "^3.0.9", + "@smithy/node-config-provider": "^3.1.10", + "@smithy/node-http-handler": "^3.3.0", + "@smithy/protocol-http": "^4.1.6", + "@smithy/smithy-client": "^3.4.3", + "@smithy/types": "^3.7.0", + "@smithy/url-parser": "^3.0.9", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.26", + "@smithy/util-defaults-mode-node": "^3.0.26", + "@smithy/util-endpoints": "^2.1.5", + "@smithy/util-middleware": "^3.0.9", + "@smithy/util-retry": "^3.0.9", + "@smithy/util-stream": "^3.3.0", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/client-sso": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.693.0.tgz", + "integrity": "sha512-QEynrBC26x6TG9ZMzApR/kZ3lmt4lEIs2D+cHuDxt6fDGzahBUsQFBwJqhizzsM97JJI5YvmJhmihoYjdSSaXA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.693.0", + "@aws-sdk/middleware-host-header": "3.693.0", + "@aws-sdk/middleware-logger": "3.693.0", + "@aws-sdk/middleware-recursion-detection": "3.693.0", + "@aws-sdk/middleware-user-agent": "3.693.0", + "@aws-sdk/region-config-resolver": "3.693.0", + "@aws-sdk/types": "3.692.0", + "@aws-sdk/util-endpoints": "3.693.0", + "@aws-sdk/util-user-agent-browser": "3.693.0", + "@aws-sdk/util-user-agent-node": "3.693.0", + "@smithy/config-resolver": "^3.0.11", + "@smithy/core": "^2.5.2", + "@smithy/fetch-http-handler": "^4.1.0", + "@smithy/hash-node": "^3.0.9", + "@smithy/invalid-dependency": "^3.0.9", + "@smithy/middleware-content-length": "^3.0.11", + "@smithy/middleware-endpoint": "^3.2.2", + "@smithy/middleware-retry": "^3.0.26", + "@smithy/middleware-serde": "^3.0.9", + "@smithy/middleware-stack": "^3.0.9", + "@smithy/node-config-provider": "^3.1.10", + "@smithy/node-http-handler": "^3.3.0", + "@smithy/protocol-http": "^4.1.6", + "@smithy/smithy-client": "^3.4.3", + "@smithy/types": "^3.7.0", + "@smithy/url-parser": "^3.0.9", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.26", + "@smithy/util-defaults-mode-node": "^3.0.26", + "@smithy/util-endpoints": "^2.1.5", + "@smithy/util-middleware": "^3.0.9", + "@smithy/util-retry": "^3.0.9", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/client-sso-oidc": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.693.0.tgz", + "integrity": "sha512-UEDbYlYtK/e86OOMyFR4zEPyenIxDzO2DRdz3fwVW7RzZ94wfmSwBh/8skzPTuY1G7sI064cjHW0b0QG01Sdtg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.693.0", + "@aws-sdk/credential-provider-node": "3.693.0", + "@aws-sdk/middleware-host-header": "3.693.0", + "@aws-sdk/middleware-logger": "3.693.0", + "@aws-sdk/middleware-recursion-detection": "3.693.0", + "@aws-sdk/middleware-user-agent": "3.693.0", + "@aws-sdk/region-config-resolver": "3.693.0", + "@aws-sdk/types": "3.692.0", + "@aws-sdk/util-endpoints": "3.693.0", + "@aws-sdk/util-user-agent-browser": "3.693.0", + "@aws-sdk/util-user-agent-node": "3.693.0", + "@smithy/config-resolver": "^3.0.11", + "@smithy/core": "^2.5.2", + "@smithy/fetch-http-handler": "^4.1.0", + "@smithy/hash-node": "^3.0.9", + "@smithy/invalid-dependency": "^3.0.9", + "@smithy/middleware-content-length": "^3.0.11", + "@smithy/middleware-endpoint": "^3.2.2", + "@smithy/middleware-retry": "^3.0.26", + "@smithy/middleware-serde": "^3.0.9", + "@smithy/middleware-stack": "^3.0.9", + "@smithy/node-config-provider": "^3.1.10", + "@smithy/node-http-handler": "^3.3.0", + "@smithy/protocol-http": "^4.1.6", + "@smithy/smithy-client": "^3.4.3", + "@smithy/types": "^3.7.0", + "@smithy/url-parser": "^3.0.9", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.26", + "@smithy/util-defaults-mode-node": "^3.0.26", + "@smithy/util-endpoints": "^2.1.5", + "@smithy/util-middleware": "^3.0.9", + "@smithy/util-retry": "^3.0.9", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.693.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/client-sts": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.693.0.tgz", + "integrity": "sha512-4S2y7VEtvdnjJX4JPl4kDQlslxXEZFnC50/UXVUYSt/AMc5A/GgspFNA5FVz4E3Gwpfobbf23hR2NBF8AGvYoQ==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sso-oidc": "3.693.0", + "@aws-sdk/core": "3.693.0", + "@aws-sdk/credential-provider-node": "3.693.0", + "@aws-sdk/middleware-host-header": "3.693.0", + "@aws-sdk/middleware-logger": "3.693.0", + "@aws-sdk/middleware-recursion-detection": "3.693.0", + "@aws-sdk/middleware-user-agent": "3.693.0", + "@aws-sdk/region-config-resolver": "3.693.0", + "@aws-sdk/types": "3.692.0", + "@aws-sdk/util-endpoints": "3.693.0", + "@aws-sdk/util-user-agent-browser": "3.693.0", + "@aws-sdk/util-user-agent-node": "3.693.0", + "@smithy/config-resolver": "^3.0.11", + "@smithy/core": "^2.5.2", + "@smithy/fetch-http-handler": "^4.1.0", + "@smithy/hash-node": "^3.0.9", + "@smithy/invalid-dependency": "^3.0.9", + "@smithy/middleware-content-length": "^3.0.11", + "@smithy/middleware-endpoint": "^3.2.2", + "@smithy/middleware-retry": "^3.0.26", + "@smithy/middleware-serde": "^3.0.9", + "@smithy/middleware-stack": "^3.0.9", + "@smithy/node-config-provider": "^3.1.10", + "@smithy/node-http-handler": "^3.3.0", + "@smithy/protocol-http": "^4.1.6", + "@smithy/smithy-client": "^3.4.3", + "@smithy/types": "^3.7.0", + "@smithy/url-parser": "^3.0.9", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.26", + "@smithy/util-defaults-mode-node": "^3.0.26", + "@smithy/util-endpoints": "^2.1.5", + "@smithy/util-middleware": "^3.0.9", + "@smithy/util-retry": "^3.0.9", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/core": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.693.0.tgz", + "integrity": "sha512-v6Z/kWmLFqRLDPEwl9hJGhtTgIFHjZugSfF1Yqffdxf4n1AWgtHS7qSegakuMyN5pP4K2tvUD8qHJ+gGe2Bw2A==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.692.0", + "@smithy/core": "^2.5.2", + "@smithy/node-config-provider": "^3.1.10", + "@smithy/property-provider": "^3.1.9", + "@smithy/protocol-http": "^4.1.6", + "@smithy/signature-v4": "^4.2.2", + "@smithy/smithy-client": "^3.4.3", + "@smithy/types": "^3.7.0", + "@smithy/util-middleware": "^3.0.9", + "fast-xml-parser": "4.4.1", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/credential-provider-http": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.693.0.tgz", + "integrity": "sha512-sL8MvwNJU7ZpD7/d2VVb3by1GknIJUxzTIgYtVkDVA/ojo+KRQSSHxcj0EWWXF5DTSh2Tm+LrEug3y1ZyKHsDA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.693.0", + "@aws-sdk/types": "3.692.0", + "@smithy/fetch-http-handler": "^4.1.0", + "@smithy/node-http-handler": "^3.3.0", + "@smithy/property-provider": "^3.1.9", + "@smithy/protocol-http": "^4.1.6", + "@smithy/smithy-client": "^3.4.3", + "@smithy/types": "^3.7.0", + "@smithy/util-stream": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/credential-provider-ini": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.693.0.tgz", + "integrity": "sha512-kvaa4mXhCCOuW7UQnBhYqYfgWmwy7WSBSDClutwSLPZvgrhYj2l16SD2lN4IfYdxARYMJJ1lFYp3/jJG/9Yk4Q==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.693.0", + "@aws-sdk/credential-provider-env": "3.693.0", + "@aws-sdk/credential-provider-http": "3.693.0", + "@aws-sdk/credential-provider-process": "3.693.0", + "@aws-sdk/credential-provider-sso": "3.693.0", + "@aws-sdk/credential-provider-web-identity": "3.693.0", + "@aws-sdk/types": "3.692.0", + "@smithy/credential-provider-imds": "^3.2.6", + "@smithy/property-provider": "^3.1.9", + "@smithy/shared-ini-file-loader": "^3.1.10", + "@smithy/types": "^3.7.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.693.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/credential-provider-node": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.693.0.tgz", + "integrity": "sha512-42WMsBjTNnjYxYuM3qD/Nq+8b7UdMopUq5OduMDxoM3mFTV6PXMMnfI4Z1TNnR4tYRvPXAnuNltF6xmjKbSJRA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.693.0", + "@aws-sdk/credential-provider-http": "3.693.0", + "@aws-sdk/credential-provider-ini": "3.693.0", + "@aws-sdk/credential-provider-process": "3.693.0", + "@aws-sdk/credential-provider-sso": "3.693.0", + "@aws-sdk/credential-provider-web-identity": "3.693.0", + "@aws-sdk/types": "3.692.0", + "@smithy/credential-provider-imds": "^3.2.6", + "@smithy/property-provider": "^3.1.9", + "@smithy/shared-ini-file-loader": "^3.1.10", + "@smithy/types": "^3.7.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/credential-provider-sso": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.693.0.tgz", + "integrity": "sha512-479UlJxY+BFjj3pJFYUNC0DCMrykuG7wBAXfsvZqQxKUa83DnH5Q1ID/N2hZLkxjGd4ZW0AC3lTOMxFelGzzpQ==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/client-sso": "3.693.0", + "@aws-sdk/core": "3.693.0", + "@aws-sdk/token-providers": "3.693.0", + "@aws-sdk/types": "3.692.0", + "@smithy/property-provider": "^3.1.9", + "@smithy/shared-ini-file-loader": "^3.1.10", + "@smithy/types": "^3.7.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/credential-provider-web-identity": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.693.0.tgz", + "integrity": "sha512-8LB210Pr6VeCiSb2hIra+sAH4KUBLyGaN50axHtIgufVK8jbKIctTZcVY5TO9Se+1107TsruzeXS7VeqVdJfFA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.693.0", + "@aws-sdk/types": "3.692.0", + "@smithy/property-provider": "^3.1.9", + "@smithy/types": "^3.7.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.693.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/middleware-host-header": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.693.0.tgz", + "integrity": "sha512-BCki6sAZ5jYwIN/t3ElCiwerHad69ipHwPsDCxJQyeiOnJ8HG+lEpnVIfrnI8A0fLQNSF3Gtx6ahfBpKiv1Oug==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.692.0", + "@smithy/protocol-http": "^4.1.6", + "@smithy/types": "^3.7.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/middleware-logger": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.693.0.tgz", + "integrity": "sha512-dXnXDPr+wIiJ1TLADACI1g9pkSB21KkMIko2u4CJ2JCBoxi5IqeTnVoa6YcC8GdFNVRl+PorZ3Zqfmf1EOTC6w==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.692.0", + "@smithy/types": "^3.7.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/middleware-recursion-detection": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.693.0.tgz", + "integrity": "sha512-0LDmM+VxXp0u3rG0xQRWD/q6Ubi7G8I44tBPahevD5CaiDZTkmNTrVUf0VEJgVe0iCKBppACMBDkLB0/ETqkFw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.692.0", + "@smithy/protocol-http": "^4.1.6", + "@smithy/types": "^3.7.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/middleware-user-agent": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.693.0.tgz", + "integrity": "sha512-/KUq/KEpFFbQmNmpp7SpAtFAdViquDfD2W0QcG07zYBfz9MwE2ig48ALynXm5sMpRmnG7sJXjdvPtTsSVPfkiw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.693.0", + "@aws-sdk/types": "3.692.0", + "@aws-sdk/util-endpoints": "3.693.0", + "@smithy/core": "^2.5.2", + "@smithy/protocol-http": "^4.1.6", + "@smithy/types": "^3.7.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/region-config-resolver": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.693.0.tgz", + "integrity": "sha512-YLUkMsUY0GLW/nfwlZ69cy1u07EZRmsv8Z9m0qW317/EZaVx59hcvmcvb+W4bFqj5E8YImTjoGfE4cZ0F9mkyw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.692.0", + "@smithy/node-config-provider": "^3.1.10", + "@smithy/types": "^3.7.0", + "@smithy/util-config-provider": "^3.0.0", + "@smithy/util-middleware": "^3.0.9", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/token-providers": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.693.0.tgz", + "integrity": "sha512-nDBTJMk1l/YmFULGfRbToOA2wjf+FkQT4dMgYCv+V9uSYsMzQj8A7Tha2dz9yv4vnQgYaEiErQ8d7HVyXcVEoA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.692.0", + "@smithy/property-provider": "^3.1.9", + "@smithy/shared-ini-file-loader": "^3.1.10", + "@smithy/types": "^3.7.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sso-oidc": "^3.693.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/util-endpoints": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.693.0.tgz", + "integrity": "sha512-eo4F6DRQ/kxS3gxJpLRv+aDNy76DxQJL5B3DPzpr9Vkq0ygVoi4GT5oIZLVaAVIJmi6k5qq9dLsYZfWLUxJJSg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.692.0", + "@smithy/types": "^3.7.0", + "@smithy/util-endpoints": "^2.1.5", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/util-user-agent-browser": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.693.0.tgz", + "integrity": "sha512-6EUfuKOujtddy18OLJUaXfKBgs+UcbZ6N/3QV4iOkubCUdeM1maIqs++B9bhCbWeaeF5ORizJw5FTwnyNjE/mw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.692.0", + "@smithy/types": "^3.7.0", + "bowser": "^2.11.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/util-user-agent-node": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.693.0.tgz", + "integrity": "sha512-td0OVX8m5ZKiXtecIDuzY3Y3UZIzvxEr57Hp21NOwieqKCG2UeyQWWeGPv0FQaU7dpTkvFmVNI+tx9iB8V/Nhg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/middleware-user-agent": "3.693.0", + "@aws-sdk/types": "3.692.0", + "@smithy/node-config-provider": "^3.1.10", + "@smithy/types": "^3.7.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "aws-crt": ">=1.0.0" + }, + "peerDependenciesMeta": { + "aws-crt": { + "optional": true + } + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@smithy/is-array-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz", + "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@smithy/util-buffer-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz", + "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/is-array-buffer": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-api-gateway/node_modules/@smithy/util-utf8": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz", + "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/util-buffer-from": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/@aws-sdk/client-cloudformation": { "version": "3.682.0", "license": "Apache-2.0", @@ -4346,6 +4870,21 @@ "node": ">=16.0.0" } }, + "node_modules/@aws-sdk/middleware-sdk-api-gateway": { + "version": "3.693.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-api-gateway/-/middleware-sdk-api-gateway-3.693.0.tgz", + "integrity": "sha512-SvvrnN1+hC0DmXBA/QA9aEEgf0+YIsGuydX43y3gej0wQGF6jrdMyOoBumKCmOmvnOqbDSrBCW9RhdLVPauQJw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.692.0", + "@smithy/protocol-http": "^4.1.6", + "@smithy/types": "^3.7.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/@aws-sdk/middleware-sdk-ec2": { "version": "3.693.0", "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-ec2/-/middleware-sdk-ec2-3.693.0.tgz", @@ -18667,6 +19206,7 @@ "dependencies": { "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client", "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming", + "@aws-sdk/client-api-gateway": "<3.696.0", "@aws-sdk/client-cloudformation": "<3.696.0", "@aws-sdk/client-cloudwatch-logs": "<3.696.0", "@aws-sdk/client-cognito-identity": "<3.696.0", diff --git a/packages/core/package.json b/packages/core/package.json index 75b60d45c60..d7a6cb525ab 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -504,6 +504,7 @@ "@aws-sdk/client-ec2": "<3.696.0", "@aws-sdk/client-iam": "<3.696.0", "@aws-sdk/client-s3": "<3.696.0", + "@aws-sdk/client-api-gateway": "<3.696.0", "@aws-sdk/lib-storage": "<3.696.0", "@aws-sdk/client-lambda": "<3.696.0", "@aws-sdk/client-ssm": "<3.696.0", From 89f353fa7631a0cfe6a935fbbae7b19c2e698440 Mon Sep 17 00:00:00 2001 From: hkobew Date: Tue, 11 Mar 2025 11:22:32 -0400 Subject: [PATCH 2/4] refactor: rename file and client --- packages/core/src/awsService/apigateway/commands/copyUrl.ts | 4 ++-- .../src/awsService/apigateway/explorer/apiGatewayNodes.ts | 4 ++-- .../src/awsService/apigateway/vue/invokeRemoteRestApi.ts | 6 +++--- .../shared/clients/{apiGatewayClient.ts => apiGateway.ts} | 4 +--- .../awsService/apigateway/explorer/apiGatewayNodes.test.ts | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) rename packages/core/src/shared/clients/{apiGatewayClient.ts => apiGateway.ts} (93%) diff --git a/packages/core/src/awsService/apigateway/commands/copyUrl.ts b/packages/core/src/awsService/apigateway/commands/copyUrl.ts index 095d6a916b8..583c0ead91d 100644 --- a/packages/core/src/awsService/apigateway/commands/copyUrl.ts +++ b/packages/core/src/awsService/apigateway/commands/copyUrl.ts @@ -12,7 +12,7 @@ import * as vscode from 'vscode' import { ProgressLocation } from 'vscode' import { Stage } from 'aws-sdk/clients/apigateway' -import { DefaultApiGatewayClient } from '../../../shared/clients/apiGatewayClient' +import { ApiGatewayClient } from '../../../shared/clients/apiGateway' import { defaultDnsSuffix, RegionProvider } from '../../../shared/regions/regionProvider' import { getLogger } from '../../../shared/logger/logger' import { telemetry } from '../../../shared/telemetry/telemetry' @@ -25,7 +25,7 @@ interface StageInvokeUrlQuickPick extends vscode.QuickPickItem { export async function copyUrlCommand(node: RestApiNode, regionProvider: RegionProvider): Promise { const region = node.regionCode const dnsSuffix = regionProvider.getDnsSuffixForRegion(region) || defaultDnsSuffix - const client = new DefaultApiGatewayClient(region) + const client = new ApiGatewayClient(region) let stages: Stage[] try { diff --git a/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts b/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts index 0a349882f6a..30a359d80ad 100644 --- a/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts +++ b/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts @@ -11,7 +11,7 @@ import * as vscode from 'vscode' import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase' import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode' import { compareTreeItems, makeChildrenNodes } from '../../../shared/treeview/utils' -import { DefaultApiGatewayClient } from '../../../shared/clients/apiGatewayClient' +import { ApiGatewayClient } from '../../../shared/clients/apiGateway' import { RestApi } from 'aws-sdk/clients/apigateway' import { toArrayAsync, toMap, updateInPlace } from '../../../shared/utilities/collectionUtils' import { RestApiNode } from './apiNodes' @@ -25,7 +25,7 @@ export class ApiGatewayNode extends AWSTreeNodeBase { public constructor( private readonly partitionId: string, public override readonly regionCode: string, - private readonly client = new DefaultApiGatewayClient(regionCode) + private readonly client = new ApiGatewayClient(regionCode) ) { super('API Gateway', vscode.TreeItemCollapsibleState.Collapsed) this.apiNodes = new Map() diff --git a/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts b/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts index 9eefc0b8b5c..df4f441d5c0 100644 --- a/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts +++ b/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts @@ -13,7 +13,7 @@ import { localize } from '../../../shared/utilities/vsCodeUtils' import { Result } from '../../../shared/telemetry/telemetry' import { VueWebview } from '../../../webviews/main' import { ExtContext } from '../../../shared/extensions' -import { DefaultApiGatewayClient } from '../../../shared/clients/apiGatewayClient' +import { ApiGatewayClient } from '../../../shared/clients/apiGateway' import { telemetry } from '../../../shared/telemetry/telemetry' interface InvokeApiMessage { @@ -50,7 +50,7 @@ export class RemoteRestInvokeWebview extends VueWebview { public constructor( private readonly data: InvokeRemoteRestApiInitialData, private readonly channel: vscode.OutputChannel, - private readonly client = new DefaultApiGatewayClient(data.Region) + private readonly client = new ApiGatewayClient(data.Region) ) { super(RemoteRestInvokeWebview.sourcePath) } @@ -115,7 +115,7 @@ export async function invokeRemoteRestApi( const logger: Logger = getLogger() try { - const client = new DefaultApiGatewayClient(params.apiNode.regionCode) + const client = new ApiGatewayClient(params.apiNode.regionCode) logger.info(`Loading API Resources for API ${params.apiNode.name} (id: ${params.apiNode.id})`) const resources = (await toArrayAsync(client.getResourcesForApi(params.apiNode.id))) .sort((a, b) => a.path!.localeCompare(b.path!)) diff --git a/packages/core/src/shared/clients/apiGatewayClient.ts b/packages/core/src/shared/clients/apiGateway.ts similarity index 93% rename from packages/core/src/shared/clients/apiGatewayClient.ts rename to packages/core/src/shared/clients/apiGateway.ts index 492e1f363a6..b76d40a435d 100644 --- a/packages/core/src/shared/clients/apiGatewayClient.ts +++ b/packages/core/src/shared/clients/apiGateway.ts @@ -6,10 +6,8 @@ import { APIGateway } from 'aws-sdk' import { RestApi, Stages } from 'aws-sdk/clients/apigateway' import globals from '../extensionGlobals' -import { ClassToInterfaceType } from '../utilities/tsUtils' -export type ApiGatewayClient = ClassToInterfaceType -export class DefaultApiGatewayClient { +export class ApiGatewayClient { public constructor(public readonly regionCode: string) {} public async *getResourcesForApi(apiId: string): AsyncIterableIterator { diff --git a/packages/core/src/test/awsService/apigateway/explorer/apiGatewayNodes.test.ts b/packages/core/src/test/awsService/apigateway/explorer/apiGatewayNodes.test.ts index cf5bf5f648b..d8363db7547 100644 --- a/packages/core/src/test/awsService/apigateway/explorer/apiGatewayNodes.test.ts +++ b/packages/core/src/test/awsService/apigateway/explorer/apiGatewayNodes.test.ts @@ -11,7 +11,7 @@ import { import { asyncGenerator } from '../../../../shared/utilities/collectionUtils' import { ApiGatewayNode } from '../../../../awsService/apigateway/explorer/apiGatewayNodes' import { RestApiNode } from '../../../../awsService/apigateway/explorer/apiNodes' -import { DefaultApiGatewayClient } from '../../../../shared/clients/apiGatewayClient' +import { ApiGatewayClient } from '../../../../shared/clients/apiGateway' import { stub } from '../../../utilities/stubber' const fakePartitionId = 'aws' @@ -37,7 +37,7 @@ describe('ApiGatewayNode', function () { let apiNames: { name: string; id: string }[] function createClient() { - const client = stub(DefaultApiGatewayClient, { regionCode: fakeRegionCode }) + const client = stub(ApiGatewayClient, { regionCode: fakeRegionCode }) client.listApis.callsFake(() => asyncGenerator(apiNames)) return client From 4285ff72fea24013e91f75d6b1055a741d852db7 Mon Sep 17 00:00:00 2001 From: hkobew Date: Tue, 11 Mar 2025 11:32:21 -0400 Subject: [PATCH 3/4] refactor: migrate functions to use v3 --- .../core/src/shared/clients/apiGateway.ts | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/packages/core/src/shared/clients/apiGateway.ts b/packages/core/src/shared/clients/apiGateway.ts index b76d40a435d..588e9610b80 100644 --- a/packages/core/src/shared/clients/apiGateway.ts +++ b/packages/core/src/shared/clients/apiGateway.ts @@ -5,20 +5,33 @@ import { APIGateway } from 'aws-sdk' import { RestApi, Stages } from 'aws-sdk/clients/apigateway' -import globals from '../extensionGlobals' - -export class ApiGatewayClient { - public constructor(public readonly regionCode: string) {} - - public async *getResourcesForApi(apiId: string): AsyncIterableIterator { - const client = await this.createSdkClient() +import { ClientWrapper } from './clientWrapper' +import { + APIGatewayClient as ApiGatewayClientSDK, + GetResourcesCommand, + GetResourcesRequest, + GetRestApisCommand, + GetStagesCommand, + Resource, + Resources, + RestApis, + TestInvokeMethodCommand, + TestInvokeMethodRequest, + TestInvokeMethodResponse, +} from '@aws-sdk/client-api-gateway' + +export class ApiGatewayClient extends ClientWrapper { + public constructor(regionCode: string) { + super(regionCode, ApiGatewayClientSDK) + } - const request: APIGateway.GetResourcesRequest = { + public async *getResourcesForApi(apiId: string): AsyncIterableIterator { + const request: GetResourcesRequest = { restApiId: apiId, } do { - const response: APIGateway.Resources = await client.getResources(request).promise() + const response: Resources = await this.makeRequest(GetResourcesCommand, request) if (response.items !== undefined && response.items.length > 0) { yield* response.items @@ -29,22 +42,16 @@ export class ApiGatewayClient { } public async getStages(apiId: string): Promise { - const client = await this.createSdkClient() - - const request: APIGateway.GetResourcesRequest = { + return this.makeRequest(GetStagesCommand, { restApiId: apiId, - } - - return client.getStages(request).promise() + }) } public async *listApis(): AsyncIterableIterator { - const client = await this.createSdkClient() - const request: APIGateway.GetRestApisRequest = {} do { - const response: APIGateway.RestApis = await client.getRestApis(request).promise() + const response: RestApis = await this.makeRequest(GetRestApisCommand, request) if (response.items !== undefined && response.items.length > 0) { yield* response.items @@ -60,9 +67,8 @@ export class ApiGatewayClient { method: string, body: string, pathWithQueryString: string | undefined - ): Promise { - const client = await this.createSdkClient() - const request: APIGateway.TestInvokeMethodRequest = { + ): Promise { + const request: TestInvokeMethodRequest = { restApiId: apiId, resourceId: resourceId, httpMethod: method, @@ -72,10 +78,6 @@ export class ApiGatewayClient { request.pathWithQueryString = pathWithQueryString } - return await client.testInvokeMethod(request).promise() - } - - private async createSdkClient(): Promise { - return await globals.sdkClientBuilder.createAwsService(APIGateway, undefined, this.regionCode) + return this.makeRequest(TestInvokeMethodCommand, request) } } From fae0e89b2cc249d3282e5ce16d759db5b7556395 Mon Sep 17 00:00:00 2001 From: hkobew Date: Tue, 11 Mar 2025 11:39:40 -0400 Subject: [PATCH 4/4] deps: remove v2 imports --- packages/core/src/shared/clients/apiGateway.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/src/shared/clients/apiGateway.ts b/packages/core/src/shared/clients/apiGateway.ts index 588e9610b80..eeae7144712 100644 --- a/packages/core/src/shared/clients/apiGateway.ts +++ b/packages/core/src/shared/clients/apiGateway.ts @@ -2,19 +2,19 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ - -import { APIGateway } from 'aws-sdk' -import { RestApi, Stages } from 'aws-sdk/clients/apigateway' import { ClientWrapper } from './clientWrapper' import { APIGatewayClient as ApiGatewayClientSDK, GetResourcesCommand, GetResourcesRequest, GetRestApisCommand, + GetRestApisRequest, GetStagesCommand, Resource, Resources, + RestApi, RestApis, + Stages, TestInvokeMethodCommand, TestInvokeMethodRequest, TestInvokeMethodResponse, @@ -48,7 +48,7 @@ export class ApiGatewayClient extends ClientWrapper { } public async *listApis(): AsyncIterableIterator { - const request: APIGateway.GetRestApisRequest = {} + const request: GetRestApisRequest = {} do { const response: RestApis = await this.makeRequest(GetRestApisCommand, request)