feat: use naming convention instead of namespace

Author: AllanZhengYP

clients/node/client-rds-data-node/RDSDataClient.ts

@@ -12,18 +12,27 @@ import {
   RollbackTransactionRequest,
   RollbackTransactionResponse
 } from "./models/index";
-import { Endpoints, ClientProtocol, Region } from "@aws-sdk/config-resolver";
-import { ContentLength } from "@aws-sdk/middleware-content-length";
-import { UserAgent } from "@aws-sdk/middleware-user-agent";
-import { Retry } from "@aws-sdk/middleware-retry";
-import { AwsAuth } from "@aws-sdk/middleware-signing";
-import { RDSDataRuntimeDependencies } from "./RDSDataConfiguration";
-import { RDSRuntimeConfiguration } from "./runtimeConfig";
 import {
-  Client as SmithyClient,
-  SmithyConfiguration,
-  SmithyResolvedConfiguration
-} from "@aws-sdk/smithy-client";
+  RdsDataServiceConfig,
+  RdsDataServiceResolvedConfig
+} from "./RdsDtataServiceConfiguration";
+import {
+  resolveEndpointsConfig,
+  resolveClientProtocolConfig,
+  resolveRegionConfig
+} from "@aws-sdk/config-resolver";
+import { getContentLengthPlugin } from "@aws-sdk/middleware-content-length";
+import {
+  resolveUserAgentConfig,
+  getUserAgentPlugin
+} from "@aws-sdk/middleware-user-agent";
+import { resolveRetryConfig, getRetryPlugin } from "@aws-sdk/middleware-retry";
+import {
+  resolveAwsAuthConfig,
+  getAwsAuthPlugin
+} from "@aws-sdk/middleware-signing";
+import { RDSRuntimeConfiguration } from "./runtimeConfig";
+import { Client as SmithyClient } from "@aws-sdk/smithy-client";
 import { HttpOptions as __HttpOptions } from "@aws-sdk/types";
 
 export type ServiceInputTypes =
@@ -42,23 +51,6 @@ export type ServiceOutputTypes =
   | ExecuteStatementResponse
   | BatchExecuteStatementResponse;
 
-export type RdsDataServiceConfig = SmithyConfiguration<__HttpOptions> &
-  Region.Input &
-  AwsAuth.Input &
-  Endpoints.Input &
-  Retry.Input &
-  UserAgent.Input;
-
-export type RdsDataServiceResolvedConfig = SmithyResolvedConfiguration<
-  __HttpOptions
-> &
-  Region.Resolved &
-  AwsAuth.Resolved &
-  Endpoints.Resolved &
-  Retry.Resolved &
-  UserAgent.Resolved &
-  Required<RDSDataRuntimeDependencies>;
-
 export class RdsDataService extends SmithyClient<
   __HttpOptions,
   ServiceInputTypes,
