@aws-sdk/client-rds 3.1045.0 → 3.1047.0

package/dist-cjs/index.js

@@ -4,20 +4,18 @@ var middlewareHostHeader = require('@aws-sdk/middleware-host-header');
 var middlewareLogger = require('@aws-sdk/middleware-logger');
 var middlewareRecursionDetection = require('@aws-sdk/middleware-recursion-detection');
 var middlewareUserAgent = require('@aws-sdk/middleware-user-agent');
-var configResolver = require('@smithy/config-resolver');
 var core = require('@smithy/core');
+var client = require('@smithy/core/client');
+var config = require('@smithy/core/config');
+var endpoints = require('@smithy/core/endpoints');
+var protocols = require('@smithy/core/protocols');
+var retry = require('@smithy/core/retry');
 var schema = require('@smithy/core/schema');
-var middlewareContentLength = require('@smithy/middleware-content-length');
-var middlewareEndpoint = require('@smithy/middleware-endpoint');
-var middlewareRetry = require('@smithy/middleware-retry');
-var smithyClient = require('@smithy/smithy-client');
 var httpAuthSchemeProvider = require('./auth/httpAuthSchemeProvider');
 var runtimeConfig = require('./runtimeConfig');
 var regionConfigResolver = require('@aws-sdk/region-config-resolver');
-var protocolHttp = require('@smithy/protocol-http');
 var schemas_0 = require('./schemas/schemas_0');
 var middlewareSdkRds = require('@aws-sdk/middleware-sdk-rds');
-var utilWaiter = require('@smithy/util-waiter');
 var errors = require('./models/errors');
 var RDSServiceException = require('./models/RDSServiceException');
 
@@ -75,12 +73,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 RDSClient extends smithyClient.Client {
+class RDSClient extends client.Client {
     config;
     constructor(...[configuration]) {
         const _config_0 = runtimeConfig.getRuntimeConfig(configuration || {});
@@ -88,17 +86,17 @@ class RDSClient extends smithyClient.Client {
         this.initConfig = _config_0;
         const _config_1 = resolveClientEndpointParameters(_config_0);
         const _config_2 = middlewareUserAgent.resolveUserAgentConfig(_config_1);
-        const _config_3 = middlewareRetry.resolveRetryConfig(_config_2);
-        const _config_4 = configResolver.resolveRegionConfig(_config_3);
+        const _config_3 = retry.resolveRetryConfig(_config_2);
+        const _config_4 = config.resolveRegionConfig(_config_3);
         const _config_5 = middlewareHostHeader.resolveHostHeaderConfig(_config_4);
-        const _config_6 = middlewareEndpoint.resolveEndpointConfig(_config_5);
+        const _config_6 = endpoints.resolveEndpointConfig(_config_5);
         const _config_7 = httpAuthSchemeProvider.resolveHttpAuthSchemeConfig(_config_6);
         const _config_8 = resolveRuntimeExtensions(_config_7, configuration?.extensions || []);
         this.config = _config_8;
         this.middlewareStack.use(schema.getSchemaSerdePlugin(this.config));
         this.middlewareStack.use(middlewareUserAgent.getUserAgentPlugin(this.config));
-        this.middlewareStack.use(middlewareRetry.getRetryPlugin(this.config));
-        this.middlewareStack.use(middlewareContentLength.getContentLengthPlugin(this.config));
+        this.middlewareStack.use(retry.getRetryPlugin(this.config));
+        this.middlewareStack.use(protocols.getContentLengthPlugin(this.config));
         this.middlewareStack.use(middlewareHostHeader.getHostHeaderPlugin(this.config));
         this.middlewareStack.use(middlewareLogger.getLoggerPlugin(this.config));
         this.middlewareStack.use(middlewareRecursionDetection.getRecursionDetectionPlugin(this.config));
@@ -115,11 +113,11 @@ class RDSClient extends smithyClient.Client {
     }
 }
 
-class AddRoleToDBClusterCommand extends smithyClient.Command
+class AddRoleToDBClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "AddRoleToDBCluster", {})
     .n("RDSClient", "AddRoleToDBClusterCommand")
@@ -127,11 +125,11 @@ class AddRoleToDBClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class AddRoleToDBInstanceCommand extends smithyClient.Command
+class AddRoleToDBInstanceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "AddRoleToDBInstance", {})
     .n("RDSClient", "AddRoleToDBInstanceCommand")
@@ -139,11 +137,11 @@ class AddRoleToDBInstanceCommand extends smithyClient.Command
     .build() {
 }
 
-class AddSourceIdentifierToSubscriptionCommand extends smithyClient.Command
+class AddSourceIdentifierToSubscriptionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "AddSourceIdentifierToSubscription", {})
     .n("RDSClient", "AddSourceIdentifierToSubscriptionCommand")
@@ -151,11 +149,11 @@ class AddSourceIdentifierToSubscriptionCommand extends smithyClient.Command
     .build() {
 }
 
-class AddTagsToResourceCommand extends smithyClient.Command
+class AddTagsToResourceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "AddTagsToResource", {})
     .n("RDSClient", "AddTagsToResourceCommand")
@@ -163,11 +161,11 @@ class AddTagsToResourceCommand extends smithyClient.Command
     .build() {
 }
 
-class ApplyPendingMaintenanceActionCommand extends smithyClient.Command
+class ApplyPendingMaintenanceActionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ApplyPendingMaintenanceAction", {})
     .n("RDSClient", "ApplyPendingMaintenanceActionCommand")
@@ -175,11 +173,11 @@ class ApplyPendingMaintenanceActionCommand extends smithyClient.Command
     .build() {
 }
 
-class AuthorizeDBSecurityGroupIngressCommand extends smithyClient.Command
+class AuthorizeDBSecurityGroupIngressCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "AuthorizeDBSecurityGroupIngress", {})
     .n("RDSClient", "AuthorizeDBSecurityGroupIngressCommand")
@@ -187,11 +185,11 @@ class AuthorizeDBSecurityGroupIngressCommand extends smithyClient.Command
     .build() {
 }
 
-class BacktrackDBClusterCommand extends smithyClient.Command
+class BacktrackDBClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "BacktrackDBCluster", {})
     .n("RDSClient", "BacktrackDBClusterCommand")
@@ -199,11 +197,11 @@ class BacktrackDBClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class CancelExportTaskCommand extends smithyClient.Command
+class CancelExportTaskCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CancelExportTask", {})
     .n("RDSClient", "CancelExportTaskCommand")
@@ -211,11 +209,11 @@ class CancelExportTaskCommand extends smithyClient.Command
     .build() {
 }
 
-class CopyDBClusterParameterGroupCommand extends smithyClient.Command
+class CopyDBClusterParameterGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CopyDBClusterParameterGroup", {})
     .n("RDSClient", "CopyDBClusterParameterGroupCommand")
@@ -223,12 +221,12 @@ class CopyDBClusterParameterGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class CopyDBClusterSnapshotCommand extends smithyClient.Command
+class CopyDBClusterSnapshotCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkRds.getCrossRegionPresignedUrlPlugin(config),
     ];
 })
@@ -238,11 +236,11 @@ class CopyDBClusterSnapshotCommand extends smithyClient.Command
     .build() {
 }
 
-class CopyDBParameterGroupCommand extends smithyClient.Command
+class CopyDBParameterGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CopyDBParameterGroup", {})
     .n("RDSClient", "CopyDBParameterGroupCommand")
@@ -250,12 +248,12 @@ class CopyDBParameterGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class CopyDBSnapshotCommand extends smithyClient.Command
+class CopyDBSnapshotCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkRds.getCrossRegionPresignedUrlPlugin(config),
     ];
 })
@@ -265,11 +263,11 @@ class CopyDBSnapshotCommand extends smithyClient.Command
     .build() {
 }
 
-class CopyOptionGroupCommand extends smithyClient.Command
+class CopyOptionGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CopyOptionGroup", {})
     .n("RDSClient", "CopyOptionGroupCommand")
