Merge pull request #818 from aws/fix-unknown-error

`s3`: Derive error code, message from HTTP status code for no body/header responses.

Author: jasdel

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

@@ -81,6 +81,6 @@ protected static GoDependency module(
     }
 
     private static final class Versions {
-        private static final String AWS_SDK = "v0.0.0-20201006075021-8b185f9d6dff";
+        private static final String AWS_SDK = "v0.26.1-0.20201016111247-66b2791dafc4";
     }
 }

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

@@ -275,8 +275,15 @@ public static void writeXmlErrorMessageCodeDeserializer(ProtocolGenerator.Genera
 
         if (requiresS3Customization(service)) {
             writer.addUseImports(AwsCustomGoDependency.S3_SHARED_CUSTOMIZATION);
-            writer.write("errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)");
+            if (isS3Service(service)){
+                writer.write("errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)");
+            } else {
+                // s3 control
+                writer.write("errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)");
+            }
+
             writer.write("if err != nil { return err }");
+
             writer.insertTrailingNewline();
             writer.openBlock("if hostID := errorComponents.HostID; len(hostID)!=0 {", "}", () -> {
                 writer.write("s3shared.SetHostIDMetadata(metadata, hostID)");
@@ -307,6 +314,11 @@ private static boolean requiresS3Customization(ServiceShape service) {
         String serviceId= service.expectTrait(ServiceTrait.class).getSdkId();
         return serviceId.equalsIgnoreCase("S3") || serviceId.equalsIgnoreCase("S3 Control");
     }
+
+    private static boolean isS3Service(ServiceShape service) {
+        String serviceId= service.expectTrait(ServiceTrait.class).getSdkId();
+        return serviceId.equalsIgnoreCase("S3");
+    }
 }
 
 

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

@@ -45,7 +45,7 @@ private AwsCustomGoDependency() {
     }
 
     private static final class Versions {
-        private static final String INTERNAL_S3SHARED = "v0.1.0";
+        private static final String INTERNAL_S3SHARED = "v0.26.1-0.20201016111247-66b2791dafc4";
         private static final String INTERNAL_ACCEPTENCODING = "v0.0.0-20200930084954-897dfb99530c";
     }
 }

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

@@ -0,0 +1,51 @@
+package software.amazon.smithy.aws.go.codegen.customization;
+
+import software.amazon.smithy.aws.traits.ServiceTrait;
+import software.amazon.smithy.go.codegen.GoSettings;
+import software.amazon.smithy.go.codegen.integration.GoIntegration;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.OperationShape;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.model.shapes.ShapeId;
+
+/**
+ * This integration removes incorrectly modeled S3 `NoSuchKey` error for HeadObject operation.
+ * Related to aws/aws-sdk-go#1208
+ *
+ */
+public class S3HeadObjectCustomizations implements GoIntegration {
+    @Override
+    public byte getOrder() {
+        return 127;
+    }
+
+    @Override
+    public Model preprocessModel(
+            Model model, GoSettings settings
+    ) {
+        ServiceShape service = model.expectShape(settings.getService(), ServiceShape.class);
+        if (!isS3Service(model, service)) {
+            return model;
+        }
+
+        for (ShapeId operationId :service.getAllOperations()) {
+            if (operationId.getName().equalsIgnoreCase("HeadObject")) {
+                Model.Builder modelBuilder = model.toBuilder();
+                OperationShape operationShape = model.expectShape(operationId, OperationShape.class);
+                OperationShape.Builder builder  = operationShape.toBuilder();
+                // clear all errors associated with 'HeadObject' operation aws/aws-sdk-go#1208
+                builder.clearErrors();
+
+                // remove old operation shape and add the updated shape to model
+                return modelBuilder.removeShape(operationId).addShape(builder.build()).build();
+            }
+        }
+        return model;
+    }
+
+    // returns true if service is s3
+    private static boolean isS3Service(Model model, ServiceShape service) {
+        String serviceId= service.expectTrait(ServiceTrait.class).getSdkId();
+        return serviceId.equalsIgnoreCase("S3");
+    }
+}

codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration

@@ -24,3 +24,4 @@ software.amazon.smithy.aws.go.codegen.customization.S3AcceptEncodingGzip
 software.amazon.smithy.aws.go.codegen.customization.KinesisCustomizations
 software.amazon.smithy.aws.go.codegen.customization.S3ErrorWith200Status
 software.amazon.smithy.aws.go.codegen.customization.Route53Customizations
+software.amazon.smithy.aws.go.codegen.customization.S3HeadObjectCustomizations

service/internal/s3shared/xml_utils.go

@@ -4,6 +4,8 @@ import (
 	"encoding/xml"
 	"fmt"
 	"io"
+	"net/http"
+	"strings"
 )
 
 // ErrorComponents represents the error response fields
@@ -23,3 +25,21 @@ func GetErrorResponseComponents(r io.Reader) (ErrorComponents, error) {
 	}
 	return errComponents, nil
 }
+
+// GetS3ErrorResponseComponents returns the error fields from an S3 xml error response body.
+// If an error code or message is not retrieved, it is derived from the http status code
+func GetS3ErrorResponseComponents(r io.Reader, statusCode int) (ErrorComponents, error) {
+	errComponents, err := GetErrorResponseComponents(r)
+	if err != nil {
+		return ErrorComponents{}, err
+	}
+
+	// for S3 service, we derive err code and message, if none is found
+	if len(errComponents.Code) == 0 && len(errComponents.Message) == 0 {
+		// derive code and message from status code
+		statusText := http.StatusText(statusCode)
+		errComponents.Code = strings.Replace(statusText, " ", "", -1)
+		errComponents.Message = statusText
+	}
+	return errComponents, nil
+}

service/internal/s3shared/xml_utils_test.go

@@ -0,0 +1,72 @@
+package s3shared
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestGetResponseErrorCode(t *testing.T) {
+	const xmlErrorResponse = `<Error>
+    <Type>Sender</Type>
+    <Code>InvalidGreeting</Code>
+    <Message>Hi</Message>
+    <HostId>bar-id</HostId>
+    <RequestId>foo-id</RequestId>
+</Error>`
+
+	cases := map[string]struct {
+		getErr                 func() (ErrorComponents, error)
+		expectedErrorCode      string
+		expectedErrorMessage   string
+		expectedErrorRequestID string
+		expectedErrorHostID    string
+	}{
+		"standard xml error": {
+			getErr: func() (ErrorComponents, error) {
+				errResp := strings.NewReader(xmlErrorResponse)
+				return GetErrorResponseComponents(errResp)
+			},
+			expectedErrorCode:      "InvalidGreeting",
+			expectedErrorMessage:   "Hi",
+			expectedErrorRequestID: "foo-id",
+			expectedErrorHostID:    "bar-id",
+		},
+
+		"s3 no response body": {
+			getErr: func() (ErrorComponents, error) {
+				errResp := strings.NewReader("")
+				return GetS3ErrorResponseComponents(errResp, 400)
+			},
+			expectedErrorCode:    "BadRequest",
+			expectedErrorMessage: "Bad Request",
+		},
+		"s3control no response body": {
+			getErr: func() (ErrorComponents, error) {
+				errResp := strings.NewReader("")
+				return GetErrorResponseComponents(errResp)
+			},
+		},
+	}
+
+	for name, c := range cases {
+		t.Run(name, func(t *testing.T) {
+			ec, err := c.getErr()
+			if err != nil {
+				t.Fatalf("expected no error, got %v", err)
+			}
+
+			if e, a := c.expectedErrorCode, ec.Code; !strings.EqualFold(e, a) {
+				t.Fatalf("expected %v, got %v", e, a)
+			}
+			if e, a := c.expectedErrorMessage, ec.Message; !strings.EqualFold(e, a) {
+				t.Fatalf("expected %v, got %v", e, a)
+			}
+			if e, a := c.expectedErrorRequestID, ec.RequestID; !strings.EqualFold(e, a) {
+				t.Fatalf("expected %v, got %v", e, a)
+			}
+			if e, a := c.expectedErrorHostID, ec.HostID; !strings.EqualFold(e, a) {
+				t.Fatalf("expected %v, got %v", e, a)
+			}
+		})
+	}
+}