@@ -67,21 +59,21 @@ export class RdsDataService extends SmithyClient<
   readonly config: RdsDataServiceResolvedConfig;
 
   constructor(configuration: RdsDataServiceConfig) {
-    const _config_0 = ClientProtocol.resolveConfig({
+    const _config_0 = resolveClientProtocolConfig({
       ...RDSRuntimeConfiguration,
       ...configuration
     });
-    let _config_1 = Region.resolveConfig(_config_0);
-    let _config_2 = AwsAuth.resolveConfig(_config_1);
-    let _config_3 = Endpoints.resolveConfig(_config_2);
-    let _config_4 = Retry.resolveConfig(_config_3);
-    let _config_5 = UserAgent.resolveConfig(_config_4);
+    let _config_1 = resolveRegionConfig(_config_0);
+    let _config_2 = resolveAwsAuthConfig(_config_1);
+    let _config_3 = resolveEndpointsConfig(_config_2);
+    let _config_4 = resolveRetryConfig(_config_3);
+    let _config_5 = resolveUserAgentConfig(_config_4);
     super(_config_5);
     this.config = _config_5;
-    super.use(ContentLength.setMiddleware(this.config));
-    super.use(AwsAuth.setMiddleware(this.config));
-    super.use(Retry.setMiddleware(this.config));
-    super.use(UserAgent.setMiddleware(this.config));
+    this.middlewareStack.use(getContentLengthPlugin(this.config));
+    this.middlewareStack.use(getAwsAuthPlugin(this.config));
+    this.middlewareStack.use(getRetryPlugin(this.config));
+    this.middlewareStack.use(getUserAgentPlugin(this.config));
   }
 
   destroy(): void {}

clients/node/client-rds-data-node/RdsDataServiceClient.ts

@@ -1,13 +1,22 @@
-import { AwsAuth, AwsAuthInput } from "@aws-sdk/middleware-signing";
-import { UserAgent, UserAgentInput } from "@aws-sdk/middleware-user-agent";
-import { Retry, RetryInput } from "@aws-sdk/middleware-retry";
 import {
-  Region,
-  RegionInput,
-  Endpoints,
-  EndpointsInput,
-  ClientProtocol,
-  ClientProtocolInput
+  AwsAuthConfigInput,
+  AwsAuthConfigResolved
+} from "@aws-sdk/middleware-signing";
+import {
+  UserAgentConfigInput,
+  UserAgentConfigResolved
+} from "@aws-sdk/middleware-user-agent";
+import {
+  RetryConfigInput,
+  RetryConfigResolved
+} from "@aws-sdk/middleware-retry";
+import {
+  RegionConfigInput,
+  RegionConfigResolved,
+  EndpointsConfigInput,
+  EndpointsConfigResolved,
+  ClientProtocolConfigInput,
+  ClientProtocolConfigResolved
 } from "@aws-sdk/config-resolver";
 import {
   Credentials,
@@ -100,20 +109,20 @@ export interface RDSDataRuntimeDependencies {
   service?: string;
 }
 
-export type RDSDataConfiguration = RDSDataRuntimeDependencies &
-  AwsAuthInput &
-  RegionInput &
-  RetryInput &
-  EndpointsInput &
-  ClientProtocolInput &
-  UserAgentInput;
+export type RdsDataServiceConfig = RDSDataRuntimeDependencies &
+  AwsAuthConfigInput &
+  RegionConfigInput &
+  RetryConfigInput &
+  EndpointsConfigInput &
+  ClientProtocolConfigInput &
+  UserAgentConfigInput;
 
-export type RDSDataResolvedConfiguration = Required<
+export type RdsDataServiceResolvedConfig = Required<
   RDSDataRuntimeDependencies
 > &
-  AwsAuth.Resolved &
-  Region.Resolved &
-  Retry.Resolved &
-  Endpoints.Resolved &
-  ClientProtocol.Resolved &
-  UserAgent.Resolved;
+  AwsAuthConfigResolved &
+  RegionConfigResolved &
+  RetryConfigResolved &
+  EndpointsConfigResolved &
+  ClientProtocolConfigResolved &
+  UserAgentConfigResolved;

clients/node/client-rds-data-node/RDSDataConfiguration.ts renamed to clients/node/client-rds-data-node/RdsDtataServiceConfiguration.ts

@@ -1,5 +1,5 @@
 import { Command } from "@aws-sdk/smithy-client";
-import { serdePlugin } from "@aws-sdk/middleware-serde";
+import { getSerdePlugin } from "@aws-sdk/middleware-serde";
 import {
   HttpOptions,
   Handler,
@@ -8,7 +8,7 @@ import {
   MiddlewareStack,
   SerdeContext
 } from "@aws-sdk/types";
-import { RDSDataResolvedConfiguration } from "../RDSDataConfiguration";
+import { RdsDataServiceResolvedConfig } from "../RdsDtataServiceConfiguration";
 import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
 import {
   executeStatementAwsRestJson1_1Serialize,
@@ -29,15 +29,15 @@ export class ExecuteStatementCommand extends Command<
 
   resolveMiddleware(
     clientStack: MiddlewareStack<InputTypesUnion, OutputTypesUnion>,
-    configuration: RDSDataResolvedConfiguration,
+    configuration: RdsDataServiceResolvedConfig,
     options?: HttpOptions
   ): Handler<ExecuteStatementRequest, ExecuteStatementResponse> {
     const {
       protocol: { handler }
     } = configuration;
 
     this.middlewareStack.use(
-      serdePlugin(configuration, this.serialize, this.deserialize)
+      getSerdePlugin(configuration, this.serialize, this.deserialize)
     );
 
     const stack = clientStack.concat(this.middlewareStack);

clients/node/client-rds-data-node/commands/ExecuteStatementCommand.ts

@@ -1,3 +1,3 @@
 export * from "./RdsDataServiceClient";
-export * from "./RDSDataConfiguration";
+export * from "./RdsDtataServiceConfiguration";
 export * from "./commands/ExecuteStatementCommand";

clients/node/client-rds-data-node/index.ts

@@ -9,7 +9,7 @@ import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-browser";
 import { fromBase64, toBase64 } from "@aws-sdk/util-base64-browser";
 import { defaultUserAgent } from "@aws-sdk/util-user-agent-browser";
 import { name, version } from "./package.json";
-import { RDSDataRuntimeDependencies } from "./RDSDataConfiguration";
+import { RDSDataRuntimeDependencies } from "./RdsDtataServiceConfiguration";
 
 export const RDSRuntimeConfiguration: Required<RDSDataRuntimeDependencies> = {
   protocolDefaultProvider: handler => new RestJsonProtocol(handler),

clients/node/client-rds-data-node/runtimeConfig.browser.ts

@@ -10,7 +10,7 @@ import { fromUtf8, toUtf8 } from "@aws-sdk/util-utf8-node";
 import { fromBase64, toBase64 } from "@aws-sdk/util-base64-node";
 import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
 import { name, version } from "./package.json";
-import { RDSDataRuntimeDependencies } from "./RDSDataConfiguration";
+import { RDSDataRuntimeDependencies } from "./RdsDtataServiceConfiguration";
 
 export const RDSRuntimeConfiguration: Required<RDSDataRuntimeDependencies> = {
   protocolDefaultProvider: handler => new RestJsonProtocol(handler),

clients/node/client-rds-data-node/runtimeConfig.ts

@@ -14,51 +14,48 @@ export function normalizeEndpoint(
   return endpoint!;
 }
 
-export namespace Endpoints {
-  export interface Input {
-    /**
-     * The fully qualified endpoint of the webservice. This is only required when using a custom endpoint (for example, when using a local version of S3).
-     */
-    endpoint?: string | Endpoint | Provider<Endpoint>;
+export interface EndpointsConfigInput {
+  /**
+   * The fully qualified endpoint of the webservice. This is only required when using a custom endpoint (for example, when using a local version of S3).
+   */
+  endpoint?: string | Endpoint | Provider<Endpoint>;
 
-    /**
-     * The endpoint provider to call if no endpoint is provided
-     */
-    endpointProvider?: any;
+  /**
+   * The endpoint provider to call if no endpoint is provided
+   */
+  endpointProvider?: any;
 
-    /**
-     * Whether TLS is enabled for requests.
-     */
-    tls?: boolean;
-  }
-  interface PreviouslyResolved {
-    urlParser: UrlParser;
-    region: Provider<string>;
-    service: string;
-  }
-  export interface Resolved extends Required<Input> {
-    endpoint: Provider<Endpoint>;
-  }
-  export function resolveConfig<T>(
-    input: T & Input & PreviouslyResolved
-  ): T & Resolved {
-    const tls = input.tls || true;
-    const defaultProvider = (tls: boolean, region: string) => ({
-      protocol: tls ? "https:" : "http:",
-      path: "/",
-      hostname: `${input.service}.${region}.amazonaws.com`
-    });
-    const endpointProvider = input.endpointProvider || defaultProvider;
-    let endpoint: Provider<Endpoint> = input.endpoint
-      ? normalizeEndpoint(input.endpoint, input.urlParser)
-      : () => input.region().then(region => endpointProvider(tls, region));
-    return {
-      ...input,
-      endpointProvider,
-      endpoint,
-      tls
-    };
-  }
+  /**
+   * Whether TLS is enabled for requests.
+   */
+  tls?: boolean;
+}
+interface PreviouslyResolved {
+  urlParser: UrlParser;
+  region: Provider<string>;
+  service: string;
+}
+export interface EndpointsConfigResolved
+  extends Required<EndpointsConfigInput> {
+  endpoint: Provider<Endpoint>;
+}
+export function resolveEndpointsConfig<T>(
+  input: T & EndpointsConfigInput & PreviouslyResolved
+): T & EndpointsConfigResolved {
+  const tls = input.tls || true;
+  const defaultProvider = (tls: boolean, region: string) => ({
+    protocol: tls ? "https:" : "http:",
+    path: "/",
+    hostname: `${input.service}.${region}.amazonaws.com`
+  });
+  const endpointProvider = input.endpointProvider || defaultProvider;
+  let endpoint: Provider<Endpoint> = input.endpoint
+    ? normalizeEndpoint(input.endpoint, input.urlParser)
+    : () => input.region().then(region => endpointProvider(tls, region));
+  return {
+    ...input,
+    endpointProvider,
+    endpoint,
+    tls
+  };
 }
-//export separately for showing comment block in Intellisense
-export type EndpointsInput = Endpoints.Input;