Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 5 additions & 15 deletions private/aws-protocoltests-ec2-schema/src/EC2ProtocolClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,7 @@ import {
resolveCompressionConfig,
} from "@smithy/middleware-compression";
import { getContentLengthPlugin } from "@smithy/middleware-content-length";
import {
EndpointInputConfig,
EndpointRequiredInputConfig,
EndpointRequiredResolvedConfig,
EndpointResolvedConfig,
resolveEndpointConfig,
resolveEndpointRequiredConfig,
} from "@smithy/middleware-endpoint";
import { EndpointInputConfig, EndpointResolvedConfig, resolveEndpointConfig } from "@smithy/middleware-endpoint";
import { getRetryPlugin, resolveRetryConfig, RetryInputConfig, RetryResolvedConfig } from "@smithy/middleware-retry";
import { HttpHandlerUserInput as __HttpHandlerUserInput } from "@smithy/protocol-http";
import {
Expand Down Expand Up @@ -357,7 +350,6 @@ export type EC2ProtocolClientConfigType = Partial<__SmithyConfiguration<__HttpHa
RegionInputConfig &
HostHeaderInputConfig &
EndpointInputConfig<EndpointParameters> &
EndpointRequiredInputConfig &
HttpAuthSchemeInputConfig &
CompressionInputConfig &
ClientInputEndpointParameters;
Expand All @@ -379,7 +371,6 @@ export type EC2ProtocolClientResolvedConfigType = __SmithyResolvedConfiguration<
RegionResolvedConfig &
HostHeaderResolvedConfig &
EndpointResolvedConfig<EndpointParameters> &
EndpointRequiredResolvedConfig &
HttpAuthSchemeResolvedConfig &
CompressionResolvedConfig &
ClientResolvedEndpointParameters;
Expand Down Expand Up @@ -415,11 +406,10 @@ export class EC2ProtocolClient extends __Client<
const _config_4 = resolveRegionConfig(_config_3);
const _config_5 = resolveHostHeaderConfig(_config_4);
const _config_6 = resolveEndpointConfig(_config_5);
const _config_7 = resolveEndpointRequiredConfig(_config_6);
const _config_8 = resolveHttpAuthSchemeConfig(_config_7);
const _config_9 = resolveCompressionConfig(_config_8);
const _config_10 = resolveRuntimeExtensions(_config_9, configuration?.extensions || []);
this.config = _config_10;
const _config_7 = resolveHttpAuthSchemeConfig(_config_6);
const _config_8 = resolveCompressionConfig(_config_7);
const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []);
this.config = _config_9;
this.middlewareStack.use(getSchemaSerdePlugin(this.config));
this.middlewareStack.use(getUserAgentPlugin(this.config));
this.middlewareStack.use(getRetryPlugin(this.config));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import { Endpoint, EndpointParameters as __EndpointParameters, EndpointV2, Provi
* @public
*/
export interface ClientInputEndpointParameters {
region?: string | undefined | Provider<string | undefined>;
useDualstackEndpoint?: boolean | undefined | Provider<boolean | undefined>;
useFipsEndpoint?: boolean | undefined | Provider<boolean | undefined>;
endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
}

Expand All @@ -16,14 +19,22 @@ export const resolveClientEndpointParameters = <T>(
options: T & ClientInputEndpointParameters
): T & ClientResolvedEndpointParameters => {
return Object.assign(options, {
useDualstackEndpoint: options.useDualstackEndpoint ?? false,
useFipsEndpoint: options.useFipsEndpoint ?? false,
defaultSigningName: "ec2query",
});
};

export const commonParams = {
endpoint: { type: "builtInParams", name: "endpoint" },
UseFIPS: { type: "builtInParams", name: "useFipsEndpoint" },
Endpoint: { type: "builtInParams", name: "endpoint" },
Region: { type: "builtInParams", name: "region" },
UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
} as const;

export interface EndpointParameters extends __EndpointParameters {
endpoint?: string | undefined;
Region?: string | undefined;
UseDualStack?: boolean | undefined;
UseFIPS?: boolean | undefined;
Endpoint?: string | undefined;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { ruleSet } from "./ruleset";

const cache = new EndpointCache({
size: 50,
params: ["endpoint"],
params: ["Endpoint", "Region", "UseDualStack", "UseFIPS"],
});

export const defaultEndpointResolver = (
Expand Down
Loading
Loading