Skip to content

Commit c425e8c

Browse files
comcalvicomcalvi
authored
fix(cli): SSO credentials do not work when using a proxy (aws#22115)
Passes `httpOptions` through to the SDK, which now recognizes `httpOptions`. Enables SSO to work with proxies. This was tested manually. Fixes aws#21328. ---- ### All Submissions: * [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 40ddfdd commit c425e8c

File tree

26 files changed

+33
-33
lines changed

26 files changed

+33
-33
lines changed

‎packages/@aws-cdk/aws-amplify/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"@aws-cdk/cfn2ts": "0.0.0",
8989
"@aws-cdk/pkglint": "0.0.0",
9090
"@types/jest": "^27.5.2",
91-
"aws-sdk": "^2.848.0"
91+
"aws-sdk": "^2.1211.0"
9292
},
9393
"dependencies": {
9494
"@aws-cdk/aws-codebuild": "0.0.0",

‎packages/@aws-cdk/aws-apigateway/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
"@aws-cdk/assertions": "0.0.0",
8585
"@aws-cdk/cdk-build-tools": "0.0.0",
8686
"@aws-cdk/integ-runner": "0.0.0",
87-
"@aws-cdk/integ-tests": "0.0.0",
8887
"@aws-cdk/cfn2ts": "0.0.0",
8988
"@aws-cdk/pkglint": "0.0.0",
9089
"@types/jest": "^27.5.2"

‎packages/@aws-cdk/aws-cloudfront-origins/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/integ-tests": "0.0.0",
8686
"@aws-cdk/pkglint": "0.0.0",
8787
"@types/jest": "^27.5.2",
88-
"aws-sdk": "^2.848.0"
88+
"aws-sdk": "^2.1211.0"
8989
},
9090
"dependencies": {
9191
"@aws-cdk/aws-apigateway": "0.0.0",

‎packages/@aws-cdk/aws-cloudfront/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/cfn2ts": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
8989
"@types/jest": "^27.5.2",
90-
"aws-sdk": "^2.848.0",
90+
"aws-sdk": "^2.1211.0",
9191
"jest": "^27.5.1"
9292
},
9393
"dependencies": {

‎packages/@aws-cdk/aws-cloudtrail/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/cfn2ts": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
8989
"@types/jest": "^27.5.2",
90-
"aws-sdk": "^2.848.0",
90+
"aws-sdk": "^2.1211.0",
9191
"jest": "^27.5.1"
9292
},
9393
"dependencies": {

‎packages/@aws-cdk/aws-codebuild/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"@aws-cdk/cfn2ts": "0.0.0",
9494
"@aws-cdk/pkglint": "0.0.0",
9595
"@types/jest": "^27.5.2",
96-
"aws-sdk": "^2.848.0",
96+
"aws-sdk": "^2.1211.0",
9797
"jest": "^27.5.1"
9898
},
9999
"dependencies": {

‎packages/@aws-cdk/aws-codecommit/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"@aws-cdk/cloud-assembly-schema": "0.0.0",
9494
"@aws-cdk/pkglint": "0.0.0",
9595
"@types/jest": "^27.5.2",
96-
"aws-sdk": "^2.848.0",
96+
"aws-sdk": "^2.1211.0",
9797
"jest": "^27.5.1"
9898
},
9999
"dependencies": {

‎packages/@aws-cdk/aws-dynamodb/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"@types/aws-lambda": "^8.10.104",
9090
"@types/jest": "^27.5.2",
9191
"@types/sinon": "^9.0.11",
92-
"aws-sdk": "^2.848.0",
92+
"aws-sdk": "^2.1211.0",
9393
"aws-sdk-mock": "5.6.0",
9494
"jest": "^27.5.1",
9595
"sinon": "^9.2.4",

‎packages/@aws-cdk/aws-eks/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"@types/jest": "^27.5.2",
9191
"@types/sinon": "^9.0.11",
9292
"@types/yaml": "1.9.6",
93-
"aws-sdk": "^2.848.0",
93+
"aws-sdk": "^2.1211.0",
9494
"cdk8s": "^2.4.33",
9595
"cdk8s-plus-21": "^2.0.0-beta.12",
9696
"jest": "^27.5.1",

‎packages/@aws-cdk/aws-events-targets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"@aws-cdk/integ-runner": "0.0.0",
9090
"@aws-cdk/pkglint": "0.0.0",
9191
"@types/jest": "^27.5.2",
92-
"aws-sdk": "^2.848.0",
92+
"aws-sdk": "^2.1211.0",
9393
"aws-sdk-mock": "5.6.0",
9494
"jest": "^27.5.1"
9595
},

