@aws-sdk/client-athena 3.1045.0 → 3.1046.0

package/dist-cjs/index.js

@@ -4,17 +4,16 @@ 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 errors = require('./models/errors');
 var AthenaServiceException = require('./models/AthenaServiceException');
@@ -73,12 +72,12 @@ const resolveHttpAuthRuntimeConfig = (config) => {
 };
 
 const resolveRuntimeExtensions = (runtimeConfig, extensions) => {
-    const extensionConfiguration = Object.assign(regionConfigResolver.getAwsRegionExtensionConfiguration(runtimeConfig), smithyClient.getDefaultExtensionConfiguration(runtimeConfig), protocolHttp.getHttpHandlerExtensionConfiguration(runtimeConfig), getHttpAuthExtensionConfiguration(runtimeConfig));
+    const extensionConfiguration = Object.assign(regionConfigResolver.getAwsRegionExtensionConfiguration(runtimeConfig), client.getDefaultExtensionConfiguration(runtimeConfig), protocols.getHttpHandlerExtensionConfiguration(runtimeConfig), getHttpAuthExtensionConfiguration(runtimeConfig));
     extensions.forEach((extension) => extension.configure(extensionConfiguration));
-    return Object.assign(runtimeConfig, regionConfigResolver.resolveAwsRegionExtensionConfiguration(extensionConfiguration), smithyClient.resolveDefaultRuntimeConfig(extensionConfiguration), protocolHttp.resolveHttpHandlerRuntimeConfig(extensionConfiguration), resolveHttpAuthRuntimeConfig(extensionConfiguration));
+    return Object.assign(runtimeConfig, regionConfigResolver.resolveAwsRegionExtensionConfiguration(extensionConfiguration), client.resolveDefaultRuntimeConfig(extensionConfiguration), protocols.resolveHttpHandlerRuntimeConfig(extensionConfiguration), resolveHttpAuthRuntimeConfig(extensionConfiguration));
 };
 
-class AthenaClient extends smithyClient.Client {
+class AthenaClient extends client.Client {
     config;
     constructor(...[configuration]) {
         const _config_0 = runtimeConfig.getRuntimeConfig(configuration || {});
@@ -86,17 +85,17 @@ class AthenaClient 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));
@@ -113,11 +112,11 @@ class AthenaClient extends smithyClient.Client {
     }
 }
 
-class BatchGetNamedQueryCommand extends smithyClient.Command
+class BatchGetNamedQueryCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "BatchGetNamedQuery", {})
     .n("AthenaClient", "BatchGetNamedQueryCommand")
@@ -125,11 +124,11 @@ class BatchGetNamedQueryCommand extends smithyClient.Command
     .build() {
 }
 
-class BatchGetPreparedStatementCommand extends smithyClient.Command
+class BatchGetPreparedStatementCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "BatchGetPreparedStatement", {})
     .n("AthenaClient", "BatchGetPreparedStatementCommand")
@@ -137,11 +136,11 @@ class BatchGetPreparedStatementCommand extends smithyClient.Command
     .build() {
 }
 
-class BatchGetQueryExecutionCommand extends smithyClient.Command
+class BatchGetQueryExecutionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "BatchGetQueryExecution", {})
     .n("AthenaClient", "BatchGetQueryExecutionCommand")
@@ -149,11 +148,11 @@ class BatchGetQueryExecutionCommand extends smithyClient.Command
     .build() {
 }
 
-class CancelCapacityReservationCommand extends smithyClient.Command
+class CancelCapacityReservationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "CancelCapacityReservation", {})
     .n("AthenaClient", "CancelCapacityReservationCommand")
@@ -161,11 +160,11 @@ class CancelCapacityReservationCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateCapacityReservationCommand extends smithyClient.Command
+class CreateCapacityReservationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "CreateCapacityReservation", {})
     .n("AthenaClient", "CreateCapacityReservationCommand")
@@ -173,11 +172,11 @@ class CreateCapacityReservationCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateDataCatalogCommand extends smithyClient.Command
+class CreateDataCatalogCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "CreateDataCatalog", {})
     .n("AthenaClient", "CreateDataCatalogCommand")
