Skip to content
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

Jump to bottom

chore(middleware-flexible-checksums): call stringHasher from flexibleChecksumsMiddleware #3363

Merged
merged 3 commits into from Apr 15, 2022
Merged

chore(middleware-flexible-checksums): call stringHasher from flexibleChecksumsMiddleware #3363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b34e3e7
chore: call stringHasher from flexibleChecksumsMiddleware
trivikr Feb 24, 2022
a114625
test: call stringHasher from flexibleChecksumsMiddleware
trivikr Feb 24, 2022
ee335ed
test: move mockBase64Encoder to where needed
trivikr Feb 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 15 additions & 9 deletions packages/middleware-flexible-checksums/src/flexibleChecksumsMiddleware.spec.ts
View file
Open in desktop
Expand Up @@ -4,23 +4,23 @@ import { BuildHandlerArguments } from "@aws-sdk/types";
import { PreviouslyResolved } from "./configuration";
import { ChecksumAlgorithm } from "./constants";
import { flexibleChecksumsMiddleware } from "./flexibleChecksumsMiddleware";
import { getChecksum } from "./getChecksum";
import { getChecksumAlgorithmForRequest } from "./getChecksumAlgorithmForRequest";
import { getChecksumLocationName } from "./getChecksumLocationName";
import { FlexibleChecksumsMiddlewareConfig } from "./getFlexibleChecksumsPlugin";
import { hasHeader } from "./hasHeader";
import { isStreaming } from "./isStreaming";
import { selectChecksumAlgorithmFunction } from "./selectChecksumAlgorithmFunction";
import { stringHasher } from "./stringHasher";
import { validateChecksumFromResponse } from "./validateChecksumFromResponse";

jest.mock("@aws-sdk/protocol-http");
jest.mock("./getChecksum");
jest.mock("./getChecksumAlgorithmForRequest");
jest.mock("./getChecksumLocationName");
jest.mock("./hasHeader");
jest.mock("./isStreaming");
jest.mock("./validateChecksumFromResponse");
jest.mock("./selectChecksumAlgorithmFunction");
jest.mock("./stringHasher");
jest.mock("./validateChecksumFromResponse");

describe(flexibleChecksumsMiddleware.name, () => {
const mockNext = jest.fn();
Expand All @@ -43,10 +43,9 @@ describe(flexibleChecksumsMiddleware.name, () => {
mockNext.mockResolvedValueOnce(mockResult);
const { isInstance } = HttpRequest;
(isInstance as unknown as jest.Mock).mockReturnValue(true);
(getChecksum as jest.Mock).mockReturnValue(mockChecksum);
(getChecksumAlgorithmForRequest as jest.Mock).mockReturnValue(ChecksumAlgorithm.MD5);
(getChecksumLocationName as jest.Mock).mockReturnValue(mockChecksumLocationName);
(hasHeader as jest.Mock).mockReturnValue(false);
(hasHeader as jest.Mock).mockReturnValue(true);
(isStreaming as jest.Mock).mockReturnValue(false);
(selectChecksumAlgorithmFunction as jest.Mock).mockReturnValue(mockChecksumAlgorithmFunction);
});
Expand All @@ -68,7 +67,6 @@ describe(flexibleChecksumsMiddleware.name, () => {
describe("request checksum", () => {
afterEach(() => {
expect(getChecksumAlgorithmForRequest).toHaveBeenCalledTimes(1);
expect(getChecksum).not.toHaveBeenCalled();
});

it("if checksumAlgorithm is not defined", async () => {
Expand All @@ -87,7 +85,6 @@ describe(flexibleChecksumsMiddleware.name, () => {
...mockArgs,
request: { ...mockRequest, headers: mockHeadersWithChecksumHeader },
};
(hasHeader as jest.Mock).mockReturnValue(true);
await handler(mockArgsWithChecksumHeader);
expect(getChecksumLocationName).toHaveBeenCalledTimes(1);
expect(selectChecksumAlgorithmFunction).toHaveBeenCalledTimes(1);
Expand Down Expand Up @@ -154,7 +151,15 @@ describe(flexibleChecksumsMiddleware.name, () => {
});

it("for non-streaming body", async () => {
const handler = flexibleChecksumsMiddleware(mockConfig, mockMiddlewareConfig)(mockNext, {});
const mockRawChecksum = Buffer.from(mockChecksum);
const mockBase64Encoder = jest.fn().mockReturnValue(mockChecksum);
(stringHasher as jest.Mock).mockResolvedValue(mockRawChecksum);
(hasHeader as jest.Mock).mockReturnValue(false);

const handler = flexibleChecksumsMiddleware(
{ ...mockConfig, base64Encoder: mockBase64Encoder },
mockMiddlewareConfig
)(mockNext, {});
await handler(mockArgs);
expect(hasHeader).toHaveBeenCalledTimes(1);
expect(mockNext).toHaveBeenCalledWith({
Expand All @@ -165,7 +170,8 @@ describe(flexibleChecksumsMiddleware.name, () => {
},
});
expect(hasHeader).toHaveBeenCalledWith(mockChecksumLocationName, mockHeaders);
expect(getChecksum).toHaveBeenCalledTimes(1);
expect(stringHasher).toHaveBeenCalledWith(mockChecksumAlgorithmFunction, mockRequest.body);
expect(mockBase64Encoder).toHaveBeenCalledWith(mockRawChecksum);
});
});

Expand Down
6 changes: 3 additions & 3 deletions packages/middleware-flexible-checksums/src/flexibleChecksumsMiddleware.ts
View file
Open in desktop
Expand Up @@ -8,13 +8,13 @@ import {
} from "@aws-sdk/types";

import { PreviouslyResolved } from "./configuration";
import { getChecksum } from "./getChecksum";
import { getChecksumAlgorithmForRequest } from "./getChecksumAlgorithmForRequest";
import { getChecksumLocationName } from "./getChecksumLocationName";
import { FlexibleChecksumsMiddlewareConfig } from "./getFlexibleChecksumsPlugin";
import { hasHeader } from "./hasHeader";
import { isStreaming } from "./isStreaming";
import { selectChecksumAlgorithmFunction } from "./selectChecksumAlgorithmFunction";
import { stringHasher } from "./stringHasher";
import { validateChecksumFromResponse } from "./validateChecksumFromResponse";

export const flexibleChecksumsMiddleware =
Expand Down Expand Up @@ -59,10 +59,10 @@ export const flexibleChecksumsMiddleware =
};
delete updatedHeaders["content-length"];
} else if (!hasHeader(checksumLocationName, headers)) {
const checksum = await getChecksum(requestBody, { streamHasher, checksumAlgorithmFn, base64Encoder });
const rawChecksum = await stringHasher(checksumAlgorithmFn, requestBody);
updatedHeaders = {
...headers,
[checksumLocationName]: checksum,
[checksumLocationName]: base64Encoder(rawChecksum),
};
}
}
Expand Down