‎packages/@aws-cdk/aws-events/package.json

-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@
8787
"@aws-cdk/integ-runner": "0.0.0",
8888
"@aws-cdk/integ-tests": "0.0.0",
8989
"@aws-cdk/cfn2ts": "0.0.0",
90-
"@aws-cdk/integ-runner": "0.0.0",
91-
"@aws-cdk/integ-tests": "0.0.0",
9290
"@aws-cdk/pkglint": "0.0.0",
9391
"@types/jest": "^27.5.2",
9492
"jest": "^27.5.1"

‎packages/@aws-cdk/aws-globalaccelerator-endpoints/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"@aws-cdk/integ-runner": "0.0.0",
8282
"@aws-cdk/pkglint": "0.0.0",
8383
"@types/jest": "^27.5.2",
84-
"aws-sdk": "^2.848.0",
84+
"aws-sdk": "^2.1211.0",
8585
"aws-sdk-mock": "5.6.0",
8686
"jest": "^27.5.1"
8787
},

‎packages/@aws-cdk/aws-logs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"@types/aws-lambda": "^8.10.104",
9090
"@types/jest": "^27.5.2",
9191
"@types/sinon": "^9.0.11",
92-
"aws-sdk": "^2.848.0",
92+
"aws-sdk": "^2.1211.0",
9393
"aws-sdk-mock": "5.6.0",
9494
"jest": "^27.5.1",
9595
"nock": "^13.2.9",

