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

fix(middleware-flexible-checksums): use input from args and not middleware config #6677

Merged
merged 4 commits into from
Nov 19, 2024
Merged

fix(middleware-flexible-checksums): use input from args and not middleware config #6677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18dc78e
fix(middleware-flexible-checksums): use input from args and not middl…
trivikr Nov 19, 2024
d3b4d73
chore(codegen): do not pass input in flexible checksums plugin
trivikr Nov 19, 2024
6b5e5ac
chore(client-s3): do not pass input in flexible checksums plugin
trivikr Nov 19, 2024
26f5d82
fix(codegen): remove unused import
trivikr Nov 19, 2024
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
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/DeleteObjectsCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ export class DeleteObjectsCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/GetObjectCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@ export class GetObjectCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestChecksumRequired: false,
requestValidationModeMember: "ChecksumMode",
responseAlgorithms: ["CRC32", "CRC32C", "SHA256", "SHA1"],
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketAccelerateConfigurationCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ export class PutBucketAccelerateConfigurationCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: false,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketAclCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ export class PutBucketAclCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketCorsCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ export class PutBucketCorsCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketEncryptionCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ export class PutBucketEncryptionCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketLifecycleConfigurationCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ export class PutBucketLifecycleConfigurationCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketLoggingCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ export class PutBucketLoggingCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketOwnershipControlsCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ export class PutBucketOwnershipControlsCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestChecksumRequired: true,
}),
];
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketPolicyCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ export class PutBucketPolicyCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketReplicationCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ export class PutBucketReplicationCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketRequestPaymentCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ export class PutBucketRequestPaymentCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketTaggingCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ export class PutBucketTaggingCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketVersioningCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ export class PutBucketVersioningCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutBucketWebsiteCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ export class PutBucketWebsiteCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutObjectAclCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ export class PutObjectAclCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutObjectCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,6 @@ export class PutObjectCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: false,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutObjectLegalHoldCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ export class PutObjectLegalHoldCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutObjectLockConfigurationCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ export class PutObjectLockConfigurationCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutObjectRetentionCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ export class PutObjectRetentionCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutObjectTaggingCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ export class PutObjectTaggingCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/PutPublicAccessBlockCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ export class PutPublicAccessBlockCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: true,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/RestoreObjectCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,6 @@ export class RestoreObjectCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: false,
}),
Expand Down
1 change: 0 additions & 1 deletion clients/client-s3/src/commands/UploadPartCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ export class UploadPartCommand extends $Command
getSerdePlugin(config, this.serialize, this.deserialize),
getEndpointPlugin(config, Command.getEndpointParameterInstructions()),
getFlexibleChecksumsPlugin(config, {
input: this.input,
requestAlgorithmMember: "ChecksumAlgorithm",
requestChecksumRequired: false,
}),
Expand Down
2 changes: 0 additions & 2 deletions ...rc/main/java/software/amazon/smithy/aws/typescript/codegen/AddHttpChecksumDependency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.TreeMap;
import java.util.function.Consumer;
import software.amazon.smithy.aws.traits.HttpChecksumTrait;
import software.amazon.smithy.codegen.core.Symbol;
import software.amazon.smithy.codegen.core.SymbolProvider;
import software.amazon.smithy.model.Model;
import software.amazon.smithy.model.knowledge.TopDownIndex;
Expand Down Expand Up @@ -197,7 +196,6 @@ private static Map<String, Object> getPluginFunctionParams(
OperationShape operation
) {
Map<String, Object> params = new TreeMap<String, Object>();
params.put("input", Symbol.builder().name("this.input").build());

HttpChecksumTrait httpChecksumTrait = operation.expectTrait(HttpChecksumTrait.class);
params.put("requestChecksumRequired", httpChecksumTrait.isRequestChecksumRequired());
Expand Down
4 changes: 2 additions & 2 deletions packages/middleware-flexible-checksums/src/flexibleChecksumsMiddleware.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ describe(flexibleChecksumsMiddleware.name, () => {

const mockInput = {};
const mockConfig = {} as PreviouslyResolved;
const mockMiddlewareConfig = { input: mockInput, requestChecksumRequired: false };
const mockMiddlewareConfig = { requestChecksumRequired: false };

const mockBody = { body: "mockRequestBody" };
const mockHeaders = { "content-length": 100, "content-encoding": "gzip" };
const mockRequest = { body: mockBody, headers: mockHeaders };
const mockArgs = { request: mockRequest } as BuildHandlerArguments<any>;
const mockArgs = { input: mockInput, request: mockRequest } as BuildHandlerArguments<any>;
const mockResult = { response: { body: "mockResponsebody" } };

beforeEach(() => {
Expand Down
8 changes: 2 additions & 6 deletions packages/middleware-flexible-checksums/src/flexibleChecksumsMiddleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ import { stringHasher } from "./stringHasher";

export interface FlexibleChecksumsRequestMiddlewareConfig {
/**
* The input object for the operation.
*/
input: Object;

/**
* Indicates an operation requires a checksum in its HTTP request.
*/
Expand Down Expand Up @@ -57,10 +53,10 @@ export const flexibleChecksumsMiddleware =
return next(args);
}

const { request } = args;
const { request, input } = args;
const { body: requestBody, headers } = request;
const { base64Encoder, streamHasher } = config;
const { input, requestChecksumRequired, requestAlgorithmMember } = middlewareConfig;
const { requestChecksumRequired, requestAlgorithmMember } = middlewareConfig;

const checksumAlgorithm = getChecksumAlgorithmForRequest(
input,
Expand Down
Loading