@aws-sdk/client-cloudfront 3.1044.0 → 3.1046.0

package/dist-cjs/index.js

@@ -4,19 +4,17 @@ var middlewareHostHeader = require('@aws-sdk/middleware-host-header');
 var middlewareLogger = require('@aws-sdk/middleware-logger');
 var middlewareRecursionDetection = require('@aws-sdk/middleware-recursion-detection');
 var middlewareUserAgent = require('@aws-sdk/middleware-user-agent');
-var configResolver = require('@smithy/config-resolver');
 var core = require('@smithy/core');
+var client = require('@smithy/core/client');
+var config = require('@smithy/core/config');
+var endpoints = require('@smithy/core/endpoints');
+var protocols = require('@smithy/core/protocols');
+var retry = require('@smithy/core/retry');
 var schema = require('@smithy/core/schema');
-var middlewareContentLength = require('@smithy/middleware-content-length');
-var middlewareEndpoint = require('@smithy/middleware-endpoint');
-var middlewareRetry = require('@smithy/middleware-retry');
-var smithyClient = require('@smithy/smithy-client');
 var httpAuthSchemeProvider = require('./auth/httpAuthSchemeProvider');
 var runtimeConfig = require('./runtimeConfig');
 var regionConfigResolver = require('@aws-sdk/region-config-resolver');
-var protocolHttp = require('@smithy/protocol-http');
 var schemas_0 = require('./schemas/schemas_0');
-var utilWaiter = require('@smithy/util-waiter');
 var errors = require('./models/errors');
 var CloudFrontServiceException = require('./models/CloudFrontServiceException');
 
@@ -74,12 +72,12 @@ const resolveHttpAuthRuntimeConfig = (config) => {
 };
 
 const resolveRuntimeExtensions = (runtimeConfig, extensions) => {
-    const extensionConfiguration = Object.assign(regionConfigResolver.getAwsRegionExtensionConfiguration(runtimeConfig), smithyClient.getDefaultExtensionConfiguration(runtimeConfig), protocolHttp.getHttpHandlerExtensionConfiguration(runtimeConfig), getHttpAuthExtensionConfiguration(runtimeConfig));
+    const extensionConfiguration = Object.assign(regionConfigResolver.getAwsRegionExtensionConfiguration(runtimeConfig), client.getDefaultExtensionConfiguration(runtimeConfig), protocols.getHttpHandlerExtensionConfiguration(runtimeConfig), getHttpAuthExtensionConfiguration(runtimeConfig));
     extensions.forEach((extension) => extension.configure(extensionConfiguration));
-    return Object.assign(runtimeConfig, regionConfigResolver.resolveAwsRegionExtensionConfiguration(extensionConfiguration), smithyClient.resolveDefaultRuntimeConfig(extensionConfiguration), protocolHttp.resolveHttpHandlerRuntimeConfig(extensionConfiguration), resolveHttpAuthRuntimeConfig(extensionConfiguration));
+    return Object.assign(runtimeConfig, regionConfigResolver.resolveAwsRegionExtensionConfiguration(extensionConfiguration), client.resolveDefaultRuntimeConfig(extensionConfiguration), protocols.resolveHttpHandlerRuntimeConfig(extensionConfiguration), resolveHttpAuthRuntimeConfig(extensionConfiguration));
 };
 
-class CloudFrontClient extends smithyClient.Client {
+class CloudFrontClient extends client.Client {
     config;
     constructor(...[configuration]) {
         const _config_0 = runtimeConfig.getRuntimeConfig(configuration || {});
@@ -87,17 +85,17 @@ class CloudFrontClient extends smithyClient.Client {
         this.initConfig = _config_0;
         const _config_1 = resolveClientEndpointParameters(_config_0);
         const _config_2 = middlewareUserAgent.resolveUserAgentConfig(_config_1);
-        const _config_3 = middlewareRetry.resolveRetryConfig(_config_2);
-        const _config_4 = configResolver.resolveRegionConfig(_config_3);
+        const _config_3 = retry.resolveRetryConfig(_config_2);
+        const _config_4 = config.resolveRegionConfig(_config_3);
         const _config_5 = middlewareHostHeader.resolveHostHeaderConfig(_config_4);
-        const _config_6 = middlewareEndpoint.resolveEndpointConfig(_config_5);
+        const _config_6 = endpoints.resolveEndpointConfig(_config_5);
         const _config_7 = httpAuthSchemeProvider.resolveHttpAuthSchemeConfig(_config_6);
         const _config_8 = resolveRuntimeExtensions(_config_7, configuration?.extensions || []);
         this.config = _config_8;
         this.middlewareStack.use(schema.getSchemaSerdePlugin(this.config));
         this.middlewareStack.use(middlewareUserAgent.getUserAgentPlugin(this.config));
-        this.middlewareStack.use(middlewareRetry.getRetryPlugin(this.config));
-        this.middlewareStack.use(middlewareContentLength.getContentLengthPlugin(this.config));
+        this.middlewareStack.use(retry.getRetryPlugin(this.config));
+        this.middlewareStack.use(protocols.getContentLengthPlugin(this.config));
         this.middlewareStack.use(middlewareHostHeader.getHostHeaderPlugin(this.config));
         this.middlewareStack.use(middlewareLogger.getLoggerPlugin(this.config));
         this.middlewareStack.use(middlewareRecursionDetection.getRecursionDetectionPlugin(this.config));
@@ -114,11 +112,11 @@ class CloudFrontClient extends smithyClient.Client {
     }
 }
 
-class AssociateAliasCommand extends smithyClient.Command
+class AssociateAliasCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "AssociateAlias", {})
     .n("CloudFrontClient", "AssociateAliasCommand")
@@ -126,11 +124,11 @@ class AssociateAliasCommand extends smithyClient.Command
     .build() {
 }
 
-class AssociateDistributionTenantWebACLCommand extends smithyClient.Command
+class AssociateDistributionTenantWebACLCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "AssociateDistributionTenantWebACL", {})
     .n("CloudFrontClient", "AssociateDistributionTenantWebACLCommand")
@@ -138,11 +136,11 @@ class AssociateDistributionTenantWebACLCommand extends smithyClient.Command
     .build() {
 }
 
-class AssociateDistributionWebACLCommand extends smithyClient.Command
+class AssociateDistributionWebACLCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "AssociateDistributionWebACL", {})
     .n("CloudFrontClient", "AssociateDistributionWebACLCommand")
@@ -150,11 +148,11 @@ class AssociateDistributionWebACLCommand extends smithyClient.Command
     .build() {
 }
 
-class CopyDistributionCommand extends smithyClient.Command
+class CopyDistributionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CopyDistribution", {})
     .n("CloudFrontClient", "CopyDistributionCommand")
@@ -162,11 +160,11 @@ class CopyDistributionCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateAnycastIpListCommand extends smithyClient.Command
+class CreateAnycastIpListCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateAnycastIpList", {})
     .n("CloudFrontClient", "CreateAnycastIpListCommand")
@@ -174,11 +172,11 @@ class CreateAnycastIpListCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateCachePolicyCommand extends smithyClient.Command
+class CreateCachePolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateCachePolicy", {})
     .n("CloudFrontClient", "CreateCachePolicyCommand")
@@ -186,11 +184,11 @@ class CreateCachePolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateCloudFrontOriginAccessIdentityCommand extends smithyClient.Command
+class CreateCloudFrontOriginAccessIdentityCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateCloudFrontOriginAccessIdentity", {})
     .n("CloudFrontClient", "CreateCloudFrontOriginAccessIdentityCommand")
