Combine serde context (#418)

* feat: combine serde types, cleanup unused imports

* feat: update model location

* feat: change Injectable to Pluggable

Author: Chase Coalwell

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

@@ -1,17 +1,19 @@
 import { Command } from "@aws-sdk/smithy-client";
 import { serdePlugin } from "@aws-sdk/middleware-serde";
-import { HttpOptions, Handler, HandlerExecutionContext } from "@aws-sdk/types";
+import {
+  HttpOptions,
+  Handler,
+  HandlerExecutionContext,
+  FinalizeHandlerArguments,
+  MiddlewareStack
+} from "@aws-sdk/types";
 import { RDSDataResolvedConfiguration } from "../RDSDataConfiguration";
 import { HttpRequest } from "@aws-sdk/protocol-http";
 import {
   executeStatementSerializer,
   executeStatementDeserializer
 } from "../protocol/ExecuteStatement";
-import { FinalizeHandlerArguments, MiddlewareStack } from "@aws-sdk/types";
-import {
-  ExecuteStatementRequest,
-  ExecuteStatementResponse
-} from "../models/rdsdataservice";
+import { ExecuteStatementRequest, ExecuteStatementResponse } from "../models";
 
 type InputTypesUnion = any;
 type OutputTypesUnion = any;

clients/node/client-rds-data-node/models/rdsdataservice/index.ts renamed to clients/node/client-rds-data-node/models/index.ts

@@ -1,4 +1,4 @@
-import * as _smithy from "../../lib/smithy";
+import * as _smithy from "../lib/smithy";
 import { MetadataBearer as $MetadataBearer } from "@aws-sdk/types";
 
 export type ArrayValue =

clients/node/client-rds-data-node/protocol/AwsRestJson1_1.ts

@@ -9,17 +9,13 @@ import {
   ForbiddenException,
   InternalServerErrorException,
   ServiceUnavailableError
-} from "../models/rdsdataservice";
+} from "../models";
 import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