@@ -185,11 +184,11 @@ class CreateDataCatalogCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateNamedQueryCommand extends smithyClient.Command
+class CreateNamedQueryCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "CreateNamedQuery", {})
     .n("AthenaClient", "CreateNamedQueryCommand")
@@ -197,11 +196,11 @@ class CreateNamedQueryCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateNotebookCommand extends smithyClient.Command
+class CreateNotebookCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "CreateNotebook", {})
     .n("AthenaClient", "CreateNotebookCommand")
@@ -209,11 +208,11 @@ class CreateNotebookCommand extends smithyClient.Command
     .build() {
 }
 
-class CreatePreparedStatementCommand extends smithyClient.Command
+class CreatePreparedStatementCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "CreatePreparedStatement", {})
     .n("AthenaClient", "CreatePreparedStatementCommand")
@@ -221,11 +220,11 @@ class CreatePreparedStatementCommand extends smithyClient.Command
     .build() {
 }
 
-class CreatePresignedNotebookUrlCommand extends smithyClient.Command
+class CreatePresignedNotebookUrlCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "CreatePresignedNotebookUrl", {})
     .n("AthenaClient", "CreatePresignedNotebookUrlCommand")
@@ -233,11 +232,11 @@ class CreatePresignedNotebookUrlCommand extends smithyClient.Command
     .build() {
 }
 
-class CreateWorkGroupCommand extends smithyClient.Command
+class CreateWorkGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "CreateWorkGroup", {})
     .n("AthenaClient", "CreateWorkGroupCommand")
@@ -245,11 +244,11 @@ class CreateWorkGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteCapacityReservationCommand extends smithyClient.Command
+class DeleteCapacityReservationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "DeleteCapacityReservation", {})
     .n("AthenaClient", "DeleteCapacityReservationCommand")
@@ -257,11 +256,11 @@ class DeleteCapacityReservationCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteDataCatalogCommand extends smithyClient.Command
+class DeleteDataCatalogCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "DeleteDataCatalog", {})
     .n("AthenaClient", "DeleteDataCatalogCommand")
@@ -269,11 +268,11 @@ class DeleteDataCatalogCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteNamedQueryCommand extends smithyClient.Command
+class DeleteNamedQueryCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "DeleteNamedQuery", {})
     .n("AthenaClient", "DeleteNamedQueryCommand")
@@ -281,11 +280,11 @@ class DeleteNamedQueryCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteNotebookCommand extends smithyClient.Command
+class DeleteNotebookCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "DeleteNotebook", {})
     .n("AthenaClient", "DeleteNotebookCommand")
@@ -293,11 +292,11 @@ class DeleteNotebookCommand extends smithyClient.Command
     .build() {
 }
 
-class DeletePreparedStatementCommand extends smithyClient.Command
+class DeletePreparedStatementCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "DeletePreparedStatement", {})
     .n("AthenaClient", "DeletePreparedStatementCommand")
@@ -305,11 +304,11 @@ class DeletePreparedStatementCommand extends smithyClient.Command
     .build() {
 }
 
-class DeleteWorkGroupCommand extends smithyClient.Command
+class DeleteWorkGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "DeleteWorkGroup", {})
     .n("AthenaClient", "DeleteWorkGroupCommand")
@@ -317,11 +316,11 @@ class DeleteWorkGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class ExportNotebookCommand extends smithyClient.Command
+class ExportNotebookCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ExportNotebook", {})
     .n("AthenaClient", "ExportNotebookCommand")
@@ -329,11 +328,11 @@ class ExportNotebookCommand extends smithyClient.Command
     .build() {
 }
 
-class GetCalculationExecutionCodeCommand extends smithyClient.Command
+class GetCalculationExecutionCodeCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetCalculationExecutionCode", {})
     .n("AthenaClient", "GetCalculationExecutionCodeCommand")
@@ -341,11 +340,11 @@ class GetCalculationExecutionCodeCommand extends smithyClient.Command
     .build() {
 }
 
