chore(codegen): add generateParseErrorBody to populate error message

aws · Sep 28, 2022 · e9b66b5 · e9b66b5
1 parent 3ed75ec
commit e9b66b5
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 0 deletions.
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
@@ -85,6 +85,7 @@ protected void generateDocumentBodyShapeDeserializers(GenerationContext context,
     public void generateSharedComponents(GenerationContext context) {
         super.generateSharedComponents(context);
         AwsProtocolUtils.generateXmlParseBody(context);
+        AwsProtocolUtils.generateParseErrorBody(context);
         AwsProtocolUtils.generateBuildFormUrlencodedString(context);
         AwsProtocolUtils.addItempotencyAutofillImport(context);
 

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
@@ -117,6 +117,27 @@ static void generateJsonParseBody(GenerationContext context) {
         writer.write("");
     }
 
+    /**
+     * Writes a response body parser function for errors. This
+     * will populate message field in parsed object, if it's not present.
+     *
+     * @param context The generation context.
+     */
+    static void generateParseErrorBody(GenerationContext 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 parseErrorBody = (errorBody: any, context: __SerdeContext): "
+            + "any => {", "}", () -> {
+                writer.write("const value = parseBody(errorBody, context);");
+                writer.write("value.message = value.message ?? value.Message;");
+                writer.write("return value;");
+            });
+
+        writer.write("");
+    }
+
     /**
      * Writes a response body parser function for XML protocols. This
      * will parse a present body after converting it to utf-8.

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
@@ -85,6 +85,7 @@ protected void generateDocumentBodyShapeDeserializers(GenerationContext context,
     public void generateSharedComponents(GenerationContext context) {
         super.generateSharedComponents(context);
         AwsProtocolUtils.generateXmlParseBody(context);
+        AwsProtocolUtils.generateParseErrorBody(context);
         AwsProtocolUtils.generateBuildFormUrlencodedString(context);
         AwsProtocolUtils.addItempotencyAutofillImport(context);
 

diff --git a/...cript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsRestXml.java b/...cript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsRestXml.java
@@ -101,6 +101,7 @@ protected void generateDocumentBodyShapeDeserializers(GenerationContext context,
     public void generateSharedComponents(GenerationContext context) {
         super.generateSharedComponents(context);
         AwsProtocolUtils.generateXmlParseBody(context);
+        AwsProtocolUtils.generateParseErrorBody(context);
         AwsProtocolUtils.addItempotencyAutofillImport(context);
 
         TypeScriptWriter writer = context.getWriter();

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
@@ -80,6 +80,7 @@ protected void generateDocumentBodyShapeDeserializers(GenerationContext context,
     public void generateSharedComponents(GenerationContext context) {
         super.generateSharedComponents(context);
         AwsProtocolUtils.generateJsonParseBody(context);
+        AwsProtocolUtils.generateParseErrorBody(context);
         AwsProtocolUtils.addItempotencyAutofillImport(context);
 
         TypeScriptWriter writer = context.getWriter();

diff --git a/...rc/main/java/software/amazon/smithy/aws/typescript/codegen/RestJsonProtocolGenerator.java b/...rc/main/java/software/amazon/smithy/aws/typescript/codegen/RestJsonProtocolGenerator.java
@@ -79,6 +79,7 @@ protected void generateDocumentBodyShapeDeserializers(GenerationContext context,
     public void generateSharedComponents(GenerationContext context) {
         super.generateSharedComponents(context);
         AwsProtocolUtils.generateJsonParseBody(context);
+        AwsProtocolUtils.generateParseErrorBody(context);
         AwsProtocolUtils.addItempotencyAutofillImport(context);
 
         TypeScriptWriter writer = context.getWriter();