feat(client): update HTTP request header code generation

aws · Apr 12, 2023 · f099278 · f099278
1 parent b4ad1b5
commit f099278
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 19 deletions.
diff --git a/codegen/gradle.properties b/codegen/gradle.properties
@@ -1,2 +1,2 @@
-smithyVersion=1.28.1
+smithyVersion=1.30.0
 smithyGradleVersion=0.6.0
diff --git a/...ypescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsEc2.java b/...ypescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsEc2.java
@@ -117,9 +117,16 @@ protected String getErrorBodyLocation(GenerationContext context, String outputLo
     }
 
     @Override
-    protected void writeDefaultHeaders(GenerationContext context, OperationShape operation) {
-        super.writeDefaultHeaders(context, operation);
-        AwsProtocolUtils.generateUnsignedPayloadSigV4Header(context, operation);
+    protected void writeRequestHeaders(GenerationContext context, OperationShape operation) {
+        TypeScriptWriter writer = context.getWriter();
+        if (AwsProtocolUtils.includeUnsignedPayloadSigV4Header(operation)) {
+            writer.openBlock("const headers: __HeaderBag = { ", " }", () -> {
+                AwsProtocolUtils.generateUnsignedPayloadSigV4Header(context, operation);
+                writer.write("...SHARED_HEADERS");
+            });
+        } else {
+            writer.write("const headers: __HeaderBag = SHARED_HEADERS;");
+        }
     }
 
     @Override

diff --git a/...codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java b/...codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java
@@ -65,11 +65,13 @@ private AwsProtocolUtils() {}
      */
     static void generateUnsignedPayloadSigV4Header(GenerationContext context, OperationShape operation) {
         TypeScriptWriter writer = context.getWriter();
+        if (includeUnsignedPayloadSigV4Header(operation)) {
+            writer.write("'x-amz-content-sha256': 'UNSIGNED-PAYLOAD',");
+        }
+    }
 
-        operation.getTrait(UnsignedPayloadTrait.class)
-                .ifPresent(trait -> {
-                    writer.write("'x-amz-content-sha256': 'UNSIGNED-PAYLOAD',");
-                });
+    static boolean includeUnsignedPayloadSigV4Header(OperationShape operation) {
+        return operation.hasTrait(UnsignedPayloadTrait.ID);
     }
 
     /**

diff --git a/...escript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsQuery.java b/...escript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsQuery.java
@@ -121,9 +121,16 @@ protected String getErrorBodyLocation(GenerationContext context, String outputLo
     }
 
     @Override
-    protected void writeDefaultHeaders(GenerationContext context, OperationShape operation) {
-        super.writeDefaultHeaders(context, operation);
-        AwsProtocolUtils.generateUnsignedPayloadSigV4Header(context, operation);
+    protected void writeRequestHeaders(GenerationContext context, OperationShape operation) {
+        TypeScriptWriter writer = context.getWriter();
+        if (AwsProtocolUtils.includeUnsignedPayloadSigV4Header(operation)) {
+            writer.openBlock("const headers: __HeaderBag = { ", " }", () -> {
+                AwsProtocolUtils.generateUnsignedPayloadSigV4Header(context, operation);
+                writer.write("...SHARED_HEADERS");
+            });
+        } else {
+            writer.write("const headers: __HeaderBag = SHARED_HEADERS;");
+        }
     }
 
     @Override

diff --git a/...src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonRpcProtocolGenerator.java b/...src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonRpcProtocolGenerator.java
@@ -94,16 +94,34 @@ public void generateSharedComponents(GenerationContext context) {
     }
 
     @Override
-    protected void writeDefaultHeaders(GenerationContext context, OperationShape operation) {
-        super.writeDefaultHeaders(context, operation);
-        AwsProtocolUtils.generateUnsignedPayloadSigV4Header(context, operation);
-
-        // AWS JSON RPC protocols use a combination of the service and operation shape names,
-        // separated by a '.' character, for the target header.
+    protected void writeRequestHeaders(GenerationContext context, OperationShape operation) {
         TypeScriptWriter writer = context.getWriter();
         ServiceShape serviceShape = context.getService();
-        String target = serviceShape.getId().getName(serviceShape) + "." + operation.getId().getName(serviceShape);
-        writer.write("'x-amz-target': $S,", target);
+        String operationName = operation.getId().getName(serviceShape);
+        if (AwsProtocolUtils.includeUnsignedPayloadSigV4Header(operation)) {
+            writer.openBlock("const headers: __HeaderBag = { ", " }", () -> {
+                AwsProtocolUtils.generateUnsignedPayloadSigV4Header(context, operation);
+                writer.write("...sharedHeaders($S)", operationName);
+            });
+        } else {
+            writer.write("const headers: __HeaderBag = sharedHeaders($S)", operationName);
+        }
+    }
+
+    @Override
+    protected void writeSharedRequestHeaders(GenerationContext context) {
+        ServiceShape serviceShape = context.getService();
+        TypeScriptWriter writer = context.getWriter();
+        writer.addImport("HeaderBag", "__HeaderBag", "@aws-sdk/types");
+        String targetHeader = serviceShape.getId().getName(serviceShape) + ".${operation}";
+        writer.openBlock("function sharedHeaders(operation: string): __HeaderBag { return {", "}};",
+                () -> {
+                    writer.write("'content-type': $S,", getDocumentContentType());
+                    // AWS JSON RPC protocols use a combination of the service and operation shape names,
+                    // separated by a '.' character, for the target header.
+                    writer.write("'x-amz-target': `$L`,", targetHeader);
+                }
+        );
     }
 
     @Override