-class GetCalculationExecutionCommand extends smithyClient.Command
+class GetCalculationExecutionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetCalculationExecution", {})
     .n("AthenaClient", "GetCalculationExecutionCommand")
@@ -353,11 +352,11 @@ class GetCalculationExecutionCommand extends smithyClient.Command
     .build() {
 }
 
-class GetCalculationExecutionStatusCommand extends smithyClient.Command
+class GetCalculationExecutionStatusCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetCalculationExecutionStatus", {})
     .n("AthenaClient", "GetCalculationExecutionStatusCommand")
@@ -365,11 +364,11 @@ class GetCalculationExecutionStatusCommand extends smithyClient.Command
     .build() {
 }
 
-class GetCapacityAssignmentConfigurationCommand extends smithyClient.Command
+class GetCapacityAssignmentConfigurationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetCapacityAssignmentConfiguration", {})
     .n("AthenaClient", "GetCapacityAssignmentConfigurationCommand")
@@ -377,11 +376,11 @@ class GetCapacityAssignmentConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetCapacityReservationCommand extends smithyClient.Command
+class GetCapacityReservationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetCapacityReservation", {})
     .n("AthenaClient", "GetCapacityReservationCommand")
@@ -389,11 +388,11 @@ class GetCapacityReservationCommand extends smithyClient.Command
     .build() {
 }
 
-class GetDatabaseCommand extends smithyClient.Command
+class GetDatabaseCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetDatabase", {})
     .n("AthenaClient", "GetDatabaseCommand")
@@ -401,11 +400,11 @@ class GetDatabaseCommand extends smithyClient.Command
     .build() {
 }
 
-class GetDataCatalogCommand extends smithyClient.Command
+class GetDataCatalogCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetDataCatalog", {})
     .n("AthenaClient", "GetDataCatalogCommand")
@@ -413,11 +412,11 @@ class GetDataCatalogCommand extends smithyClient.Command
     .build() {
 }
 
-class GetNamedQueryCommand extends smithyClient.Command
+class GetNamedQueryCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetNamedQuery", {})
     .n("AthenaClient", "GetNamedQueryCommand")
@@ -425,11 +424,11 @@ class GetNamedQueryCommand extends smithyClient.Command
     .build() {
 }
 
-class GetNotebookMetadataCommand extends smithyClient.Command
+class GetNotebookMetadataCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetNotebookMetadata", {})
     .n("AthenaClient", "GetNotebookMetadataCommand")
@@ -437,11 +436,11 @@ class GetNotebookMetadataCommand extends smithyClient.Command
     .build() {
 }
 
-class GetPreparedStatementCommand extends smithyClient.Command
+class GetPreparedStatementCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetPreparedStatement", {})
     .n("AthenaClient", "GetPreparedStatementCommand")
@@ -449,11 +448,11 @@ class GetPreparedStatementCommand extends smithyClient.Command
     .build() {
 }
 
-class GetQueryExecutionCommand extends smithyClient.Command
+class GetQueryExecutionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetQueryExecution", {})
     .n("AthenaClient", "GetQueryExecutionCommand")
@@ -461,11 +460,11 @@ class GetQueryExecutionCommand extends smithyClient.Command
     .build() {
 }
 
-class GetQueryResultsCommand extends smithyClient.Command
+class GetQueryResultsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetQueryResults", {})
     .n("AthenaClient", "GetQueryResultsCommand")
@@ -473,11 +472,11 @@ class GetQueryResultsCommand extends smithyClient.Command
     .build() {
 }
 
-class GetQueryRuntimeStatisticsCommand extends smithyClient.Command
+class GetQueryRuntimeStatisticsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetQueryRuntimeStatistics", {})
     .n("AthenaClient", "GetQueryRuntimeStatisticsCommand")
@@ -485,11 +484,11 @@ class GetQueryRuntimeStatisticsCommand extends smithyClient.Command
     .build() {
 }
 
-class GetResourceDashboardCommand extends smithyClient.Command
+class GetResourceDashboardCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetResourceDashboard", {})
     .n("AthenaClient", "GetResourceDashboardCommand")
