Skip to content

Commit 635f9b8

Browse files
AllanZhengYPsrchase
authored andcommitted
fix: update updated types (#474)
* Use HttpRequest interface instread of class when implementation is not necessary * Make request serializer async just like response deserializer. This makes the serde symmetric
1 parent 0e6f47c commit 635f9b8

23 files changed

+353
-252
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import {
1010
} from "@aws-sdk/types";
1111
import { HttpRequest } from "@aws-sdk/protocol-http";
1212

13+
const CONTENT_LENGTH_HEADER = "content-length";
14+
1315
export function contentLengthMiddleware(
1416
bodyLengthChecker: BodyLengthCalculator
1517
): BuildMiddleware<any, any> {
@@ -18,21 +20,20 @@ export function contentLengthMiddleware(
1820
): BuildHandler<any, Output> => async (
1921
args: BuildHandlerArguments<any>
2022
): Promise<BuildHandlerOutput<Output>> => {
21-
let request = { ...args.request };
22-
//TODO: cast request with instanceof
23+
let request = args.request;
2324
if (HttpRequest.isInstance(request)) {
2425
const { body, headers } = request;
2526
if (
2627
body &&
2728
Object.keys(headers)
2829
.map(str => str.toLowerCase())
29-
.indexOf("content-length") === -1
30+
.indexOf(CONTENT_LENGTH_HEADER) === -1
3031
) {
3132
const length = bodyLengthChecker(body);
3233
if (length !== undefined) {
3334
request.headers = {
3435
...request.headers,
35-
"Content-Length": String(length)
36+
CONTENT_LENGTH_HEADER: String(length)
3637
};
3738
}
3839
}

packages/middleware-serde/src/serializerMiddleware.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export function serializerMiddleware<
2828
...options,
2929
endpoint: await options.endpoint()
3030
};
31-
const request = serializer(
31+
const request = await serializer(
3232
args.input,
3333
options.protocol,
3434
endpointResolvedOptions

packages/middleware-serde/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"target": "es5",
3+
"target": "es2016",
44
"module": "commonjs",
55
"declaration": true,
66
"strict": true,

packages/node-http-handler/src/server.mock.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { HttpResponse } from "@aws-sdk/types";
1717

1818
const fixturesDir = join(__dirname, "..", "fixtures");
1919

20-
export function createResponseFunction(httpResp: HttpResponse<Readable>) {
20+
export function createResponseFunction(httpResp: HttpResponse) {
2121
return function(request: IncomingMessage, response: ServerResponse) {
2222
response.statusCode = httpResp.statusCode;
2323
for (let name of Object.keys(httpResp.headers)) {
@@ -32,9 +32,7 @@ export function createResponseFunction(httpResp: HttpResponse<Readable>) {
3232
};
3333
}
3434

35-
export function createContinueResponseFunction(
36-
httpResp: HttpResponse<Readable>
37-
) {
35+
export function createContinueResponseFunction(httpResp: HttpResponse) {
3836
return function(request: IncomingMessage, response: ServerResponse) {
3937
response.writeContinue();
4038
setTimeout(() => {

packages/node-http-handler/src/write-request-body.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { HttpRequest } from "@aws-sdk/types";
55

66
export function writeRequestBody(
77
httpRequest: ClientRequest | ClientHttp2Stream,
8-
request: HttpRequest<Readable>
8+
request: HttpRequest
99
) {
1010
const expect = request.headers["Expect"] || request.headers["expect"];
1111
if (expect === "100-continue") {

packages/node-http-handler/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"target": "es5",
3+
"target": "es2017",
44
"module": "commonjs",
55
"declaration": true,
66
"strict": true,

packages/signature-v4/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
},
2727
"devDependencies": {
2828
"@aws-crypto/sha256-js": "^0.1.0-preview.1",
29-
"@aws-sdk/http-serialization": "^0.1.0-preview.7",
3029
"@aws-sdk/util-buffer-from": "^0.1.0-preview.3",
30+
"@aws-sdk/protocol-http": "^0.1.0-preview.1",
3131
"@types/jest": "^24.0.12",
3232
"jest": "^24.7.1",
3333
"typescript": "~3.4.0"

0 commit comments

Comments
 (0)