@aws-sdk/client-s3 3.1045.0 → 3.1046.0

package/dist-cjs/index.js

@@ -7,22 +7,20 @@ var middlewareLogger = require('@aws-sdk/middleware-logger');
 var middlewareRecursionDetection = require('@aws-sdk/middleware-recursion-detection');
 var middlewareSdkS3 = require('@aws-sdk/middleware-sdk-s3');
 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 eventStreams = require('@smithy/core/event-streams');
+var protocols = require('@smithy/core/protocols');
+var retry = require('@smithy/core/retry');
 var schema = require('@smithy/core/schema');
-var eventstreamSerdeConfigResolver = require('@smithy/eventstream-serde-config-resolver');
-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 schemas_0 = require('./schemas/schemas_0');
 var runtimeConfig = require('./runtimeConfig');
 var regionConfigResolver = require('@aws-sdk/region-config-resolver');
-var protocolHttp = require('@smithy/protocol-http');
 var middlewareSsec = require('@aws-sdk/middleware-ssec');
 var middlewareLocationConstraint = require('@aws-sdk/middleware-location-constraint');
-var utilWaiter = require('@smithy/util-waiter');
 var errors = require('./models/errors');
 var S3ServiceException = require('./models/S3ServiceException');
 
@@ -51,7 +49,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-class CreateSessionCommand extends smithyClient.Command
+class CreateSessionCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -60,7 +58,7 @@ class CreateSessionCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -110,12 +108,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 S3Client extends smithyClient.Client {
+class S3Client extends client.Client {
     config;
     constructor(...[configuration]) {
         const _config_0 = runtimeConfig.getRuntimeConfig(configuration || {});
@@ -124,19 +122,19 @@ class S3Client extends smithyClient.Client {
         const _config_1 = resolveClientEndpointParameters(_config_0);
         const _config_2 = middlewareUserAgent.resolveUserAgentConfig(_config_1);
         const _config_3 = middlewareFlexibleChecksums.resolveFlexibleChecksumsConfig(_config_2);
-        const _config_4 = middlewareRetry.resolveRetryConfig(_config_3);
-        const _config_5 = configResolver.resolveRegionConfig(_config_4);
+        const _config_4 = retry.resolveRetryConfig(_config_3);
+        const _config_5 = config.resolveRegionConfig(_config_4);
         const _config_6 = middlewareHostHeader.resolveHostHeaderConfig(_config_5);
-        const _config_7 = middlewareEndpoint.resolveEndpointConfig(_config_6);
-        const _config_8 = eventstreamSerdeConfigResolver.resolveEventStreamSerdeConfig(_config_7);
+        const _config_7 = endpoints.resolveEndpointConfig(_config_6);
+        const _config_8 = eventStreams.resolveEventStreamSerdeConfig(_config_7);
         const _config_9 = httpAuthSchemeProvider.resolveHttpAuthSchemeConfig(_config_8);
         const _config_10 = middlewareSdkS3.resolveS3Config(_config_9, { session: [() => this, CreateSessionCommand] });
         const _config_11 = resolveRuntimeExtensions(_config_10, configuration?.extensions || []);
         this.config = _config_11;
         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));
@@ -159,7 +157,7 @@ class S3Client extends smithyClient.Client {
     }
 }
 
-class AbortMultipartUploadCommand extends smithyClient.Command
+class AbortMultipartUploadCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -168,7 +166,7 @@ class AbortMultipartUploadCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -178,7 +176,7 @@ class AbortMultipartUploadCommand extends smithyClient.Command
     .build() {
 }
 
-class CompleteMultipartUploadCommand extends smithyClient.Command
+class CompleteMultipartUploadCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -187,7 +185,7 @@ class CompleteMultipartUploadCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
         middlewareSsec.getSsecPlugin(config),
     ];
@@ -198,7 +196,7 @@ class CompleteMultipartUploadCommand extends smithyClient.Command
     .build() {
 }
 
-class CopyObjectCommand extends smithyClient.Command
+class CopyObjectCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -209,7 +207,7 @@ class CopyObjectCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
         middlewareSsec.getSsecPlugin(config),
     ];
@@ -220,7 +218,7 @@ class CopyObjectCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateBucketCommand extends smithyClient.Command
+class CreateBucketCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -230,7 +228,7 @@ class CreateBucketCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
         middlewareLocationConstraint.getLocationConstraintPlugin(config),
     ];