@@ -497,11 +496,11 @@ class GetResourceDashboardCommand extends smithyClient.Command
     .build() {
 }
 
-class GetSessionCommand extends smithyClient.Command
+class GetSessionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetSession", {})
     .n("AthenaClient", "GetSessionCommand")
@@ -509,11 +508,11 @@ class GetSessionCommand extends smithyClient.Command
     .build() {
 }
 
-class GetSessionEndpointCommand extends smithyClient.Command
+class GetSessionEndpointCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetSessionEndpoint", {})
     .n("AthenaClient", "GetSessionEndpointCommand")
@@ -521,11 +520,11 @@ class GetSessionEndpointCommand extends smithyClient.Command
     .build() {
 }
 
-class GetSessionStatusCommand extends smithyClient.Command
+class GetSessionStatusCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetSessionStatus", {})
     .n("AthenaClient", "GetSessionStatusCommand")
@@ -533,11 +532,11 @@ class GetSessionStatusCommand extends smithyClient.Command
     .build() {
 }
 
-class GetTableMetadataCommand extends smithyClient.Command
+class GetTableMetadataCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetTableMetadata", {})
     .n("AthenaClient", "GetTableMetadataCommand")
@@ -545,11 +544,11 @@ class GetTableMetadataCommand extends smithyClient.Command
     .build() {
 }
 
-class GetWorkGroupCommand extends smithyClient.Command
+class GetWorkGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "GetWorkGroup", {})
     .n("AthenaClient", "GetWorkGroupCommand")
@@ -557,11 +556,11 @@ class GetWorkGroupCommand extends smithyClient.Command
     .build() {
 }
 
-class ImportNotebookCommand extends smithyClient.Command
+class ImportNotebookCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ImportNotebook", {})
     .n("AthenaClient", "ImportNotebookCommand")
@@ -569,11 +568,11 @@ class ImportNotebookCommand extends smithyClient.Command
     .build() {
 }
 
-class ListApplicationDPUSizesCommand extends smithyClient.Command
+class ListApplicationDPUSizesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListApplicationDPUSizes", {})
     .n("AthenaClient", "ListApplicationDPUSizesCommand")
@@ -581,11 +580,11 @@ class ListApplicationDPUSizesCommand extends smithyClient.Command
     .build() {
 }
 
-class ListCalculationExecutionsCommand extends smithyClient.Command
+class ListCalculationExecutionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListCalculationExecutions", {})
     .n("AthenaClient", "ListCalculationExecutionsCommand")
@@ -593,11 +592,11 @@ class ListCalculationExecutionsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListCapacityReservationsCommand extends smithyClient.Command
+class ListCapacityReservationsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListCapacityReservations", {})
     .n("AthenaClient", "ListCapacityReservationsCommand")
@@ -605,11 +604,11 @@ class ListCapacityReservationsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDatabasesCommand extends smithyClient.Command
+class ListDatabasesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListDatabases", {})
     .n("AthenaClient", "ListDatabasesCommand")
@@ -617,11 +616,11 @@ class ListDatabasesCommand extends smithyClient.Command
     .build() {
 }
 
-class ListDataCatalogsCommand extends smithyClient.Command
+class ListDataCatalogsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListDataCatalogs", {})
     .n("AthenaClient", "ListDataCatalogsCommand")
@@ -629,11 +628,11 @@ class ListDataCatalogsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListEngineVersionsCommand extends smithyClient.Command
+class ListEngineVersionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListEngineVersions", {})
     .n("AthenaClient", "ListEngineVersionsCommand")
@@ -641,11 +640,11 @@ class ListEngineVersionsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListExecutorsCommand extends smithyClient.Command
+class ListExecutorsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListExecutors", {})
     .n("AthenaClient", "ListExecutorsCommand")
@@ -653,11 +652,11 @@ class ListExecutorsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListNamedQueriesCommand extends smithyClient.Command
+class ListNamedQueriesCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListNamedQueries", {})
     .n("AthenaClient", "ListNamedQueriesCommand")