@@ -277,11 +275,11 @@ class CopyOptionGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateBlueGreenDeploymentCommand extends smithyClient.Command
+class CreateBlueGreenDeploymentCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateBlueGreenDeployment", {})
     .n("RDSClient", "CreateBlueGreenDeploymentCommand")
@@ -289,11 +287,11 @@ class CreateBlueGreenDeploymentCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateCustomDBEngineVersionCommand extends smithyClient.Command
+class CreateCustomDBEngineVersionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateCustomDBEngineVersion", {})
     .n("RDSClient", "CreateCustomDBEngineVersionCommand")
@@ -301,12 +299,12 @@ class CreateCustomDBEngineVersionCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBClusterCommand extends smithyClient.Command
+class CreateDBClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkRds.getCrossRegionPresignedUrlPlugin(config),
     ];
 })
@@ -316,11 +314,11 @@ class CreateDBClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBClusterEndpointCommand extends smithyClient.Command
+class CreateDBClusterEndpointCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateDBClusterEndpoint", {})
     .n("RDSClient", "CreateDBClusterEndpointCommand")
@@ -328,11 +326,11 @@ class CreateDBClusterEndpointCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBClusterParameterGroupCommand extends smithyClient.Command
+class CreateDBClusterParameterGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateDBClusterParameterGroup", {})
     .n("RDSClient", "CreateDBClusterParameterGroupCommand")
@@ -340,11 +338,11 @@ class CreateDBClusterParameterGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBClusterSnapshotCommand extends smithyClient.Command
+class CreateDBClusterSnapshotCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateDBClusterSnapshot", {})
     .n("RDSClient", "CreateDBClusterSnapshotCommand")
@@ -352,11 +350,11 @@ class CreateDBClusterSnapshotCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBInstanceCommand extends smithyClient.Command
+class CreateDBInstanceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateDBInstance", {})
     .n("RDSClient", "CreateDBInstanceCommand")
@@ -364,12 +362,12 @@ class CreateDBInstanceCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBInstanceReadReplicaCommand extends smithyClient.Command
+class CreateDBInstanceReadReplicaCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkRds.getCrossRegionPresignedUrlPlugin(config),
     ];
 })
@@ -379,11 +377,11 @@ class CreateDBInstanceReadReplicaCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBParameterGroupCommand extends smithyClient.Command
+class CreateDBParameterGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateDBParameterGroup", {})
     .n("RDSClient", "CreateDBParameterGroupCommand")
@@ -391,11 +389,11 @@ class CreateDBParameterGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBProxyCommand extends smithyClient.Command
+class CreateDBProxyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateDBProxy", {})
     .n("RDSClient", "CreateDBProxyCommand")
@@ -403,11 +401,11 @@ class CreateDBProxyCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBProxyEndpointCommand extends smithyClient.Command
+class CreateDBProxyEndpointCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateDBProxyEndpoint", {})
     .n("RDSClient", "CreateDBProxyEndpointCommand")
@@ -415,11 +413,11 @@ class CreateDBProxyEndpointCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBSecurityGroupCommand extends smithyClient.Command
+class CreateDBSecurityGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateDBSecurityGroup", {})
     .n("RDSClient", "CreateDBSecurityGroupCommand")
@@ -427,11 +425,11 @@ class CreateDBSecurityGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBShardGroupCommand extends smithyClient.Command
+class CreateDBShardGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateDBShardGroup", {})
     .n("RDSClient", "CreateDBShardGroupCommand")
@@ -439,11 +437,11 @@ class CreateDBShardGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBSnapshotCommand extends smithyClient.Command
+class CreateDBSnapshotCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateDBSnapshot", {})
     .n("RDSClient", "CreateDBSnapshotCommand")
@@ -451,11 +449,11 @@ class CreateDBSnapshotCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDBSubnetGroupCommand extends smithyClient.Command
+class CreateDBSubnetGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateDBSubnetGroup", {})
     .n("RDSClient", "CreateDBSubnetGroupCommand")
@@ -463,11 +461,11 @@ class CreateDBSubnetGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateEventSubscriptionCommand extends smithyClient.Command
+class CreateEventSubscriptionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateEventSubscription", {})
     .n("RDSClient", "CreateEventSubscriptionCommand")
@@ -475,11 +473,11 @@ class CreateEventSubscriptionCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateGlobalClusterCommand extends smithyClient.Command
+class CreateGlobalClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateGlobalCluster", {})
     .n("RDSClient", "CreateGlobalClusterCommand")
@@ -487,11 +485,11 @@ class CreateGlobalClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateIntegrationCommand extends smithyClient.Command
+class CreateIntegrationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateIntegration", {})
     .n("RDSClient", "CreateIntegrationCommand")
@@ -499,11 +497,11 @@ class CreateIntegrationCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateOptionGroupCommand extends smithyClient.Command
+class CreateOptionGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateOptionGroup", {})
     .n("RDSClient", "CreateOptionGroupCommand")
@@ -511,11 +509,11 @@ class CreateOptionGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateTenantDatabaseCommand extends smithyClient.Command
+class CreateTenantDatabaseCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "CreateTenantDatabase", {})
     .n("RDSClient", "CreateTenantDatabaseCommand")
@@ -523,11 +521,11 @@ class CreateTenantDatabaseCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteBlueGreenDeploymentCommand extends smithyClient.Command
+class DeleteBlueGreenDeploymentCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteBlueGreenDeployment", {})
     .n("RDSClient", "DeleteBlueGreenDeploymentCommand")
@@ -535,11 +533,11 @@ class DeleteBlueGreenDeploymentCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteCustomDBEngineVersionCommand extends smithyClient.Command
+class DeleteCustomDBEngineVersionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteCustomDBEngineVersion", {})
     .n("RDSClient", "DeleteCustomDBEngineVersionCommand")
@@ -547,11 +545,11 @@ class DeleteCustomDBEngineVersionCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBClusterAutomatedBackupCommand extends smithyClient.Command
+class DeleteDBClusterAutomatedBackupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBClusterAutomatedBackup", {})
     .n("RDSClient", "DeleteDBClusterAutomatedBackupCommand")
@@ -559,11 +557,11 @@ class DeleteDBClusterAutomatedBackupCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBClusterCommand extends smithyClient.Command
+class DeleteDBClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBCluster", {})
     .n("RDSClient", "DeleteDBClusterCommand")
@@ -571,11 +569,11 @@ class DeleteDBClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBClusterEndpointCommand extends smithyClient.Command
+class DeleteDBClusterEndpointCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBClusterEndpoint", {})
     .n("RDSClient", "DeleteDBClusterEndpointCommand")
@@ -583,11 +581,11 @@ class DeleteDBClusterEndpointCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBClusterParameterGroupCommand extends smithyClient.Command
+class DeleteDBClusterParameterGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBClusterParameterGroup", {})
     .n("RDSClient", "DeleteDBClusterParameterGroupCommand")
@@ -595,11 +593,11 @@ class DeleteDBClusterParameterGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBClusterSnapshotCommand extends smithyClient.Command
+class DeleteDBClusterSnapshotCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBClusterSnapshot", {})
     .n("RDSClient", "DeleteDBClusterSnapshotCommand")
@@ -607,11 +605,11 @@ class DeleteDBClusterSnapshotCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBInstanceAutomatedBackupCommand extends smithyClient.Command
+class DeleteDBInstanceAutomatedBackupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBInstanceAutomatedBackup", {})
     .n("RDSClient", "DeleteDBInstanceAutomatedBackupCommand")
@@ -619,11 +617,11 @@ class DeleteDBInstanceAutomatedBackupCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBInstanceCommand extends smithyClient.Command
+class DeleteDBInstanceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBInstance", {})
     .n("RDSClient", "DeleteDBInstanceCommand")
@@ -631,11 +629,11 @@ class DeleteDBInstanceCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBParameterGroupCommand extends smithyClient.Command
+class DeleteDBParameterGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBParameterGroup", {})
     .n("RDSClient", "DeleteDBParameterGroupCommand")
