Skip to content

Commit dead1ea

Browse files
jackreinkuhe
authored andcommitted
fix(client-sts): propagate parent configuration to nested sts client
1 parent 45e7305 commit dead1ea

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

clients/client-sts/src/defaultStsRoleAssumers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export const getDefaultRoleAssumer = (
105105
const isCompatibleRequestHandler = !isH2(requestHandler);
106106

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

168168
stsClient = new STSClient({
169-
profile: stsOptions?.parentClientConfig?.profile,
169+
...stsOptions?.parentClientConfig,
170170
region: resolvedRegion,
171171
requestHandler: isCompatibleRequestHandler ? (requestHandler as any) : undefined,
172172
logger: logger as any,

codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/sts-client-defaultRoleAssumers.spec.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,13 @@ describe("getDefaultRoleAssumer", () => {
165165
};
166166
const region = "some-region";
167167
const handler = new NodeHttpHandler();
168+
const customUserAgent = [["custom-agent", "1.0.0"]];
168169
const roleAssumer = getDefaultRoleAssumer({
169170
parentClientConfig: {
170171
region,
171172
logger,
172173
requestHandler: handler,
174+
customUserAgent,
173175
},
174176
});
175177
const params: AssumeRoleCommandInput = {
@@ -183,6 +185,7 @@ describe("getDefaultRoleAssumer", () => {
183185
logger,
184186
requestHandler: handler,
185187
region,
188+
customUserAgent,
186189
});
187190
});
188191

@@ -275,10 +278,12 @@ describe("getDefaultRoleAssumerWithWebIdentity", () => {
275278
};
276279
const region = "some-region";
277280
const handler = new NodeHttpHandler();
281+
const customUserAgent = [["custom-agent", "1.0.0"]];
278282
const roleAssumerWithWebIdentity = getDefaultRoleAssumerWithWebIdentity({
279283
region,
280284
logger,
281285
requestHandler: handler,
286+
customUserAgent,
282287
});
283288
const params: AssumeRoleWithWebIdentityCommandInput = {
284289
RoleArn: "arn:aws:foo",
@@ -291,6 +296,7 @@ describe("getDefaultRoleAssumerWithWebIdentity", () => {
291296
logger,
292297
requestHandler: handler,
293298
region,
299+
customUserAgent,
294300
});
295301
});
296302

codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/sts-client-defaultStsRoleAssumers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export const getDefaultRoleAssumer = (
102102
const isCompatibleRequestHandler = !isH2(requestHandler);
103103

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

165165
stsClient = new STSClient({
166-
profile: stsOptions?.parentClientConfig?.profile,
166+
...stsOptions?.parentClientConfig,
167167
region: resolvedRegion,
168168
requestHandler: isCompatibleRequestHandler ? (requestHandler as any) : undefined,
169169
logger: logger as any,

packages/nested-clients/src/submodules/sts/defaultStsRoleAssumers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export const getDefaultRoleAssumer = (
105105
const isCompatibleRequestHandler = !isH2(requestHandler);
106106

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

168168
stsClient = new STSClient({
169-
profile: stsOptions?.parentClientConfig?.profile,
169+
...stsOptions?.parentClientConfig,
170170
region: resolvedRegion,
171171
requestHandler: isCompatibleRequestHandler ? (requestHandler as any) : undefined,
172172
logger: logger as any,

0 commit comments

Comments
 (0)