Feat: update and apply S3 middleware (#478)

* feat: migrate s3 middleware

* feat: apply validate-bucket-name plugin

Author: Chase Coalwell

codegen/config/checkstyle/suppressions.xml

@@ -19,5 +19,5 @@
         "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 <suppressions>
     <suppress checks="TypeName"
-              files="/Aws.*\d_\d.java$"/>
+              files="AwsRestJson1_1.java|AwsRestJson1_0.java"/>
 </suppressions>

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java

@@ -56,7 +56,12 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                 RuntimeClientPlugin.builder()
                         .withConventions("@aws-sdk/middleware-sdk-api-gateway", "^0.1.0-preview.5",
                                         "AcceptsHeader", HAS_MIDDLEWARE)
-                        .servicePredicate((m, s) -> s.getId().getName().equals("BackplaneControlService"))
+                        .servicePredicate((m,s) -> s.getId().getName().equals("BackplaneControlService"))
+                        .build(),
+                RuntimeClientPlugin.builder()
+                        .withConventions("@aws-sdk/middleware-sdk-s3", "^0.1.0-preview.2",
+                                        "validateBucketNameMiddleware", HAS_MIDDLEWARE)
+                        .servicePredicate((m,s) -> s.getId().getName().equals("AmazonS3"))
                         .build()
         );
     }

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddProtocols.java

@@ -27,7 +27,6 @@ public class AddProtocols implements TypeScriptIntegration {
 
     @Override
     public List<ProtocolGenerator> getProtocolGenerators() {
-        return ListUtils.of(new AwsRestJson1_0(), new AwsRestJson1_1(),
-                new AwsJsonRpc1_0(), new AwsJsonRpc1_1());
+        return ListUtils.of(new AwsRestJson1_0(), new AwsRestJson1_1());
     }
 }

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsJsonRpc1_0.java

@@ -25,12 +25,12 @@
 public final class AwsRestJson1_0 extends RestJsonProtocolGenerator {
 
     @Override
-    protected String getDocumentContentType() {
-        return "application/x-amz-json-1.0";
+    public String getName() {
+        return "aws.rest-json-1.0";
     }
 
     @Override
-    public String getName() {
-        return "aws.rest-json-1.0";
+    protected String getDocumentContentType() {
+        return "application/x-amz-json-1.0";
     }
 }

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsJsonRpc1_1.java

@@ -25,12 +25,12 @@
 public final class AwsRestJson1_1 extends RestJsonProtocolGenerator {
 
     @Override
-    protected String getDocumentContentType() {
-        return "application/x-amz-json-1.1";
+    public String getName() {
+        return "aws.rest-json-1.1";
     }
 
     @Override
-    public String getName() {
-        return "aws.rest-json-1.1";
+    protected String getDocumentContentType() {
+        return "application/x-amz-json-1.1";
     }
 }

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsRestJson1_0.java

@@ -44,7 +44,7 @@
  * @see JsonShapeSerVisitor
  * @see JsonShapeDeserVisitor
  * @see JsonMemberSerVisitor
- * @see JsonMemberDeserVisitor
+ * @see DocumentMemberDeserVisitor
  * @see <a href="https://awslabs.github.io/smithy/spec/http.html">Smithy HTTP protocol bindings.</a>
  */
 abstract class RestJsonProtocolGenerator extends HttpBindingProtocolGenerator {
@@ -75,7 +75,21 @@ private void generateDocumentShapeSerde(GenerationContext context, Set<Shape> sh
     @Override
     public void generateSharedComponents(GenerationContext context) {
         super.generateSharedComponents(context);
-        JsonProtocolUtils.generateParseBody(context);
+        TypeScriptWriter writer = context.getWriter();
+
+        // Include a JSON body parser used to deserialize documents from HTTP responses.
+        writer.addImport("SerdeContext", "SerdeContext", "@aws-sdk/types");
+        writer.openBlock("const parseBody = (streamBody: any, context: SerdeContext): any => {", "};", () -> {
+            writer.openBlock("return context.streamCollector(streamBody).then((body: any) => {", "});", () -> {
+                writer.write("const encoded = context.utf8Encoder(body);");
+                writer.openBlock("if (encoded.length) {", "}", () -> {
+                    writer.write("return JSON.parse(encoded);");
+                });
+                writer.write("return {};");
+            });
+        });
+
+        writer.write("");
     }
 
     @Override

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsRestJson1_1.java

@@ -1,21 +1,18 @@
-import { validateBucketName } from "./validate-bucket-name";
-import { SerializeHandler } from "@aws-sdk/types";
+import { validateBucketNameMiddleware } from "./validate-bucket-name";
 
-describe("validateBucketName", () => {
+describe("validateBucketNameMiddleware", () => {
   const mockNextHandler = jest.fn();
-  const composedHandler: SerializeHandler<any, any> = validateBucketName(
-    mockNextHandler
-  );
 
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   it("throws error if Bucket parameter contains '/'", async () => {
+    const handler = validateBucketNameMiddleware()(mockNextHandler, {} as any);
     const bucket = "bucket/part/of/key";
     let error;
     try {
-      await composedHandler({
+      await handler({
         input: {
           Bucket: bucket
         }
@@ -31,12 +28,13 @@ describe("validateBucketName", () => {
   });
 
   it("doesn't throw error if Bucket parameter has no '/'", async () => {
+    const handler = validateBucketNameMiddleware()(mockNextHandler, {} as any);
     const args = {
       input: {
         Bucket: "bucket"
       }
     };
-    await composedHandler(args);
+    await handler(args);
     expect(mockNextHandler.mock.calls.length).toBe(1);
     expect(mockNextHandler.mock.calls[0][0]).toEqual(args);
   });