@@ -643,11 +641,11 @@ class DeleteDBParameterGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBProxyCommand extends smithyClient.Command
+class DeleteDBProxyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBProxy", {})
     .n("RDSClient", "DeleteDBProxyCommand")
@@ -655,11 +653,11 @@ class DeleteDBProxyCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBProxyEndpointCommand extends smithyClient.Command
+class DeleteDBProxyEndpointCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBProxyEndpoint", {})
     .n("RDSClient", "DeleteDBProxyEndpointCommand")
@@ -667,11 +665,11 @@ class DeleteDBProxyEndpointCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBSecurityGroupCommand extends smithyClient.Command
+class DeleteDBSecurityGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBSecurityGroup", {})
     .n("RDSClient", "DeleteDBSecurityGroupCommand")
@@ -679,11 +677,11 @@ class DeleteDBSecurityGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBShardGroupCommand extends smithyClient.Command
+class DeleteDBShardGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBShardGroup", {})
     .n("RDSClient", "DeleteDBShardGroupCommand")
@@ -691,11 +689,11 @@ class DeleteDBShardGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBSnapshotCommand extends smithyClient.Command
+class DeleteDBSnapshotCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBSnapshot", {})
     .n("RDSClient", "DeleteDBSnapshotCommand")
@@ -703,11 +701,11 @@ class DeleteDBSnapshotCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDBSubnetGroupCommand extends smithyClient.Command
+class DeleteDBSubnetGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteDBSubnetGroup", {})
     .n("RDSClient", "DeleteDBSubnetGroupCommand")
@@ -715,11 +713,11 @@ class DeleteDBSubnetGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteEventSubscriptionCommand extends smithyClient.Command
+class DeleteEventSubscriptionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteEventSubscription", {})
     .n("RDSClient", "DeleteEventSubscriptionCommand")
@@ -727,11 +725,11 @@ class DeleteEventSubscriptionCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteGlobalClusterCommand extends smithyClient.Command
+class DeleteGlobalClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteGlobalCluster", {})
     .n("RDSClient", "DeleteGlobalClusterCommand")
@@ -739,11 +737,11 @@ class DeleteGlobalClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteIntegrationCommand extends smithyClient.Command
+class DeleteIntegrationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteIntegration", {})
     .n("RDSClient", "DeleteIntegrationCommand")
@@ -751,11 +749,11 @@ class DeleteIntegrationCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteOptionGroupCommand extends smithyClient.Command
+class DeleteOptionGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteOptionGroup", {})
     .n("RDSClient", "DeleteOptionGroupCommand")
@@ -763,11 +761,11 @@ class DeleteOptionGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteTenantDatabaseCommand extends smithyClient.Command
+class DeleteTenantDatabaseCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeleteTenantDatabase", {})
     .n("RDSClient", "DeleteTenantDatabaseCommand")
@@ -775,11 +773,11 @@ class DeleteTenantDatabaseCommand extends smithyClient.Command
     .build() {
 }
 
-class DeregisterDBProxyTargetsCommand extends smithyClient.Command
+class DeregisterDBProxyTargetsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DeregisterDBProxyTargets", {})
     .n("RDSClient", "DeregisterDBProxyTargetsCommand")
@@ -787,11 +785,11 @@ class DeregisterDBProxyTargetsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeAccountAttributesCommand extends smithyClient.Command
+class DescribeAccountAttributesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeAccountAttributes", {})
     .n("RDSClient", "DescribeAccountAttributesCommand")
@@ -799,11 +797,11 @@ class DescribeAccountAttributesCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeBlueGreenDeploymentsCommand extends smithyClient.Command
+class DescribeBlueGreenDeploymentsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeBlueGreenDeployments", {})
     .n("RDSClient", "DescribeBlueGreenDeploymentsCommand")
@@ -811,11 +809,11 @@ class DescribeBlueGreenDeploymentsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeCertificatesCommand extends smithyClient.Command
+class DescribeCertificatesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeCertificates", {})
     .n("RDSClient", "DescribeCertificatesCommand")
@@ -823,11 +821,11 @@ class DescribeCertificatesCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBClusterAutomatedBackupsCommand extends smithyClient.Command
+class DescribeDBClusterAutomatedBackupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBClusterAutomatedBackups", {})
     .n("RDSClient", "DescribeDBClusterAutomatedBackupsCommand")
@@ -835,11 +833,11 @@ class DescribeDBClusterAutomatedBackupsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBClusterBacktracksCommand extends smithyClient.Command
+class DescribeDBClusterBacktracksCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBClusterBacktracks", {})
     .n("RDSClient", "DescribeDBClusterBacktracksCommand")
@@ -847,11 +845,11 @@ class DescribeDBClusterBacktracksCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBClusterEndpointsCommand extends smithyClient.Command
+class DescribeDBClusterEndpointsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBClusterEndpoints", {})
     .n("RDSClient", "DescribeDBClusterEndpointsCommand")
@@ -859,11 +857,11 @@ class DescribeDBClusterEndpointsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBClusterParameterGroupsCommand extends smithyClient.Command
+class DescribeDBClusterParameterGroupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBClusterParameterGroups", {})
     .n("RDSClient", "DescribeDBClusterParameterGroupsCommand")
@@ -871,11 +869,11 @@ class DescribeDBClusterParameterGroupsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBClusterParametersCommand extends smithyClient.Command
+class DescribeDBClusterParametersCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBClusterParameters", {})
     .n("RDSClient", "DescribeDBClusterParametersCommand")
@@ -883,11 +881,11 @@ class DescribeDBClusterParametersCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBClustersCommand extends smithyClient.Command
+class DescribeDBClustersCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBClusters", {})
     .n("RDSClient", "DescribeDBClustersCommand")
@@ -895,11 +893,11 @@ class DescribeDBClustersCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBClusterSnapshotAttributesCommand extends smithyClient.Command
+class DescribeDBClusterSnapshotAttributesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBClusterSnapshotAttributes", {})
     .n("RDSClient", "DescribeDBClusterSnapshotAttributesCommand")
@@ -907,11 +905,11 @@ class DescribeDBClusterSnapshotAttributesCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBClusterSnapshotsCommand extends smithyClient.Command
+class DescribeDBClusterSnapshotsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBClusterSnapshots", {})
     .n("RDSClient", "DescribeDBClusterSnapshotsCommand")
@@ -919,11 +917,11 @@ class DescribeDBClusterSnapshotsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBEngineVersionsCommand extends smithyClient.Command
+class DescribeDBEngineVersionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBEngineVersions", {})
     .n("RDSClient", "DescribeDBEngineVersionsCommand")
@@ -931,11 +929,11 @@ class DescribeDBEngineVersionsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBInstanceAutomatedBackupsCommand extends smithyClient.Command
+class DescribeDBInstanceAutomatedBackupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBInstanceAutomatedBackups", {})
     .n("RDSClient", "DescribeDBInstanceAutomatedBackupsCommand")
@@ -943,11 +941,11 @@ class DescribeDBInstanceAutomatedBackupsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBInstancesCommand extends smithyClient.Command
+class DescribeDBInstancesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBInstances", {})
     .n("RDSClient", "DescribeDBInstancesCommand")
@@ -955,11 +953,11 @@ class DescribeDBInstancesCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBLogFilesCommand extends smithyClient.Command
+class DescribeDBLogFilesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBLogFiles", {})
     .n("RDSClient", "DescribeDBLogFilesCommand")
@@ -967,11 +965,11 @@ class DescribeDBLogFilesCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBMajorEngineVersionsCommand extends smithyClient.Command
+class DescribeDBMajorEngineVersionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBMajorEngineVersions", {})
     .n("RDSClient", "DescribeDBMajorEngineVersionsCommand")
@@ -979,11 +977,11 @@ class DescribeDBMajorEngineVersionsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBParameterGroupsCommand extends smithyClient.Command
+class DescribeDBParameterGroupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBParameterGroups", {})
     .n("RDSClient", "DescribeDBParameterGroupsCommand")