@@ -198,11 +196,11 @@ class CreateCloudFrontOriginAccessIdentityCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateConnectionFunctionCommand extends smithyClient.Command
+class CreateConnectionFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateConnectionFunction", {})
     .n("CloudFrontClient", "CreateConnectionFunctionCommand")
@@ -210,11 +208,11 @@ class CreateConnectionFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateConnectionGroupCommand extends smithyClient.Command
+class CreateConnectionGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateConnectionGroup", {})
     .n("CloudFrontClient", "CreateConnectionGroupCommand")
@@ -222,11 +220,11 @@ class CreateConnectionGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateContinuousDeploymentPolicyCommand extends smithyClient.Command
+class CreateContinuousDeploymentPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateContinuousDeploymentPolicy", {})
     .n("CloudFrontClient", "CreateContinuousDeploymentPolicyCommand")
@@ -234,11 +232,11 @@ class CreateContinuousDeploymentPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDistributionCommand extends smithyClient.Command
+class CreateDistributionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateDistribution", {})
     .n("CloudFrontClient", "CreateDistributionCommand")
@@ -246,11 +244,11 @@ class CreateDistributionCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDistributionTenantCommand extends smithyClient.Command
+class CreateDistributionTenantCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateDistributionTenant", {})
     .n("CloudFrontClient", "CreateDistributionTenantCommand")
@@ -258,11 +256,11 @@ class CreateDistributionTenantCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDistributionWithTagsCommand extends smithyClient.Command
+class CreateDistributionWithTagsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateDistributionWithTags", {})
     .n("CloudFrontClient", "CreateDistributionWithTagsCommand")
@@ -270,11 +268,11 @@ class CreateDistributionWithTagsCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateFieldLevelEncryptionConfigCommand extends smithyClient.Command
+class CreateFieldLevelEncryptionConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateFieldLevelEncryptionConfig", {})
     .n("CloudFrontClient", "CreateFieldLevelEncryptionConfigCommand")
@@ -282,11 +280,11 @@ class CreateFieldLevelEncryptionConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateFieldLevelEncryptionProfileCommand extends smithyClient.Command
+class CreateFieldLevelEncryptionProfileCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateFieldLevelEncryptionProfile", {})
     .n("CloudFrontClient", "CreateFieldLevelEncryptionProfileCommand")
@@ -294,11 +292,11 @@ class CreateFieldLevelEncryptionProfileCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateFunctionCommand extends smithyClient.Command
+class CreateFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateFunction", {})
     .n("CloudFrontClient", "CreateFunctionCommand")
@@ -306,11 +304,11 @@ class CreateFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateInvalidationCommand extends smithyClient.Command
+class CreateInvalidationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateInvalidation", {})
     .n("CloudFrontClient", "CreateInvalidationCommand")
@@ -318,11 +316,11 @@ class CreateInvalidationCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateInvalidationForDistributionTenantCommand extends smithyClient.Command
+class CreateInvalidationForDistributionTenantCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateInvalidationForDistributionTenant", {})
     .n("CloudFrontClient", "CreateInvalidationForDistributionTenantCommand")
@@ -330,11 +328,11 @@ class CreateInvalidationForDistributionTenantCommand extends smithyClient.Comman
     .build() {
 }
 
-class CreateKeyGroupCommand extends smithyClient.Command
+class CreateKeyGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateKeyGroup", {})
     .n("CloudFrontClient", "CreateKeyGroupCommand")
@@ -342,11 +340,11 @@ class CreateKeyGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateKeyValueStoreCommand extends smithyClient.Command
+class CreateKeyValueStoreCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateKeyValueStore", {})
     .n("CloudFrontClient", "CreateKeyValueStoreCommand")
@@ -354,11 +352,11 @@ class CreateKeyValueStoreCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateMonitoringSubscriptionCommand extends smithyClient.Command
+class CreateMonitoringSubscriptionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateMonitoringSubscription", {})
     .n("CloudFrontClient", "CreateMonitoringSubscriptionCommand")
@@ -366,11 +364,11 @@ class CreateMonitoringSubscriptionCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateOriginAccessControlCommand extends smithyClient.Command
+class CreateOriginAccessControlCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateOriginAccessControl", {})
     .n("CloudFrontClient", "CreateOriginAccessControlCommand")
@@ -378,11 +376,11 @@ class CreateOriginAccessControlCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateOriginRequestPolicyCommand extends smithyClient.Command
+class CreateOriginRequestPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateOriginRequestPolicy", {})
     .n("CloudFrontClient", "CreateOriginRequestPolicyCommand")
@@ -390,11 +388,11 @@ class CreateOriginRequestPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class CreatePublicKeyCommand extends smithyClient.Command
+class CreatePublicKeyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreatePublicKey", {})
     .n("CloudFrontClient", "CreatePublicKeyCommand")
@@ -402,11 +400,11 @@ class CreatePublicKeyCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateRealtimeLogConfigCommand extends smithyClient.Command
+class CreateRealtimeLogConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateRealtimeLogConfig", {})
     .n("CloudFrontClient", "CreateRealtimeLogConfigCommand")
@@ -414,11 +412,11 @@ class CreateRealtimeLogConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateResponseHeadersPolicyCommand extends smithyClient.Command
+class CreateResponseHeadersPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateResponseHeadersPolicy", {})
     .n("CloudFrontClient", "CreateResponseHeadersPolicyCommand")
@@ -426,11 +424,11 @@ class CreateResponseHeadersPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateStreamingDistributionCommand extends smithyClient.Command
+class CreateStreamingDistributionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateStreamingDistribution", {})
     .n("CloudFrontClient", "CreateStreamingDistributionCommand")
@@ -438,11 +436,11 @@ class CreateStreamingDistributionCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateStreamingDistributionWithTagsCommand extends smithyClient.Command
+class CreateStreamingDistributionWithTagsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateStreamingDistributionWithTags", {})
     .n("CloudFrontClient", "CreateStreamingDistributionWithTagsCommand")
@@ -450,11 +448,11 @@ class CreateStreamingDistributionWithTagsCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateTrustStoreCommand extends smithyClient.Command
+class CreateTrustStoreCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateTrustStore", {})
     .n("CloudFrontClient", "CreateTrustStoreCommand")
@@ -462,11 +460,11 @@ class CreateTrustStoreCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateVpcOriginCommand extends smithyClient.Command
+class CreateVpcOriginCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "CreateVpcOrigin", {})
     .n("CloudFrontClient", "CreateVpcOriginCommand")
@@ -474,11 +472,11 @@ class CreateVpcOriginCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteAnycastIpListCommand extends smithyClient.Command
+class DeleteAnycastIpListCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteAnycastIpList", {})
     .n("CloudFrontClient", "DeleteAnycastIpListCommand")
@@ -486,11 +484,11 @@ class DeleteAnycastIpListCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteCachePolicyCommand extends smithyClient.Command
+class DeleteCachePolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteCachePolicy", {})
     .n("CloudFrontClient", "DeleteCachePolicyCommand")
@@ -498,11 +496,11 @@ class DeleteCachePolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteCloudFrontOriginAccessIdentityCommand extends smithyClient.Command
+class DeleteCloudFrontOriginAccessIdentityCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteCloudFrontOriginAccessIdentity", {})
     .n("CloudFrontClient", "DeleteCloudFrontOriginAccessIdentityCommand")
@@ -510,11 +508,11 @@ class DeleteCloudFrontOriginAccessIdentityCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteConnectionFunctionCommand extends smithyClient.Command
+class DeleteConnectionFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteConnectionFunction", {})
     .n("CloudFrontClient", "DeleteConnectionFunctionCommand")