@@ -241,7 +239,7 @@ class CreateBucketCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateBucketMetadataConfigurationCommand extends smithyClient.Command
+class CreateBucketMetadataConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -250,7 +248,7 @@ class CreateBucketMetadataConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -263,7 +261,7 @@ class CreateBucketMetadataConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateBucketMetadataTableConfigurationCommand extends smithyClient.Command
+class CreateBucketMetadataTableConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -272,7 +270,7 @@ class CreateBucketMetadataTableConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -285,7 +283,7 @@ class CreateBucketMetadataTableConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateMultipartUploadCommand extends smithyClient.Command
+class CreateMultipartUploadCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -294,7 +292,7 @@ class CreateMultipartUploadCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
         middlewareSsec.getSsecPlugin(config),
     ];
@@ -305,7 +303,7 @@ class CreateMultipartUploadCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketAnalyticsConfigurationCommand extends smithyClient.Command
+class DeleteBucketAnalyticsConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -313,7 +311,7 @@ class DeleteBucketAnalyticsConfigurationCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketAnalyticsConfiguration", {})
     .n("S3Client", "DeleteBucketAnalyticsConfigurationCommand")
@@ -321,7 +319,7 @@ class DeleteBucketAnalyticsConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketCommand extends smithyClient.Command
+class DeleteBucketCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -329,7 +327,7 @@ class DeleteBucketCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucket", {})
     .n("S3Client", "DeleteBucketCommand")
@@ -337,7 +335,7 @@ class DeleteBucketCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketCorsCommand extends smithyClient.Command
+class DeleteBucketCorsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -345,7 +343,7 @@ class DeleteBucketCorsCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketCors", {})
     .n("S3Client", "DeleteBucketCorsCommand")
@@ -353,7 +351,7 @@ class DeleteBucketCorsCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketEncryptionCommand extends smithyClient.Command
+class DeleteBucketEncryptionCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -361,7 +359,7 @@ class DeleteBucketEncryptionCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketEncryption", {})
     .n("S3Client", "DeleteBucketEncryptionCommand")
@@ -369,7 +367,7 @@ class DeleteBucketEncryptionCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketIntelligentTieringConfigurationCommand extends smithyClient.Command
+class DeleteBucketIntelligentTieringConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -377,7 +375,7 @@ class DeleteBucketIntelligentTieringConfigurationCommand extends smithyClient.Co
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketIntelligentTieringConfiguration", {})
     .n("S3Client", "DeleteBucketIntelligentTieringConfigurationCommand")
@@ -385,7 +383,7 @@ class DeleteBucketIntelligentTieringConfigurationCommand extends smithyClient.Co
     .build() {
 }
 
-class DeleteBucketInventoryConfigurationCommand extends smithyClient.Command
+class DeleteBucketInventoryConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -393,7 +391,7 @@ class DeleteBucketInventoryConfigurationCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketInventoryConfiguration", {})
     .n("S3Client", "DeleteBucketInventoryConfigurationCommand")
@@ -401,7 +399,7 @@ class DeleteBucketInventoryConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketLifecycleCommand extends smithyClient.Command
+class DeleteBucketLifecycleCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -409,7 +407,7 @@ class DeleteBucketLifecycleCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketLifecycle", {})
     .n("S3Client", "DeleteBucketLifecycleCommand")
@@ -417,7 +415,7 @@ class DeleteBucketLifecycleCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketMetadataConfigurationCommand extends smithyClient.Command
+class DeleteBucketMetadataConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -425,7 +423,7 @@ class DeleteBucketMetadataConfigurationCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketMetadataConfiguration", {})
     .n("S3Client", "DeleteBucketMetadataConfigurationCommand")
@@ -433,7 +431,7 @@ class DeleteBucketMetadataConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketMetadataTableConfigurationCommand extends smithyClient.Command
+class DeleteBucketMetadataTableConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -441,7 +439,7 @@ class DeleteBucketMetadataTableConfigurationCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketMetadataTableConfiguration", {})
     .n("S3Client", "DeleteBucketMetadataTableConfigurationCommand")
@@ -449,7 +447,7 @@ class DeleteBucketMetadataTableConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketMetricsConfigurationCommand extends smithyClient.Command
+class DeleteBucketMetricsConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -457,7 +455,7 @@ class DeleteBucketMetricsConfigurationCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketMetricsConfiguration", {})
     .n("S3Client", "DeleteBucketMetricsConfigurationCommand")
@@ -465,7 +463,7 @@ class DeleteBucketMetricsConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketOwnershipControlsCommand extends smithyClient.Command
+class DeleteBucketOwnershipControlsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -473,7 +471,7 @@ class DeleteBucketOwnershipControlsCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketOwnershipControls", {})
     .n("S3Client", "DeleteBucketOwnershipControlsCommand")
@@ -481,7 +479,7 @@ class DeleteBucketOwnershipControlsCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketPolicyCommand extends smithyClient.Command
+class DeleteBucketPolicyCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -489,7 +487,7 @@ class DeleteBucketPolicyCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketPolicy", {})
     .n("S3Client", "DeleteBucketPolicyCommand")
