diff --git a/package-lock.json b/package-lock.json index 1644a3d70ae..89f94a71543 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,14 +6,14 @@ "packages": { "": { "name": "aws-toolkit-vscode", - "version": "1.45.0-SNAPSHOT", + "version": "1.46.0-SNAPSHOT", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-sso": "^3.54.0", "@aws-sdk/client-sso-oidc": "^3.58.0", "@aws-sdk/credential-provider-ini": "^3.46.0", - "@aws-sdk/credential-provider-process": "^3.15.0", + "@aws-sdk/credential-provider-process": "^3.127.0", "@aws-sdk/credential-provider-sso": "^3.38.0", "@aws-sdk/util-arn-parser": "^3.46.0", "@vscode/codicons": "^0.0.29", @@ -1001,18 +1001,17 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.37.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.37.0.tgz", - "integrity": "sha512-VOfWtUBbICb7xEHRFN7+fRA+move/3HT4mZt7C5KBXIaILT3b8hrK1mT/fRQ3dx9dF56PEGj/WkACOBjMzIcdg==", + "version": "3.127.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.127.0.tgz", + "integrity": "sha512-6v0m2lqkO9J5fNlTl+HjriQNIdfg8mjVST544+5y9EnC/FVmTnIz64vfHveWdNkP/fehFx7wTimNENtoSqCn3A==", "dependencies": { - "@aws-sdk/property-provider": "3.37.0", - "@aws-sdk/shared-ini-file-loader": "3.37.0", - "@aws-sdk/types": "3.37.0", - "@aws-sdk/util-credentials": "3.37.0", - "tslib": "^2.3.0" + "@aws-sdk/property-provider": "3.127.0", + "@aws-sdk/shared-ini-file-loader": "3.127.0", + "@aws-sdk/types": "3.127.0", + "tslib": "^2.3.1" }, "engines": { - "node": ">= 10.0.0" + "node": ">= 12.0.0" } }, "node_modules/@aws-sdk/credential-provider-sso": { @@ -1819,15 +1818,15 @@ } }, "node_modules/@aws-sdk/property-provider": { - "version": "3.37.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.37.0.tgz", - "integrity": "sha512-puXV4MIj+n9Pr4KbwpOz6+nK7gmJAgAOZW/yKXxyWH4fTcrCVe9xuo5kqaiI1gb5ojaNt2GuISBFR7bVLumh9Q==", + "version": "3.127.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.127.0.tgz", + "integrity": "sha512-JxenxlTEkWfLrtJqIjaXaJzAVQbbscoCb5bNjmdud07ESLVfWRKJx2nAJdecHKYp2M5NQyqBuFhQ1ELSFYQKCA==", "dependencies": { - "@aws-sdk/types": "3.37.0", - "tslib": "^2.3.0" + "@aws-sdk/types": "3.127.0", + "tslib": "^2.3.1" }, "engines": { - "node": ">= 10.0.0" + "node": ">= 12.0.0" } }, "node_modules/@aws-sdk/protocol-http": { @@ -1900,14 +1899,14 @@ } }, "node_modules/@aws-sdk/shared-ini-file-loader": { - "version": "3.37.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.37.0.tgz", - "integrity": "sha512-+vRBSlfa48R9KL7DpQt3dsu5/+5atjRgoCISblWo3SLpjrx41pKcjKneo7a1u0aP1Xc2oG2TfIyqTWZuOXsmEQ==", + "version": "3.127.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.127.0.tgz", + "integrity": "sha512-S3Nn4KRTqoJsB/TbRZSWBBUrkckNMR0Juqz7bOB+wupVvddKP6IcpspSC/GX9zgJjVMV8iGisZ6AUsYsC5r+cA==", "dependencies": { - "tslib": "^2.3.0" + "tslib": "^2.3.1" }, "engines": { - "node": ">= 10.0.0" + "node": ">= 12.0.0" } }, "node_modules/@aws-sdk/signature-v4": { @@ -1955,11 +1954,11 @@ } }, "node_modules/@aws-sdk/types": { - "version": "3.37.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.37.0.tgz", - "integrity": "sha512-KwHB06E1uxof5ijfcQXYidyihoCRMnHEFvWCy/VlL+1S54FTlMZ27JOZzQhLiw8NqeNfO33aqpMkxR60TwUZzg==", + "version": "3.127.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.127.0.tgz", + "integrity": "sha512-e0wtx2IkOl7rwfKfLH5pPTzQ+d45V7b1WrjeL0WDI8kOu6w+sXmhNxI6uM2kf0k4NiTLN84lW290AEWupey9Og==", "engines": { - "node": ">= 10.0.0" + "node": ">= 12.0.0" } }, "node_modules/@aws-sdk/url-parser": { @@ -2053,18 +2052,6 @@ "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/util-credentials": { - "version": "3.37.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.37.0.tgz", - "integrity": "sha512-zcLhSZDKgBLhUjSU5HoQpuQiP3v8oE86NmV/tiZVPEaO6YVULEAB2Cfj1hpM/b/JXWzjSHfT06KXT7QUODKS+A==", - "dependencies": { - "@aws-sdk/shared-ini-file-loader": "3.37.0", - "tslib": "^2.3.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/@aws-sdk/util-defaults-mode-browser": { "version": "3.54.0", "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.54.0.tgz", @@ -15019,15 +15006,14 @@ } }, "@aws-sdk/credential-provider-process": { - "version": "3.37.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.37.0.tgz", - "integrity": "sha512-VOfWtUBbICb7xEHRFN7+fRA+move/3HT4mZt7C5KBXIaILT3b8hrK1mT/fRQ3dx9dF56PEGj/WkACOBjMzIcdg==", + "version": "3.127.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.127.0.tgz", + "integrity": "sha512-6v0m2lqkO9J5fNlTl+HjriQNIdfg8mjVST544+5y9EnC/FVmTnIz64vfHveWdNkP/fehFx7wTimNENtoSqCn3A==", "requires": { - "@aws-sdk/property-provider": "3.37.0", - "@aws-sdk/shared-ini-file-loader": "3.37.0", - "@aws-sdk/types": "3.37.0", - "@aws-sdk/util-credentials": "3.37.0", - "tslib": "^2.3.0" + "@aws-sdk/property-provider": "3.127.0", + "@aws-sdk/shared-ini-file-loader": "3.127.0", + "@aws-sdk/types": "3.127.0", + "tslib": "^2.3.1" } }, "@aws-sdk/credential-provider-sso": { @@ -15680,12 +15666,12 @@ } }, "@aws-sdk/property-provider": { - "version": "3.37.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.37.0.tgz", - "integrity": "sha512-puXV4MIj+n9Pr4KbwpOz6+nK7gmJAgAOZW/yKXxyWH4fTcrCVe9xuo5kqaiI1gb5ojaNt2GuISBFR7bVLumh9Q==", + "version": "3.127.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.127.0.tgz", + "integrity": "sha512-JxenxlTEkWfLrtJqIjaXaJzAVQbbscoCb5bNjmdud07ESLVfWRKJx2nAJdecHKYp2M5NQyqBuFhQ1ELSFYQKCA==", "requires": { - "@aws-sdk/types": "3.37.0", - "tslib": "^2.3.0" + "@aws-sdk/types": "3.127.0", + "tslib": "^2.3.1" } }, "@aws-sdk/protocol-http": { @@ -15743,11 +15729,11 @@ "integrity": "sha512-XWANvjJJZNqsYhGmccSSuhsvINIUX1KckfDmvYtUR6cKM6nM6QWOg/QJeTFageTEpruJ5TqzW9vY414bIE883w==" }, "@aws-sdk/shared-ini-file-loader": { - "version": "3.37.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.37.0.tgz", - "integrity": "sha512-+vRBSlfa48R9KL7DpQt3dsu5/+5atjRgoCISblWo3SLpjrx41pKcjKneo7a1u0aP1Xc2oG2TfIyqTWZuOXsmEQ==", + "version": "3.127.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.127.0.tgz", + "integrity": "sha512-S3Nn4KRTqoJsB/TbRZSWBBUrkckNMR0Juqz7bOB+wupVvddKP6IcpspSC/GX9zgJjVMV8iGisZ6AUsYsC5r+cA==", "requires": { - "tslib": "^2.3.0" + "tslib": "^2.3.1" } }, "@aws-sdk/signature-v4": { @@ -15787,9 +15773,9 @@ } }, "@aws-sdk/types": { - "version": "3.37.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.37.0.tgz", - "integrity": "sha512-KwHB06E1uxof5ijfcQXYidyihoCRMnHEFvWCy/VlL+1S54FTlMZ27JOZzQhLiw8NqeNfO33aqpMkxR60TwUZzg==" + "version": "3.127.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.127.0.tgz", + "integrity": "sha512-e0wtx2IkOl7rwfKfLH5pPTzQ+d45V7b1WrjeL0WDI8kOu6w+sXmhNxI6uM2kf0k4NiTLN84lW290AEWupey9Og==" }, "@aws-sdk/url-parser": { "version": "3.54.0", @@ -15866,15 +15852,6 @@ "tslib": "^2.3.0" } }, - "@aws-sdk/util-credentials": { - "version": "3.37.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.37.0.tgz", - "integrity": "sha512-zcLhSZDKgBLhUjSU5HoQpuQiP3v8oE86NmV/tiZVPEaO6YVULEAB2Cfj1hpM/b/JXWzjSHfT06KXT7QUODKS+A==", - "requires": { - "@aws-sdk/shared-ini-file-loader": "3.37.0", - "tslib": "^2.3.0" - } - }, "@aws-sdk/util-defaults-mode-browser": { "version": "3.54.0", "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.54.0.tgz", diff --git a/package.json b/package.json index 7d69cd6f397..2ca016e6f7e 100644 --- a/package.json +++ b/package.json @@ -3231,7 +3231,7 @@ "@aws-sdk/client-sso": "^3.54.0", "@aws-sdk/client-sso-oidc": "^3.58.0", "@aws-sdk/credential-provider-ini": "^3.46.0", - "@aws-sdk/credential-provider-process": "^3.15.0", + "@aws-sdk/credential-provider-process": "^3.127.0", "@aws-sdk/credential-provider-sso": "^3.38.0", "@aws-sdk/util-arn-parser": "^3.46.0", "@vscode/codicons": "^0.0.29", diff --git a/src/test/credentials/provider/sharedCredentialsProvider.test.ts b/src/test/credentials/provider/sharedCredentialsProvider.test.ts index 07d77890a87..25ed00a3cdb 100644 --- a/src/test/credentials/provider/sharedCredentialsProvider.test.ts +++ b/src/test/credentials/provider/sharedCredentialsProvider.test.ts @@ -9,7 +9,6 @@ import * as sinon from 'sinon' import { SharedCredentialsProvider } from '../../../credentials/providers/sharedCredentialsProvider' import { Profile } from '../../../shared/credentials/credentialsFile' import { stripUndefined } from '../../../shared/utilities/collectionUtils' -import * as process from '@aws-sdk/credential-provider-process' import { ParsedIniData } from '@aws-sdk/shared-ini-file-loader' import { installFakeClock } from '../../testUtil' @@ -266,29 +265,6 @@ describe('SharedCredentialsProvider', async function () { assert.ok(makeIni.calledOnce) } - it('resolves profile with source_profile as credential_process', async function () { - const resolvedProfile = { - base: resolvedBaseProfile, - child: childProfile, - } - const sut = new SharedCredentialsProvider( - 'child', - new Map([ - ['base', { credential_process: 'test_process' }], - ['child', { ...childProfile }], - ]) - ) - - sandbox.stub(process, 'fromProcess').returns(() => - Promise.resolve({ - accessKeyId: resolvedBaseProfile['aws_access_key_id'], - secretAccessKey: resolvedBaseProfile['aws_secret_access_key'], - }) - ) - - await assertIniProviderResolves(sut, resolvedProfile) - }) - it('resolves profile with source_profile as sso', async function () { resolvedBaseProfile['aws_session_token'] = 'token' const resolvedProfile = { @@ -322,41 +298,6 @@ describe('SharedCredentialsProvider', async function () { await assertIniProviderResolves(sut, resolvedProfile) }) - - it('resolves profile with source_profile and MFA', async function () { - const mfaSerial = 'serial' - const resolvedProfile = { - base: resolvedBaseProfile, - child: { - ...childProfile, - mfa_serial: mfaSerial, - }, - } - const sut = new SharedCredentialsProvider( - 'child', - new Map([ - [ - 'base', - { - credential_process: 'test_process', - mfa_serial: mfaSerial, - }, - ], - ['child', { ...childProfile }], - ]) - ) - - // We use 'credential_process' here to simulate static credentials since we can't - // stub out 'makeSharedIniFileCredentialsProvider' as it is already stubbed - sandbox.stub(process, 'fromProcess').returns(() => - Promise.resolve({ - accessKeyId: resolvedBaseProfile['aws_access_key_id'], - secretAccessKey: resolvedBaseProfile['aws_secret_access_key'], - }) - ) - - await assertIniProviderResolves(sut, resolvedProfile) - }) }) })