@@ -522,11 +520,11 @@ class DeleteConnectionFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteConnectionGroupCommand extends smithyClient.Command
+class DeleteConnectionGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteConnectionGroup", {})
     .n("CloudFrontClient", "DeleteConnectionGroupCommand")
@@ -534,11 +532,11 @@ class DeleteConnectionGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteContinuousDeploymentPolicyCommand extends smithyClient.Command
+class DeleteContinuousDeploymentPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteContinuousDeploymentPolicy", {})
     .n("CloudFrontClient", "DeleteContinuousDeploymentPolicyCommand")
@@ -546,11 +544,11 @@ class DeleteContinuousDeploymentPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDistributionCommand extends smithyClient.Command
+class DeleteDistributionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteDistribution", {})
     .n("CloudFrontClient", "DeleteDistributionCommand")
@@ -558,11 +556,11 @@ class DeleteDistributionCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDistributionTenantCommand extends smithyClient.Command
+class DeleteDistributionTenantCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteDistributionTenant", {})
     .n("CloudFrontClient", "DeleteDistributionTenantCommand")
@@ -570,11 +568,11 @@ class DeleteDistributionTenantCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteFieldLevelEncryptionConfigCommand extends smithyClient.Command
+class DeleteFieldLevelEncryptionConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteFieldLevelEncryptionConfig", {})
     .n("CloudFrontClient", "DeleteFieldLevelEncryptionConfigCommand")
@@ -582,11 +580,11 @@ class DeleteFieldLevelEncryptionConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteFieldLevelEncryptionProfileCommand extends smithyClient.Command
+class DeleteFieldLevelEncryptionProfileCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteFieldLevelEncryptionProfile", {})
     .n("CloudFrontClient", "DeleteFieldLevelEncryptionProfileCommand")
@@ -594,11 +592,11 @@ class DeleteFieldLevelEncryptionProfileCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteFunctionCommand extends smithyClient.Command
+class DeleteFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteFunction", {})
     .n("CloudFrontClient", "DeleteFunctionCommand")
@@ -606,11 +604,11 @@ class DeleteFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteKeyGroupCommand extends smithyClient.Command
+class DeleteKeyGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteKeyGroup", {})
     .n("CloudFrontClient", "DeleteKeyGroupCommand")
@@ -618,11 +616,11 @@ class DeleteKeyGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteKeyValueStoreCommand extends smithyClient.Command
+class DeleteKeyValueStoreCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteKeyValueStore", {})
     .n("CloudFrontClient", "DeleteKeyValueStoreCommand")
@@ -630,11 +628,11 @@ class DeleteKeyValueStoreCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteMonitoringSubscriptionCommand extends smithyClient.Command
+class DeleteMonitoringSubscriptionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteMonitoringSubscription", {})
     .n("CloudFrontClient", "DeleteMonitoringSubscriptionCommand")
@@ -642,11 +640,11 @@ class DeleteMonitoringSubscriptionCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteOriginAccessControlCommand extends smithyClient.Command
+class DeleteOriginAccessControlCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteOriginAccessControl", {})
     .n("CloudFrontClient", "DeleteOriginAccessControlCommand")
@@ -654,11 +652,11 @@ class DeleteOriginAccessControlCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteOriginRequestPolicyCommand extends smithyClient.Command
+class DeleteOriginRequestPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteOriginRequestPolicy", {})
     .n("CloudFrontClient", "DeleteOriginRequestPolicyCommand")
@@ -666,11 +664,11 @@ class DeleteOriginRequestPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class DeletePublicKeyCommand extends smithyClient.Command
+class DeletePublicKeyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeletePublicKey", {})
     .n("CloudFrontClient", "DeletePublicKeyCommand")
@@ -678,11 +676,11 @@ class DeletePublicKeyCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteRealtimeLogConfigCommand extends smithyClient.Command
+class DeleteRealtimeLogConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteRealtimeLogConfig", {})
     .n("CloudFrontClient", "DeleteRealtimeLogConfigCommand")
@@ -690,11 +688,11 @@ class DeleteRealtimeLogConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteResourcePolicyCommand extends smithyClient.Command
+class DeleteResourcePolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteResourcePolicy", {})
     .n("CloudFrontClient", "DeleteResourcePolicyCommand")
@@ -702,11 +700,11 @@ class DeleteResourcePolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteResponseHeadersPolicyCommand extends smithyClient.Command
+class DeleteResponseHeadersPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteResponseHeadersPolicy", {})
     .n("CloudFrontClient", "DeleteResponseHeadersPolicyCommand")
@@ -714,11 +712,11 @@ class DeleteResponseHeadersPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteStreamingDistributionCommand extends smithyClient.Command
+class DeleteStreamingDistributionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteStreamingDistribution", {})
     .n("CloudFrontClient", "DeleteStreamingDistributionCommand")
@@ -726,11 +724,11 @@ class DeleteStreamingDistributionCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteTrustStoreCommand extends smithyClient.Command
+class DeleteTrustStoreCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteTrustStore", {})
     .n("CloudFrontClient", "DeleteTrustStoreCommand")
@@ -738,11 +736,11 @@ class DeleteTrustStoreCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteVpcOriginCommand extends smithyClient.Command
+class DeleteVpcOriginCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DeleteVpcOrigin", {})
     .n("CloudFrontClient", "DeleteVpcOriginCommand")
@@ -750,11 +748,11 @@ class DeleteVpcOriginCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeConnectionFunctionCommand extends smithyClient.Command
+class DescribeConnectionFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DescribeConnectionFunction", {})
     .n("CloudFrontClient", "DescribeConnectionFunctionCommand")
@@ -762,11 +760,11 @@ class DescribeConnectionFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeFunctionCommand extends smithyClient.Command
+class DescribeFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DescribeFunction", {})
     .n("CloudFrontClient", "DescribeFunctionCommand")
@@ -774,11 +772,11 @@ class DescribeFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeKeyValueStoreCommand extends smithyClient.Command
+class DescribeKeyValueStoreCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DescribeKeyValueStore", {})
     .n("CloudFrontClient", "DescribeKeyValueStoreCommand")
@@ -786,11 +784,11 @@ class DescribeKeyValueStoreCommand extends smithyClient.Command
     .build() {
 }
 
-class DisassociateDistributionTenantWebACLCommand extends smithyClient.Command
+class DisassociateDistributionTenantWebACLCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DisassociateDistributionTenantWebACL", {})
     .n("CloudFrontClient", "DisassociateDistributionTenantWebACLCommand")
@@ -798,11 +796,11 @@ class DisassociateDistributionTenantWebACLCommand extends smithyClient.Command
     .build() {
 }
 
-class DisassociateDistributionWebACLCommand extends smithyClient.Command
+class DisassociateDistributionWebACLCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "DisassociateDistributionWebACL", {})
     .n("CloudFrontClient", "DisassociateDistributionWebACLCommand")
@@ -810,11 +808,11 @@ class DisassociateDistributionWebACLCommand extends smithyClient.Command
     .build() {
 }
 
-class GetAnycastIpListCommand extends smithyClient.Command
+class GetAnycastIpListCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetAnycastIpList", {})
     .n("CloudFrontClient", "GetAnycastIpListCommand")
@@ -822,11 +820,11 @@ class GetAnycastIpListCommand extends smithyClient.Command
     .build() {
 }
 
-class GetCachePolicyCommand extends smithyClient.Command
+class GetCachePolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetCachePolicy", {})
     .n("CloudFrontClient", "GetCachePolicyCommand")
