diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddDefaultAwsEndpointRuleSet.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddDefaultAwsEndpointRuleSet.java index fa4b060447e8..54b072b64e2c 100644 --- a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddDefaultAwsEndpointRuleSet.java +++ b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddDefaultAwsEndpointRuleSet.java @@ -13,6 +13,7 @@ import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait; import software.amazon.smithy.typescript.codegen.TypeScriptSettings; import software.amazon.smithy.typescript.codegen.endpointsV2.AddDefaultEndpointRuleSet; +import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin; import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration; @@ -20,6 +21,8 @@ * This replaces behavior from {@link EndpointGenerator}. */ public class AddDefaultAwsEndpointRuleSet implements TypeScriptIntegration { + private boolean usesDefaultAwsRegionalEndpoints = false; + /** * Running before the smithy-typescript default endpoint integration * will prevent it from applying its non-AWS default ruleset and @@ -31,6 +34,39 @@ public List runBefore() { return List.of(AddDefaultEndpointRuleSet.class.getCanonicalName()); } + /** + * Inserts this resolver after the `resolveEndpointConfig` function. + */ + @Override + public void mutateClientPlugins(List plugins) { + if (!usesDefaultAwsRegionalEndpoints) { + return; + } + + /* + This resolver supports the behavior of endpoints.json-based endpoint provider + for default regional services: it makes client.config.endpoint optional on the input side, + but guaranteed on the resolved side. + */ + RuntimeClientPlugin defaultAwsRegionalEndpoints = RuntimeClientPlugin.builder() + .withConventions( + AwsDependency.UTIL_ENDPOINTS.dependency, + "DefaultAwsRegionalEndpoints", + RuntimeClientPlugin.Convention.HAS_CONFIG + ) + .build(); + + RuntimeClientPlugin endpointPlugin = plugins.stream() + .filter(p -> p.getResolveFunction() + .map(r -> r.getAlias().equals("resolveEndpointConfig")) + .orElse(false)) + .findAny() + .orElseThrow(() -> new IllegalStateException("Expected resolveEndpointConfig function in plugins.")); + + int index = plugins.indexOf(endpointPlugin); + plugins.add(index + 1, defaultAwsRegionalEndpoints); + } + @Override public Model preprocessModel(Model model, TypeScriptSettings settings) { Model.Builder modelBuilder = model.toBuilder(); @@ -40,7 +76,7 @@ public Model preprocessModel(Model model, TypeScriptSettings settings) { && AwsTraitsUtils.isAwsService(serviceShape)) { // this branch is for models that identify as AWS services // but do not include an endpoint ruleset. - + usesDefaultAwsRegionalEndpoints = true; modelBuilder.removeShape(serviceShape.toShapeId()); modelBuilder.addShape( serviceShape.toBuilder() @@ -49,6 +85,8 @@ public Model preprocessModel(Model model, TypeScriptSettings settings) { )) .build() ); + } else { + usesDefaultAwsRegionalEndpoints = false; } return modelBuilder.build(); diff --git a/packages/util-endpoints/package.json b/packages/util-endpoints/package.json index 7b7418d28400..9f2ca472ea1c 100644 --- a/packages/util-endpoints/package.json +++ b/packages/util-endpoints/package.json @@ -26,6 +26,7 @@ "dependencies": { "@aws-sdk/types": "*", "@smithy/types": "^4.3.1", + "@smithy/url-parser": "^4.0.4", "@smithy/util-endpoints": "^3.0.6", "tslib": "^2.6.2" }, diff --git a/packages/util-endpoints/src/index.ts b/packages/util-endpoints/src/index.ts index d046d9079f7a..f41d9bece11d 100644 --- a/packages/util-endpoints/src/index.ts +++ b/packages/util-endpoints/src/index.ts @@ -1,5 +1,6 @@ export * from "./aws"; export * from "./lib/aws/partition"; export * from "./lib/isIpAddress"; +export * from "./resolveDefaultAwsRegionalEndpointsConfig"; export * from "./resolveEndpoint"; export * from "./types"; diff --git a/packages/util-endpoints/src/resolveDefaultAwsRegionalEndpointsConfig.ts b/packages/util-endpoints/src/resolveDefaultAwsRegionalEndpointsConfig.ts new file mode 100644 index 000000000000..64c571e9c911 --- /dev/null +++ b/packages/util-endpoints/src/resolveDefaultAwsRegionalEndpointsConfig.ts @@ -0,0 +1,91 @@ +import type { Endpoint, EndpointParameters, EndpointV2, Logger, Provider } from "@smithy/types"; +import { parseUrl } from "@smithy/url-parser"; + +/** + * This is an additional config resolver layer for clients using the default + * AWS regional endpoints ruleset. It makes the *resolved* config guarantee the presence of an + * endpoint provider function. This differs from the base behavior of the Endpoint + * config resolver, which only normalizes config.endpoint IFF one is provided by the caller. + * + * This is not used by AWS SDK clients, but rather + * generated clients that have the aws.api#service trait. This includes protocol tests + * and other customers. + * + * This resolver is MUTUALLY EXCLUSIVE with the EndpointRequired config resolver from + * |@smithy/middleware-endpoint. + * + * It must be placed after the `resolveEndpointConfig` + * resolver. This replaces the endpoints.json-based default endpoint provider. + * + * @public + */ +export type DefaultAwsRegionalEndpointsInputConfig = { + endpoint?: unknown; +}; + +type PreviouslyResolved = { + logger?: Logger; + region?: undefined | string | Provider; + useFipsEndpoint?: undefined | boolean | Provider; + useDualstackEndpoint?: undefined | boolean | Provider; + endpointProvider: ( + endpointParams: EndpointParameters | DefaultRegionalEndpointParameters, + context?: { logger?: Logger } + ) => EndpointV2; +}; + +/** + * @internal + */ +type DefaultRegionalEndpointParameters = { + Region?: string | undefined; + UseDualStack?: boolean | undefined; + UseFIPS?: boolean | undefined; +}; + +/** + * @internal + */ +export interface DefaultAwsRegionalEndpointsResolvedConfig { + endpoint: Provider; +} + +/** + * MUST resolve after `\@smithy/middleware-endpoint`::`resolveEndpointConfig`. + * + * @internal + */ +export const resolveDefaultAwsRegionalEndpointsConfig = ( + input: T & DefaultAwsRegionalEndpointsInputConfig & PreviouslyResolved +): T & DefaultAwsRegionalEndpointsResolvedConfig => { + if (typeof input.endpointProvider !== "function") { + throw new Error("@aws-sdk/util-endpoint - endpointProvider and endpoint missing in config for this client."); + } + + const { endpoint } = input; + if (endpoint === undefined) { + input.endpoint = async () => { + return toEndpointV1( + input.endpointProvider( + { + Region: typeof input.region === "function" ? await input.region() : input.region, + UseDualStack: + typeof input.useDualstackEndpoint === "function" + ? await input.useDualstackEndpoint() + : input.useDualstackEndpoint, + UseFIPS: + typeof input.useFipsEndpoint === "function" ? await input.useFipsEndpoint() : input.useFipsEndpoint, + Endpoint: undefined, + }, + { logger: input.logger } + ) + ); + }; + } + return input as T & DefaultAwsRegionalEndpointsResolvedConfig; +}; + +/** + * @internal + */ +export const toEndpointV1 = (endpoint: EndpointV2): Endpoint => parseUrl(endpoint.url); diff --git a/private/aws-protocoltests-ec2-schema/src/EC2ProtocolClient.ts b/private/aws-protocoltests-ec2-schema/src/EC2ProtocolClient.ts index 27fc0b507f4f..131c90fe7ad1 100644 --- a/private/aws-protocoltests-ec2-schema/src/EC2ProtocolClient.ts +++ b/private/aws-protocoltests-ec2-schema/src/EC2ProtocolClient.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -350,6 +355,7 @@ export type EC2ProtocolClientConfigType = Partial<__SmithyConfiguration<__HttpHa RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -371,6 +377,7 @@ export type EC2ProtocolClientResolvedConfigType = __SmithyResolvedConfiguration< RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -406,10 +413,11 @@ 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 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getSchemaSerdePlugin(this.config)); this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); diff --git a/private/aws-protocoltests-ec2/src/EC2ProtocolClient.ts b/private/aws-protocoltests-ec2/src/EC2ProtocolClient.ts index b130debb5c9a..0ebf689de394 100644 --- a/private/aws-protocoltests-ec2/src/EC2ProtocolClient.ts +++ b/private/aws-protocoltests-ec2/src/EC2ProtocolClient.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -26,7 +31,7 @@ import { } from "@smithy/middleware-compression"; import { getContentLengthPlugin } from "@smithy/middleware-content-length"; import { EndpointInputConfig, EndpointResolvedConfig, resolveEndpointConfig } from "@smithy/middleware-endpoint"; -import { getRetryPlugin, resolveRetryConfig, RetryInputConfig, RetryResolvedConfig } from "@smithy/middleware-retry"; +import { getRetryPlugin, RetryInputConfig, RetryResolvedConfig, resolveRetryConfig } from "@smithy/middleware-retry"; import { HttpHandlerUserInput as __HttpHandlerUserInput } from "@smithy/protocol-http"; import { Client as __Client, @@ -35,7 +40,6 @@ import { SmithyResolvedConfiguration as __SmithyResolvedConfiguration, } from "@smithy/smithy-client"; import { - AwsCredentialIdentityProvider, BodyLengthCalculator as __BodyLengthCalculator, CheckOptionalClientConfig as __CheckOptionalClientConfig, ChecksumConstructor as __ChecksumConstructor, @@ -46,10 +50,11 @@ import { HttpHandlerOptions as __HttpHandlerOptions, Logger as __Logger, Provider as __Provider, - Provider, StreamCollector as __StreamCollector, UrlParser as __UrlParser, UserAgent as __UserAgent, + AwsCredentialIdentityProvider, + Provider, } from "@smithy/types"; import { @@ -111,7 +116,7 @@ import { resolveClientEndpointParameters, } from "./endpoint/EndpointParameters"; import { getRuntimeConfig as __getRuntimeConfig } from "./runtimeConfig"; -import { resolveRuntimeExtensions, RuntimeExtension, RuntimeExtensionsConfig } from "./runtimeExtensions"; +import { RuntimeExtension, RuntimeExtensionsConfig, resolveRuntimeExtensions } from "./runtimeExtensions"; export { __Client }; @@ -336,6 +341,7 @@ export type EC2ProtocolClientConfigType = Partial<__SmithyConfiguration<__HttpHa RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -357,6 +363,7 @@ export type EC2ProtocolClientResolvedConfigType = __SmithyResolvedConfiguration< RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -392,10 +399,11 @@ 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 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); this.middlewareStack.use(getContentLengthPlugin(this.config)); diff --git a/private/aws-protocoltests-json-10-schema/src/JSONRPC10Client.ts b/private/aws-protocoltests-json-10-schema/src/JSONRPC10Client.ts index 3089d970daed..660b916c44be 100644 --- a/private/aws-protocoltests-json-10-schema/src/JSONRPC10Client.ts +++ b/private/aws-protocoltests-json-10-schema/src/JSONRPC10Client.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -335,6 +340,7 @@ export type JSONRPC10ClientConfigType = Partial<__SmithyConfiguration<__HttpHand RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -356,6 +362,7 @@ export type JSONRPC10ClientResolvedConfigType = __SmithyResolvedConfiguration<__ RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -390,10 +397,11 @@ export class JSONRPC10Client extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getSchemaSerdePlugin(this.config)); this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); diff --git a/private/aws-protocoltests-json-10/src/JSONRPC10Client.ts b/private/aws-protocoltests-json-10/src/JSONRPC10Client.ts index 382ffff9cdb9..fac08dfe690e 100644 --- a/private/aws-protocoltests-json-10/src/JSONRPC10Client.ts +++ b/private/aws-protocoltests-json-10/src/JSONRPC10Client.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -321,6 +326,7 @@ export type JSONRPC10ClientConfigType = Partial<__SmithyConfiguration<__HttpHand RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -342,6 +348,7 @@ export type JSONRPC10ClientResolvedConfigType = __SmithyResolvedConfiguration<__ RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -376,10 +383,11 @@ export class JSONRPC10Client extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); this.middlewareStack.use(getContentLengthPlugin(this.config)); diff --git a/private/aws-protocoltests-json-machinelearning/src/MachineLearningClient.ts b/private/aws-protocoltests-json-machinelearning/src/MachineLearningClient.ts index f6581f857c35..01bf7b223bac 100644 --- a/private/aws-protocoltests-json-machinelearning/src/MachineLearningClient.ts +++ b/private/aws-protocoltests-json-machinelearning/src/MachineLearningClient.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -236,6 +241,7 @@ export type MachineLearningClientConfigType = Partial<__SmithyConfiguration<__Ht RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & ClientInputEndpointParameters; /** @@ -256,6 +262,7 @@ export type MachineLearningClientResolvedConfigType = __SmithyResolvedConfigurat RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & ClientResolvedEndpointParameters; /** @@ -289,9 +296,10 @@ export class MachineLearningClient extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveRuntimeExtensions(_config_7, configuration?.extensions || []); - this.config = _config_8; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_config_6); + const _config_8 = resolveHttpAuthSchemeConfig(_config_7); + const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); + this.config = _config_9; this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); this.middlewareStack.use(getContentLengthPlugin(this.config)); diff --git a/private/aws-protocoltests-json-schema/src/JsonProtocolClient.ts b/private/aws-protocoltests-json-schema/src/JsonProtocolClient.ts index 9387bd19b73a..902103681ee8 100644 --- a/private/aws-protocoltests-json-schema/src/JsonProtocolClient.ts +++ b/private/aws-protocoltests-json-schema/src/JsonProtocolClient.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -335,6 +340,7 @@ export type JsonProtocolClientConfigType = Partial<__SmithyConfiguration<__HttpH RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -356,6 +362,7 @@ export type JsonProtocolClientResolvedConfigType = __SmithyResolvedConfiguration RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -390,10 +397,11 @@ export class JsonProtocolClient extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getSchemaSerdePlugin(this.config)); this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); diff --git a/private/aws-protocoltests-json/src/JsonProtocolClient.ts b/private/aws-protocoltests-json/src/JsonProtocolClient.ts index 630cc1d60a37..eefbe39da55e 100644 --- a/private/aws-protocoltests-json/src/JsonProtocolClient.ts +++ b/private/aws-protocoltests-json/src/JsonProtocolClient.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -321,6 +326,7 @@ export type JsonProtocolClientConfigType = Partial<__SmithyConfiguration<__HttpH RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -342,6 +348,7 @@ export type JsonProtocolClientResolvedConfigType = __SmithyResolvedConfiguration RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -376,10 +383,11 @@ export class JsonProtocolClient extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); this.middlewareStack.use(getContentLengthPlugin(this.config)); diff --git a/private/aws-protocoltests-query-schema/src/QueryProtocolClient.ts b/private/aws-protocoltests-query-schema/src/QueryProtocolClient.ts index e6520331aa24..1640f69b7830 100644 --- a/private/aws-protocoltests-query-schema/src/QueryProtocolClient.ts +++ b/private/aws-protocoltests-query-schema/src/QueryProtocolClient.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -380,6 +385,7 @@ export type QueryProtocolClientConfigType = Partial<__SmithyConfiguration<__Http RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -401,6 +407,7 @@ export type QueryProtocolClientResolvedConfigType = __SmithyResolvedConfiguratio RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -436,10 +443,11 @@ export class QueryProtocolClient extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getSchemaSerdePlugin(this.config)); this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); diff --git a/private/aws-protocoltests-query-schema/src/schemas/schemas.ts b/private/aws-protocoltests-query-schema/src/schemas/schemas.ts index 5f9166a0f7dc..e13357a8a8e8 100644 --- a/private/aws-protocoltests-query-schema/src/schemas/schemas.ts +++ b/private/aws-protocoltests-query-schema/src/schemas/schemas.ts @@ -290,9 +290,9 @@ export var FlattenedXmlMapWithXmlNamespaceOutput = struct( [ () => FlattenedXmlMapWithXmlNamespaceOutputMap, { + [_xNm]: [_, _hm], [_xN]: _KVP, [_xF]: 1, - [_xNm]: [_, _hm], }, ], ] diff --git a/private/aws-protocoltests-query/src/QueryProtocolClient.ts b/private/aws-protocoltests-query/src/QueryProtocolClient.ts index fedac2ca7d89..c868ace02a6d 100644 --- a/private/aws-protocoltests-query/src/QueryProtocolClient.ts +++ b/private/aws-protocoltests-query/src/QueryProtocolClient.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -366,6 +371,7 @@ export type QueryProtocolClientConfigType = Partial<__SmithyConfiguration<__Http RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -387,6 +393,7 @@ export type QueryProtocolClientResolvedConfigType = __SmithyResolvedConfiguratio RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -422,10 +429,11 @@ export class QueryProtocolClient extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); this.middlewareStack.use(getContentLengthPlugin(this.config)); diff --git a/private/aws-protocoltests-restjson-apigateway/src/APIGatewayClient.ts b/private/aws-protocoltests-restjson-apigateway/src/APIGatewayClient.ts index 8cfa0496fed1..aee2fc1958a7 100644 --- a/private/aws-protocoltests-restjson-apigateway/src/APIGatewayClient.ts +++ b/private/aws-protocoltests-restjson-apigateway/src/APIGatewayClient.ts @@ -14,6 +14,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -237,6 +242,7 @@ export type APIGatewayClientConfigType = Partial<__SmithyConfiguration<__HttpHan RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & ClientInputEndpointParameters; /** @@ -257,6 +263,7 @@ export type APIGatewayClientResolvedConfigType = __SmithyResolvedConfiguration<_ RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & ClientResolvedEndpointParameters; /** @@ -290,9 +297,10 @@ export class APIGatewayClient extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveRuntimeExtensions(_config_7, configuration?.extensions || []); - this.config = _config_8; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_config_6); + const _config_8 = resolveHttpAuthSchemeConfig(_config_7); + const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); + this.config = _config_9; this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); this.middlewareStack.use(getContentLengthPlugin(this.config)); diff --git a/private/aws-protocoltests-restjson-glacier/src/GlacierClient.ts b/private/aws-protocoltests-restjson-glacier/src/GlacierClient.ts index 96a6ac6c6e06..81a5b20aaf0d 100644 --- a/private/aws-protocoltests-restjson-glacier/src/GlacierClient.ts +++ b/private/aws-protocoltests-restjson-glacier/src/GlacierClient.ts @@ -14,6 +14,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -251,6 +256,7 @@ export type GlacierClientConfigType = Partial<__SmithyConfiguration<__HttpHandle RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & ClientInputEndpointParameters; /** @@ -271,6 +277,7 @@ export type GlacierClientResolvedConfigType = __SmithyResolvedConfiguration<__Ht RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & ClientResolvedEndpointParameters; /** @@ -304,9 +311,10 @@ export class GlacierClient extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveRuntimeExtensions(_config_7, configuration?.extensions || []); - this.config = _config_8; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_config_6); + const _config_8 = resolveHttpAuthSchemeConfig(_config_7); + const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); + this.config = _config_9; this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); this.middlewareStack.use(getContentLengthPlugin(this.config)); diff --git a/private/aws-protocoltests-restjson-schema/src/RestJsonProtocolClient.ts b/private/aws-protocoltests-restjson-schema/src/RestJsonProtocolClient.ts index cc019186eac0..41820d1c15b4 100644 --- a/private/aws-protocoltests-restjson-schema/src/RestJsonProtocolClient.ts +++ b/private/aws-protocoltests-restjson-schema/src/RestJsonProtocolClient.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -779,6 +784,7 @@ export type RestJsonProtocolClientConfigType = Partial<__SmithyConfiguration<__H RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -800,6 +806,7 @@ export type RestJsonProtocolClientResolvedConfigType = __SmithyResolvedConfigura RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -835,10 +842,11 @@ export class RestJsonProtocolClient extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getSchemaSerdePlugin(this.config)); this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); diff --git a/private/aws-protocoltests-restjson/src/RestJsonProtocolClient.ts b/private/aws-protocoltests-restjson/src/RestJsonProtocolClient.ts index 06d5fc0d6887..c916cbc4189e 100644 --- a/private/aws-protocoltests-restjson/src/RestJsonProtocolClient.ts +++ b/private/aws-protocoltests-restjson/src/RestJsonProtocolClient.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -765,6 +770,7 @@ export type RestJsonProtocolClientConfigType = Partial<__SmithyConfiguration<__H RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -786,6 +792,7 @@ export type RestJsonProtocolClientResolvedConfigType = __SmithyResolvedConfigura RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -821,10 +828,11 @@ export class RestJsonProtocolClient extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); this.middlewareStack.use(getContentLengthPlugin(this.config)); diff --git a/private/aws-protocoltests-restxml-schema/src/RestXmlProtocolClient.ts b/private/aws-protocoltests-restxml-schema/src/RestXmlProtocolClient.ts index 970dd768282f..0997b8692a82 100644 --- a/private/aws-protocoltests-restxml-schema/src/RestXmlProtocolClient.ts +++ b/private/aws-protocoltests-restxml-schema/src/RestXmlProtocolClient.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -548,6 +553,7 @@ export type RestXmlProtocolClientConfigType = Partial<__SmithyConfiguration<__Ht RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -569,6 +575,7 @@ export type RestXmlProtocolClientResolvedConfigType = __SmithyResolvedConfigurat RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -604,10 +611,11 @@ export class RestXmlProtocolClient extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getSchemaSerdePlugin(this.config)); this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); diff --git a/private/aws-protocoltests-restxml-schema/src/schemas/schemas.ts b/private/aws-protocoltests-restxml-schema/src/schemas/schemas.ts index 8bb4cb3a3168..9a2e88941221 100644 --- a/private/aws-protocoltests-restxml-schema/src/schemas/schemas.ts +++ b/private/aws-protocoltests-restxml-schema/src/schemas/schemas.ts @@ -723,9 +723,9 @@ export var FlattenedXmlMapWithXmlNamespaceOutput = struct( [ () => FlattenedXmlMapWithXmlNamespaceOutputMap, { + [_xNm]: [_, _hm], [_xN]: _KVP, [_xF]: 1, - [_xNm]: [_, _hm], }, ], ] diff --git a/private/aws-protocoltests-restxml/src/RestXmlProtocolClient.ts b/private/aws-protocoltests-restxml/src/RestXmlProtocolClient.ts index 3d6830100c1c..6d6b5a5117ea 100644 --- a/private/aws-protocoltests-restxml/src/RestXmlProtocolClient.ts +++ b/private/aws-protocoltests-restxml/src/RestXmlProtocolClient.ts @@ -13,6 +13,11 @@ import { UserAgentInputConfig, UserAgentResolvedConfig, } from "@aws-sdk/middleware-user-agent"; +import { + DefaultAwsRegionalEndpointsInputConfig, + DefaultAwsRegionalEndpointsResolvedConfig, + resolveDefaultAwsRegionalEndpointsConfig, +} from "@aws-sdk/util-endpoints"; import { RegionInputConfig, RegionResolvedConfig, resolveRegionConfig } from "@smithy/config-resolver"; import { DefaultIdentityProviderConfig, @@ -534,6 +539,7 @@ export type RestXmlProtocolClientConfigType = Partial<__SmithyConfiguration<__Ht RegionInputConfig & HostHeaderInputConfig & EndpointInputConfig & + DefaultAwsRegionalEndpointsInputConfig & HttpAuthSchemeInputConfig & CompressionInputConfig & ClientInputEndpointParameters; @@ -555,6 +561,7 @@ export type RestXmlProtocolClientResolvedConfigType = __SmithyResolvedConfigurat RegionResolvedConfig & HostHeaderResolvedConfig & EndpointResolvedConfig & + DefaultAwsRegionalEndpointsResolvedConfig & HttpAuthSchemeResolvedConfig & CompressionResolvedConfig & ClientResolvedEndpointParameters; @@ -590,10 +597,11 @@ export class RestXmlProtocolClient extends __Client< const _config_4 = resolveRegionConfig(_config_3); const _config_5 = resolveHostHeaderConfig(_config_4); const _config_6 = resolveEndpointConfig(_config_5); - const _config_7 = resolveHttpAuthSchemeConfig(_config_6); - const _config_8 = resolveCompressionConfig(_config_7); - const _config_9 = resolveRuntimeExtensions(_config_8, configuration?.extensions || []); - this.config = _config_9; + const _config_7 = resolveDefaultAwsRegionalEndpointsConfig(_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; this.middlewareStack.use(getUserAgentPlugin(this.config)); this.middlewareStack.use(getRetryPlugin(this.config)); this.middlewareStack.use(getContentLengthPlugin(this.config)); diff --git a/yarn.lock b/yarn.lock index f572764cb92f..65302f1286da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24460,6 +24460,7 @@ __metadata: dependencies: "@aws-sdk/types": "npm:*" "@smithy/types": "npm:^4.3.1" + "@smithy/url-parser": "npm:^4.0.4" "@smithy/util-endpoints": "npm:^3.0.6" "@tsconfig/recommended": "npm:1.0.1" concurrently: "npm:7.0.0"