‎packages/@aws-cdk/aws-redshift/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/pkglint": "0.0.0",
8888
"@aws-cdk/integ-tests": "0.0.0",
8989
"@types/jest": "^27.5.2",
90-
"aws-sdk": "^2.848.0",
90+
"aws-sdk": "^2.1211.0",
9191
"jest": "^27.5.1"
9292
},
9393
"dependencies": {

‎packages/@aws-cdk/aws-route53/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/pkglint": "0.0.0",
8888
"@types/aws-lambda": "^8.10.104",
8989
"@types/jest": "^27.5.2",
90-
"aws-sdk": "^2.848.0",
90+
"aws-sdk": "^2.1211.0",
9191
"jest": "^27.5.1"
9292
},
9393
"dependencies": {

‎packages/@aws-cdk/aws-sqs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/cfn2ts": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
8989
"@types/jest": "^27.5.2",
90-
"aws-sdk": "^2.848.0",
90+
"aws-sdk": "^2.1211.0",
9191
"jest": "^27.5.1"
9292
},
9393
"dependencies": {

‎packages/@aws-cdk/custom-resources/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"@types/fs-extra": "^8.1.2",
9494
"@types/jest": "^27.5.2",
9595
"@types/sinon": "^9.0.11",
96-
"aws-sdk": "^2.848.0",
96+
"aws-sdk": "^2.1211.0",
9797
"aws-sdk-mock": "5.6.0",
9898
"fs-extra": "^9.1.0",
9999
"nock": "^13.2.9",

‎packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
156156

157157
----------------
158158

159-
** aws-sdk@2.1220.0 - https://www.npmjs.com/package/aws-sdk/v/2.1220.0 | Apache-2.0
159+
** aws-sdk@2.1219.0 - https://www.npmjs.com/package/aws-sdk/v/2.1219.0 | Apache-2.0
160160
AWS SDK for JavaScript
161161
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
162162

‎packages/@aws-cdk/integ-tests/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"@types/fs-extra": "^8.1.2",
6969
"@types/jest": "^27.5.2",
7070
"@types/node": "^14.18.29",
71-
"aws-sdk": "^2.1093.0",
71+
"aws-sdk": "^2.1211.0",
7272
"aws-sdk-mock": "5.6.0",
7373
"jest": "^27.5.1",
7474
"nock": "^13.2.9",

‎packages/@aws-cdk/pipelines/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"@aws-cdk/cfn2ts": "0.0.0",
5252
"@aws-cdk/pkglint": "0.0.0",
5353
"@types/jest": "^27.5.2",
54-
"aws-sdk": "^2.848.0"
54+
"aws-sdk": "^2.1211.0"
5555
},
5656
"peerDependencies": {
5757
"@aws-cdk/aws-codebuild": "0.0.0",

‎packages/@aws-cdk/triggers/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"@aws-cdk/cdk-build-tools": "0.0.0",
7878
"@aws-cdk/integ-runner": "0.0.0",
7979
"@aws-cdk/aws-sns": "0.0.0",
80-
"aws-sdk": "^2.848.0",
80+
"aws-sdk": "^2.1211.0",
8181
"@aws-cdk/pkglint": "0.0.0",
8282
"@types/jest": "^27.5.2",
8383
"jest": "^27.5.1"

‎packages/aws-cdk/THIRD_PARTY_LICENSES

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
268268

269269
----------------
270270

271-
** aws-sdk@2.1220.0 - https://www.npmjs.com/package/aws-sdk/v/2.1220.0 | Apache-2.0
271+
** aws-sdk@2.1219.0 - https://www.npmjs.com/package/aws-sdk/v/2.1219.0 | Apache-2.0
272272
AWS SDK for JavaScript
273273
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
274274

‎packages/aws-cdk/lib/api/aws-auth/awscli-compatible.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ export class AwsCliCompatible {
4141
// we use that to the exclusion of everything else (note: this does not apply
4242
// to AWS_PROFILE, environment credentials still take precedence over AWS_PROFILE)
4343
if (options.profile) {
44-
return new AWS.CredentialProviderChain(iniFileCredentialFactories(options.profile));
44+
return new AWS.CredentialProviderChain(iniFileCredentialFactories(options.profile, options.httpOptions));
4545
}
4646

4747
const implicitProfile = process.env.AWS_PROFILE || process.env.AWS_DEFAULT_PROFILE || 'default';
4848

4949
const sources = [
5050
() => new AWS.EnvironmentCredentials('AWS'),
5151
() => new AWS.EnvironmentCredentials('AMAZON'),
52-
...iniFileCredentialFactories(implicitProfile),
52+
...iniFileCredentialFactories(implicitProfile, options.httpOptions),
5353
];
5454

5555
if (options.containerCreds ?? hasEcsCredentials()) {
@@ -75,10 +75,13 @@ export class AwsCliCompatible {
7575
});
7676
}
7777

78-
function iniFileCredentialFactories(theProfile: string) {
78+
function iniFileCredentialFactories(theProfile: string, theHttpOptions?: AWS.HTTPOptions) {
7979
return [
8080
() => profileCredentials(theProfile),
81-
() => new AWS.SsoCredentials({ profile: theProfile }),
81+
() => new AWS.SsoCredentials({
82+
profile: theProfile,
83+
httpOptions: theHttpOptions,
84+
}),
8285
() => new AWS.ProcessCredentials({ profile: theProfile }),
8386
];
8487
}

‎packages/aws-cdk/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"@aws-cdk/region-info": "0.0.0",
9898
"@jsii/check-node": "1.68.0",
9999
"archiver": "^5.3.1",
100-
"aws-sdk": "^2.1093.0",
100+
"aws-sdk": "^2.1211.0",
101101
"camelcase": "^6.3.0",
102102
"cdk-assets": "0.0.0",
103103
"chokidar": "^3.5.3",

‎packages/cdk-assets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@aws-cdk/cloud-assembly-schema": "0.0.0",
4848
"@aws-cdk/cx-api": "0.0.0",
4949
"archiver": "^5.3.1",
50-
"aws-sdk": "^2.1093.0",
50+
"aws-sdk": "^2.1211.0",
5151
"glob": "^7.2.3",
5252
"mime": "^2.6.0",
5353
"yargs": "^16.2.0"

‎yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -2626,10 +2626,10 @@ [email protected]:
26262626
sinon "^11.1.1"
26272627
traverse "^0.6.6"
26282628

2629-
aws-sdk@^2.1093.0, aws-sdk@^2.596.0, aws-sdk@^2.848.0, aws-sdk@^2.928.0:
2630-
version "2.1220.0"
2631-
resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1220.0.tgz#5cec163ee7799875e484afcdde93c4b1e713c64c"
2632-
integrity sha512-l8KEOo2Cb066lLPhVDucx6JuNUrMVmZW937htKagf8rcADCbM0ySIGGKWbi2E8l44ptX3/tDOFnyiSislolATQ==
2629+
aws-sdk@^2.1211.0, aws-sdk@^2.596.0, aws-sdk@^2.928.0:
2630+
version "2.1219.0"
2631+
resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1219.0.tgz#96d056fc4ebfd8417308f18a34f127dbaafc022e"
2632+
integrity sha512-KOGA0E3wZ/Zom1VDAd4ttsaq2LAVECXdHUs/i8OyJkuR3vSvmKQa/BOH4baIBNt4VMS062FhPA29UtT1YPTlwQ==
26332633
dependencies:
26342634
buffer "4.9.2"
26352635
events "1.1.1"

0 commit comments

Comments
 (0)