Skip to content

Commit 330bbfc

Browse files
committed
fix(nested-clients): propagate clientConfig to nested STS client for role assumer
1 parent dead1ea commit 330bbfc

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-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-
...stsOptions?.parentClientConfig,
108+
...stsOptions,
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-
...stsOptions?.parentClientConfig,
169+
...stsOptions,
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-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-
...stsOptions?.parentClientConfig,
105+
...stsOptions,
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-
...stsOptions?.parentClientConfig,
166+
...stsOptions,
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-
...stsOptions?.parentClientConfig,
108+
...stsOptions,
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-
...stsOptions?.parentClientConfig,
169+
...stsOptions,
170170
region: resolvedRegion,
171171
requestHandler: isCompatibleRequestHandler ? (requestHandler as any) : undefined,
172172
logger: logger as any,

scripts/generate-clients/single-service.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ const { solo } = yargs(process.argv.slice(2))
4141
} catch (ignored) {}
4242
}
4343

44+
if (solo === "sts" || solo === "sso-oidc") {
45+
const generateNestedClients = require("./nested-clients/generate-nested-clients");
46+
await generateNestedClients();
47+
}
48+
4449
console.log("================ starting prettier ================", "\n", new Date().toString(), solo);
4550
await spawnProcess("npx", [
4651
"prettier",

0 commit comments

Comments
 (0)