Skip to content

feat: deserialize with error header #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 2, 2019
Merged

feat: deserialize with error header #385

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af46383
feat: deserialize with error header
Oct 2, 2019
ec7ce7d
fix: swap switch for map
Oct 2, 2019
02fb1f0
fix: await parseBody
Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 86 additions & 44 deletions clients/node/client-rds-data-node/protocol/AwsRestJson1_1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import {
ExecuteStatementRequest,
ExecuteStatementResponse,
Field,
SqlParameter
SqlParameter,
BadRequestException,
StatementTimeoutException,
ForbiddenException,
InternalServerErrorException,
ServiceUnavailableError
} from "../models/rdsdataservice";
import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
import * as __aws_sdk_stream_collector_node from "@aws-sdk/stream-collector-node";
Expand Down Expand Up @@ -83,49 +88,36 @@ export function executeStatementAwsRestJson1_1Deserialize(
function executeStatementAwsRestJson1_1DeserializeError(
output: HttpResponse
): Promise<ExecuteStatementResponse> {
let data = parseBody(output);
if (output.statusCode === 400 && data.dbConnectionId !== undefined) {
return Promise.reject({
__type: "com.amazon.rdsdataservice#StatementTimeoutException",
$name: "StatementTimeoutException",
$fault: "client",
message: data.message,
dbConnectionId: data.dbConnectionId
});
}

if (output.statusCode === 400) {
return Promise.reject({
__type: "com.amazon.rdsdataservice#BadRequestException",
$name: "BadRequestException",
$fault: "client",
message: data.message
});
}

if (output.statusCode === 403) {
return Promise.reject({
__type: "com.amazon.rdsdataservice#ForbiddenException",
$name: "ForbiddenException",
$fault: "client",
message: data.message
});
}

if (output.statusCode === 500) {
return Promise.reject({
__type: "com.amazon.rdsdataservice#InternalServerErrorException",
$name: "InternalServerErrorException",
$fault: "server"
});
}
const data = parseBody(output);

const errorMap: { [index: string]: any } = {
BadRequestException: badRequestExceptionDeserialize(data),
StatementTimeoutException: statementTimeoutExceptionDeserialize(data),
ForbiddenException: forbiddenExceptionDeserialize(data),
InternalServerErrorException: internalServerErrorExceptionDeserialize(data),
ServiceUnavailableError: serviceUnavailableErrorDeserialize(data),
"com.amazon.rdsdataservice#BadRequestException": badRequestExceptionDeserialize(
data
),
"com.amazon.rdsdataservice#StatementTimeoutExceptio": statementTimeoutExceptionDeserialize(
data
),
"com.amazon.rdsdataservice#ForbiddenException": forbiddenExceptionDeserialize(
data
),
"com.amazon.rdsdataservice#InternalServerErrorException": internalServerErrorExceptionDeserialize(
data
),
"com.amazon.rdsdataservice#ServiceUnavailableError": serviceUnavailableErrorDeserialize(
data
)
};

if (output.statusCode === 503) {
return Promise.reject({
__type: "com.amazon.rdsdataservice#ServiceUnavailableError",
$name: "ServiceUnavailableError",
$fault: "server"
});
if ("x-amzn-ErrorType" in output.headers) {
const error = output.headers["x-amzn-ErrorType"];
if (error in errorMap) {
return Promise.reject(errorMap[error]);
}
}

return Promise.reject({
Expand Down Expand Up @@ -290,8 +282,58 @@ function recordsListAwsRestJson1_1Deserialize(input: any): Array<Field> {
return list;
}

function badRequestExceptionDeserialize(input: any): BadRequestException {
return {
__type: "com.amazon.rdsdataservice#BadRequestException",
$name: "BadRequestException",
$fault: "client",
message: input.message
};
}

function statementTimeoutExceptionDeserialize(
input: any
): StatementTimeoutException {
return {
__type: "com.amazon.rdsdataservice#StatementTimeoutException",
$name: "StatementTimeoutException",
$fault: "client",
message: input.message,
dbConnectionId: input.dbConnectionId
};
}

function forbiddenExceptionDeserialize(input: any): ForbiddenException {
return {
__type: "com.amazon.rdsdataservice#ForbiddenException",
$name: "ForbiddenException",
$fault: "client",
message: input.message
};
}

function internalServerErrorExceptionDeserialize(
input: any
): InternalServerErrorException {
return {
__type: "com.amazon.rdsdataservice#InternalServerErrorException",
$name: "InternalServerErrorException",
$fault: "server"
};
}

function serviceUnavailableErrorDeserialize(
input: any
): ServiceUnavailableError {
return {
__type: "com.amazon.rdsdataservice#ServiceUnavailableError",
$name: "ServiceUnavailableError",
$fault: "server"
};
}

function parseBody(streamBody: any): any {
__aws_sdk_stream_collector_node.streamCollector(streamBody).then(body => {
return __aws_sdk_util_utf8_node.toUtf8(body);
return JSON.parse(__aws_sdk_util_utf8_node.toUtf8(body));
});
}