@@ -834,11 +832,11 @@ class GetCachePolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class GetCachePolicyConfigCommand extends smithyClient.Command
+class GetCachePolicyConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetCachePolicyConfig", {})
     .n("CloudFrontClient", "GetCachePolicyConfigCommand")
@@ -846,11 +844,11 @@ class GetCachePolicyConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetCloudFrontOriginAccessIdentityCommand extends smithyClient.Command
+class GetCloudFrontOriginAccessIdentityCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetCloudFrontOriginAccessIdentity", {})
     .n("CloudFrontClient", "GetCloudFrontOriginAccessIdentityCommand")
@@ -858,11 +856,11 @@ class GetCloudFrontOriginAccessIdentityCommand extends smithyClient.Command
     .build() {
 }
 
-class GetCloudFrontOriginAccessIdentityConfigCommand extends smithyClient.Command
+class GetCloudFrontOriginAccessIdentityConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetCloudFrontOriginAccessIdentityConfig", {})
     .n("CloudFrontClient", "GetCloudFrontOriginAccessIdentityConfigCommand")
@@ -870,11 +868,11 @@ class GetCloudFrontOriginAccessIdentityConfigCommand extends smithyClient.Comman
     .build() {
 }
 
-class GetConnectionFunctionCommand extends smithyClient.Command
+class GetConnectionFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetConnectionFunction", {})
     .n("CloudFrontClient", "GetConnectionFunctionCommand")
@@ -882,11 +880,11 @@ class GetConnectionFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class GetConnectionGroupByRoutingEndpointCommand extends smithyClient.Command
+class GetConnectionGroupByRoutingEndpointCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetConnectionGroupByRoutingEndpoint", {})
     .n("CloudFrontClient", "GetConnectionGroupByRoutingEndpointCommand")
@@ -894,11 +892,11 @@ class GetConnectionGroupByRoutingEndpointCommand extends smithyClient.Command
     .build() {
 }
 
-class GetConnectionGroupCommand extends smithyClient.Command
+class GetConnectionGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetConnectionGroup", {})
     .n("CloudFrontClient", "GetConnectionGroupCommand")
@@ -906,11 +904,11 @@ class GetConnectionGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class GetContinuousDeploymentPolicyCommand extends smithyClient.Command
+class GetContinuousDeploymentPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetContinuousDeploymentPolicy", {})
     .n("CloudFrontClient", "GetContinuousDeploymentPolicyCommand")
@@ -918,11 +916,11 @@ class GetContinuousDeploymentPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class GetContinuousDeploymentPolicyConfigCommand extends smithyClient.Command
+class GetContinuousDeploymentPolicyConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetContinuousDeploymentPolicyConfig", {})
     .n("CloudFrontClient", "GetContinuousDeploymentPolicyConfigCommand")
@@ -930,11 +928,11 @@ class GetContinuousDeploymentPolicyConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetDistributionCommand extends smithyClient.Command
+class GetDistributionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetDistribution", {})
     .n("CloudFrontClient", "GetDistributionCommand")
@@ -942,11 +940,11 @@ class GetDistributionCommand extends smithyClient.Command
     .build() {
 }
 
-class GetDistributionConfigCommand extends smithyClient.Command
+class GetDistributionConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetDistributionConfig", {})
     .n("CloudFrontClient", "GetDistributionConfigCommand")
@@ -954,11 +952,11 @@ class GetDistributionConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetDistributionTenantByDomainCommand extends smithyClient.Command
+class GetDistributionTenantByDomainCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetDistributionTenantByDomain", {})
     .n("CloudFrontClient", "GetDistributionTenantByDomainCommand")
@@ -966,11 +964,11 @@ class GetDistributionTenantByDomainCommand extends smithyClient.Command
     .build() {
 }
 
-class GetDistributionTenantCommand extends smithyClient.Command
+class GetDistributionTenantCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetDistributionTenant", {})
     .n("CloudFrontClient", "GetDistributionTenantCommand")
@@ -978,11 +976,11 @@ class GetDistributionTenantCommand extends smithyClient.Command
     .build() {
 }
 
-class GetFieldLevelEncryptionCommand extends smithyClient.Command
+class GetFieldLevelEncryptionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetFieldLevelEncryption", {})
     .n("CloudFrontClient", "GetFieldLevelEncryptionCommand")
@@ -990,11 +988,11 @@ class GetFieldLevelEncryptionCommand extends smithyClient.Command
     .build() {
 }
 
-class GetFieldLevelEncryptionConfigCommand extends smithyClient.Command
+class GetFieldLevelEncryptionConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetFieldLevelEncryptionConfig", {})
     .n("CloudFrontClient", "GetFieldLevelEncryptionConfigCommand")
@@ -1002,11 +1000,11 @@ class GetFieldLevelEncryptionConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetFieldLevelEncryptionProfileCommand extends smithyClient.Command
+class GetFieldLevelEncryptionProfileCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetFieldLevelEncryptionProfile", {})
     .n("CloudFrontClient", "GetFieldLevelEncryptionProfileCommand")
@@ -1014,11 +1012,11 @@ class GetFieldLevelEncryptionProfileCommand extends smithyClient.Command
     .build() {
 }
 
-class GetFieldLevelEncryptionProfileConfigCommand extends smithyClient.Command
+class GetFieldLevelEncryptionProfileConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetFieldLevelEncryptionProfileConfig", {})
     .n("CloudFrontClient", "GetFieldLevelEncryptionProfileConfigCommand")
@@ -1026,11 +1024,11 @@ class GetFieldLevelEncryptionProfileConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetFunctionCommand extends smithyClient.Command
+class GetFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetFunction", {})
     .n("CloudFrontClient", "GetFunctionCommand")
@@ -1038,11 +1036,11 @@ class GetFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class GetInvalidationCommand extends smithyClient.Command
+class GetInvalidationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetInvalidation", {})
     .n("CloudFrontClient", "GetInvalidationCommand")
@@ -1050,11 +1048,11 @@ class GetInvalidationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetInvalidationForDistributionTenantCommand extends smithyClient.Command
+class GetInvalidationForDistributionTenantCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetInvalidationForDistributionTenant", {})
     .n("CloudFrontClient", "GetInvalidationForDistributionTenantCommand")
@@ -1062,11 +1060,11 @@ class GetInvalidationForDistributionTenantCommand extends smithyClient.Command
     .build() {
 }
 
-class GetKeyGroupCommand extends smithyClient.Command
+class GetKeyGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetKeyGroup", {})
     .n("CloudFrontClient", "GetKeyGroupCommand")
@@ -1074,11 +1072,11 @@ class GetKeyGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class GetKeyGroupConfigCommand extends smithyClient.Command
+class GetKeyGroupConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetKeyGroupConfig", {})
     .n("CloudFrontClient", "GetKeyGroupConfigCommand")
@@ -1086,11 +1084,11 @@ class GetKeyGroupConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetManagedCertificateDetailsCommand extends smithyClient.Command
+class GetManagedCertificateDetailsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetManagedCertificateDetails", {})
     .n("CloudFrontClient", "GetManagedCertificateDetailsCommand")
@@ -1098,11 +1096,11 @@ class GetManagedCertificateDetailsCommand extends smithyClient.Command
     .build() {
 }
 
-class GetMonitoringSubscriptionCommand extends smithyClient.Command
+class GetMonitoringSubscriptionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetMonitoringSubscription", {})
     .n("CloudFrontClient", "GetMonitoringSubscriptionCommand")
@@ -1110,11 +1108,11 @@ class GetMonitoringSubscriptionCommand extends smithyClient.Command
     .build() {
 }
 