@@ -665,11 +664,11 @@ class ListNamedQueriesCommand extends smithyClient.Command
     .build() {
 }
 
-class ListNotebookMetadataCommand extends smithyClient.Command
+class ListNotebookMetadataCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListNotebookMetadata", {})
     .n("AthenaClient", "ListNotebookMetadataCommand")
@@ -677,11 +676,11 @@ class ListNotebookMetadataCommand extends smithyClient.Command
     .build() {
 }
 
-class ListNotebookSessionsCommand extends smithyClient.Command
+class ListNotebookSessionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListNotebookSessions", {})
     .n("AthenaClient", "ListNotebookSessionsCommand")
@@ -689,11 +688,11 @@ class ListNotebookSessionsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListPreparedStatementsCommand extends smithyClient.Command
+class ListPreparedStatementsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListPreparedStatements", {})
     .n("AthenaClient", "ListPreparedStatementsCommand")
@@ -701,11 +700,11 @@ class ListPreparedStatementsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListQueryExecutionsCommand extends smithyClient.Command
+class ListQueryExecutionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListQueryExecutions", {})
     .n("AthenaClient", "ListQueryExecutionsCommand")
@@ -713,11 +712,11 @@ class ListQueryExecutionsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListSessionsCommand extends smithyClient.Command
+class ListSessionsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListSessions", {})
     .n("AthenaClient", "ListSessionsCommand")
@@ -725,11 +724,11 @@ class ListSessionsCommand extends smithyClient.Command
     .build() {
 }
 
-class ListTableMetadataCommand extends smithyClient.Command
+class ListTableMetadataCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListTableMetadata", {})
     .n("AthenaClient", "ListTableMetadataCommand")
@@ -737,11 +736,11 @@ class ListTableMetadataCommand 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("AmazonAthena", "ListTagsForResource", {})
     .n("AthenaClient", "ListTagsForResourceCommand")
@@ -749,11 +748,11 @@ class ListTagsForResourceCommand extends smithyClient.Command
     .build() {
 }
 
-class ListWorkGroupsCommand extends smithyClient.Command
+class ListWorkGroupsCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "ListWorkGroups", {})
     .n("AthenaClient", "ListWorkGroupsCommand")
@@ -761,11 +760,11 @@ class ListWorkGroupsCommand extends smithyClient.Command
     .build() {
 }
 
-class PutCapacityAssignmentConfigurationCommand extends smithyClient.Command
+class PutCapacityAssignmentConfigurationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "PutCapacityAssignmentConfiguration", {})
     .n("AthenaClient", "PutCapacityAssignmentConfigurationCommand")
@@ -773,11 +772,11 @@ class PutCapacityAssignmentConfigurationCommand extends smithyClient.Command
     .build() {
 }
 
-class StartCalculationExecutionCommand extends smithyClient.Command
+class StartCalculationExecutionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "StartCalculationExecution", {})
     .n("AthenaClient", "StartCalculationExecutionCommand")
@@ -785,11 +784,11 @@ class StartCalculationExecutionCommand extends smithyClient.Command
     .build() {
 }
 
-class StartQueryExecutionCommand extends smithyClient.Command
+class StartQueryExecutionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "StartQueryExecution", {})
     .n("AthenaClient", "StartQueryExecutionCommand")
@@ -797,11 +796,11 @@ class StartQueryExecutionCommand extends smithyClient.Command
     .build() {
 }
 
-class StartSessionCommand extends smithyClient.Command
+class StartSessionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "StartSession", {})
     .n("AthenaClient", "StartSessionCommand")
@@ -809,11 +808,11 @@ class StartSessionCommand extends smithyClient.Command
     .build() {
 }
 
-class StopCalculationExecutionCommand extends smithyClient.Command
+class StopCalculationExecutionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "StopCalculationExecution", {})
     .n("AthenaClient", "StopCalculationExecutionCommand")
@@ -821,11 +820,11 @@ class StopCalculationExecutionCommand extends smithyClient.Command
     .build() {
 }
 