@@ -497,7 +495,7 @@ class DeleteBucketPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketReplicationCommand extends smithyClient.Command
+class DeleteBucketReplicationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -505,7 +503,7 @@ class DeleteBucketReplicationCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketReplication", {})
     .n("S3Client", "DeleteBucketReplicationCommand")
@@ -513,7 +511,7 @@ class DeleteBucketReplicationCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketTaggingCommand extends smithyClient.Command
+class DeleteBucketTaggingCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -521,7 +519,7 @@ class DeleteBucketTaggingCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketTagging", {})
     .n("S3Client", "DeleteBucketTaggingCommand")
@@ -529,7 +527,7 @@ class DeleteBucketTaggingCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBucketWebsiteCommand extends smithyClient.Command
+class DeleteBucketWebsiteCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -537,7 +535,7 @@ class DeleteBucketWebsiteCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeleteBucketWebsite", {})
     .n("S3Client", "DeleteBucketWebsiteCommand")
@@ -545,7 +543,7 @@ class DeleteBucketWebsiteCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteObjectCommand extends smithyClient.Command
+class DeleteObjectCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -554,7 +552,7 @@ class DeleteObjectCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -564,7 +562,7 @@ class DeleteObjectCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteObjectsCommand extends smithyClient.Command
+class DeleteObjectsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -572,7 +570,7 @@ class DeleteObjectsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -586,7 +584,7 @@ class DeleteObjectsCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteObjectTaggingCommand extends smithyClient.Command
+class DeleteObjectTaggingCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -594,7 +592,7 @@ class DeleteObjectTaggingCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -604,7 +602,7 @@ class DeleteObjectTaggingCommand extends smithyClient.Command
     .build() {
 }
 
-class DeletePublicAccessBlockCommand extends smithyClient.Command
+class DeletePublicAccessBlockCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -612,7 +610,7 @@ class DeletePublicAccessBlockCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "DeletePublicAccessBlock", {})
     .n("S3Client", "DeletePublicAccessBlockCommand")
@@ -620,7 +618,7 @@ class DeletePublicAccessBlockCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketAbacCommand extends smithyClient.Command
+class GetBucketAbacCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -628,7 +626,7 @@ class GetBucketAbacCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -638,7 +636,7 @@ class GetBucketAbacCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketAccelerateConfigurationCommand extends smithyClient.Command
+class GetBucketAccelerateConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -647,7 +645,7 @@ class GetBucketAccelerateConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -657,7 +655,7 @@ class GetBucketAccelerateConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketAclCommand extends smithyClient.Command
+class GetBucketAclCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -666,7 +664,7 @@ class GetBucketAclCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -676,7 +674,7 @@ class GetBucketAclCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketAnalyticsConfigurationCommand extends smithyClient.Command
+class GetBucketAnalyticsConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -685,7 +683,7 @@ class GetBucketAnalyticsConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -695,7 +693,7 @@ class GetBucketAnalyticsConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketCorsCommand extends smithyClient.Command
+class GetBucketCorsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -704,7 +702,7 @@ class GetBucketCorsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -714,7 +712,7 @@ class GetBucketCorsCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketEncryptionCommand extends smithyClient.Command
+class GetBucketEncryptionCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -723,7 +721,7 @@ class GetBucketEncryptionCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -733,7 +731,7 @@ class GetBucketEncryptionCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketIntelligentTieringConfigurationCommand extends smithyClient.Command
+class GetBucketIntelligentTieringConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -742,7 +740,7 @@ class GetBucketIntelligentTieringConfigurationCommand extends smithyClient.Comma
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -752,7 +750,7 @@ class GetBucketIntelligentTieringConfigurationCommand extends smithyClient.Comma
     .build() {
 }
 
