Change s3 100continue middleware codegen comment, shrink middleware scale to PutObject and UploadPart

Author: Tianyi Wang

aws/signer/internal/v4/headers_test.go

@@ -41,21 +41,21 @@ func TestIgnoredHeaders(t *testing.T) {
 	}{
 		"expect": {
 			Header:        "Expect",
-			ExpectIgnored: false,
+			ExpectIgnored: true,
 		},
 		"authorization": {
 			Header:        "Authorization",
-			ExpectIgnored: false,
+			ExpectIgnored: true,
 		},
 		"X-AMZ header": {
 			Header:        "X-Amz-Content-Sha256",
-			ExpectIgnored: true,
+			ExpectIgnored: false,
 		},
 	}
 
 	for name, c := range cases {
 		t.Run(name, func(t *testing.T) {
-			if e, a := c.ExpectIgnored, IgnoredHeaders.IsValid(c.Header); e != a {
+			if e, a := c.ExpectIgnored, IgnoredHeaders.IsValid(c.Header); e == a {
 				t.Errorf("expect ignored %v, was %v", e, a)
 			}
 		})

codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/S3100Continue.java

@@ -14,7 +14,10 @@
 import software.amazon.smithy.model.traits.HttpTrait;
 import software.amazon.smithy.utils.ListUtils;
 
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Add middleware, which adds {Expect: 100-continue} header for s3 client HTTP PUT request larger than 2MB
@@ -23,8 +26,8 @@
 public class S3100Continue implements GoIntegration {
     private static final String ADD_100Continue_Header = "add100Continue";
     private static final String ADD_100Continue_Header_INTERNAL = "Add100Continue";
-    private static final String ADD_100Continue_Header_Option = "AddContinueOption";
     private static final String Continue_Client_Option = "ContinueHeaderThresholdBytes";
+    private static final Set<String> Put_Op_Set = new HashSet<>(Arrays.asList("PutObject", "UploadPart"));
 
     /**
      * Return true if service is Amazon S3.
@@ -76,8 +79,9 @@ private void writeMiddlewareHelper(GoWriter writer) {
     public List<RuntimeClientPlugin> getClientPlugins() {
         return ListUtils.of(
                 RuntimeClientPlugin.builder()
-                        .operationPredicate((model, service, operation) -> isS3Service(model, service) && operation.
-                                getTrait(HttpTrait.class).get().getMethod().equals("PUT"))
+                        .operationPredicate((model, service, operation) ->
+                                isS3Service(model, service) && Put_Op_Set.contains(operation.getId().getName())
+                        )
                         .registerMiddleware(MiddlewareRegistrar.builder()
                                 .resolvedFunction(SymbolUtils.createValueSymbolBuilder(ADD_100Continue_Header).build())
                                 .useClientOptions()
@@ -92,9 +96,9 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                                     .type(SymbolUtils.createValueSymbolBuilder("int64")
                                             .putProperty(SymbolUtils.GO_UNIVERSE_TYPE, true)
                                             .build())
-                                    .documentation("The threshold ContentLength for HTTP PUT request to receive {Expect: 100-continue} header. " +
-                                            "When set to -1, this header will be opt out of the operation request; when set to 0, the threshold" +
-                                            "will be set to default 2MB")
+                                    .documentation("The threshold ContentLength in bytes for HTTP PUT request to receive {Expect: 100-continue} header. " +
+                                            "Setting to -1 will disable adding the Expect header to requests; setting to 0 will set the threshold " +
+                                            "to default 2MB")
                                     .build()
                         ))
                         .build()