Skip to content

chore: codegen changes for handling conflicting params #7549

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

Draft
smilkuri wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −4
Draft

chore: codegen changes for handling conflicting params #7549

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
9 changes: 9 additions & 0 deletions clients/client-s3/src/endpoint/EndpointParameters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import type { Endpoint, EndpointParameters as __EndpointParameters, EndpointV2,
* @public
*/
export interface ClientInputEndpointParameters {
clientContextParams?: {
disableS3ExpressSessionAuth?: boolean | undefined | Provider<boolean | undefined>;
};
region?: string | undefined | Provider<string | undefined>;
useFipsEndpoint?: boolean | undefined | Provider<boolean | undefined>;
useDualstackEndpoint?: boolean | undefined | Provider<boolean | undefined>;
Expand All @@ -24,6 +27,11 @@ export type ClientResolvedEndpointParameters = Omit<ClientInputEndpointParameter
defaultSigningName: string;
};

/**
* @internal
*/
const clientContextParamDefaults = {} as const;

/**
* @internal
*/
Expand All @@ -38,6 +46,7 @@ export const resolveClientEndpointParameters = <T>(
useGlobalEndpoint: options.useGlobalEndpoint ?? false,
disableMultiregionAccessPoints: options.disableMultiregionAccessPoints ?? false,
defaultSigningName: "s3",
clientContextParams: options.clientContextParams ?? {},
});
};

Expand Down
1 change: 1 addition & 0 deletions ...-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export const initializeWithMaximalConfiguration = () => {
httpAuthSchemes: [],
httpAuthSchemeProvider: (() => null) as unknown as HttpAuthSchemeProvider<any>,
serviceConfiguredEndpoint: null as never,
clientContextParams: {},
// END internal options

// S3 specific options below
Expand Down
4 changes: 2 additions & 2 deletions private/weather/src/auth/httpAuthExtensionConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// smithy-typescript generated code
import {
type ApiKeyIdentity,
type ApiKeyIdentityProvider,
type HttpAuthScheme,
ApiKeyIdentity,
ApiKeyIdentityProvider,
AwsCredentialIdentity,
AwsCredentialIdentityProvider,
TokenIdentity,
Expand Down
4 changes: 2 additions & 2 deletions private/weather/src/auth/httpAuthSchemeProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// smithy-typescript generated code
import { doesIdentityRequireRefresh, isIdentityExpired, memoizeIdentityProvider } from "@smithy/core";
import {
type ApiKeyIdentity,
type ApiKeyIdentityProvider,
type HandlerExecutionContext,
type HttpAuthOption,
type HttpAuthScheme,
type HttpAuthSchemeParameters,
type HttpAuthSchemeParametersProvider,
type HttpAuthSchemeProvider,
type Provider,
ApiKeyIdentity,
ApiKeyIdentityProvider,
AwsCredentialIdentity,
AwsCredentialIdentityProvider,
HttpApiKeyAuthLocation,
Expand Down
Loading