-class GetBucketInventoryConfigurationCommand extends smithyClient.Command
+class GetBucketInventoryConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -761,7 +759,7 @@ class GetBucketInventoryConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -771,7 +769,7 @@ class GetBucketInventoryConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketLifecycleConfigurationCommand extends smithyClient.Command
+class GetBucketLifecycleConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -780,7 +778,7 @@ class GetBucketLifecycleConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -790,7 +788,7 @@ class GetBucketLifecycleConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketLocationCommand extends smithyClient.Command
+class GetBucketLocationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -799,7 +797,7 @@ class GetBucketLocationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -809,7 +807,7 @@ class GetBucketLocationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketLoggingCommand extends smithyClient.Command
+class GetBucketLoggingCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -818,7 +816,7 @@ class GetBucketLoggingCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -828,7 +826,7 @@ class GetBucketLoggingCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketMetadataConfigurationCommand extends smithyClient.Command
+class GetBucketMetadataConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -837,7 +835,7 @@ class GetBucketMetadataConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -847,7 +845,7 @@ class GetBucketMetadataConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketMetadataTableConfigurationCommand extends smithyClient.Command
+class GetBucketMetadataTableConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -856,7 +854,7 @@ class GetBucketMetadataTableConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -866,7 +864,7 @@ class GetBucketMetadataTableConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketMetricsConfigurationCommand extends smithyClient.Command
+class GetBucketMetricsConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -875,7 +873,7 @@ class GetBucketMetricsConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -885,7 +883,7 @@ class GetBucketMetricsConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketNotificationConfigurationCommand extends smithyClient.Command
+class GetBucketNotificationConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -894,7 +892,7 @@ class GetBucketNotificationConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -904,7 +902,7 @@ class GetBucketNotificationConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketOwnershipControlsCommand extends smithyClient.Command
+class GetBucketOwnershipControlsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -913,7 +911,7 @@ class GetBucketOwnershipControlsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -923,7 +921,7 @@ class GetBucketOwnershipControlsCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketPolicyCommand extends smithyClient.Command
+class GetBucketPolicyCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -931,7 +929,7 @@ class GetBucketPolicyCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "GetBucketPolicy", {})
     .n("S3Client", "GetBucketPolicyCommand")
@@ -939,7 +937,7 @@ class GetBucketPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketPolicyStatusCommand extends smithyClient.Command
+class GetBucketPolicyStatusCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -948,7 +946,7 @@ class GetBucketPolicyStatusCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -958,7 +956,7 @@ class GetBucketPolicyStatusCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketReplicationCommand extends smithyClient.Command
+class GetBucketReplicationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -967,7 +965,7 @@ class GetBucketReplicationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -977,7 +975,7 @@ class GetBucketReplicationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketRequestPaymentCommand extends smithyClient.Command
+class GetBucketRequestPaymentCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -986,7 +984,7 @@ class GetBucketRequestPaymentCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -996,7 +994,7 @@ class GetBucketRequestPaymentCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketTaggingCommand extends smithyClient.Command
+class GetBucketTaggingCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1005,7 +1003,7 @@ class GetBucketTaggingCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1015,7 +1013,7 @@ class GetBucketTaggingCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketVersioningCommand extends smithyClient.Command
+class GetBucketVersioningCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1024,7 +1022,7 @@ class GetBucketVersioningCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1034,7 +1032,7 @@ class GetBucketVersioningCommand extends smithyClient.Command
     .build() {
 }
 
-class GetBucketWebsiteCommand extends smithyClient.Command
+class GetBucketWebsiteCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1043,7 +1041,7 @@ class GetBucketWebsiteCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1053,7 +1051,7 @@ class GetBucketWebsiteCommand extends smithyClient.Command
     .build() {
 }
 
-class GetObjectAclCommand extends smithyClient.Command
+class GetObjectAclCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1062,7 +1060,7 @@ class GetObjectAclCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1072,7 +1070,7 @@ class GetObjectAclCommand extends smithyClient.Command
     .build() {
 }
 
-class GetObjectAttributesCommand extends smithyClient.Command
+class GetObjectAttributesCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1080,7 +1078,7 @@ class GetObjectAttributesCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
         middlewareSsec.getSsecPlugin(config),
     ];
@@ -1091,7 +1089,7 @@ class GetObjectAttributesCommand extends smithyClient.Command
     .build() {
 }
 
-class GetObjectCommand extends smithyClient.Command
+class GetObjectCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1100,7 +1098,7 @@ class GetObjectCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestChecksumRequired: false,
             requestValidationModeMember: 'ChecksumMode',
@@ -1116,7 +1114,7 @@ class GetObjectCommand extends smithyClient.Command
     .build() {
 }
 
-class GetObjectLegalHoldCommand extends smithyClient.Command
+class GetObjectLegalHoldCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1124,7 +1122,7 @@ class GetObjectLegalHoldCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1134,7 +1132,7 @@ class GetObjectLegalHoldCommand extends smithyClient.Command
     .build() {
 }
 
-class GetObjectLockConfigurationCommand extends smithyClient.Command
+class GetObjectLockConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1142,7 +1140,7 @@ class GetObjectLockConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1152,7 +1150,7 @@ class GetObjectLockConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetObjectRetentionCommand extends smithyClient.Command
+class GetObjectRetentionCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1160,7 +1158,7 @@ class GetObjectRetentionCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1170,7 +1168,7 @@ class GetObjectRetentionCommand extends smithyClient.Command
     .build() {
 }
 