@@ -991,11 +989,11 @@ class DescribeDBParameterGroupsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBParametersCommand extends smithyClient.Command
+class DescribeDBParametersCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBParameters", {})
     .n("RDSClient", "DescribeDBParametersCommand")
@@ -1003,11 +1001,11 @@ class DescribeDBParametersCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBProxiesCommand extends smithyClient.Command
+class DescribeDBProxiesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBProxies", {})
     .n("RDSClient", "DescribeDBProxiesCommand")
@@ -1015,11 +1013,11 @@ class DescribeDBProxiesCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBProxyEndpointsCommand extends smithyClient.Command
+class DescribeDBProxyEndpointsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBProxyEndpoints", {})
     .n("RDSClient", "DescribeDBProxyEndpointsCommand")
@@ -1027,11 +1025,11 @@ class DescribeDBProxyEndpointsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBProxyTargetGroupsCommand extends smithyClient.Command
+class DescribeDBProxyTargetGroupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBProxyTargetGroups", {})
     .n("RDSClient", "DescribeDBProxyTargetGroupsCommand")
@@ -1039,11 +1037,11 @@ class DescribeDBProxyTargetGroupsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBProxyTargetsCommand extends smithyClient.Command
+class DescribeDBProxyTargetsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBProxyTargets", {})
     .n("RDSClient", "DescribeDBProxyTargetsCommand")
@@ -1051,11 +1049,11 @@ class DescribeDBProxyTargetsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBRecommendationsCommand extends smithyClient.Command
+class DescribeDBRecommendationsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBRecommendations", {})
     .n("RDSClient", "DescribeDBRecommendationsCommand")
@@ -1063,11 +1061,11 @@ class DescribeDBRecommendationsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBSecurityGroupsCommand extends smithyClient.Command
+class DescribeDBSecurityGroupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBSecurityGroups", {})
     .n("RDSClient", "DescribeDBSecurityGroupsCommand")
@@ -1075,11 +1073,11 @@ class DescribeDBSecurityGroupsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBShardGroupsCommand extends smithyClient.Command
+class DescribeDBShardGroupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBShardGroups", {})
     .n("RDSClient", "DescribeDBShardGroupsCommand")
@@ -1087,11 +1085,11 @@ class DescribeDBShardGroupsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBSnapshotAttributesCommand extends smithyClient.Command
+class DescribeDBSnapshotAttributesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBSnapshotAttributes", {})
     .n("RDSClient", "DescribeDBSnapshotAttributesCommand")
@@ -1099,11 +1097,11 @@ class DescribeDBSnapshotAttributesCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBSnapshotsCommand extends smithyClient.Command
+class DescribeDBSnapshotsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBSnapshots", {})
     .n("RDSClient", "DescribeDBSnapshotsCommand")
@@ -1111,11 +1109,11 @@ class DescribeDBSnapshotsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBSnapshotTenantDatabasesCommand extends smithyClient.Command
+class DescribeDBSnapshotTenantDatabasesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBSnapshotTenantDatabases", {})
     .n("RDSClient", "DescribeDBSnapshotTenantDatabasesCommand")
@@ -1123,11 +1121,11 @@ class DescribeDBSnapshotTenantDatabasesCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeDBSubnetGroupsCommand extends smithyClient.Command
+class DescribeDBSubnetGroupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeDBSubnetGroups", {})
     .n("RDSClient", "DescribeDBSubnetGroupsCommand")
@@ -1135,11 +1133,11 @@ class DescribeDBSubnetGroupsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeEngineDefaultClusterParametersCommand extends smithyClient.Command
+class DescribeEngineDefaultClusterParametersCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeEngineDefaultClusterParameters", {})
     .n("RDSClient", "DescribeEngineDefaultClusterParametersCommand")
@@ -1147,11 +1145,11 @@ class DescribeEngineDefaultClusterParametersCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeEngineDefaultParametersCommand extends smithyClient.Command
+class DescribeEngineDefaultParametersCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeEngineDefaultParameters", {})
     .n("RDSClient", "DescribeEngineDefaultParametersCommand")
@@ -1159,11 +1157,11 @@ class DescribeEngineDefaultParametersCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeEventCategoriesCommand extends smithyClient.Command
+class DescribeEventCategoriesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeEventCategories", {})
     .n("RDSClient", "DescribeEventCategoriesCommand")
@@ -1171,11 +1169,11 @@ class DescribeEventCategoriesCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeEventsCommand extends smithyClient.Command
+class DescribeEventsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeEvents", {})
     .n("RDSClient", "DescribeEventsCommand")
@@ -1183,11 +1181,11 @@ class DescribeEventsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeEventSubscriptionsCommand extends smithyClient.Command
+class DescribeEventSubscriptionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeEventSubscriptions", {})
     .n("RDSClient", "DescribeEventSubscriptionsCommand")
@@ -1195,11 +1193,11 @@ class DescribeEventSubscriptionsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeExportTasksCommand extends smithyClient.Command
+class DescribeExportTasksCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeExportTasks", {})
     .n("RDSClient", "DescribeExportTasksCommand")
@@ -1207,11 +1205,11 @@ class DescribeExportTasksCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeGlobalClustersCommand extends smithyClient.Command
+class DescribeGlobalClustersCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeGlobalClusters", {})
     .n("RDSClient", "DescribeGlobalClustersCommand")
@@ -1219,11 +1217,11 @@ class DescribeGlobalClustersCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeIntegrationsCommand extends smithyClient.Command
+class DescribeIntegrationsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeIntegrations", {})
     .n("RDSClient", "DescribeIntegrationsCommand")
@@ -1231,11 +1229,11 @@ class DescribeIntegrationsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeOptionGroupOptionsCommand extends smithyClient.Command
+class DescribeOptionGroupOptionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeOptionGroupOptions", {})
     .n("RDSClient", "DescribeOptionGroupOptionsCommand")
@@ -1243,11 +1241,11 @@ class DescribeOptionGroupOptionsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeOptionGroupsCommand extends smithyClient.Command
+class DescribeOptionGroupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeOptionGroups", {})
     .n("RDSClient", "DescribeOptionGroupsCommand")
@@ -1255,11 +1253,11 @@ class DescribeOptionGroupsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeOrderableDBInstanceOptionsCommand extends smithyClient.Command
+class DescribeOrderableDBInstanceOptionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeOrderableDBInstanceOptions", {})
     .n("RDSClient", "DescribeOrderableDBInstanceOptionsCommand")
@@ -1267,11 +1265,11 @@ class DescribeOrderableDBInstanceOptionsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribePendingMaintenanceActionsCommand extends smithyClient.Command
+class DescribePendingMaintenanceActionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribePendingMaintenanceActions", {})
     .n("RDSClient", "DescribePendingMaintenanceActionsCommand")
@@ -1279,11 +1277,11 @@ class DescribePendingMaintenanceActionsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeReservedDBInstancesCommand extends smithyClient.Command
+class DescribeReservedDBInstancesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeReservedDBInstances", {})
     .n("RDSClient", "DescribeReservedDBInstancesCommand")
@@ -1291,11 +1289,11 @@ class DescribeReservedDBInstancesCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeReservedDBInstancesOfferingsCommand extends smithyClient.Command
+class DescribeReservedDBInstancesOfferingsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeReservedDBInstancesOfferings", {})
     .n("RDSClient", "DescribeReservedDBInstancesOfferingsCommand")
@@ -1303,11 +1301,11 @@ class DescribeReservedDBInstancesOfferingsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeServerlessV2PlatformVersionsCommand extends smithyClient.Command
+class DescribeServerlessV2PlatformVersionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeServerlessV2PlatformVersions", {})
     .n("RDSClient", "DescribeServerlessV2PlatformVersionsCommand")
@@ -1315,11 +1313,11 @@ class DescribeServerlessV2PlatformVersionsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeSourceRegionsCommand extends smithyClient.Command
+class DescribeSourceRegionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeSourceRegions", {})
     .n("RDSClient", "DescribeSourceRegionsCommand")
@@ -1327,11 +1325,11 @@ class DescribeSourceRegionsCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeTenantDatabasesCommand extends smithyClient.Command
+class DescribeTenantDatabasesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeTenantDatabases", {})
     .n("RDSClient", "DescribeTenantDatabasesCommand")