-import {
-  SerializerContext,
-  DeserializerContext,
-  ResponseMetadata
-} from "@aws-sdk/types";
+import { SerdeContext, ResponseMetadata } from "@aws-sdk/types";
 
 export function executeStatementAwsRestJson1_1Serialize(
   input: ExecuteStatementRequest,
-  context: SerializerContext
+  context: SerdeContext
 ): HttpRequest {
   let body: any = {};
   if (input.resourceArn !== undefined) {
@@ -75,7 +71,7 @@ export function executeStatementAwsRestJson1_1Serialize(
 
 export async function executeStatementAwsRestJson1_1Deserialize(
   output: HttpResponse,
-  context: DeserializerContext
+  context: SerdeContext
 ): Promise<ExecuteStatementResponse> {
   if (output.statusCode !== 200) {
     return executeStatementAwsRestJson1_1DeserializeError(output, context);
@@ -99,7 +95,7 @@ export async function executeStatementAwsRestJson1_1Deserialize(
 
 async function executeStatementAwsRestJson1_1DeserializeError(
   output: HttpResponse,
-  context: DeserializerContext
+  context: SerdeContext
 ): Promise<ExecuteStatementResponse> {
   let data = await parseBody(output.body, context);
   let response: any;
@@ -137,7 +133,7 @@ async function executeStatementAwsRestJson1_1DeserializeError(
 
 const sqlParameterListAwsRestJson1_1Serialize = (
   input: Array<SqlParameter>,
-  context: SerializerContext
+  context: SerdeContext
 ): Array<SqlParameter> =>
   input &&
   input.map(sqlParameter =>
@@ -146,7 +142,7 @@ const sqlParameterListAwsRestJson1_1Serialize = (
 
 const sqlParameterAwsRestJson1_1Serialize = (
   input: SqlParameter,
-  context: SerializerContext
+  context: SerdeContext
 ): any =>
   input.name &&
   input.value && {
@@ -156,7 +152,7 @@ const sqlParameterAwsRestJson1_1Serialize = (
 
 const fieldAwsRestJson1_1Serialize = (
   input: Field,
-  context: SerializerContext
+  context: SerdeContext
 ): any =>
   Field.visit(input, {
     blobValue: value => {
@@ -190,7 +186,7 @@ const fieldAwsRestJson1_1Serialize = (
 
 export function columnMetadataAwsRestJson1_1Deserialize(
   input: any,
-  context: DeserializerContext
+  context: SerdeContext
 ): ColumnMetadata {
   let columnMetadata: any = {
     $namespace: "com.amazon.rdsdataservice",
@@ -257,7 +253,7 @@ export function columnMetadataAwsRestJson1_1Deserialize(
 
 const columnMetadataListAwsRestJson1_1Deserialize = (
   input: any,
-  context: DeserializerContext
+  context: SerdeContext
 ): Array<ColumnMetadata> =>
   input &&
   input.map((columnMetadata: any) =>
@@ -266,7 +262,7 @@ const columnMetadataListAwsRestJson1_1Deserialize = (
 
 const fieldAwsRestJson1_1Deserialize = (
   input: any,
-  context: DeserializerContext
+  context: SerdeContext
 ): any =>
   Field.visit(input, {
     blobValue: value => {
@@ -300,14 +296,14 @@ const fieldAwsRestJson1_1Deserialize = (
 
 const generatedFieldsAwsRestJson1_1Deserialize = (
   input: any,
-  context: DeserializerContext
+  context: SerdeContext
 ): Array<Field> =>
   input &&
   input.map((field: any) => fieldAwsRestJson1_1Deserialize(field, context));
 
 const recordsAwsRestJson1_1Deserialize = (
   input: any,
-  context: DeserializerContext
+  context: SerdeContext
 ): Array<Array<Field>> =>
   input &&
   input.map((recordsList: any) =>
@@ -316,14 +312,14 @@ const recordsAwsRestJson1_1Deserialize = (
 
 const recordsListAwsRestJson1_1Deserialize = (
   input: any,
-  context: DeserializerContext
+  context: SerdeContext
 ): Array<Field> =>
   input &&
   input.map((field: any) => fieldAwsRestJson1_1Deserialize(field, context));
 
 const badRequestExceptionDeserialize = (
   input: any,
-  context: DeserializerContext
+  context: SerdeContext
 ): BadRequestException => ({
   __type: "com.amazon.rdsdataservice#BadRequestException",
   $name: "BadRequestException",
@@ -333,7 +329,7 @@ const badRequestExceptionDeserialize = (
 
 const statementTimeoutExceptionDeserialize = (
   input: any,
-  context: DeserializerContext
+  context: SerdeContext
 ): StatementTimeoutException => ({
   __type: "com.amazon.rdsdataservice#StatementTimeoutException",
   $name: "StatementTimeoutException",
@@ -344,7 +340,7 @@ const statementTimeoutExceptionDeserialize = (
 
 const forbiddenExceptionDeserialize = (
   input: any,
-  context: DeserializerContext
+  context: SerdeContext
 ): ForbiddenException => ({
   __type: "com.amazon.rdsdataservice#ForbiddenException",
   $name: "ForbiddenException",
@@ -354,7 +350,7 @@ const forbiddenExceptionDeserialize = (
 
 const internalServerErrorExceptionDeserialize = (
   input: any,
-  context: DeserializerContext
+  context: SerdeContext
 ): InternalServerErrorException => ({
   __type: "com.amazon.rdsdataservice#InternalServerErrorException",
   $name: "InternalServerErrorException",
@@ -363,7 +359,7 @@ const internalServerErrorExceptionDeserialize = (
 
 const serviceUnavailableErrorDeserialize = (
   input: any,
-  context: DeserializerContext
+  context: SerdeContext
 ): ServiceUnavailableError => ({
   __type: "com.amazon.rdsdataservice#ServiceUnavailableError",
   $name: "ServiceUnavailableError",
@@ -376,7 +372,7 @@ const deserializeMetadata = (output: HttpResponse): ResponseMetadata => ({
   requestId: output.headers["x-amzn-requestid"]
 });
 
-const parseBody = (streamBody: any, context: DeserializerContext): any => {
+const parseBody = (streamBody: any, context: SerdeContext): any => {
   return context.streamCollector(streamBody).then(body => {
     return JSON.parse(context.utf8Encoder(body));
   });

clients/node/client-rds-data-node/protocol/ExecuteStatement.ts

@@ -1,9 +1,6 @@
 import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
-import { SerializerContext, DeserializerContext } from "@aws-sdk/types";
-import {
-  ExecuteStatementRequest,
-  ExecuteStatementResponse
-} from "../models/rdsdataservice";
+import { SerdeContext } from "@aws-sdk/types";
+import { ExecuteStatementRequest, ExecuteStatementResponse } from "../models";
 import {
   executeStatementAwsRestJson1_1Serialize,
   executeStatementAwsRestJson1_1Deserialize
@@ -12,7 +9,7 @@ import {
 export function executeStatementSerializer(
   input: ExecuteStatementRequest,
   protocol: string,
-  utils: SerializerContext
+  utils: SerdeContext
 ): HttpRequest {
   switch (protocol) {
     case "aws.rest-json-1.1":
@@ -25,7 +22,7 @@ export function executeStatementSerializer(
 export async function executeStatementDeserializer(
   output: HttpResponse,
   protocol: string,
-  utils: DeserializerContext
+  utils: SerdeContext
 ): Promise<ExecuteStatementResponse> {
   switch (protocol) {
     case "aws.rest-json-1.1":

packages/middleware-content-length/src/index.ts

@@ -5,7 +5,7 @@ import {
   BodyLengthCalculator,
   MetadataBearer,
   BuildHandlerOutput,
-  Injectable
+  Pluggable
 } from "@aws-sdk/types";
 import { HttpRequest } from "@aws-sdk/protocol-http";
 
@@ -46,7 +46,7 @@ export function contentLengthMiddleware(
 
 export const contentLengthPlugin = (options: {
   bodyLengthChecker: BodyLengthCalculator;
-}): Injectable<any, any> => clientStack => {
+}): Pluggable<any, any> => clientStack => {
   clientStack.add(contentLengthMiddleware(options.bodyLengthChecker), {
     step: "build",
     tags: { SET_CONTENT_LENGTH: true }

packages/middleware-serde/src/serdePlugin.ts

@@ -1,12 +1,11 @@
 import {
   RequestSerializer,
   ResponseDeserializer,
-  Injectable,
+  Pluggable,
   Protocol,
   MetadataBearer,
   MiddlewareStack,
-  EndpointBearer,
-  Provider
+  EndpointBearer
 } from "@aws-sdk/types";
 import { deserializerMiddleware } from "./deserializerMiddleware";
 import { serializerMiddleware } from "./serializerMiddleware";
@@ -17,11 +16,11 @@ export function serdePlugin<
   OutputType extends MetadataBearer,
   DeserializerRuntimeUtils
 >(
-  config: PromisifyEndpoint<SerializerRuntimeUtils> &
+  config: SerializerRuntimeUtils &
     DeserializerRuntimeUtils & { protocol: Protocol<any, any> },
   serializer: RequestSerializer<any, SerializerRuntimeUtils>,
   deserializer: ResponseDeserializer<OutputType, any, DeserializerRuntimeUtils>
-): Injectable<InputType, OutputType> {
+): Pluggable<InputType, OutputType> {
   return (commandStack: MiddlewareStack<InputType, OutputType>) => {
     commandStack.add(deserializerMiddleware(config, deserializer), {
       step: "deserialize",
@@ -33,7 +32,3 @@ export function serdePlugin<
     });
   };
 }
-
-export type PromisifyEndpoint<T extends EndpointBearer> = {
-  [K in keyof T]: K extends "endpoint" ? Provider<T[K]> : T[K];
-};

packages/middleware-serde/src/serializerMiddleware.ts

@@ -7,14 +7,13 @@ import {
   Protocol,
   EndpointBearer
 } from "@aws-sdk/types";
-import { PromisifyEndpoint } from "./serdePlugin";
 
 export function serializerMiddleware<
   Input extends object,
   Output extends object,
   RuntimeUtils extends EndpointBearer
 >(
-  options: { protocol: Protocol<any, any> } & PromisifyEndpoint<RuntimeUtils>,
+  options: { protocol: Protocol<any, any> } & RuntimeUtils,
   serializer: RequestSerializer<any, RuntimeUtils>
 ): SerializeMiddleware<Input, Output> {
   return (

packages/middleware-user-agent/src/middleware.ts

@@ -3,7 +3,7 @@ import {
   BuildHandler,
   MetadataBearer,
   BuildHandlerOutput,
-  Injectable
+  Pluggable
 } from "@aws-sdk/types";
 import { HttpRequest } from "@aws-sdk/protocol-http";
 import { UserAgentConfig } from "./configurations";
@@ -36,7 +36,7 @@ export function userAgentMiddleware(options: UserAgentConfig.Resolved) {
 
 export const userAgentPlugin = (
   config: UserAgentConfig.Resolved
-): Injectable<any, any> => clientStack => {
+): Pluggable<any, any> => clientStack => {
   clientStack.add(userAgentMiddleware(config), {
     step: "build",
     tags: { SET_USER_AGENT: true }

packages/protocol-rest-json/src/index.ts

@@ -4,8 +4,7 @@ import {
   Protocol,
   TransferHandler,
   HttpOptions,
-  SerializerContext,
-  DeserializerContext
+  SerdeContext
 } from "@aws-sdk/types";
 import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
 
@@ -20,16 +19,16 @@ export class RestJsonProtocol extends Protocol<
     super(handler);
   }
   serialize(
-    serializer: RequestSerializer<HttpRequest, SerializerContext>,
+    serializer: RequestSerializer<HttpRequest, SerdeContext>,
     input: any,
-    utils: SerializerContext
+    utils: SerdeContext
   ) {
     return serializer(input, "aws.rest-json-1.1", utils);
   }
   deserialize(
-    deserializer: ResponseDeserializer<HttpResponse, any, DeserializerContext>,
+    deserializer: ResponseDeserializer<HttpResponse, any, SerdeContext>,
     output: HttpResponse,
-    utils: DeserializerContext
+    utils: SerdeContext
   ) {
     return deserializer(output, "aws.rest-json-1.1", utils) as any;
   }

packages/retry-middleware/src/retryMiddleware.ts

@@ -3,7 +3,7 @@ import {
   FinalizeHandlerArguments,
   MetadataBearer,
   FinalizeHandlerOutput,
-  Injectable
+  Pluggable
 } from "@aws-sdk/types";
 import { RetryConfig } from "./configurations";
 
@@ -19,7 +19,7 @@ export function retryMiddleware(options: RetryConfig.Resolved) {
 
 export const retryPlugin = (
   options: RetryConfig.Resolved
-): Injectable<any, any> => clientStack => {
+): Pluggable<any, any> => clientStack => {
   if (options.maxRetries > 0) {
     clientStack.add(retryMiddleware(options), {
       step: "finalizeRequest",

packages/signing-middleware/src/middleware.ts

@@ -3,7 +3,7 @@ import {
   FinalizeHandlerArguments,
   FinalizeRequestMiddleware,
   FinalizeHandlerOutput,
-  Injectable
+  Pluggable
 } from "@aws-sdk/types";
 import { AwsAuthConfiguration } from "./configurations";
 import { HttpRequest } from "@aws-sdk/protocol-http";
@@ -27,7 +27,7 @@ export function signingMiddleware<Input extends object, Output extends object>(
 
 export const awsAuthPlugin = (
   options: AwsAuthConfiguration.Resolved
-): Injectable<any, any> => clientStack => {
+): Pluggable<any, any> => clientStack => {
   clientStack.add(signingMiddleware(options), {
     step: "finalizeRequest",
     tags: { SIGNATURE: true }