chore: resolve merging conflicts

Author: AllanZhengYP

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

@@ -1,59 +1,116 @@
-import { defaultProvider as credentialDefaultProvider } from "@aws-sdk/credential-provider-node";
-import { Hash } from "@aws-sdk/hash-node";
-import { NodeHttpHandler } from "@aws-sdk/node-http-handler";
-import { defaultProvider as regionDefaultProvider } from "@aws-sdk/region-provider";
-import { parseUrl } from "@aws-sdk/url-parser-node";
-import { calculateBodyLength } from "@aws-sdk/util-body-length-node";
-import { streamCollector } from "@aws-sdk/stream-collector-node";
-import { RestJsonProtocol } from "@aws-sdk/protocol-rest-json";
-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 { 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 { name, version } from "./package.json";
 import {
   Region,
   RegionInput,
   Endpoints,
   EndpointsInput,
   ClientProtocol,
-  ClientProtocolInput,
-  AWSClientRuntimeConfiguration
+  ClientProtocolInput
 } from "@aws-sdk/config-resolver";
+import {
+  Credentials,
+  Provider,
+  HashConstructor,
+  UrlParser,
+  Protocol,
+  StreamCollector,
+  Decoder,
+  Encoder
+} from "@aws-sdk/types";
+import { HttpHandler, HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
+
+export interface RDSDataRuntimeDependencies {
+  /**
+   * The HTTP handler to use. Fetch in browser and Https in Nodejs
+   */
+  httpHandler?: HttpHandler;
+
+  /**
+   * A constructor for a class implementing the @aws-sdk/types.Hash interface that computes the SHA-256 HMAC or checksum of a string or binary buffer
+   */
+  sha256?: HashConstructor;
+
+  /**
+   * Default credentials provider; Not available in browser runtime
+   */
+  credentialDefaultProvider?: (input: any) => Provider<Credentials>;
+
+  /**
+   * Provider function that return promise of a region string
+   */
+  regionDefaultProvider?: (input: any) => Provider<string>;
+
+  /**
+   * The function that will be used to convert strings into HTTP endpoints
+   */
+  urlParser?: UrlParser;
+
+  /**
+   * A function that can calculate the length of a request body.
+   */
+  bodyLengthChecker?: (body: any) => number | undefined;
+
+  /**
+   * A function that converts a stream into an array of bytes.
+   */
+  streamCollector?: StreamCollector;
+
+  /**
+   * The function that will be used to convert a base64-encoded string to a byte array
+   */
+  base64Decoder?: Decoder;
+
+  /**
+   * The function that will be used to convert binary data to a base64-encoded string
+   */
+  base64Encoder?: Encoder;
+
+  /**
+   * The function that will be used to convert a UTF8-encoded string to a byte array
+   */
+  utf8Decoder?: Decoder;
+
+  /**
+   * The function that will be used to convert binary data to a UTF-8 encoded string
+   */
+  utf8Encoder?: Encoder;
+
+  /**
+   * The function that will be used to populate default value in 'User-Agent' header
+   */
+  defaultUserAgent?: string;
+
+  /**
+   * The function that will be used to populate serializing protocol
+   */
+  protocolDefaultProvider?: (
+    handler: HttpHandler
+  ) => Protocol<HttpRequest, HttpResponse>;
+
+  /**
+   * The service name with which to sign requests.
+   */
+  signingName?: string;
+
+  /**
+   * The service name with which to construct endpoints.
+   */
+  service?: string;
+}
 
-export type AWSClientRuntimeResolvedConfiguration = Required<
-  AWSClientRuntimeConfiguration
->;
-
-export const RDSRuntimeConfiguration: AWSClientRuntimeResolvedConfiguration = {
-  protocolDefaultProvider: handler => new RestJsonProtocol(handler),
-  signingName: "rds-data",
-  service: "rds-data",
-  httpHandler: new NodeHttpHandler(),
-  sha256: Hash.bind(null, "sha256"),
-  credentialDefaultProvider,
-  regionDefaultProvider,
-  urlParser: parseUrl,
-  bodyLengthChecker: calculateBodyLength,
-  streamCollector,
-  base64Decoder: fromBase64,
-  base64Encoder: toBase64,
-  utf8Decoder: fromUtf8,
-  utf8Encoder: toUtf8,
-  defaultUserAgent: defaultUserAgent(name, version)
-};
-
-export type RDSDataConfiguration = AWSClientRuntimeConfiguration &
+export type RDSDataConfiguration = RDSDataRuntimeDependencies &
   AwsAuthInput &
   RegionInput &
   RetryInput &
   EndpointsInput &
   ClientProtocolInput &
   UserAgentInput;
 
-export type RDSDataResolvedConfiguration = AWSClientRuntimeResolvedConfiguration &
+export type RDSDataResolvedConfiguration = Required<
+  RDSDataRuntimeDependencies
+> &
   AwsAuth.Resolved &
   Region.Resolved &
   Retry.Resolved &

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

@@ -12,17 +12,13 @@ import {
   RollbackTransactionRequest,
   RollbackTransactionResponse
 } from "./models/index";
-import {
-  Endpoints,
-  ClientProtocol,
-  Region,
-  AWSClientRuntimeConfiguration
-} from "@aws-sdk/config-resolver";
+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 { RDSRuntimeConfiguration } from "./RDSDataConfiguration";
+import { RDSDataRuntimeDependencies } from "./RDSDataConfiguration";
+import { RDSRuntimeConfiguration } from "./runtimeConfig";
 import {
   Client as SmithyClient,
   SmithyConfiguration,
@@ -61,7 +57,7 @@ export type RdsDataServiceResolvedConfig = SmithyResolvedConfiguration<
   Endpoints.Resolved &
   Retry.Resolved &
   UserAgent.Resolved &
-  Required<AWSClientRuntimeConfiguration>;
+  Required<RDSDataRuntimeDependencies>;
 
 export class RdsDataService extends SmithyClient<
   __HttpOptions,

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

@@ -11,9 +11,10 @@ import {
 import { RDSDataResolvedConfiguration } from "../RDSDataConfiguration";
 import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
 import {
-  ExecuteStatementRequest,
-  ExecuteStatementResponse
-} from "../models/index";
+  executeStatementAwsRestJson1_1Serialize,
+  executeStatementAwsRestJson1_1Deserialize
+} from "../protocol/AwsRestJson1_1";
+import { ExecuteStatementRequest, ExecuteStatementResponse } from "../models";
 
 type InputTypesUnion = any;
 type OutputTypesUnion = any;
@@ -35,13 +36,7 @@ export class ExecuteStatementCommand extends Command<
       protocol: { handler }
     } = configuration;
 
-    this.use(
-      serdePlugin(
-        configuration,
-        executeStatementSerializer,
-        executeStatementDeserializer
-      )
-    );
+    this.use(serdePlugin(configuration, this.serialize, this.deserialize));
 
     const stack = clientStack.concat(this.middlewareStack);