-class StopQueryExecutionCommand extends smithyClient.Command
+class StopQueryExecutionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "StopQueryExecution", {})
     .n("AthenaClient", "StopQueryExecutionCommand")
@@ -833,11 +832,11 @@ class StopQueryExecutionCommand extends smithyClient.Command
     .build() {
 }
 
-class TagResourceCommand extends smithyClient.Command
+class TagResourceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "TagResource", {})
     .n("AthenaClient", "TagResourceCommand")
@@ -845,11 +844,11 @@ class TagResourceCommand extends smithyClient.Command
     .build() {
 }
 
-class TerminateSessionCommand extends smithyClient.Command
+class TerminateSessionCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "TerminateSession", {})
     .n("AthenaClient", "TerminateSessionCommand")
@@ -857,11 +856,11 @@ class TerminateSessionCommand extends smithyClient.Command
     .build() {
 }
 
-class UntagResourceCommand extends smithyClient.Command
+class UntagResourceCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "UntagResource", {})
     .n("AthenaClient", "UntagResourceCommand")
@@ -869,11 +868,11 @@ class UntagResourceCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateCapacityReservationCommand extends smithyClient.Command
+class UpdateCapacityReservationCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "UpdateCapacityReservation", {})
     .n("AthenaClient", "UpdateCapacityReservationCommand")
@@ -881,11 +880,11 @@ class UpdateCapacityReservationCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateDataCatalogCommand extends smithyClient.Command
+class UpdateDataCatalogCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "UpdateDataCatalog", {})
     .n("AthenaClient", "UpdateDataCatalogCommand")
@@ -893,11 +892,11 @@ class UpdateDataCatalogCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateNamedQueryCommand extends smithyClient.Command
+class UpdateNamedQueryCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "UpdateNamedQuery", {})
     .n("AthenaClient", "UpdateNamedQueryCommand")
@@ -905,11 +904,11 @@ class UpdateNamedQueryCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateNotebookCommand extends smithyClient.Command
+class UpdateNotebookCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "UpdateNotebook", {})
     .n("AthenaClient", "UpdateNotebookCommand")
@@ -917,11 +916,11 @@ class UpdateNotebookCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateNotebookMetadataCommand extends smithyClient.Command
+class UpdateNotebookMetadataCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "UpdateNotebookMetadata", {})
     .n("AthenaClient", "UpdateNotebookMetadataCommand")
@@ -929,11 +928,11 @@ class UpdateNotebookMetadataCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdatePreparedStatementCommand extends smithyClient.Command
+class UpdatePreparedStatementCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "UpdatePreparedStatement", {})
     .n("AthenaClient", "UpdatePreparedStatementCommand")
@@ -941,11 +940,11 @@ class UpdatePreparedStatementCommand extends smithyClient.Command
     .build() {
 }
 
-class UpdateWorkGroupCommand extends smithyClient.Command
+class UpdateWorkGroupCommand extends client.Command
     .classBuilder()
     .ep(commonParams)
     .m(function (Command, cs, config, o) {
-    return [middlewareEndpoint.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
+    return [endpoints.getEndpointPlugin(config, Command.getEndpointParameterInstructions())];
 })
     .s("AmazonAthena", "UpdateWorkGroup", {})
     .n("AthenaClient", "UpdateWorkGroupCommand")
@@ -1074,7 +1073,7 @@ const paginators = {
 };
 class Athena extends AthenaClient {
 }
-smithyClient.createAggregatedClient(commands, Athena, { paginators });
+client.createAggregatedClient(commands, Athena, { paginators });
 
 const S3AclOption = {
     BUCKET_OWNER_FULL_CONTROL: "BUCKET_OWNER_FULL_CONTROL",
@@ -1204,8 +1203,8 @@ const ExecutorType = {
     WORKER: "WORKER",
 };
 
-exports.$Command = smithyClient.Command;
-exports.__Client = smithyClient.Client;
+exports.$Command = client.Command;
+exports.__Client = client.Client;
 exports.AthenaServiceException = AthenaServiceException.AthenaServiceException;
 exports.Athena = Athena;
 exports.AthenaClient = AthenaClient;