Skip to content

fix(client-sts): propagate parent configuration to nested sts client #7444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+12 −6
Closed

fix(client-sts): propagate parent configuration to nested sts client #7444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clients/client-sts/src/defaultStsRoleAssumers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export const getDefaultRoleAssumer = (
const isCompatibleRequestHandler = !isH2(requestHandler);

stsClient = new STSClient({
profile: stsOptions?.parentClientConfig?.profile,
...stsOptions?.parentClientConfig,
// A hack to make sts client uses the credential in current closure.
credentialDefaultProvider: () => async () => closureSourceCreds,
region: resolvedRegion,
Expand Down Expand Up @@ -166,7 +166,7 @@ export const getDefaultRoleAssumerWithWebIdentity = (
const isCompatibleRequestHandler = !isH2(requestHandler);

stsClient = new STSClient({
profile: stsOptions?.parentClientConfig?.profile,
...stsOptions?.parentClientConfig,
region: resolvedRegion,
requestHandler: isCompatibleRequestHandler ? (requestHandler as any) : undefined,
logger: logger as any,
Expand Down
6 changes: 6 additions & 0 deletions ...rces/software/amazon/smithy/aws/typescript/codegen/sts-client-defaultRoleAssumers.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,13 @@ describe("getDefaultRoleAssumer", () => {
};
const region = "some-region";
const handler = new NodeHttpHandler();
const customUserAgent = [["custom-agent", "1.0.0"]];
const roleAssumer = getDefaultRoleAssumer({
parentClientConfig: {
region,
logger,
requestHandler: handler,
customUserAgent,
},
});
const params: AssumeRoleCommandInput = {
Expand All @@ -183,6 +185,7 @@ describe("getDefaultRoleAssumer", () => {
logger,
requestHandler: handler,
region,
customUserAgent,
});
});

Expand Down Expand Up @@ -275,10 +278,12 @@ describe("getDefaultRoleAssumerWithWebIdentity", () => {
};
const region = "some-region";
const handler = new NodeHttpHandler();
const customUserAgent = [["custom-agent", "1.0.0"]];
const roleAssumerWithWebIdentity = getDefaultRoleAssumerWithWebIdentity({
region,
logger,
requestHandler: handler,
customUserAgent,
});
const params: AssumeRoleWithWebIdentityCommandInput = {
RoleArn: "arn:aws:foo",
Expand All @@ -291,6 +296,7 @@ describe("getDefaultRoleAssumerWithWebIdentity", () => {
logger,
requestHandler: handler,
region,
customUserAgent,
});
});

Expand Down
4 changes: 2 additions & 2 deletions ...ources/software/amazon/smithy/aws/typescript/codegen/sts-client-defaultStsRoleAssumers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export const getDefaultRoleAssumer = (
const isCompatibleRequestHandler = !isH2(requestHandler);

stsClient = new STSClient({
profile: stsOptions?.parentClientConfig?.profile,
...stsOptions?.parentClientConfig,
// A hack to make sts client uses the credential in current closure.
credentialDefaultProvider: () => async () => closureSourceCreds,
region: resolvedRegion,
Expand Down Expand Up @@ -163,7 +163,7 @@ export const getDefaultRoleAssumerWithWebIdentity = (
const isCompatibleRequestHandler = !isH2(requestHandler);

stsClient = new STSClient({
profile: stsOptions?.parentClientConfig?.profile,
...stsOptions?.parentClientConfig,
region: resolvedRegion,
requestHandler: isCompatibleRequestHandler ? (requestHandler as any) : undefined,
logger: logger as any,
Expand Down
4 changes: 2 additions & 2 deletions packages/nested-clients/src/submodules/sts/defaultStsRoleAssumers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export const getDefaultRoleAssumer = (
const isCompatibleRequestHandler = !isH2(requestHandler);

stsClient = new STSClient({
profile: stsOptions?.parentClientConfig?.profile,
...stsOptions?.parentClientConfig,
// A hack to make sts client uses the credential in current closure.
credentialDefaultProvider: () => async () => closureSourceCreds,
region: resolvedRegion,
Expand Down Expand Up @@ -166,7 +166,7 @@ export const getDefaultRoleAssumerWithWebIdentity = (
const isCompatibleRequestHandler = !isH2(requestHandler);

stsClient = new STSClient({
profile: stsOptions?.parentClientConfig?.profile,
...stsOptions?.parentClientConfig,
region: resolvedRegion,
requestHandler: isCompatibleRequestHandler ? (requestHandler as any) : undefined,
logger: logger as any,
Expand Down