@@ -1339,11 +1337,11 @@ class DescribeTenantDatabasesCommand extends smithyClient.Command
     .build() {
 }
 
-class DescribeValidDBInstanceModificationsCommand extends smithyClient.Command
+class DescribeValidDBInstanceModificationsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DescribeValidDBInstanceModifications", {})
     .n("RDSClient", "DescribeValidDBInstanceModificationsCommand")
@@ -1351,11 +1349,11 @@ class DescribeValidDBInstanceModificationsCommand extends smithyClient.Command
     .build() {
 }
 
-class DisableHttpEndpointCommand extends smithyClient.Command
+class DisableHttpEndpointCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DisableHttpEndpoint", {})
     .n("RDSClient", "DisableHttpEndpointCommand")
@@ -1363,11 +1361,11 @@ class DisableHttpEndpointCommand extends smithyClient.Command
     .build() {
 }
 
-class DownloadDBLogFilePortionCommand extends smithyClient.Command
+class DownloadDBLogFilePortionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "DownloadDBLogFilePortion", {})
     .n("RDSClient", "DownloadDBLogFilePortionCommand")
@@ -1375,11 +1373,11 @@ class DownloadDBLogFilePortionCommand extends smithyClient.Command
     .build() {
 }
 
-class EnableHttpEndpointCommand extends smithyClient.Command
+class EnableHttpEndpointCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "EnableHttpEndpoint", {})
     .n("RDSClient", "EnableHttpEndpointCommand")
@@ -1387,11 +1385,11 @@ class EnableHttpEndpointCommand extends smithyClient.Command
     .build() {
 }
 
-class FailoverDBClusterCommand extends smithyClient.Command
+class FailoverDBClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "FailoverDBCluster", {})
     .n("RDSClient", "FailoverDBClusterCommand")
@@ -1399,11 +1397,11 @@ class FailoverDBClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class FailoverGlobalClusterCommand extends smithyClient.Command
+class FailoverGlobalClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "FailoverGlobalCluster", {})
     .n("RDSClient", "FailoverGlobalClusterCommand")
@@ -1411,11 +1409,11 @@ class FailoverGlobalClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class ListTagsForResourceCommand extends smithyClient.Command
+class ListTagsForResourceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ListTagsForResource", {})
     .n("RDSClient", "ListTagsForResourceCommand")
@@ -1423,11 +1421,11 @@ class ListTagsForResourceCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyActivityStreamCommand extends smithyClient.Command
+class ModifyActivityStreamCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyActivityStream", {})
     .n("RDSClient", "ModifyActivityStreamCommand")
@@ -1435,11 +1433,11 @@ class ModifyActivityStreamCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyCertificatesCommand extends smithyClient.Command
+class ModifyCertificatesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyCertificates", {})
     .n("RDSClient", "ModifyCertificatesCommand")
@@ -1447,11 +1445,11 @@ class ModifyCertificatesCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyCurrentDBClusterCapacityCommand extends smithyClient.Command
+class ModifyCurrentDBClusterCapacityCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyCurrentDBClusterCapacity", {})
     .n("RDSClient", "ModifyCurrentDBClusterCapacityCommand")
@@ -1459,11 +1457,11 @@ class ModifyCurrentDBClusterCapacityCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyCustomDBEngineVersionCommand extends smithyClient.Command
+class ModifyCustomDBEngineVersionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyCustomDBEngineVersion", {})
     .n("RDSClient", "ModifyCustomDBEngineVersionCommand")
@@ -1471,11 +1469,11 @@ class ModifyCustomDBEngineVersionCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBClusterCommand extends smithyClient.Command
+class ModifyDBClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBCluster", {})
     .n("RDSClient", "ModifyDBClusterCommand")
@@ -1483,11 +1481,11 @@ class ModifyDBClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBClusterEndpointCommand extends smithyClient.Command
+class ModifyDBClusterEndpointCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBClusterEndpoint", {})
     .n("RDSClient", "ModifyDBClusterEndpointCommand")
@@ -1495,11 +1493,11 @@ class ModifyDBClusterEndpointCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBClusterParameterGroupCommand extends smithyClient.Command
+class ModifyDBClusterParameterGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBClusterParameterGroup", {})
     .n("RDSClient", "ModifyDBClusterParameterGroupCommand")
@@ -1507,11 +1505,11 @@ class ModifyDBClusterParameterGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBClusterSnapshotAttributeCommand extends smithyClient.Command
+class ModifyDBClusterSnapshotAttributeCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBClusterSnapshotAttribute", {})
     .n("RDSClient", "ModifyDBClusterSnapshotAttributeCommand")
@@ -1519,11 +1517,11 @@ class ModifyDBClusterSnapshotAttributeCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBInstanceCommand extends smithyClient.Command
+class ModifyDBInstanceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBInstance", {})
     .n("RDSClient", "ModifyDBInstanceCommand")
@@ -1531,11 +1529,11 @@ class ModifyDBInstanceCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBParameterGroupCommand extends smithyClient.Command
+class ModifyDBParameterGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBParameterGroup", {})
     .n("RDSClient", "ModifyDBParameterGroupCommand")
@@ -1543,11 +1541,11 @@ class ModifyDBParameterGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBProxyCommand extends smithyClient.Command
+class ModifyDBProxyCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBProxy", {})
     .n("RDSClient", "ModifyDBProxyCommand")
@@ -1555,11 +1553,11 @@ class ModifyDBProxyCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBProxyEndpointCommand extends smithyClient.Command
+class ModifyDBProxyEndpointCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBProxyEndpoint", {})
     .n("RDSClient", "ModifyDBProxyEndpointCommand")
@@ -1567,11 +1565,11 @@ class ModifyDBProxyEndpointCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBProxyTargetGroupCommand extends smithyClient.Command
+class ModifyDBProxyTargetGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBProxyTargetGroup", {})
     .n("RDSClient", "ModifyDBProxyTargetGroupCommand")
@@ -1579,11 +1577,11 @@ class ModifyDBProxyTargetGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBRecommendationCommand extends smithyClient.Command
+class ModifyDBRecommendationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBRecommendation", {})
     .n("RDSClient", "ModifyDBRecommendationCommand")
@@ -1591,11 +1589,11 @@ class ModifyDBRecommendationCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBShardGroupCommand extends smithyClient.Command
+class ModifyDBShardGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBShardGroup", {})
     .n("RDSClient", "ModifyDBShardGroupCommand")
@@ -1603,11 +1601,11 @@ class ModifyDBShardGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBSnapshotAttributeCommand extends smithyClient.Command
+class ModifyDBSnapshotAttributeCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBSnapshotAttribute", {})
     .n("RDSClient", "ModifyDBSnapshotAttributeCommand")
@@ -1615,11 +1613,11 @@ class ModifyDBSnapshotAttributeCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBSnapshotCommand extends smithyClient.Command
+class ModifyDBSnapshotCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBSnapshot", {})
     .n("RDSClient", "ModifyDBSnapshotCommand")
@@ -1627,11 +1625,11 @@ class ModifyDBSnapshotCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyDBSubnetGroupCommand extends smithyClient.Command
+class ModifyDBSubnetGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyDBSubnetGroup", {})
     .n("RDSClient", "ModifyDBSubnetGroupCommand")
@@ -1639,11 +1637,11 @@ class ModifyDBSubnetGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyEventSubscriptionCommand extends smithyClient.Command
+class ModifyEventSubscriptionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyEventSubscription", {})
     .n("RDSClient", "ModifyEventSubscriptionCommand")
@@ -1651,11 +1649,11 @@ class ModifyEventSubscriptionCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyGlobalClusterCommand extends smithyClient.Command
+class ModifyGlobalClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyGlobalCluster", {})
     .n("RDSClient", "ModifyGlobalClusterCommand")
@@ -1663,11 +1661,11 @@ class ModifyGlobalClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyIntegrationCommand extends smithyClient.Command
+class ModifyIntegrationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyIntegration", {})
     .n("RDSClient", "ModifyIntegrationCommand")