-class GetOriginAccessControlCommand extends smithyClient.Command
+class GetOriginAccessControlCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetOriginAccessControl", {})
     .n("CloudFrontClient", "GetOriginAccessControlCommand")
@@ -1122,11 +1120,11 @@ class GetOriginAccessControlCommand extends smithyClient.Command
     .build() {
 }
 
-class GetOriginAccessControlConfigCommand extends smithyClient.Command
+class GetOriginAccessControlConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetOriginAccessControlConfig", {})
     .n("CloudFrontClient", "GetOriginAccessControlConfigCommand")
@@ -1134,11 +1132,11 @@ class GetOriginAccessControlConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetOriginRequestPolicyCommand extends smithyClient.Command
+class GetOriginRequestPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetOriginRequestPolicy", {})
     .n("CloudFrontClient", "GetOriginRequestPolicyCommand")
@@ -1146,11 +1144,11 @@ class GetOriginRequestPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class GetOriginRequestPolicyConfigCommand extends smithyClient.Command
+class GetOriginRequestPolicyConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetOriginRequestPolicyConfig", {})
     .n("CloudFrontClient", "GetOriginRequestPolicyConfigCommand")
@@ -1158,11 +1156,11 @@ class GetOriginRequestPolicyConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetPublicKeyCommand extends smithyClient.Command
+class GetPublicKeyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetPublicKey", {})
     .n("CloudFrontClient", "GetPublicKeyCommand")
@@ -1170,11 +1168,11 @@ class GetPublicKeyCommand extends smithyClient.Command
     .build() {
 }
 
-class GetPublicKeyConfigCommand extends smithyClient.Command
+class GetPublicKeyConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetPublicKeyConfig", {})
     .n("CloudFrontClient", "GetPublicKeyConfigCommand")
@@ -1182,11 +1180,11 @@ class GetPublicKeyConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetRealtimeLogConfigCommand extends smithyClient.Command
+class GetRealtimeLogConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetRealtimeLogConfig", {})
     .n("CloudFrontClient", "GetRealtimeLogConfigCommand")
@@ -1194,11 +1192,11 @@ class GetRealtimeLogConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetResourcePolicyCommand extends smithyClient.Command
+class GetResourcePolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetResourcePolicy", {})
     .n("CloudFrontClient", "GetResourcePolicyCommand")
@@ -1206,11 +1204,11 @@ class GetResourcePolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class GetResponseHeadersPolicyCommand extends smithyClient.Command
+class GetResponseHeadersPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetResponseHeadersPolicy", {})
     .n("CloudFrontClient", "GetResponseHeadersPolicyCommand")
@@ -1218,11 +1216,11 @@ class GetResponseHeadersPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class GetResponseHeadersPolicyConfigCommand extends smithyClient.Command
+class GetResponseHeadersPolicyConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetResponseHeadersPolicyConfig", {})
     .n("CloudFrontClient", "GetResponseHeadersPolicyConfigCommand")
@@ -1230,11 +1228,11 @@ class GetResponseHeadersPolicyConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetStreamingDistributionCommand extends smithyClient.Command
+class GetStreamingDistributionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetStreamingDistribution", {})
     .n("CloudFrontClient", "GetStreamingDistributionCommand")
@@ -1242,11 +1240,11 @@ class GetStreamingDistributionCommand extends smithyClient.Command
     .build() {
 }
 
-class GetStreamingDistributionConfigCommand extends smithyClient.Command
+class GetStreamingDistributionConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetStreamingDistributionConfig", {})
     .n("CloudFrontClient", "GetStreamingDistributionConfigCommand")
@@ -1254,11 +1252,11 @@ class GetStreamingDistributionConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class GetTrustStoreCommand extends smithyClient.Command
+class GetTrustStoreCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetTrustStore", {})
     .n("CloudFrontClient", "GetTrustStoreCommand")
@@ -1266,11 +1264,11 @@ class GetTrustStoreCommand extends smithyClient.Command
     .build() {
 }
 
-class GetVpcOriginCommand extends smithyClient.Command
+class GetVpcOriginCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "GetVpcOrigin", {})
     .n("CloudFrontClient", "GetVpcOriginCommand")
@@ -1278,11 +1276,11 @@ class GetVpcOriginCommand extends smithyClient.Command
     .build() {
 }
 
-class ListAnycastIpListsCommand extends smithyClient.Command
+class ListAnycastIpListsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListAnycastIpLists", {})
     .n("CloudFrontClient", "ListAnycastIpListsCommand")
@@ -1290,11 +1288,11 @@ class ListAnycastIpListsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListCachePoliciesCommand extends smithyClient.Command
+class ListCachePoliciesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListCachePolicies", {})
     .n("CloudFrontClient", "ListCachePoliciesCommand")
@@ -1302,11 +1300,11 @@ class ListCachePoliciesCommand extends smithyClient.Command
     .build() {
 }
 
-class ListCloudFrontOriginAccessIdentitiesCommand extends smithyClient.Command
+class ListCloudFrontOriginAccessIdentitiesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListCloudFrontOriginAccessIdentities", {})
     .n("CloudFrontClient", "ListCloudFrontOriginAccessIdentitiesCommand")
@@ -1314,11 +1312,11 @@ class ListCloudFrontOriginAccessIdentitiesCommand extends smithyClient.Command
     .build() {
 }
 
-class ListConflictingAliasesCommand extends smithyClient.Command
+class ListConflictingAliasesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListConflictingAliases", {})
     .n("CloudFrontClient", "ListConflictingAliasesCommand")
@@ -1326,11 +1324,11 @@ class ListConflictingAliasesCommand extends smithyClient.Command
     .build() {
 }
 
-class ListConnectionFunctionsCommand extends smithyClient.Command
+class ListConnectionFunctionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListConnectionFunctions", {})
     .n("CloudFrontClient", "ListConnectionFunctionsCommand")
@@ -1338,11 +1336,11 @@ class ListConnectionFunctionsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListConnectionGroupsCommand extends smithyClient.Command
+class ListConnectionGroupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListConnectionGroups", {})
     .n("CloudFrontClient", "ListConnectionGroupsCommand")
@@ -1350,11 +1348,11 @@ class ListConnectionGroupsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListContinuousDeploymentPoliciesCommand extends smithyClient.Command
+class ListContinuousDeploymentPoliciesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListContinuousDeploymentPolicies", {})
     .n("CloudFrontClient", "ListContinuousDeploymentPoliciesCommand")
@@ -1362,11 +1360,11 @@ class ListContinuousDeploymentPoliciesCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionsByAnycastIpListIdCommand extends smithyClient.Command
+class ListDistributionsByAnycastIpListIdCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByAnycastIpListId", {})
     .n("CloudFrontClient", "ListDistributionsByAnycastIpListIdCommand")
@@ -1374,11 +1372,11 @@ class ListDistributionsByAnycastIpListIdCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionsByCachePolicyIdCommand extends smithyClient.Command
+class ListDistributionsByCachePolicyIdCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByCachePolicyId", {})
     .n("CloudFrontClient", "ListDistributionsByCachePolicyIdCommand")
@@ -1386,11 +1384,11 @@ class ListDistributionsByCachePolicyIdCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionsByConnectionFunctionCommand extends smithyClient.Command
+class ListDistributionsByConnectionFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByConnectionFunction", {})
     .n("CloudFrontClient", "ListDistributionsByConnectionFunctionCommand")