-class GetObjectTaggingCommand extends smithyClient.Command
+class GetObjectTaggingCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1178,7 +1176,7 @@ class GetObjectTaggingCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1188,14 +1186,14 @@ class GetObjectTaggingCommand extends smithyClient.Command
     .build() {
 }
 
-class GetObjectTorrentCommand extends smithyClient.Command
+class GetObjectTorrentCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "GetObjectTorrent", {})
     .n("S3Client", "GetObjectTorrentCommand")
@@ -1203,7 +1201,7 @@ class GetObjectTorrentCommand extends smithyClient.Command
     .build() {
 }
 
-class GetPublicAccessBlockCommand extends smithyClient.Command
+class GetPublicAccessBlockCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1212,7 +1210,7 @@ class GetPublicAccessBlockCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1222,7 +1220,7 @@ class GetPublicAccessBlockCommand extends smithyClient.Command
     .build() {
 }
 
-class HeadBucketCommand extends smithyClient.Command
+class HeadBucketCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1230,7 +1228,7 @@ class HeadBucketCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1240,7 +1238,7 @@ class HeadBucketCommand extends smithyClient.Command
     .build() {
 }
 
-class HeadObjectCommand extends smithyClient.Command
+class HeadObjectCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1249,7 +1247,7 @@ class HeadObjectCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
         middlewareSsec.getSsecPlugin(config),
         middlewareSdkS3.getS3ExpiresMiddlewarePlugin(config),
@@ -1261,7 +1259,7 @@ class HeadObjectCommand extends smithyClient.Command
     .build() {
 }
 
-class ListBucketAnalyticsConfigurationsCommand extends smithyClient.Command
+class ListBucketAnalyticsConfigurationsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1270,7 +1268,7 @@ class ListBucketAnalyticsConfigurationsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1280,7 +1278,7 @@ class ListBucketAnalyticsConfigurationsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListBucketIntelligentTieringConfigurationsCommand extends smithyClient.Command
+class ListBucketIntelligentTieringConfigurationsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1289,7 +1287,7 @@ class ListBucketIntelligentTieringConfigurationsCommand extends smithyClient.Com
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1299,7 +1297,7 @@ class ListBucketIntelligentTieringConfigurationsCommand extends smithyClient.Com
     .build() {
 }
 
-class ListBucketInventoryConfigurationsCommand extends smithyClient.Command
+class ListBucketInventoryConfigurationsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1308,7 +1306,7 @@ class ListBucketInventoryConfigurationsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1318,7 +1316,7 @@ class ListBucketInventoryConfigurationsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListBucketMetricsConfigurationsCommand extends smithyClient.Command
+class ListBucketMetricsConfigurationsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1327,7 +1325,7 @@ class ListBucketMetricsConfigurationsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1337,12 +1335,12 @@ class ListBucketMetricsConfigurationsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListBucketsCommand extends smithyClient.Command
+class ListBucketsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1352,7 +1350,7 @@ class ListBucketsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDirectoryBucketsCommand extends smithyClient.Command
+class ListDirectoryBucketsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1360,7 +1358,7 @@ class ListDirectoryBucketsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1370,7 +1368,7 @@ class ListDirectoryBucketsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListMultipartUploadsCommand extends smithyClient.Command
+class ListMultipartUploadsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1379,7 +1377,7 @@ class ListMultipartUploadsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1389,7 +1387,7 @@ class ListMultipartUploadsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListObjectsCommand extends smithyClient.Command
+class ListObjectsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1398,7 +1396,7 @@ class ListObjectsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1408,7 +1406,7 @@ class ListObjectsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListObjectsV2Command extends smithyClient.Command
+class ListObjectsV2Command extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1417,7 +1415,7 @@ class ListObjectsV2Command extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1427,7 +1425,7 @@ class ListObjectsV2Command extends smithyClient.Command
     .build() {
 }
 
-class ListObjectVersionsCommand extends smithyClient.Command
+class ListObjectVersionsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1436,7 +1434,7 @@ class ListObjectVersionsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -1446,7 +1444,7 @@ class ListObjectVersionsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListPartsCommand extends smithyClient.Command
+class ListPartsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1455,7 +1453,7 @@ class ListPartsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
         middlewareSsec.getSsecPlugin(config),
     ];
@@ -1466,7 +1464,7 @@ class ListPartsCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketAbacCommand extends smithyClient.Command
+class PutBucketAbacCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1474,7 +1472,7 @@ class PutBucketAbacCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: false,
@@ -1487,7 +1485,7 @@ class PutBucketAbacCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketAccelerateConfigurationCommand extends smithyClient.Command
+class PutBucketAccelerateConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1496,7 +1494,7 @@ class PutBucketAccelerateConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: false,
@@ -1509,7 +1507,7 @@ class PutBucketAccelerateConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketAclCommand extends smithyClient.Command
+class PutBucketAclCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1518,7 +1516,7 @@ class PutBucketAclCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1531,7 +1529,7 @@ class PutBucketAclCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketAnalyticsConfigurationCommand extends smithyClient.Command
+class PutBucketAnalyticsConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1539,7 +1537,7 @@ class PutBucketAnalyticsConfigurationCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "PutBucketAnalyticsConfiguration", {})
     .n("S3Client", "PutBucketAnalyticsConfigurationCommand")