@@ -1675,11 +1673,11 @@ class ModifyIntegrationCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyOptionGroupCommand extends smithyClient.Command
+class ModifyOptionGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyOptionGroup", {})
     .n("RDSClient", "ModifyOptionGroupCommand")
@@ -1687,11 +1685,11 @@ class ModifyOptionGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class ModifyTenantDatabaseCommand extends smithyClient.Command
+class ModifyTenantDatabaseCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ModifyTenantDatabase", {})
     .n("RDSClient", "ModifyTenantDatabaseCommand")
@@ -1699,11 +1697,11 @@ class ModifyTenantDatabaseCommand extends smithyClient.Command
     .build() {
 }
 
-class PromoteReadReplicaCommand extends smithyClient.Command
+class PromoteReadReplicaCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "PromoteReadReplica", {})
     .n("RDSClient", "PromoteReadReplicaCommand")
@@ -1711,11 +1709,11 @@ class PromoteReadReplicaCommand extends smithyClient.Command
     .build() {
 }
 
-class PromoteReadReplicaDBClusterCommand extends smithyClient.Command
+class PromoteReadReplicaDBClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "PromoteReadReplicaDBCluster", {})
     .n("RDSClient", "PromoteReadReplicaDBClusterCommand")
@@ -1723,11 +1721,11 @@ class PromoteReadReplicaDBClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class PurchaseReservedDBInstancesOfferingCommand extends smithyClient.Command
+class PurchaseReservedDBInstancesOfferingCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "PurchaseReservedDBInstancesOffering", {})
     .n("RDSClient", "PurchaseReservedDBInstancesOfferingCommand")
@@ -1735,11 +1733,11 @@ class PurchaseReservedDBInstancesOfferingCommand extends smithyClient.Command
     .build() {
 }
 
-class RebootDBClusterCommand extends smithyClient.Command
+class RebootDBClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RebootDBCluster", {})
     .n("RDSClient", "RebootDBClusterCommand")
@@ -1747,11 +1745,11 @@ class RebootDBClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class RebootDBInstanceCommand extends smithyClient.Command
+class RebootDBInstanceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RebootDBInstance", {})
     .n("RDSClient", "RebootDBInstanceCommand")
@@ -1759,11 +1757,11 @@ class RebootDBInstanceCommand extends smithyClient.Command
     .build() {
 }
 
-class RebootDBShardGroupCommand extends smithyClient.Command
+class RebootDBShardGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RebootDBShardGroup", {})
     .n("RDSClient", "RebootDBShardGroupCommand")
@@ -1771,11 +1769,11 @@ class RebootDBShardGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class RegisterDBProxyTargetsCommand extends smithyClient.Command
+class RegisterDBProxyTargetsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RegisterDBProxyTargets", {})
     .n("RDSClient", "RegisterDBProxyTargetsCommand")
@@ -1783,11 +1781,11 @@ class RegisterDBProxyTargetsCommand extends smithyClient.Command
     .build() {
 }
 
-class RemoveFromGlobalClusterCommand extends smithyClient.Command
+class RemoveFromGlobalClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RemoveFromGlobalCluster", {})
     .n("RDSClient", "RemoveFromGlobalClusterCommand")
@@ -1795,11 +1793,11 @@ class RemoveFromGlobalClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class RemoveRoleFromDBClusterCommand extends smithyClient.Command
+class RemoveRoleFromDBClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RemoveRoleFromDBCluster", {})
     .n("RDSClient", "RemoveRoleFromDBClusterCommand")
@@ -1807,11 +1805,11 @@ class RemoveRoleFromDBClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class RemoveRoleFromDBInstanceCommand extends smithyClient.Command
+class RemoveRoleFromDBInstanceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RemoveRoleFromDBInstance", {})
     .n("RDSClient", "RemoveRoleFromDBInstanceCommand")
@@ -1819,11 +1817,11 @@ class RemoveRoleFromDBInstanceCommand extends smithyClient.Command
     .build() {
 }
 
-class RemoveSourceIdentifierFromSubscriptionCommand extends smithyClient.Command
+class RemoveSourceIdentifierFromSubscriptionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RemoveSourceIdentifierFromSubscription", {})
     .n("RDSClient", "RemoveSourceIdentifierFromSubscriptionCommand")
@@ -1831,11 +1829,11 @@ class RemoveSourceIdentifierFromSubscriptionCommand extends smithyClient.Command
     .build() {
 }
 
-class RemoveTagsFromResourceCommand extends smithyClient.Command
+class RemoveTagsFromResourceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RemoveTagsFromResource", {})
     .n("RDSClient", "RemoveTagsFromResourceCommand")
@@ -1843,11 +1841,11 @@ class RemoveTagsFromResourceCommand extends smithyClient.Command
     .build() {
 }
 
-class ResetDBClusterParameterGroupCommand extends smithyClient.Command
+class ResetDBClusterParameterGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ResetDBClusterParameterGroup", {})
     .n("RDSClient", "ResetDBClusterParameterGroupCommand")
@@ -1855,11 +1853,11 @@ class ResetDBClusterParameterGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class ResetDBParameterGroupCommand extends smithyClient.Command
+class ResetDBParameterGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "ResetDBParameterGroup", {})
     .n("RDSClient", "ResetDBParameterGroupCommand")
@@ -1867,11 +1865,11 @@ class ResetDBParameterGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class RestoreDBClusterFromS3Command extends smithyClient.Command
+class RestoreDBClusterFromS3Command extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RestoreDBClusterFromS3", {})
     .n("RDSClient", "RestoreDBClusterFromS3Command")
@@ -1879,11 +1877,11 @@ class RestoreDBClusterFromS3Command extends smithyClient.Command
     .build() {
 }
 
-class RestoreDBClusterFromSnapshotCommand extends smithyClient.Command
+class RestoreDBClusterFromSnapshotCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RestoreDBClusterFromSnapshot", {})
     .n("RDSClient", "RestoreDBClusterFromSnapshotCommand")
@@ -1891,11 +1889,11 @@ class RestoreDBClusterFromSnapshotCommand extends smithyClient.Command
     .build() {
 }
 
-class RestoreDBClusterToPointInTimeCommand extends smithyClient.Command
+class RestoreDBClusterToPointInTimeCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RestoreDBClusterToPointInTime", {})
     .n("RDSClient", "RestoreDBClusterToPointInTimeCommand")
@@ -1903,11 +1901,11 @@ class RestoreDBClusterToPointInTimeCommand extends smithyClient.Command
     .build() {
 }
 
-class RestoreDBInstanceFromDBSnapshotCommand extends smithyClient.Command
+class RestoreDBInstanceFromDBSnapshotCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RestoreDBInstanceFromDBSnapshot", {})
     .n("RDSClient", "RestoreDBInstanceFromDBSnapshotCommand")
@@ -1915,11 +1913,11 @@ class RestoreDBInstanceFromDBSnapshotCommand extends smithyClient.Command
     .build() {
 }
 
-class RestoreDBInstanceFromS3Command extends smithyClient.Command
+class RestoreDBInstanceFromS3Command extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RestoreDBInstanceFromS3", {})
     .n("RDSClient", "RestoreDBInstanceFromS3Command")
@@ -1927,11 +1925,11 @@ class RestoreDBInstanceFromS3Command extends smithyClient.Command
     .build() {
 }
 
-class RestoreDBInstanceToPointInTimeCommand extends smithyClient.Command
+class RestoreDBInstanceToPointInTimeCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RestoreDBInstanceToPointInTime", {})
     .n("RDSClient", "RestoreDBInstanceToPointInTimeCommand")
@@ -1939,11 +1937,11 @@ class RestoreDBInstanceToPointInTimeCommand extends smithyClient.Command
     .build() {
 }
 
-class RevokeDBSecurityGroupIngressCommand extends smithyClient.Command
+class RevokeDBSecurityGroupIngressCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "RevokeDBSecurityGroupIngress", {})
     .n("RDSClient", "RevokeDBSecurityGroupIngressCommand")