@@ -1398,11 +1396,11 @@ class ListDistributionsByConnectionFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionsByConnectionModeCommand extends smithyClient.Command
+class ListDistributionsByConnectionModeCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByConnectionMode", {})
     .n("CloudFrontClient", "ListDistributionsByConnectionModeCommand")
@@ -1410,11 +1408,11 @@ class ListDistributionsByConnectionModeCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionsByKeyGroupCommand extends smithyClient.Command
+class ListDistributionsByKeyGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByKeyGroup", {})
     .n("CloudFrontClient", "ListDistributionsByKeyGroupCommand")
@@ -1422,11 +1420,11 @@ class ListDistributionsByKeyGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionsByOriginRequestPolicyIdCommand extends smithyClient.Command
+class ListDistributionsByOriginRequestPolicyIdCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByOriginRequestPolicyId", {})
     .n("CloudFrontClient", "ListDistributionsByOriginRequestPolicyIdCommand")
@@ -1434,11 +1432,11 @@ class ListDistributionsByOriginRequestPolicyIdCommand extends smithyClient.Comma
     .build() {
 }
 
-class ListDistributionsByOwnedResourceCommand extends smithyClient.Command
+class ListDistributionsByOwnedResourceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByOwnedResource", {})
     .n("CloudFrontClient", "ListDistributionsByOwnedResourceCommand")
@@ -1446,11 +1444,11 @@ class ListDistributionsByOwnedResourceCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionsByRealtimeLogConfigCommand extends smithyClient.Command
+class ListDistributionsByRealtimeLogConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByRealtimeLogConfig", {})
     .n("CloudFrontClient", "ListDistributionsByRealtimeLogConfigCommand")
@@ -1458,11 +1456,11 @@ class ListDistributionsByRealtimeLogConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionsByResponseHeadersPolicyIdCommand extends smithyClient.Command
+class ListDistributionsByResponseHeadersPolicyIdCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByResponseHeadersPolicyId", {})
     .n("CloudFrontClient", "ListDistributionsByResponseHeadersPolicyIdCommand")
@@ -1470,11 +1468,11 @@ class ListDistributionsByResponseHeadersPolicyIdCommand extends smithyClient.Com
     .build() {
 }
 
-class ListDistributionsByTrustStoreCommand extends smithyClient.Command
+class ListDistributionsByTrustStoreCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByTrustStore", {})
     .n("CloudFrontClient", "ListDistributionsByTrustStoreCommand")
@@ -1482,11 +1480,11 @@ class ListDistributionsByTrustStoreCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionsByVpcOriginIdCommand extends smithyClient.Command
+class ListDistributionsByVpcOriginIdCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByVpcOriginId", {})
     .n("CloudFrontClient", "ListDistributionsByVpcOriginIdCommand")
@@ -1494,11 +1492,11 @@ class ListDistributionsByVpcOriginIdCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionsByWebACLIdCommand extends smithyClient.Command
+class ListDistributionsByWebACLIdCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionsByWebACLId", {})
     .n("CloudFrontClient", "ListDistributionsByWebACLIdCommand")
@@ -1506,11 +1504,11 @@ class ListDistributionsByWebACLIdCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionsCommand extends smithyClient.Command
+class ListDistributionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributions", {})
     .n("CloudFrontClient", "ListDistributionsCommand")
@@ -1518,11 +1516,11 @@ class ListDistributionsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionTenantsByCustomizationCommand extends smithyClient.Command
+class ListDistributionTenantsByCustomizationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionTenantsByCustomization", {})
     .n("CloudFrontClient", "ListDistributionTenantsByCustomizationCommand")
@@ -1530,11 +1528,11 @@ class ListDistributionTenantsByCustomizationCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDistributionTenantsCommand extends smithyClient.Command
+class ListDistributionTenantsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDistributionTenants", {})
     .n("CloudFrontClient", "ListDistributionTenantsCommand")
@@ -1542,11 +1540,11 @@ class ListDistributionTenantsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDomainConflictsCommand extends smithyClient.Command
+class ListDomainConflictsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListDomainConflicts", {})
     .n("CloudFrontClient", "ListDomainConflictsCommand")
@@ -1554,11 +1552,11 @@ class ListDomainConflictsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListFieldLevelEncryptionConfigsCommand extends smithyClient.Command
+class ListFieldLevelEncryptionConfigsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListFieldLevelEncryptionConfigs", {})
     .n("CloudFrontClient", "ListFieldLevelEncryptionConfigsCommand")
@@ -1566,11 +1564,11 @@ class ListFieldLevelEncryptionConfigsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListFieldLevelEncryptionProfilesCommand extends smithyClient.Command
+class ListFieldLevelEncryptionProfilesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListFieldLevelEncryptionProfiles", {})
     .n("CloudFrontClient", "ListFieldLevelEncryptionProfilesCommand")
@@ -1578,11 +1576,11 @@ class ListFieldLevelEncryptionProfilesCommand extends smithyClient.Command
     .build() {
 }
 
-class ListFunctionsCommand extends smithyClient.Command
+class ListFunctionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListFunctions", {})
     .n("CloudFrontClient", "ListFunctionsCommand")
@@ -1590,11 +1588,11 @@ class ListFunctionsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListInvalidationsCommand extends smithyClient.Command
+class ListInvalidationsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListInvalidations", {})
     .n("CloudFrontClient", "ListInvalidationsCommand")
@@ -1602,11 +1600,11 @@ class ListInvalidationsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListInvalidationsForDistributionTenantCommand extends smithyClient.Command
+class ListInvalidationsForDistributionTenantCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListInvalidationsForDistributionTenant", {})
     .n("CloudFrontClient", "ListInvalidationsForDistributionTenantCommand")
@@ -1614,11 +1612,11 @@ class ListInvalidationsForDistributionTenantCommand extends smithyClient.Command
     .build() {
 }
 
-class ListKeyGroupsCommand extends smithyClient.Command
+class ListKeyGroupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListKeyGroups", {})
     .n("CloudFrontClient", "ListKeyGroupsCommand")
@@ -1626,11 +1624,11 @@ class ListKeyGroupsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListKeyValueStoresCommand extends smithyClient.Command
+class ListKeyValueStoresCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListKeyValueStores", {})
     .n("CloudFrontClient", "ListKeyValueStoresCommand")
@@ -1638,11 +1636,11 @@ class ListKeyValueStoresCommand extends smithyClient.Command
     .build() {
 }
 
-class ListOriginAccessControlsCommand extends smithyClient.Command
+class ListOriginAccessControlsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListOriginAccessControls", {})
     .n("CloudFrontClient", "ListOriginAccessControlsCommand")
@@ -1650,11 +1648,11 @@ class ListOriginAccessControlsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListOriginRequestPoliciesCommand extends smithyClient.Command
+class ListOriginRequestPoliciesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListOriginRequestPolicies", {})
     .n("CloudFrontClient", "ListOriginRequestPoliciesCommand")
@@ -1662,11 +1660,11 @@ class ListOriginRequestPoliciesCommand extends smithyClient.Command
     .build() {
 }
 
-class ListPublicKeysCommand extends smithyClient.Command
+class ListPublicKeysCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListPublicKeys", {})
     .n("CloudFrontClient", "ListPublicKeysCommand")
@@ -1674,11 +1672,11 @@ class ListPublicKeysCommand extends smithyClient.Command
     .build() {
 }
 
-class ListRealtimeLogConfigsCommand extends smithyClient.Command
+class ListRealtimeLogConfigsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListRealtimeLogConfigs", {})
     .n("CloudFrontClient", "ListRealtimeLogConfigsCommand")