@@ -1547,7 +1545,7 @@ class PutBucketAnalyticsConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketCorsCommand extends smithyClient.Command
+class PutBucketCorsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1556,7 +1554,7 @@ class PutBucketCorsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1569,7 +1567,7 @@ class PutBucketCorsCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketEncryptionCommand extends smithyClient.Command
+class PutBucketEncryptionCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1578,7 +1576,7 @@ class PutBucketEncryptionCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1591,7 +1589,7 @@ class PutBucketEncryptionCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketIntelligentTieringConfigurationCommand extends smithyClient.Command
+class PutBucketIntelligentTieringConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1599,7 +1597,7 @@ class PutBucketIntelligentTieringConfigurationCommand extends smithyClient.Comma
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "PutBucketIntelligentTieringConfiguration", {})
     .n("S3Client", "PutBucketIntelligentTieringConfigurationCommand")
@@ -1607,7 +1605,7 @@ class PutBucketIntelligentTieringConfigurationCommand extends smithyClient.Comma
     .build() {
 }
 
-class PutBucketInventoryConfigurationCommand extends smithyClient.Command
+class PutBucketInventoryConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1615,7 +1613,7 @@ class PutBucketInventoryConfigurationCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "PutBucketInventoryConfiguration", {})
     .n("S3Client", "PutBucketInventoryConfigurationCommand")
@@ -1623,7 +1621,7 @@ class PutBucketInventoryConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketLifecycleConfigurationCommand extends smithyClient.Command
+class PutBucketLifecycleConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1632,7 +1630,7 @@ class PutBucketLifecycleConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1646,7 +1644,7 @@ class PutBucketLifecycleConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketLoggingCommand extends smithyClient.Command
+class PutBucketLoggingCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1655,7 +1653,7 @@ class PutBucketLoggingCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1668,7 +1666,7 @@ class PutBucketLoggingCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketMetricsConfigurationCommand extends smithyClient.Command
+class PutBucketMetricsConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1676,7 +1674,7 @@ class PutBucketMetricsConfigurationCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "PutBucketMetricsConfiguration", {})
     .n("S3Client", "PutBucketMetricsConfigurationCommand")
@@ -1684,7 +1682,7 @@ class PutBucketMetricsConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketNotificationConfigurationCommand extends smithyClient.Command
+class PutBucketNotificationConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1692,7 +1690,7 @@ class PutBucketNotificationConfigurationCommand extends smithyClient.Command
     Bucket: { type: "contextParams", name: "Bucket" },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "PutBucketNotificationConfiguration", {})
     .n("S3Client", "PutBucketNotificationConfigurationCommand")
@@ -1700,7 +1698,7 @@ class PutBucketNotificationConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketOwnershipControlsCommand extends smithyClient.Command
+class PutBucketOwnershipControlsCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1709,7 +1707,7 @@ class PutBucketOwnershipControlsCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1722,7 +1720,7 @@ class PutBucketOwnershipControlsCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketPolicyCommand extends smithyClient.Command
+class PutBucketPolicyCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1731,7 +1729,7 @@ class PutBucketPolicyCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1744,7 +1742,7 @@ class PutBucketPolicyCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketReplicationCommand extends smithyClient.Command
+class PutBucketReplicationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1753,7 +1751,7 @@ class PutBucketReplicationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1766,7 +1764,7 @@ class PutBucketReplicationCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketRequestPaymentCommand extends smithyClient.Command
+class PutBucketRequestPaymentCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1775,7 +1773,7 @@ class PutBucketRequestPaymentCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1788,7 +1786,7 @@ class PutBucketRequestPaymentCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketTaggingCommand extends smithyClient.Command
+class PutBucketTaggingCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1797,7 +1795,7 @@ class PutBucketTaggingCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1810,7 +1808,7 @@ class PutBucketTaggingCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketVersioningCommand extends smithyClient.Command
+class PutBucketVersioningCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1819,7 +1817,7 @@ class PutBucketVersioningCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1832,7 +1830,7 @@ class PutBucketVersioningCommand extends smithyClient.Command
     .build() {
 }
 
-class PutBucketWebsiteCommand extends smithyClient.Command
+class PutBucketWebsiteCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1841,7 +1839,7 @@ class PutBucketWebsiteCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1854,7 +1852,7 @@ class PutBucketWebsiteCommand extends smithyClient.Command
     .build() {
 }
 
