Skip to content

Commit 1f1d684

Browse files
AllanZhengYPtrivikr
AllanZhengYP
authored and
trivikr
committed
fix: remove duplicated declaration of endpoints (#416)
* fix: remove duplicated declaration of endpoints * fix: rename serializerUtils to serializerContext
1 parent 8be08fc commit 1f1d684

File tree

5 files changed

+62
-61
lines changed

5 files changed

+62
-61
lines changed

Diff for: ‎clients/node/client-rds-data-node/protocol/AwsRestJson1_1.ts

+44-41
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@ import {
1111
ServiceUnavailableError
1212
} from "../models/rdsdataservice";
1313
import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
14-
import { SerializerUtils, DeserializerUtils } from "@aws-sdk/types";
15-
import { ResponseMetadata, Endpoint } from "@aws-sdk/types";
14+
import {
15+
SerializerContext,
16+
DeserializerContext,
17+
ResponseMetadata
18+
} from "@aws-sdk/types";
1619

1720
export function executeStatementAwsRestJson1_1Serialize(
1821
input: ExecuteStatementRequest,
19-
utils: SerializerUtils & { endpoint: Endpoint }
22+
context: SerializerContext
2023
): HttpRequest {
2124
let body: any = {};
2225
if (input.resourceArn !== undefined) {
@@ -42,7 +45,7 @@ export function executeStatementAwsRestJson1_1Serialize(
4245
if (input.parameters !== undefined) {
4346
body.parameters = sqlParameterListAwsRestJson1_1Serialize(
4447
input.parameters,
45-
utils
48+
context
4649
);
4750
}
4851

@@ -59,7 +62,7 @@ export function executeStatementAwsRestJson1_1Serialize(
5962
}
6063

6164
return new HttpRequest({
62-
...utils.endpoint,
65+
...context.endpoint,
6366
body: JSON.stringify(body),
6467
path: "/Execute",
6568
method: "POST",
@@ -72,54 +75,54 @@ export function executeStatementAwsRestJson1_1Serialize(
7275

7376
export async function executeStatementAwsRestJson1_1Deserialize(
7477
output: HttpResponse,
75-
utils: DeserializerUtils
78+
context: DeserializerContext
7679
): Promise<ExecuteStatementResponse> {
7780
if (output.statusCode !== 200) {
78-
return executeStatementAwsRestJson1_1DeserializeError(output, utils);
81+
return executeStatementAwsRestJson1_1DeserializeError(output, context);
7982
}
80-
let data: any = await parseBody(output.body, utils);
83+
let data: any = await parseBody(output.body, context);
8184
return Promise.resolve({
8285
$metadata: deserializeMetadata(output),
8386
__type: "com.amazon.rdsdataservice#ExecuteStatementResponse",
84-
records: recordsAwsRestJson1_1Deserialize(data.records, utils),
87+
records: recordsAwsRestJson1_1Deserialize(data.records, context),
8588
columnMetadata: columnMetadataListAwsRestJson1_1Deserialize(
8689
data.columnMetadata,
87-
utils
90+
context
8891
),
8992
numberOfRecordsUpdated: data.numberOfRecordsUpdated,
9093
generatedFields: generatedFieldsAwsRestJson1_1Deserialize(
9194
data.generatedFields,
92-
utils
95+
context
9396
)
9497
});
9598
}
9699

97100
async function executeStatementAwsRestJson1_1DeserializeError(
98101
output: HttpResponse,
99-
utils: DeserializerUtils
102+
context: DeserializerContext
100103
): Promise<ExecuteStatementResponse> {
101-
let data = await parseBody(output.body, utils);
104+
let data = await parseBody(output.body, context);
102105
let response: any;
103106
switch (output.headers["x-amzn-ErrorType"]) {
104107
case "BadRequestException":
105108
case "com.amazon.rdsdataservice#BadRequestException":
106-
response = badRequestExceptionDeserialize(data, utils);
109+
response = badRequestExceptionDeserialize(data, context);
107110
break;
108111
case "StatementTimeoutException":
109112
case "com.amazon.rdsdataservice#StatementTimeoutException":
110-
response = statementTimeoutExceptionDeserialize(data, utils);
113+
response = statementTimeoutExceptionDeserialize(data, context);
111114
break;
112115
case "ForbiddenException":
113116
case "com.amazon.rdsdataservice#ForbiddenException":
114-
response = forbiddenExceptionDeserialize(data, utils);
117+
response = forbiddenExceptionDeserialize(data, context);
115118
break;
116119
case "InternalServerErrorException":
117120
case "com.amazon.rdsdataservice#InternalServerErrorException":
118-
response = internalServerErrorExceptionDeserialize(data, utils);
121+
response = internalServerErrorExceptionDeserialize(data, context);
119122
break;
120123
case "ServiceUnavailableError":
121124
case "com.amazon.rdsdataservice#ServiceUnavailableError":
122-
response = serviceUnavailableErrorDeserialize(data, utils);
125+
response = serviceUnavailableErrorDeserialize(data, context);
123126
break;
124127
default:
125128
response = {
@@ -134,26 +137,26 @@ async function executeStatementAwsRestJson1_1DeserializeError(
134137

135138
const sqlParameterListAwsRestJson1_1Serialize = (
136139
input: Array<SqlParameter>,
137-
utils: SerializerUtils
140+
context: SerializerContext
138141
): Array<SqlParameter> =>
139142
input &&
140143
input.map(sqlParameter =>
141-
sqlParameterAwsRestJson1_1Serialize(sqlParameter, utils)
144+
sqlParameterAwsRestJson1_1Serialize(sqlParameter, context)
142145
);
143146

144147
const sqlParameterAwsRestJson1_1Serialize = (
145148
input: SqlParameter,
146-
utils: SerializerUtils
149+
context: SerializerContext
147150
): any =>
148151
input.name &&
149152
input.value && {
150153
name: input.name,
151-
value: fieldAwsRestJson1_1Serialize(input.value, utils)
154+
value: fieldAwsRestJson1_1Serialize(input.value, context)
152155
};
153156

154157
const fieldAwsRestJson1_1Serialize = (
155158
input: Field,
156-
utils: SerializerUtils
159+
context: SerializerContext
157160
): any =>
158161
Field.visit(input, {
159162
blobValue: value => {
@@ -187,7 +190,7 @@ const fieldAwsRestJson1_1Serialize = (
187190

188191
export function columnMetadataAwsRestJson1_1Deserialize(
189192
input: any,
190-
utils: DeserializerUtils
193+
context: DeserializerContext
191194
): ColumnMetadata {
192195
let columnMetadata: any = {
193196
$namespace: "com.amazon.rdsdataservice",
@@ -254,16 +257,16 @@ export function columnMetadataAwsRestJson1_1Deserialize(
254257

255258
const columnMetadataListAwsRestJson1_1Deserialize = (
256259
input: any,
257-
utils: DeserializerUtils
260+
context: DeserializerContext
258261
): Array<ColumnMetadata> =>
259262
input &&
260263
input.map((columnMetadata: any) =>
261-
columnMetadataAwsRestJson1_1Deserialize(columnMetadata, utils)
264+
columnMetadataAwsRestJson1_1Deserialize(columnMetadata, context)
262265
);
263266

264267
const fieldAwsRestJson1_1Deserialize = (
265268
input: any,
266-
utils: DeserializerUtils
269+
context: DeserializerContext
267270
): any =>
268271
Field.visit(input, {
269272
blobValue: value => {
@@ -297,30 +300,30 @@ const fieldAwsRestJson1_1Deserialize = (
297300

298301
const generatedFieldsAwsRestJson1_1Deserialize = (
299302
input: any,
300-
utils: DeserializerUtils
303+
context: DeserializerContext
301304
): Array<Field> =>
302305
input &&
303-
input.map((field: any) => fieldAwsRestJson1_1Deserialize(field, utils));
306+
input.map((field: any) => fieldAwsRestJson1_1Deserialize(field, context));
304307

305308
const recordsAwsRestJson1_1Deserialize = (
306309
input: any,
307-
utils: DeserializerUtils
310+
context: DeserializerContext
308311
): Array<Array<Field>> =>
309312
input &&
310313
input.map((recordsList: any) =>
311-
recordsListAwsRestJson1_1Deserialize(recordsList, utils)
314+
recordsListAwsRestJson1_1Deserialize(recordsList, context)
312315
);
313316

314317
const recordsListAwsRestJson1_1Deserialize = (
315318
input: any,
316-
utils: DeserializerUtils
319+
context: DeserializerContext
317320
): Array<Field> =>
318321
input &&
319-
input.map((field: any) => fieldAwsRestJson1_1Deserialize(field, utils));
322+
input.map((field: any) => fieldAwsRestJson1_1Deserialize(field, context));
320323

321324
const badRequestExceptionDeserialize = (
322325
input: any,
323-
utils: DeserializerUtils
326+
context: DeserializerContext
324327
): BadRequestException => ({
325328
__type: "com.amazon.rdsdataservice#BadRequestException",
326329
$name: "BadRequestException",
@@ -330,7 +333,7 @@ const badRequestExceptionDeserialize = (
330333

331334
const statementTimeoutExceptionDeserialize = (
332335
input: any,
333-
utils: DeserializerUtils
336+
context: DeserializerContext
334337
): StatementTimeoutException => ({
335338
__type: "com.amazon.rdsdataservice#StatementTimeoutException",
336339
$name: "StatementTimeoutException",
@@ -341,7 +344,7 @@ const statementTimeoutExceptionDeserialize = (
341344

342345
const forbiddenExceptionDeserialize = (
343346
input: any,
344-
utils: DeserializerUtils
347+
context: DeserializerContext
345348
): ForbiddenException => ({
346349
__type: "com.amazon.rdsdataservice#ForbiddenException",
347350
$name: "ForbiddenException",
@@ -351,7 +354,7 @@ const forbiddenExceptionDeserialize = (
351354

352355
const internalServerErrorExceptionDeserialize = (
353356
input: any,
354-
utils: DeserializerUtils
357+
context: DeserializerContext
355358
): InternalServerErrorException => ({
356359
__type: "com.amazon.rdsdataservice#InternalServerErrorException",
357360
$name: "InternalServerErrorException",
@@ -360,7 +363,7 @@ const internalServerErrorExceptionDeserialize = (
360363

361364
const serviceUnavailableErrorDeserialize = (
362365
input: any,
363-
utils: DeserializerUtils
366+
context: DeserializerContext
364367
): ServiceUnavailableError => ({
365368
__type: "com.amazon.rdsdataservice#ServiceUnavailableError",
366369
$name: "ServiceUnavailableError",
@@ -373,8 +376,8 @@ const deserializeMetadata = (output: HttpResponse): ResponseMetadata => ({
373376
requestId: output.headers["x-amzn-requestid"]
374377
});
375378

376-
const parseBody = (streamBody: any, utils: DeserializerUtils): any => {
377-
return utils.streamCollector(streamBody).then(body => {
378-
return JSON.parse(utils.utf8Encoder(body));
379+
const parseBody = (streamBody: any, context: DeserializerContext): any => {
380+
return context.streamCollector(streamBody).then(body => {
381+
return JSON.parse(context.utf8Encoder(body));
379382
});
380383
};

Diff for: ‎clients/node/client-rds-data-node/protocol/ExecuteStatement.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
2-
import { SerializerUtils, DeserializerUtils } from "@aws-sdk/types";
2+
import { SerializerContext, DeserializerContext } from "@aws-sdk/types";
33
import {
44
ExecuteStatementRequest,
55
ExecuteStatementResponse
@@ -12,7 +12,7 @@ import {
1212
export function executeStatementSerializer(
1313
input: ExecuteStatementRequest,
1414
protocol: string,
15-
utils: SerializerUtils
15+
utils: SerializerContext
1616
): HttpRequest {
1717
switch (protocol) {
1818
case "aws.rest-json-1.1":
@@ -25,7 +25,7 @@ export function executeStatementSerializer(
2525
export async function executeStatementDeserializer(
2626
output: HttpResponse,
2727
protocol: string,
28-
utils: DeserializerUtils
28+
utils: DeserializerContext
2929
): Promise<ExecuteStatementResponse> {
3030
switch (protocol) {
3131
case "aws.rest-json-1.1":

Diff for: ‎packages/protocol-rest-json/src/index.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import {
44
Protocol,
55
TransferHandler,
66
HttpOptions,
7-
SerializerUtils,
8-
DeserializerUtils
7+
SerializerContext,
8+
DeserializerContext
99
} from "@aws-sdk/types";
1010
import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
1111

@@ -20,16 +20,16 @@ export class RestJsonProtocol extends Protocol<
2020
super(handler);
2121
}
2222
serialize(
23-
serializer: RequestSerializer<HttpRequest, SerializerUtils>,
23+
serializer: RequestSerializer<HttpRequest, SerializerContext>,
2424
input: any,
25-
utils: SerializerUtils
25+
utils: SerializerContext
2626
) {
2727
return serializer(input, "aws.rest-json-1.1", utils);
2828
}
2929
deserialize(
30-
deserializer: ResponseDeserializer<HttpResponse, any, DeserializerUtils>,
30+
deserializer: ResponseDeserializer<HttpResponse, any, DeserializerContext>,
3131
output: HttpResponse,
32-
utils: DeserializerUtils
32+
utils: DeserializerContext
3333
) {
3434
return deserializer(output, "aws.rest-json-1.1", utils) as any;
3535
}

Diff for: ‎packages/types/src/deserializer.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ export interface StreamCollector {
1010
}
1111

1212
/**
13-
* Response deserializer utils functions for AWS services
13+
* Function execution context contains util functions for deserializers
1414
*/
15-
export interface DeserializerUtils {
15+
export interface DeserializerContext {
1616
base64Decoder: Decoder;
1717
utf8Encoder: Encoder;
1818
streamCollector: StreamCollector;
@@ -21,7 +21,7 @@ export interface DeserializerUtils {
2121
export interface ResponseDeserializer<
2222
OutputType,
2323
ResponseType = any,
24-
RuntimeUtils = any
24+
Context = any
2525
> {
2626
/**
2727
* Converts the output of an operation into JavaScript types.
@@ -30,10 +30,9 @@ export interface ResponseDeserializer<
3030
* response received
3131
* @param input The HTTP response received from the service
3232
*
33-
* @param utils The runtime-specific util functions. If provided will
34-
* overwrite the provided ones
33+
* @param context context containing runtime-specific util functions.
3534
*/
36-
(output: ResponseType, protocolName: string, utils: RuntimeUtils): Promise<
35+
(output: ResponseType, protocolName: string, context: Context): Promise<
3736
OutputType
3837
>;
3938
}

Diff for: ‎packages/types/src/serializer.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ export interface EndpointBearer {
1111
/**
1212
* Response deserializer util functions for AWS services
1313
*/
14-
export interface SerializerUtils extends EndpointBearer {
14+
export interface SerializerContext extends EndpointBearer {
1515
utf8Decoder: Decoder;
1616
base64Encoder: Encoder;
1717
}
1818

1919
export interface RequestSerializer<
2020
Request,
21-
RuntimeUtils extends EndpointBearer = any
21+
Context extends EndpointBearer = any
2222
> {
2323
/**
2424
* Converts the provided `input` into a request object
@@ -27,8 +27,7 @@ export interface RequestSerializer<
2727
* to. Like `RestJson`, `RestXML`
2828
* @param input The user input to serialize.
2929
*
30-
* @param config The runtime-specific util functions. If provided will
31-
* overwrite the provided ones
30+
* @param context Context containing runtime-specific util functions.
3231
*/
33-
(input: any, transferProtocol: string, utils: RuntimeUtils): Request;
32+
(input: any, transferProtocol: string, context: Context): Request;
3433
}

0 commit comments

Comments
 (0)