@@ -1686,11 +1684,11 @@ class ListRealtimeLogConfigsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListResponseHeadersPoliciesCommand extends smithyClient.Command
+class ListResponseHeadersPoliciesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListResponseHeadersPolicies", {})
     .n("CloudFrontClient", "ListResponseHeadersPoliciesCommand")
@@ -1698,11 +1696,11 @@ class ListResponseHeadersPoliciesCommand extends smithyClient.Command
     .build() {
 }
 
-class ListStreamingDistributionsCommand extends smithyClient.Command
+class ListStreamingDistributionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListStreamingDistributions", {})
     .n("CloudFrontClient", "ListStreamingDistributionsCommand")
@@ -1710,11 +1708,11 @@ class ListStreamingDistributionsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListTagsForResourceCommand extends smithyClient.Command
+class ListTagsForResourceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListTagsForResource", {})
     .n("CloudFrontClient", "ListTagsForResourceCommand")
@@ -1722,11 +1720,11 @@ class ListTagsForResourceCommand extends smithyClient.Command
     .build() {
 }
 
-class ListTrustStoresCommand extends smithyClient.Command
+class ListTrustStoresCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListTrustStores", {})
     .n("CloudFrontClient", "ListTrustStoresCommand")
@@ -1734,11 +1732,11 @@ class ListTrustStoresCommand extends smithyClient.Command
     .build() {
 }
 
-class ListVpcOriginsCommand extends smithyClient.Command
+class ListVpcOriginsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "ListVpcOrigins", {})
     .n("CloudFrontClient", "ListVpcOriginsCommand")
@@ -1746,11 +1744,11 @@ class ListVpcOriginsCommand extends smithyClient.Command
     .build() {
 }
 
-class PublishConnectionFunctionCommand extends smithyClient.Command
+class PublishConnectionFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "PublishConnectionFunction", {})
     .n("CloudFrontClient", "PublishConnectionFunctionCommand")
@@ -1758,11 +1756,11 @@ class PublishConnectionFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class PublishFunctionCommand extends smithyClient.Command
+class PublishFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "PublishFunction", {})
     .n("CloudFrontClient", "PublishFunctionCommand")
@@ -1770,11 +1768,11 @@ class PublishFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class PutResourcePolicyCommand extends smithyClient.Command
+class PutResourcePolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "PutResourcePolicy", {})
     .n("CloudFrontClient", "PutResourcePolicyCommand")
@@ -1782,11 +1780,11 @@ class PutResourcePolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class TagResourceCommand extends smithyClient.Command
+class TagResourceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "TagResource", {})
     .n("CloudFrontClient", "TagResourceCommand")
@@ -1794,11 +1792,11 @@ class TagResourceCommand extends smithyClient.Command
     .build() {
 }
 
-class TestConnectionFunctionCommand extends smithyClient.Command
+class TestConnectionFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "TestConnectionFunction", {})
     .n("CloudFrontClient", "TestConnectionFunctionCommand")
@@ -1806,11 +1804,11 @@ class TestConnectionFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class TestFunctionCommand extends smithyClient.Command
+class TestFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "TestFunction", {})
     .n("CloudFrontClient", "TestFunctionCommand")
@@ -1818,11 +1816,11 @@ class TestFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class UntagResourceCommand extends smithyClient.Command
+class UntagResourceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UntagResource", {})
     .n("CloudFrontClient", "UntagResourceCommand")
@@ -1830,11 +1828,11 @@ class UntagResourceCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateAnycastIpListCommand extends smithyClient.Command
+class UpdateAnycastIpListCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateAnycastIpList", {})
     .n("CloudFrontClient", "UpdateAnycastIpListCommand")
@@ -1842,11 +1840,11 @@ class UpdateAnycastIpListCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateCachePolicyCommand extends smithyClient.Command
+class UpdateCachePolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateCachePolicy", {})
     .n("CloudFrontClient", "UpdateCachePolicyCommand")
@@ -1854,11 +1852,11 @@ class UpdateCachePolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateCloudFrontOriginAccessIdentityCommand extends smithyClient.Command
+class UpdateCloudFrontOriginAccessIdentityCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateCloudFrontOriginAccessIdentity", {})
     .n("CloudFrontClient", "UpdateCloudFrontOriginAccessIdentityCommand")
@@ -1866,11 +1864,11 @@ class UpdateCloudFrontOriginAccessIdentityCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateConnectionFunctionCommand extends smithyClient.Command
+class UpdateConnectionFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateConnectionFunction", {})
     .n("CloudFrontClient", "UpdateConnectionFunctionCommand")
@@ -1878,11 +1876,11 @@ class UpdateConnectionFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateConnectionGroupCommand extends smithyClient.Command
+class UpdateConnectionGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateConnectionGroup", {})
     .n("CloudFrontClient", "UpdateConnectionGroupCommand")
@@ -1890,11 +1888,11 @@ class UpdateConnectionGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateContinuousDeploymentPolicyCommand extends smithyClient.Command
+class UpdateContinuousDeploymentPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateContinuousDeploymentPolicy", {})
     .n("CloudFrontClient", "UpdateContinuousDeploymentPolicyCommand")
@@ -1902,11 +1900,11 @@ class UpdateContinuousDeploymentPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateDistributionCommand extends smithyClient.Command
+class UpdateDistributionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateDistribution", {})
     .n("CloudFrontClient", "UpdateDistributionCommand")
@@ -1914,11 +1912,11 @@ class UpdateDistributionCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateDistributionTenantCommand extends smithyClient.Command
+class UpdateDistributionTenantCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateDistributionTenant", {})
     .n("CloudFrontClient", "UpdateDistributionTenantCommand")
@@ -1926,11 +1924,11 @@ class UpdateDistributionTenantCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateDistributionWithStagingConfigCommand extends smithyClient.Command
+class UpdateDistributionWithStagingConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateDistributionWithStagingConfig", {})
     .n("CloudFrontClient", "UpdateDistributionWithStagingConfigCommand")
@@ -1938,11 +1936,11 @@ class UpdateDistributionWithStagingConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateDomainAssociationCommand extends smithyClient.Command
+class UpdateDomainAssociationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateDomainAssociation", {})
     .n("CloudFrontClient", "UpdateDomainAssociationCommand")
@@ -1950,11 +1948,11 @@ class UpdateDomainAssociationCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateFieldLevelEncryptionConfigCommand extends smithyClient.Command
+class UpdateFieldLevelEncryptionConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateFieldLevelEncryptionConfig", {})
     .n("CloudFrontClient", "UpdateFieldLevelEncryptionConfigCommand")
@@ -1962,11 +1960,11 @@ class UpdateFieldLevelEncryptionConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateFieldLevelEncryptionProfileCommand extends smithyClient.Command
+class UpdateFieldLevelEncryptionProfileCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateFieldLevelEncryptionProfile", {})
     .n("CloudFrontClient", "UpdateFieldLevelEncryptionProfileCommand")
@@ -1974,11 +1972,11 @@ class UpdateFieldLevelEncryptionProfileCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateFunctionCommand extends smithyClient.Command
+class UpdateFunctionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateFunction", {})
     .n("CloudFrontClient", "UpdateFunctionCommand")
@@ -1986,11 +1984,11 @@ class UpdateFunctionCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateKeyGroupCommand extends smithyClient.Command
+class UpdateKeyGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateKeyGroup", {})
     .n("CloudFrontClient", "UpdateKeyGroupCommand")