@@ -1951,11 +1949,11 @@ class RevokeDBSecurityGroupIngressCommand extends smithyClient.Command
     .build() {
 }
 
-class StartActivityStreamCommand extends smithyClient.Command
+class StartActivityStreamCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "StartActivityStream", {})
     .n("RDSClient", "StartActivityStreamCommand")
@@ -1963,11 +1961,11 @@ class StartActivityStreamCommand extends smithyClient.Command
     .build() {
 }
 
-class StartDBClusterCommand extends smithyClient.Command
+class StartDBClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "StartDBCluster", {})
     .n("RDSClient", "StartDBClusterCommand")
@@ -1975,12 +1973,12 @@ class StartDBClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class StartDBInstanceAutomatedBackupsReplicationCommand extends smithyClient.Command
+class StartDBInstanceAutomatedBackupsReplicationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
     return [
-        middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
+        endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
         middlewareSdkRds.getCrossRegionPresignedUrlPlugin(config),
     ];
 })
@@ -1990,11 +1988,11 @@ class StartDBInstanceAutomatedBackupsReplicationCommand extends smithyClient.Com
     .build() {
 }
 
-class StartDBInstanceCommand extends smithyClient.Command
+class StartDBInstanceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "StartDBInstance", {})
     .n("RDSClient", "StartDBInstanceCommand")
@@ -2002,11 +2000,11 @@ class StartDBInstanceCommand extends smithyClient.Command
     .build() {
 }
 
-class StartExportTaskCommand extends smithyClient.Command
+class StartExportTaskCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "StartExportTask", {})
     .n("RDSClient", "StartExportTaskCommand")
@@ -2014,11 +2012,11 @@ class StartExportTaskCommand extends smithyClient.Command
     .build() {
 }
 
-class StopActivityStreamCommand extends smithyClient.Command
+class StopActivityStreamCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "StopActivityStream", {})
     .n("RDSClient", "StopActivityStreamCommand")
@@ -2026,11 +2024,11 @@ class StopActivityStreamCommand extends smithyClient.Command
     .build() {
 }
 
-class StopDBClusterCommand extends smithyClient.Command
+class StopDBClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "StopDBCluster", {})
     .n("RDSClient", "StopDBClusterCommand")
@@ -2038,11 +2036,11 @@ class StopDBClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class StopDBInstanceAutomatedBackupsReplicationCommand extends smithyClient.Command
+class StopDBInstanceAutomatedBackupsReplicationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "StopDBInstanceAutomatedBackupsReplication", {})
     .n("RDSClient", "StopDBInstanceAutomatedBackupsReplicationCommand")
@@ -2050,11 +2048,11 @@ class StopDBInstanceAutomatedBackupsReplicationCommand extends smithyClient.Comm
     .build() {
 }
 
-class StopDBInstanceCommand extends smithyClient.Command
+class StopDBInstanceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "StopDBInstance", {})
     .n("RDSClient", "StopDBInstanceCommand")
@@ -2062,11 +2060,11 @@ class StopDBInstanceCommand extends smithyClient.Command
     .build() {
 }
 
-class SwitchoverBlueGreenDeploymentCommand extends smithyClient.Command
+class SwitchoverBlueGreenDeploymentCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "SwitchoverBlueGreenDeployment", {})
     .n("RDSClient", "SwitchoverBlueGreenDeploymentCommand")
@@ -2074,11 +2072,11 @@ class SwitchoverBlueGreenDeploymentCommand extends smithyClient.Command
     .build() {
 }
 
-class SwitchoverGlobalClusterCommand extends smithyClient.Command
+class SwitchoverGlobalClusterCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "SwitchoverGlobalCluster", {})
     .n("RDSClient", "SwitchoverGlobalClusterCommand")
@@ -2086,11 +2084,11 @@ class SwitchoverGlobalClusterCommand extends smithyClient.Command
     .build() {
 }
 
-class SwitchoverReadReplicaCommand extends smithyClient.Command
+class SwitchoverReadReplicaCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonRDSv19", "SwitchoverReadReplica", {})
     .n("RDSClient", "SwitchoverReadReplicaCommand")
@@ -2182,10 +2180,10 @@ const paginateDescribeTenantDatabases = core.createPaginator(RDSClient, Describe
 
 const paginateDownloadDBLogFilePortion = core.createPaginator(RDSClient, DownloadDBLogFilePortionCommand, "Marker", "Marker", "NumberOfLines");
 
-const checkState$9 = async (client, input) => {
+const checkState$9 = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new DescribeDBClustersCommand(input));
+        let result = await client$1.send(new DescribeDBClustersCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
@@ -2200,7 +2198,7 @@ const checkState$9 = async (client, input) => {
                 allStringEq_5 = allStringEq_5 && (element_4 == "available");
             }
             if (allStringEq_5) {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2214,7 +2212,7 @@ const checkState$9 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "deleted") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2229,7 +2227,7 @@ const checkState$9 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "deleting") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2244,7 +2242,7 @@ const checkState$9 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "failed") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2259,7 +2257,7 @@ const checkState$9 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "incompatible-restore") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2274,7 +2272,7 @@ const checkState$9 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "incompatible-parameters") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2283,29 +2281,29 @@ const checkState$9 = async (client, input) => {
     catch (exception) {
         reason = exception;
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForDBClusterAvailable = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$9);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$9);
 };
 const waitUntilDBClusterAvailable = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    const result = await utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$9);
-    return utilWaiter.checkExceptions(result);
+    const result = await client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$9);
+    return client.checkExceptions(result);
 };
 
-const checkState$8 = async (client, input) => {
+const checkState$8 = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new DescribeDBClustersCommand(input));
+        let result = await client$1.send(new DescribeDBClustersCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
                 return (result.DBClusters.length == 0);
             };
             if (returnComparator() == true) {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2319,7 +2317,7 @@ const checkState$8 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "creating") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2334,7 +2332,7 @@ const checkState$8 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "modifying") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2349,7 +2347,7 @@ const checkState$8 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "rebooting") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2364,7 +2362,7 @@ const checkState$8 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "resetting-master-credentials") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2373,25 +2371,25 @@ const checkState$8 = async (client, input) => {
     catch (exception) {
         reason = exception;
         if (exception.name === "DBClusterNotFoundFault") {
-            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 waitForDBClusterDeleted = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$8);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$8);
 };
 const waitUntilDBClusterDeleted = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    const result = await utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$8);
-    return utilWaiter.checkExceptions(result);
+    const result = await client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$8);
+    return client.checkExceptions(result);
 };
 
-const checkState$7 = async (client, input) => {
+const checkState$7 = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new DescribeDBClusterSnapshotsCommand(input));
+        let result = await client$1.send(new DescribeDBClusterSnapshotsCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
@@ -2406,7 +2404,7 @@ const checkState$7 = async (client, input) => {
                 allStringEq_5 = allStringEq_5 && (element_4 == "available");
             }
             if (allStringEq_5) {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2420,7 +2418,7 @@ const checkState$7 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "deleted") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2435,7 +2433,7 @@ const checkState$7 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "deleting") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2450,7 +2448,7 @@ const checkState$7 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "failed") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2465,7 +2463,7 @@ const checkState$7 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "incompatible-restore") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2480,7 +2478,7 @@ const checkState$7 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "incompatible-parameters") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2489,29 +2487,29 @@ const checkState$7 = async (client, input) => {
     catch (exception) {
         reason = exception;
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForDBClusterSnapshotAvailable = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$7);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$7);
 };
 const waitUntilDBClusterSnapshotAvailable = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    const result = await utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$7);
-    return utilWaiter.checkExceptions(result);
+    const result = await client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$7);
+    return client.checkExceptions(result);
 };
 