-class PutObjectAclCommand extends smithyClient.Command
+class PutObjectAclCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1863,7 +1861,7 @@ class PutObjectAclCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1877,7 +1875,7 @@ class PutObjectAclCommand extends smithyClient.Command
     .build() {
 }
 
-class PutObjectCommand extends smithyClient.Command
+class PutObjectCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1886,7 +1884,7 @@ class PutObjectCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: false,
@@ -1902,7 +1900,7 @@ class PutObjectCommand extends smithyClient.Command
     .build() {
 }
 
-class PutObjectLegalHoldCommand extends smithyClient.Command
+class PutObjectLegalHoldCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1910,7 +1908,7 @@ class PutObjectLegalHoldCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1924,7 +1922,7 @@ class PutObjectLegalHoldCommand extends smithyClient.Command
     .build() {
 }
 
-class PutObjectLockConfigurationCommand extends smithyClient.Command
+class PutObjectLockConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1932,7 +1930,7 @@ class PutObjectLockConfigurationCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1946,7 +1944,7 @@ class PutObjectLockConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class PutObjectRetentionCommand extends smithyClient.Command
+class PutObjectRetentionCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1954,7 +1952,7 @@ class PutObjectRetentionCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1968,7 +1966,7 @@ class PutObjectRetentionCommand extends smithyClient.Command
     .build() {
 }
 
-class PutObjectTaggingCommand extends smithyClient.Command
+class PutObjectTaggingCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1976,7 +1974,7 @@ class PutObjectTaggingCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -1990,7 +1988,7 @@ class PutObjectTaggingCommand extends smithyClient.Command
     .build() {
 }
 
-class PutPublicAccessBlockCommand extends smithyClient.Command
+class PutPublicAccessBlockCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -1999,7 +1997,7 @@ class PutPublicAccessBlockCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -2012,7 +2010,7 @@ class PutPublicAccessBlockCommand extends smithyClient.Command
     .build() {
 }
 
-class RenameObjectCommand extends smithyClient.Command
+class RenameObjectCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -2021,7 +2019,7 @@ class RenameObjectCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
     ];
 })
@@ -2031,7 +2029,7 @@ class RenameObjectCommand extends smithyClient.Command
     .build() {
 }
 
-class RestoreObjectCommand extends smithyClient.Command
+class RestoreObjectCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -2039,7 +2037,7 @@ class RestoreObjectCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: false,
@@ -2053,7 +2051,7 @@ class RestoreObjectCommand extends smithyClient.Command
     .build() {
 }
 
-class SelectObjectContentCommand extends smithyClient.Command
+class SelectObjectContentCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -2061,7 +2059,7 @@ class SelectObjectContentCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSsec.getSsecPlugin(config),
     ];
 })
@@ -2075,7 +2073,7 @@ class SelectObjectContentCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateBucketMetadataInventoryTableConfigurationCommand extends smithyClient.Command
+class UpdateBucketMetadataInventoryTableConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -2084,7 +2082,7 @@ class UpdateBucketMetadataInventoryTableConfigurationCommand extends smithyClien
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -2097,7 +2095,7 @@ class UpdateBucketMetadataInventoryTableConfigurationCommand extends smithyClien
     .build() {
 }
 
-class UpdateBucketMetadataJournalTableConfigurationCommand extends smithyClient.Command
+class UpdateBucketMetadataJournalTableConfigurationCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -2106,7 +2104,7 @@ class UpdateBucketMetadataJournalTableConfigurationCommand extends smithyClient.
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -2119,7 +2117,7 @@ class UpdateBucketMetadataJournalTableConfigurationCommand extends smithyClient.
     .build() {
 }
 
-class UpdateObjectEncryptionCommand extends smithyClient.Command
+class UpdateObjectEncryptionCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -2127,7 +2125,7 @@ class UpdateObjectEncryptionCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: true,
@@ -2141,7 +2139,7 @@ class UpdateObjectEncryptionCommand extends smithyClient.Command
     .build() {
 }
 
-class UploadPartCommand extends smithyClient.Command
+class UploadPartCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -2150,7 +2148,7 @@ class UploadPartCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareFlexibleChecksums.getFlexibleChecksumsPlugin(config, {
             requestAlgorithmMember: { 'httpHeader': 'x-amz-sdk-checksum-algorithm', 'name': 'ChecksumAlgorithm' },
             requestChecksumRequired: false,
@@ -2165,7 +2163,7 @@ class UploadPartCommand extends smithyClient.Command
     .build() {
 }
 
-class UploadPartCopyCommand extends smithyClient.Command
+class UploadPartCopyCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
@@ -2174,7 +2172,7 @@ class UploadPartCopyCommand extends smithyClient.Command
 })
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkS3.getThrow200ExceptionsPlugin(config),
         middlewareSsec.getSsecPlugin(config),
     ];