@@ -1998,11 +1996,11 @@ class UpdateKeyGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateKeyValueStoreCommand extends smithyClient.Command
+class UpdateKeyValueStoreCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateKeyValueStore", {})
     .n("CloudFrontClient", "UpdateKeyValueStoreCommand")
@@ -2010,11 +2008,11 @@ class UpdateKeyValueStoreCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateOriginAccessControlCommand extends smithyClient.Command
+class UpdateOriginAccessControlCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateOriginAccessControl", {})
     .n("CloudFrontClient", "UpdateOriginAccessControlCommand")
@@ -2022,11 +2020,11 @@ class UpdateOriginAccessControlCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateOriginRequestPolicyCommand extends smithyClient.Command
+class UpdateOriginRequestPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateOriginRequestPolicy", {})
     .n("CloudFrontClient", "UpdateOriginRequestPolicyCommand")
@@ -2034,11 +2032,11 @@ class UpdateOriginRequestPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdatePublicKeyCommand extends smithyClient.Command
+class UpdatePublicKeyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdatePublicKey", {})
     .n("CloudFrontClient", "UpdatePublicKeyCommand")
@@ -2046,11 +2044,11 @@ class UpdatePublicKeyCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateRealtimeLogConfigCommand extends smithyClient.Command
+class UpdateRealtimeLogConfigCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateRealtimeLogConfig", {})
     .n("CloudFrontClient", "UpdateRealtimeLogConfigCommand")
@@ -2058,11 +2056,11 @@ class UpdateRealtimeLogConfigCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateResponseHeadersPolicyCommand extends smithyClient.Command
+class UpdateResponseHeadersPolicyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateResponseHeadersPolicy", {})
     .n("CloudFrontClient", "UpdateResponseHeadersPolicyCommand")
@@ -2070,11 +2068,11 @@ class UpdateResponseHeadersPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateStreamingDistributionCommand extends smithyClient.Command
+class UpdateStreamingDistributionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateStreamingDistribution", {})
     .n("CloudFrontClient", "UpdateStreamingDistributionCommand")
@@ -2082,11 +2080,11 @@ class UpdateStreamingDistributionCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateTrustStoreCommand extends smithyClient.Command
+class UpdateTrustStoreCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateTrustStore", {})
     .n("CloudFrontClient", "UpdateTrustStoreCommand")
@@ -2094,11 +2092,11 @@ class UpdateTrustStoreCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateVpcOriginCommand extends smithyClient.Command
+class UpdateVpcOriginCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "UpdateVpcOrigin", {})
     .n("CloudFrontClient", "UpdateVpcOriginCommand")
@@ -2106,11 +2104,11 @@ class UpdateVpcOriginCommand extends smithyClient.Command
     .build() {
 }
 
-class VerifyDnsConfigurationCommand extends smithyClient.Command
+class VerifyDnsConfigurationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("Cloudfront2020_05_31", "VerifyDnsConfiguration", {})
     .n("CloudFrontClient", "VerifyDnsConfigurationCommand")
@@ -2152,17 +2150,17 @@ const paginateListStreamingDistributions = core.createPaginator(CloudFrontClient
 
 const paginateListTrustStores = core.createPaginator(CloudFrontClient, ListTrustStoresCommand, "Marker", "NextMarker", "MaxItems");
 
-const checkState$3 = async (client, input) => {
+const checkState$3 = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new GetDistributionCommand(input));
+        let result = await client$1.send(new GetDistributionCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
                 return result.Distribution.Status;
             };
             if (returnComparator() === "Deployed") {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2170,29 +2168,29 @@ const checkState$3 = async (client, input) => {
     catch (exception) {
         reason = exception;
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForDistributionDeployed = async (params, input) => {
     const serviceDefaults = { minDelay: 60, maxDelay: 2100 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$3);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$3);
 };
 const waitUntilDistributionDeployed = async (params, input) => {
     const serviceDefaults = { minDelay: 60, maxDelay: 2100 };
-    const result = await utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$3);
-    return utilWaiter.checkExceptions(result);
+    const result = await client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$3);
+    return client.checkExceptions(result);
 };
 
-const checkState$2 = async (client, input) => {
+const checkState$2 = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new GetInvalidationCommand(input));
+        let result = await client$1.send(new GetInvalidationCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
                 return result.Invalidation.Status;
             };
             if (returnComparator() === "Completed") {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2200,29 +2198,29 @@ const checkState$2 = async (client, input) => {
     catch (exception) {
         reason = exception;
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForInvalidationCompleted = async (params, input) => {
     const serviceDefaults = { minDelay: 20, maxDelay: 600 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$2);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$2);
 };
 const waitUntilInvalidationCompleted = async (params, input) => {
     const serviceDefaults = { minDelay: 20, maxDelay: 600 };
-    const result = await utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$2);
-    return utilWaiter.checkExceptions(result);
+    const result = await client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$2);
+    return client.checkExceptions(result);
 };
 
-const checkState$1 = async (client, input) => {
+const checkState$1 = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new GetInvalidationForDistributionTenantCommand(input));
+        let result = await client$1.send(new GetInvalidationForDistributionTenantCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
                 return result.Invalidation.Status;
             };
             if (returnComparator() === "Completed") {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2230,29 +2228,29 @@ const checkState$1 = async (client, input) => {
     catch (exception) {
         reason = exception;
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForInvalidationForDistributionTenantCompleted = async (params, input) => {
     const serviceDefaults = { minDelay: 20, maxDelay: 600 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$1);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$1);
 };
 const waitUntilInvalidationForDistributionTenantCompleted = async (params, input) => {
     const serviceDefaults = { minDelay: 20, maxDelay: 600 };
-    const result = await utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$1);
-    return utilWaiter.checkExceptions(result);
+    const result = await client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$1);
+    return client.checkExceptions(result);
 };
 
-const checkState = async (client, input) => {
+const checkState = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new GetStreamingDistributionCommand(input));
+        let result = await client$1.send(new GetStreamingDistributionCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
                 return result.StreamingDistribution.Status;
             };
             if (returnComparator() === "Deployed") {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2260,16 +2258,16 @@ const checkState = async (client, input) => {
     catch (exception) {
         reason = exception;
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForStreamingDistributionDeployed = async (params, input) => {
     const serviceDefaults = { minDelay: 60, maxDelay: 1500 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState);
 };
 const waitUntilStreamingDistributionDeployed = async (params, input) => {
     const serviceDefaults = { minDelay: 60, maxDelay: 1500 };
-    const result = await utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState);
-    return utilWaiter.checkExceptions(result);
+    const result = await client.createWaiter({ ...serviceDefaults, ...params }, input, checkState);
+    return client.checkExceptions(result);
 };
 
 const commands = {
@@ -2468,7 +2466,7 @@ const waiters = {
 };
 class CloudFront extends CloudFrontClient {
 }
-smithyClient.createAggregatedClient(commands, CloudFront, { paginators, waiters });
+client.createAggregatedClient(commands, CloudFront, { paginators, waiters });
 
 const ResponseHeadersPolicyAccessControlAllowMethodsValues = {
     ALL: "ALL",
@@ -2727,8 +2725,8 @@ const DnsConfigurationStatus = {
     Valid: "valid-configuration",
 };
 
-exports.$Command = smithyClient.Command;
-exports.__Client = smithyClient.Client;
+exports.$Command = client.Command;
+exports.__Client = client.Client;
 exports.CloudFrontServiceException = CloudFrontServiceException.CloudFrontServiceException;
 exports.AssociateAliasCommand = AssociateAliasCommand;
 exports.AssociateDistributionTenantWebACLCommand = AssociateDistributionTenantWebACLCommand;