Skip to content

Commit ac735a0

Browse files
authored
correct s3express codegen check for default checksum (#3157)
1 parent 711cf64 commit ac735a0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/service/s3/ExpressDefaultChecksum.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import software.amazon.smithy.aws.go.codegen.SdkGoTypes;
44
import software.amazon.smithy.aws.traits.HttpChecksumTrait;
5+
import software.amazon.smithy.aws.traits.ServiceTrait;
56
import software.amazon.smithy.go.codegen.GoSettings;
67
import software.amazon.smithy.go.codegen.GoWriter;
78
import software.amazon.smithy.go.codegen.integration.GoIntegration;
@@ -10,6 +11,7 @@
1011
import software.amazon.smithy.model.Model;
1112
import software.amazon.smithy.model.shapes.OperationShape;
1213
import software.amazon.smithy.model.shapes.ServiceShape;
14+
import software.amazon.smithy.model.shapes.ShapeId;
1315
import software.amazon.smithy.utils.ListUtils;
1416

1517
import java.util.List;
@@ -30,12 +32,13 @@ public class ExpressDefaultChecksum implements GoIntegration {
3032
.build();
3133

3234
private static boolean hasRequiredChecksum(Model model, ServiceShape service, OperationShape operation) {
33-
return operation.hasTrait(HttpChecksumTrait.class)
35+
return S3ModelUtils.isServiceS3(model, service)
36+
&& operation.hasTrait(HttpChecksumTrait.class)
3437
&& operation.expectTrait(HttpChecksumTrait.class).isRequestChecksumRequired();
3538
}
3639

3740
private static boolean isCreateMultipartUpload(Model model, ServiceShape service, OperationShape operation) {
38-
return operation.getId().getName().equals("CreateMultipartUpload");
41+
return operation.getId().equals(ShapeId.from("com.amazonaws.s3#CreateMultipartUpload"));
3942
}
4043

4144
@Override
@@ -47,12 +50,10 @@ public byte getOrder() {
4750
public List<RuntimeClientPlugin> getClientPlugins() {
4851
return ListUtils.of(
4952
RuntimeClientPlugin.builder()
50-
.servicePredicate(S3ModelUtils::isServiceS3)
5153
.operationPredicate(ExpressDefaultChecksum::hasRequiredChecksum)
5254
.registerMiddleware(SET_ALGORITHM_MIDDLEWARE)
5355
.build(),
5456
RuntimeClientPlugin.builder()
55-
.servicePredicate(S3ModelUtils::isServiceS3)
5657
.operationPredicate(ExpressDefaultChecksum::isCreateMultipartUpload)
5758
.registerMiddleware(SET_MPU_ALGORITHM_MIDDLEWARE)
5859
.build()

0 commit comments

Comments
 (0)