-const checkState$6 = async (client, input) => {
+const checkState$6 = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new DescribeDBClusterSnapshotsCommand(input));
+        let result = await client$1.send(new DescribeDBClusterSnapshotsCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
                 return (result.DBClusterSnapshots.length == 0);
             };
             if (returnComparator() == true) {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2525,7 +2523,7 @@ const checkState$6 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "creating") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2540,7 +2538,7 @@ const checkState$6 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "modifying") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2555,7 +2553,7 @@ const checkState$6 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "rebooting") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2570,7 +2568,7 @@ const checkState$6 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "resetting-master-credentials") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2579,25 +2577,25 @@ const checkState$6 = async (client, input) => {
     catch (exception) {
         reason = exception;
         if (exception.name === "DBClusterSnapshotNotFoundFault") {
-            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 waitForDBClusterSnapshotDeleted = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$6);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$6);
 };
 const waitUntilDBClusterSnapshotDeleted = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    const result = await utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$6);
-    return utilWaiter.checkExceptions(result);
+    const result = await client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$6);
+    return client.checkExceptions(result);
 };
 
-const checkState$5 = async (client, input) => {
+const checkState$5 = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new DescribeDBInstancesCommand(input));
+        let result = await client$1.send(new DescribeDBInstancesCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
@@ -2612,7 +2610,7 @@ const checkState$5 = async (client, input) => {
                 allStringEq_5 = allStringEq_5 && (element_4 == "available");
             }
             if (allStringEq_5) {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2626,7 +2624,7 @@ const checkState$5 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "deleted") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2641,7 +2639,7 @@ const checkState$5 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "deleting") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2656,7 +2654,7 @@ const checkState$5 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "failed") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2671,7 +2669,7 @@ const checkState$5 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "incompatible-restore") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2686,7 +2684,7 @@ const checkState$5 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "incompatible-parameters") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2695,29 +2693,29 @@ const checkState$5 = async (client, input) => {
     catch (exception) {
         reason = exception;
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForDBInstanceAvailable = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$5);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$5);
 };
 const waitUntilDBInstanceAvailable = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    const result = await utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$5);
-    return utilWaiter.checkExceptions(result);
+    const result = await client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$5);
+    return client.checkExceptions(result);
 };
 
-const checkState$4 = async (client, input) => {
+const checkState$4 = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new DescribeDBInstancesCommand(input));
+        let result = await client$1.send(new DescribeDBInstancesCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
                 return (result.DBInstances.length == 0);
             };
             if (returnComparator() == true) {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2731,7 +2729,7 @@ const checkState$4 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "creating") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2746,7 +2744,7 @@ const checkState$4 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "modifying") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2761,7 +2759,7 @@ const checkState$4 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "rebooting") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2776,7 +2774,7 @@ const checkState$4 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "resetting-master-credentials") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2785,25 +2783,25 @@ const checkState$4 = async (client, input) => {
     catch (exception) {
         reason = exception;
         if (exception.name === "DBInstanceNotFoundFault") {
-            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 waitForDBInstanceDeleted = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$4);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$4);
 };
 const waitUntilDBInstanceDeleted = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    const result = await utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$4);
-    return utilWaiter.checkExceptions(result);
+    const result = await client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$4);
+    return client.checkExceptions(result);
 };
 
-const checkState$3 = async (client, input) => {
+const checkState$3 = async (client$1, input) => {
     let reason;
     try {
-        let result = await client.send(new DescribeDBSnapshotsCommand(input));
+        let result = await client$1.send(new DescribeDBSnapshotsCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
@@ -2818,7 +2816,7 @@ const checkState$3 = async (client, input) => {
                 allStringEq_5 = allStringEq_5 && (element_4 == "available");
             }
             if (allStringEq_5) {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2832,7 +2830,7 @@ const checkState$3 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "deleted") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2847,7 +2845,7 @@ const checkState$3 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "deleting") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2862,7 +2860,7 @@ const checkState$3 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "failed") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2877,7 +2875,7 @@ const checkState$3 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "incompatible-restore") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2892,7 +2890,7 @@ const checkState$3 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "incompatible-parameters") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2901,29 +2899,29 @@ const checkState$3 = async (client, input) => {
     catch (exception) {
         reason = exception;
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForDBSnapshotAvailable = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$3);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$3);
 };
 const waitUntilDBSnapshotAvailable = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    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 DescribeDBSnapshotsCommand(input));
+        let result = await client$1.send(new DescribeDBSnapshotsCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
                 return (result.DBSnapshots.length == 0);
             };
             if (returnComparator() == true) {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -2937,7 +2935,7 @@ const checkState$2 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "creating") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2952,7 +2950,7 @@ const checkState$2 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "modifying") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2967,7 +2965,7 @@ const checkState$2 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "rebooting") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2982,7 +2980,7 @@ const checkState$2 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "resetting-master-credentials") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -2991,25 +2989,25 @@ const checkState$2 = async (client, input) => {
     catch (exception) {
         reason = exception;
         if (exception.name === "DBSnapshotNotFoundFault") {
-            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 waitForDBSnapshotDeleted = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$2);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$2);
 };
 const waitUntilDBSnapshotDeleted = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    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 DescribeTenantDatabasesCommand(input));
+        let result = await client$1.send(new DescribeTenantDatabasesCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
@@ -3024,7 +3022,7 @@ const checkState$1 = async (client, input) => {
                 allStringEq_5 = allStringEq_5 && (element_4 == "available");
             }
             if (allStringEq_5) {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -3038,7 +3036,7 @@ const checkState$1 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "deleted") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -3053,7 +3051,7 @@ const checkState$1 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "incompatible-parameters") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -3068,7 +3066,7 @@ const checkState$1 = async (client, input) => {
             };
             for (let anyStringEq_4 of returnComparator()) {
                 if (anyStringEq_4 == "incompatible-restore") {
-                    return { state: utilWaiter.WaiterState.FAILURE, reason };
+                    return { state: client.WaiterState.FAILURE, reason };
                 }
             }
         }
@@ -3077,29 +3075,29 @@ const checkState$1 = async (client, input) => {
     catch (exception) {
         reason = exception;
     }
-    return { state: utilWaiter.WaiterState.RETRY, reason };
+    return { state: client.WaiterState.RETRY, reason };
 };
 const waitForTenantDatabaseAvailable = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState$1);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState$1);
 };
 const waitUntilTenantDatabaseAvailable = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    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 DescribeTenantDatabasesCommand(input));
+        let result = await client$1.send(new DescribeTenantDatabasesCommand(input));
         reason = result;
         try {
             const returnComparator = () => {
                 return (result.TenantDatabases.length == 0);
             };
             if (returnComparator() == true) {
-                return { state: utilWaiter.WaiterState.SUCCESS, reason };
+                return { state: client.WaiterState.SUCCESS, reason };
             }
         }
         catch (e) { }
@@ -3107,19 +3105,19 @@ const checkState = async (client, input) => {
     catch (exception) {
         reason = exception;
         if (exception.name === "DBInstanceNotFoundFault") {
-            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 waitForTenantDatabaseDeleted = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    return utilWaiter.createWaiter({ ...serviceDefaults, ...params }, input, checkState);
+    return client.createWaiter({ ...serviceDefaults, ...params }, input, checkState);
 };
 const waitUntilTenantDatabaseDeleted = async (params, input) => {
     const serviceDefaults = { minDelay: 30, maxDelay: 1800 };
-    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 = {
@@ -3346,7 +3344,7 @@ const waiters = {
 };
 class RDS extends RDSClient {
 }
-smithyClient.createAggregatedClient(commands, RDS, { paginators, waiters });
+client.createAggregatedClient(commands, RDS, { paginators, waiters });
 
 const ActivityStreamMode = {
     async: "async",
@@ -3551,8 +3549,8 @@ const CustomEngineVersionStatus = {
     inactive_except_restore: "inactive-except-restore",
 };
 
-exports.$Command = smithyClient.Command;
-exports.__Client = smithyClient.Client;
+exports.$Command = client.Command;
+exports.__Client = client.Client;
 exports.RDSServiceException = RDSServiceException.RDSServiceException;
 exports.ActivityStreamMode = ActivityStreamMode;
 exports.ActivityStreamPolicyStatus = ActivityStreamPolicyStatus;