Skip to content

Commit 1978c68

Browse files
authored
chore(codegen): changes for handling conflicting params (#7549)
1 parent 09e0721 commit 1978c68

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

clients/client-s3/src/endpoint/EndpointParameters.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ import type { Endpoint, EndpointParameters as __EndpointParameters, EndpointV2,
55
* @public
66
*/
77
export interface ClientInputEndpointParameters {
8+
clientContextParams?: {
9+
disableS3ExpressSessionAuth?: boolean | undefined | Provider<boolean | undefined>;
10+
};
811
region?: string | undefined | Provider<string | undefined>;
912
useFipsEndpoint?: boolean | undefined | Provider<boolean | undefined>;
1013
useDualstackEndpoint?: boolean | undefined | Provider<boolean | undefined>;
@@ -24,6 +27,11 @@ export type ClientResolvedEndpointParameters = Omit<ClientInputEndpointParameter
2427
defaultSigningName: string;
2528
};
2629

30+
/**
31+
* @internal
32+
*/
33+
const clientContextParamDefaults = {} as const;
34+
2735
/**
2836
* @internal
2937
*/
@@ -38,6 +46,7 @@ export const resolveClientEndpointParameters = <T>(
3846
useGlobalEndpoint: options.useGlobalEndpoint ?? false,
3947
disableMultiregionAccessPoints: options.disableMultiregionAccessPoints ?? false,
4048
defaultSigningName: "s3",
49+
clientContextParams: options.clientContextParams ?? {},
4150
});
4251
};
4352

private/aws-client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ export const initializeWithMaximalConfiguration = () => {
128128
httpAuthSchemes: [],
129129
httpAuthSchemeProvider: (() => null) as unknown as HttpAuthSchemeProvider<any>,
130130
serviceConfiguredEndpoint: null as never,
131+
clientContextParams: {},
131132
// END internal options
132133

133134
// S3 specific options below

private/weather/src/auth/httpAuthExtensionConfiguration.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// smithy-typescript generated code
22
import {
3+
type ApiKeyIdentity,
4+
type ApiKeyIdentityProvider,
35
type HttpAuthScheme,
4-
ApiKeyIdentity,
5-
ApiKeyIdentityProvider,
66
AwsCredentialIdentity,
77
AwsCredentialIdentityProvider,
88
TokenIdentity,

private/weather/src/auth/httpAuthSchemeProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// smithy-typescript generated code
22
import { doesIdentityRequireRefresh, isIdentityExpired, memoizeIdentityProvider } from "@smithy/core";
33
import {
4+
type ApiKeyIdentity,
5+
type ApiKeyIdentityProvider,
46
type HandlerExecutionContext,
57
type HttpAuthOption,
68
type HttpAuthScheme,
79
type HttpAuthSchemeParameters,
810
type HttpAuthSchemeParametersProvider,
911
type HttpAuthSchemeProvider,
1012
type Provider,
11-
ApiKeyIdentity,
12-
ApiKeyIdentityProvider,
1313
AwsCredentialIdentity,
1414
AwsCredentialIdentityProvider,
1515
HttpApiKeyAuthLocation,

scripts/generate-clients/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
module.exports = {
33
// Use full commit hash as we explicitly fetch it.
44
// Comparison link (update with previous hash):
5-
// https://github.com/smithy-lang/smithy-typescript/compare/27f444b8aa045e37abfa811577fa3ed7d921516a...8b90f360df2a5c80c105db732b3c2f6972994854
6-
SMITHY_TS_COMMIT: "8b90f360df2a5c80c105db732b3c2f6972994854",
5+
// https://github.com/smithy-lang/smithy-typescript/compare/8b90f360df2a5c80c105db732b3c2f6972994854...76d7994ef3f8373bb866a60e7ef87adca147a2f0
6+
SMITHY_TS_COMMIT: "76d7994ef3f8373bb866a60e7ef87adca147a2f0",
77
};
88

99
if (module.exports.SMITHY_TS_COMMIT.length < 40) {

0 commit comments

Comments
 (0)