@@ -2185,14 +2183,14 @@ class UploadPartCopyCommand extends smithyClient.Command
     .build() {
 }
 
-class WriteGetObjectResponseCommand extends smithyClient.Command
+class WriteGetObjectResponseCommand extends client.Command
     .classBuilder()
     .ep({
     ...commonParams,
     UseObjectLambdaEndpoint: { type: "staticContextParams", value: true },
 })
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonS3", "WriteGetObjectResponse", {})
     .n("S3Client", "WriteGetObjectResponseCommand")
@@ -2208,102 +2206,102 @@ const paginateListObjectsV2 = core.createPaginator(S3Client, ListObjectsV2Comman
 
 const paginateListParts = core.createPaginator(S3Client, ListPartsCommand, "PartNumberMarker", "NextPartNumberMarker", "MaxParts");
 
-const checkState$3 = async (client, input) => {
+const checkState$3 = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new HeadBucketCommand(input));
+        let result = await client$1.send(new HeadBucketCommand(input));
         reason = result;
-        return { state: utilWaiter.WaiterState.SUCCESS, reason };
+        return { state: client.WaiterState.SUCCESS, reason };
     }
     catch (exception) {
         reason = exception;
         if (exception.name === "NotFound") {
-            return { state: utilWaiter.WaiterState.RETRY, reason };
+            return { state: client.WaiterState.RETRY, reason };
         }
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForBucketExists = async (params, input) => {
     const serviceDefaults = { minDelay: 5, maxDelay: 120 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$3);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$3);
 };
 const waitUntilBucketExists = async (params, input) => {
     const serviceDefaults = { minDelay: 5, maxDelay: 120 };
-    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 HeadBucketCommand(input));
+        let result = await client$1.send(new HeadBucketCommand(input));
         reason = result;
     }
     catch (exception) {
         reason = exception;
         if (exception.name === "NotFound") {
-            return { state: utilWaiter.WaiterState.SUCCESS, reason };
+            return { state: client.WaiterState.SUCCESS, reason };
         }
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForBucketNotExists = async (params, input) => {
     const serviceDefaults = { minDelay: 5, maxDelay: 120 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$2);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$2);
 };
 const waitUntilBucketNotExists = async (params, input) => {
     const serviceDefaults = { minDelay: 5, maxDelay: 120 };
-    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 HeadObjectCommand(input));
+        let result = await client$1.send(new HeadObjectCommand(input));
         reason = result;
-        return { state: utilWaiter.WaiterState.SUCCESS, reason };
+        return { state: client.WaiterState.SUCCESS, reason };
     }
     catch (exception) {
         reason = exception;
         if (exception.name === "NotFound") {
-            return { state: utilWaiter.WaiterState.RETRY, reason };
+            return { state: client.WaiterState.RETRY, reason };
         }
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForObjectExists = async (params, input) => {
     const serviceDefaults = { minDelay: 5, maxDelay: 120 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$1);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$1);
 };
 const waitUntilObjectExists = async (params, input) => {
     const serviceDefaults = { minDelay: 5, maxDelay: 120 };
-    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 HeadObjectCommand(input));
+        let result = await client$1.send(new HeadObjectCommand(input));
         reason = result;
     }
     catch (exception) {
         reason = exception;
         if (exception.name === "NotFound") {
-            return { state: utilWaiter.WaiterState.SUCCESS, reason };
+            return { state: client.WaiterState.SUCCESS, reason };
         }
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForObjectNotExists = async (params, input) => {
     const serviceDefaults = { minDelay: 5, maxDelay: 120 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState);
 };
 const waitUntilObjectNotExists = async (params, input) => {
     const serviceDefaults = { minDelay: 5, maxDelay: 120 };
-    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 = {
@@ -2429,7 +2427,7 @@ const waiters = {
 };
 class S3 extends S3Client {
 }
-smithyClient.createAggregatedClient(commands, S3, { paginators, waiters });
+client.createAggregatedClient(commands, S3, { paginators, waiters });
 
 const BucketAbacStatus = {
     Disabled: "Disabled",
@@ -2845,8 +2843,8 @@ const RestoreRequestType = {
     SELECT: "SELECT",
 };
 
-exports.$Command = smithyClient.Command;
-exports.__Client = smithyClient.Client;
+exports.$Command = client.Command;
+exports.__Client = client.Client;
 exports.S3ServiceException = S3ServiceException.S3ServiceException;
 exports.AbortMultipartUploadCommand = AbortMultipartUploadCommand;
 exports.AnalyticsS3ExportFileFormat = AnalyticsS3ExportFileFormat;