From c9f4b942998a4faa06d77cdc7563093fa0f6418f Mon Sep 17 00:00:00 2001
From: skotambkar <kotambka@amazon.com>
Date: Wed, 14 Oct 2020 09:11:45 -0700
Subject: [PATCH 01/10] updates s3 xml util to derive error code from status
 code, adds s3 HeadObject customization

---
 .../aws/go/codegen/XMLProtocolUtils.java      |  2 +-
 .../S3HeadObjectCustomizations.java           | 51 +++++++++++++++
 ...mithy.go.codegen.integration.GoIntegration |  1 +
 service/internal/s3shared/xml_utils.go        | 12 +++-
 service/internal/s3shared/xml_utils_test.go   | 62 +++++++++++++++++++
 5 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/S3HeadObjectCustomizations.java
 create mode 100644 service/internal/s3shared/xml_utils_test.go

diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java
index 036ff02c77a..80932ed71d3 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java
+++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java
@@ -275,7 +275,7 @@ public static void writeXmlErrorMessageCodeDeserializer(ProtocolGenerator.Genera
 
         if (requiresS3Customization(service)) {
             writer.addUseImports(AwsCustomGoDependency.S3_SHARED_CUSTOMIZATION);
-            writer.write("errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)");
+            writer.write("errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)");
             writer.write("if err != nil { return err }");
             writer.insertTrailingNewline();
             writer.openBlock("if hostID := errorComponents.HostID; len(hostID)!=0 {", "}", () -> {
diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/S3HeadObjectCustomizations.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/S3HeadObjectCustomizations.java
new file mode 100644
index 00000000000..2b3ceca77e4
--- /dev/null
+++ b/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");
+    }
+}
diff --git a/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration b/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration
index 81a05865ad8..6f09faa72ca 100644
--- a/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration
+++ b/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
diff --git a/service/internal/s3shared/xml_utils.go b/service/internal/s3shared/xml_utils.go
index 10335fdf558..d26a2fa1657 100644
--- a/service/internal/s3shared/xml_utils.go
+++ b/service/internal/s3shared/xml_utils.go
@@ -4,6 +4,8 @@ import (
 	"encoding/xml"
 	"fmt"
 	"io"
+	"net/http"
+	"strings"
 )
 
 // ErrorComponents represents the error response fields
@@ -16,10 +18,18 @@ type ErrorComponents struct {
 }
 
 // GetErrorResponseComponents returns the error fields from an xml error response body
-func GetErrorResponseComponents(r io.Reader) (ErrorComponents, error) {
+func GetErrorResponseComponents(r io.Reader, statusCode int) (ErrorComponents, error) {
 	var errComponents ErrorComponents
 	if err := xml.NewDecoder(r).Decode(&errComponents); err != nil && err != io.EOF {
 		return ErrorComponents{}, fmt.Errorf("error while deserializing xml error response : %w", err)
 	}
+
+	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
 }
diff --git a/service/internal/s3shared/xml_utils_test.go b/service/internal/s3shared/xml_utils_test.go
new file mode 100644
index 00000000000..460c5607998
--- /dev/null
+++ b/service/internal/s3shared/xml_utils_test.go
@@ -0,0 +1,62 @@
+package s3shared
+
+import (
+	"bytes"
+	"io"
+	"strings"
+	"testing"
+)
+
+func TestGetResponseErrorCode(t *testing.T) {
+	cases := map[string]struct {
+		status                 int
+		errorResponse          io.Reader
+		expectedErrorCode      string
+		expectedErrorMessage   string
+		expectedErrorRequestID string
+		expectedErrorHostID    string
+	}{
+		"standard xml error": {
+			status: 400,
+			errorResponse: bytes.NewReader([]byte(`<Error>
+    <Type>Sender</Type>
+    <Code>InvalidGreeting</Code>
+    <Message>Hi</Message>
+    <HostId>bar-id</HostId>
+    <RequestId>foo-id</RequestId>
+</Error>`)),
+			expectedErrorCode:      "InvalidGreeting",
+			expectedErrorMessage:   "Hi",
+			expectedErrorRequestID: "foo-id",
+			expectedErrorHostID:    "bar-id",
+		},
+		"no response body": {
+			status:               400,
+			errorResponse:        bytes.NewReader([]byte(``)),
+			expectedErrorCode:    "BadRequest",
+			expectedErrorMessage: "Bad Request",
+		},
+	}
+
+	for name, c := range cases {
+		t.Run(name, func(t *testing.T) {
+			ec, err := GetErrorResponseComponents(c.errorResponse, c.status)
+			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)
+			}
+		})
+	}
+}

From bcbde978e32c68a8a6006991b69af47d0123e95c Mon Sep 17 00:00:00 2001
From: skotambkar <kotambka@amazon.com>
Date: Wed, 14 Oct 2020 10:01:02 -0700
Subject: [PATCH 02/10] update gohash

---
 .../software/amazon/smithy/aws/go/codegen/AwsGoDependency.java  | 2 +-
 .../aws/go/codegen/customization/AwsCustomGoDependency.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java
index 9f2eef2f11d..375dfd2f737 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java
+++ b/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.0.0-20201014161145-592e24615bd4";
     }
 }
diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsCustomGoDependency.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsCustomGoDependency.java
index 6dbe43e3316..c1bb423c8c8 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsCustomGoDependency.java
+++ b/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.0.0-20201014161145-592e24615bd4";
         private static final String INTERNAL_ACCEPTENCODING = "v0.0.0-20200930084954-897dfb99530c";
     }
 }

From c80253c28d1cc605e9bdbacd6d68a218dfbd96de Mon Sep 17 00:00:00 2001
From: skotambkar <kotambka@amazon.com>
Date: Wed, 14 Oct 2020 10:02:14 -0700
Subject: [PATCH 03/10] generated s3 and s3control clients

---
 service/s3/deserializers.go        | 169 ++++++++++++++---------------
 service/s3/go.mod                  |   2 +-
 service/s3control/deserializers.go |  64 +++++------
 service/s3control/go.mod           |   2 +-
 4 files changed, 117 insertions(+), 120 deletions(-)

diff --git a/service/s3/deserializers.go b/service/s3/deserializers.go
index b2343584bc5..3cdda3e9f29 100644
--- a/service/s3/deserializers.go
+++ b/service/s3/deserializers.go
@@ -66,7 +66,7 @@ func awsRestxml_deserializeOpErrorAbortMultipartUpload(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -182,7 +182,7 @@ func awsRestxml_deserializeOpErrorCompleteMultipartUpload(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -410,7 +410,7 @@ func awsRestxml_deserializeOpErrorCopyObject(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -575,7 +575,7 @@ func awsRestxml_deserializeOpErrorCreateBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -694,7 +694,7 @@ func awsRestxml_deserializeOpErrorCreateMultipartUpload(response *smithyhttp.Res
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -892,7 +892,7 @@ func awsRestxml_deserializeOpErrorDeleteBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -959,7 +959,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketAnalyticsConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1026,7 +1026,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketCors(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1093,7 +1093,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketEncryption(response *smithyhttp.Re
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1160,7 +1160,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketInventoryConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1227,7 +1227,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketLifecycle(response *smithyhttp.Res
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1294,7 +1294,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketMetricsConfiguration(response *smi
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1361,7 +1361,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketPolicy(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1428,7 +1428,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketReplication(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1495,7 +1495,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketTagging(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1562,7 +1562,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketWebsite(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1634,7 +1634,7 @@ func awsRestxml_deserializeOpErrorDeleteObject(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1761,7 +1761,7 @@ func awsRestxml_deserializeOpErrorDeleteObjects(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1889,7 +1889,7 @@ func awsRestxml_deserializeOpErrorDeleteObjectTagging(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1969,7 +1969,7 @@ func awsRestxml_deserializeOpErrorDeletePublicAccessBlock(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2064,7 +2064,7 @@ func awsRestxml_deserializeOpErrorGetBucketAccelerateConfiguration(response *smi
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2204,7 +2204,7 @@ func awsRestxml_deserializeOpErrorGetBucketAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2343,7 +2343,7 @@ func awsRestxml_deserializeOpErrorGetBucketAnalyticsConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2476,7 +2476,7 @@ func awsRestxml_deserializeOpErrorGetBucketCors(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2609,7 +2609,7 @@ func awsRestxml_deserializeOpErrorGetBucketEncryption(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2742,7 +2742,7 @@ func awsRestxml_deserializeOpErrorGetBucketInventoryConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2875,7 +2875,7 @@ func awsRestxml_deserializeOpErrorGetBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3008,7 +3008,7 @@ func awsRestxml_deserializeOpErrorGetBucketLocation(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3148,7 +3148,7 @@ func awsRestxml_deserializeOpErrorGetBucketLogging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3281,7 +3281,7 @@ func awsRestxml_deserializeOpErrorGetBucketMetricsConfiguration(response *smithy
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3414,7 +3414,7 @@ func awsRestxml_deserializeOpErrorGetBucketNotificationConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3559,7 +3559,7 @@ func awsRestxml_deserializeOpErrorGetBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3702,7 +3702,7 @@ func awsRestxml_deserializeOpErrorGetBucketPolicyStatus(response *smithyhttp.Res
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3835,7 +3835,7 @@ func awsRestxml_deserializeOpErrorGetBucketReplication(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3968,7 +3968,7 @@ func awsRestxml_deserializeOpErrorGetBucketRequestPayment(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4108,7 +4108,7 @@ func awsRestxml_deserializeOpErrorGetBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4241,7 +4241,7 @@ func awsRestxml_deserializeOpErrorGetBucketVersioning(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4394,7 +4394,7 @@ func awsRestxml_deserializeOpErrorGetBucketWebsite(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4527,7 +4527,7 @@ func awsRestxml_deserializeOpErrorGetObject(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4832,7 +4832,7 @@ func awsRestxml_deserializeOpErrorGetObjectAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4986,7 +4986,7 @@ func awsRestxml_deserializeOpErrorGetObjectLegalHold(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5119,7 +5119,7 @@ func awsRestxml_deserializeOpErrorGetObjectLockConfiguration(response *smithyhtt
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5252,7 +5252,7 @@ func awsRestxml_deserializeOpErrorGetObjectRetention(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5390,7 +5390,7 @@ func awsRestxml_deserializeOpErrorGetObjectTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5517,7 +5517,7 @@ func awsRestxml_deserializeOpErrorGetObjectTorrent(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5632,7 +5632,7 @@ func awsRestxml_deserializeOpErrorGetPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5737,7 +5737,7 @@ func awsRestxml_deserializeOpErrorHeadBucket(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5812,7 +5812,7 @@ func awsRestxml_deserializeOpErrorHeadObject(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5830,9 +5830,6 @@ func awsRestxml_deserializeOpErrorHeadObject(response *smithyhttp.Response, meta
 	}
 	errorBody.Seek(0, io.SeekStart)
 	switch {
-	case strings.EqualFold("NoSuchKey", errorCode):
-		return awsRestxml_deserializeErrorNoSuchKey(response, errorBody)
-
 	default:
 		genericError := &smithy.GenericAPIError{
 			Code:    errorCode,
@@ -6091,7 +6088,7 @@ func awsRestxml_deserializeOpErrorListBucketAnalyticsConfigurations(response *sm
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -6272,7 +6269,7 @@ func awsRestxml_deserializeOpErrorListBucketInventoryConfigurations(response *sm
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -6453,7 +6450,7 @@ func awsRestxml_deserializeOpErrorListBucketMetricsConfigurations(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -6634,7 +6631,7 @@ func awsRestxml_deserializeOpErrorListBuckets(response *smithyhttp.Response, met
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -6773,7 +6770,7 @@ func awsRestxml_deserializeOpErrorListMultipartUploads(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -7070,7 +7067,7 @@ func awsRestxml_deserializeOpErrorListObjects(response *smithyhttp.Response, met
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -7338,7 +7335,7 @@ func awsRestxml_deserializeOpErrorListObjectsV2(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -7639,7 +7636,7 @@ func awsRestxml_deserializeOpErrorListObjectVersions(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -7947,7 +7944,7 @@ func awsRestxml_deserializeOpErrorListParts(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8218,7 +8215,7 @@ func awsRestxml_deserializeOpErrorPutBucketAccelerateConfiguration(response *smi
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8285,7 +8282,7 @@ func awsRestxml_deserializeOpErrorPutBucketAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8352,7 +8349,7 @@ func awsRestxml_deserializeOpErrorPutBucketAnalyticsConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8419,7 +8416,7 @@ func awsRestxml_deserializeOpErrorPutBucketCors(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8486,7 +8483,7 @@ func awsRestxml_deserializeOpErrorPutBucketEncryption(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8553,7 +8550,7 @@ func awsRestxml_deserializeOpErrorPutBucketInventoryConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8620,7 +8617,7 @@ func awsRestxml_deserializeOpErrorPutBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8687,7 +8684,7 @@ func awsRestxml_deserializeOpErrorPutBucketLogging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8754,7 +8751,7 @@ func awsRestxml_deserializeOpErrorPutBucketMetricsConfiguration(response *smithy
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8821,7 +8818,7 @@ func awsRestxml_deserializeOpErrorPutBucketNotificationConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8888,7 +8885,7 @@ func awsRestxml_deserializeOpErrorPutBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8955,7 +8952,7 @@ func awsRestxml_deserializeOpErrorPutBucketReplication(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9022,7 +9019,7 @@ func awsRestxml_deserializeOpErrorPutBucketRequestPayment(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9089,7 +9086,7 @@ func awsRestxml_deserializeOpErrorPutBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9156,7 +9153,7 @@ func awsRestxml_deserializeOpErrorPutBucketVersioning(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9223,7 +9220,7 @@ func awsRestxml_deserializeOpErrorPutBucketWebsite(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9295,7 +9292,7 @@ func awsRestxml_deserializeOpErrorPutObject(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9420,7 +9417,7 @@ func awsRestxml_deserializeOpErrorPutObjectAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9508,7 +9505,7 @@ func awsRestxml_deserializeOpErrorPutObjectLegalHold(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9593,7 +9590,7 @@ func awsRestxml_deserializeOpErrorPutObjectLockConfiguration(response *smithyhtt
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9678,7 +9675,7 @@ func awsRestxml_deserializeOpErrorPutObjectRetention(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9763,7 +9760,7 @@ func awsRestxml_deserializeOpErrorPutObjectTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9843,7 +9840,7 @@ func awsRestxml_deserializeOpErrorPutPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9915,7 +9912,7 @@ func awsRestxml_deserializeOpErrorRestoreObject(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -10008,7 +10005,7 @@ func awsRestxml_deserializeOpErrorUploadPart(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -10146,7 +10143,7 @@ func awsRestxml_deserializeOpErrorUploadPartCopy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
diff --git a/service/s3/go.mod b/service/s3/go.mod
index 25286edc413..6c356e87b74 100644
--- a/service/s3/go.mod
+++ b/service/s3/go.mod
@@ -5,7 +5,7 @@ go 1.15
 require (
 	github.com/aws/aws-sdk-go-v2 v0.26.0
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v0.0.0-20200930084954-897dfb99530c
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.1.0
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.0.0-20201014161145-592e24615bd4
 	github.com/awslabs/smithy-go v0.1.2-0.20201012175301-b4d8737f29d1
 )
 
diff --git a/service/s3control/deserializers.go b/service/s3control/deserializers.go
index 89eb3b5e23d..951e3751089 100644
--- a/service/s3control/deserializers.go
+++ b/service/s3control/deserializers.go
@@ -89,7 +89,7 @@ func awsRestxml_deserializeOpErrorCreateAccessPoint(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -237,7 +237,7 @@ func awsRestxml_deserializeOpErrorCreateBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -398,7 +398,7 @@ func awsRestxml_deserializeOpErrorCreateJob(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -525,7 +525,7 @@ func awsRestxml_deserializeOpErrorDeleteAccessPoint(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -592,7 +592,7 @@ func awsRestxml_deserializeOpErrorDeleteAccessPointPolicy(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -659,7 +659,7 @@ func awsRestxml_deserializeOpErrorDeleteBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -726,7 +726,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketLifecycleConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -793,7 +793,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketPolicy(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -860,7 +860,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketTagging(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -927,7 +927,7 @@ func awsRestxml_deserializeOpErrorDeleteJobTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1003,7 +1003,7 @@ func awsRestxml_deserializeOpErrorDeletePublicAccessBlock(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1098,7 +1098,7 @@ func awsRestxml_deserializeOpErrorDescribeJob(response *smithyhttp.Response, met
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1243,7 +1243,7 @@ func awsRestxml_deserializeOpErrorGetAccessPoint(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1444,7 +1444,7 @@ func awsRestxml_deserializeOpErrorGetAccessPointPolicy(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1587,7 +1587,7 @@ func awsRestxml_deserializeOpErrorGetAccessPointPolicyStatus(response *smithyhtt
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1720,7 +1720,7 @@ func awsRestxml_deserializeOpErrorGetBucket(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1896,7 +1896,7 @@ func awsRestxml_deserializeOpErrorGetBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2029,7 +2029,7 @@ func awsRestxml_deserializeOpErrorGetBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2172,7 +2172,7 @@ func awsRestxml_deserializeOpErrorGetBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2305,7 +2305,7 @@ func awsRestxml_deserializeOpErrorGetJobTagging(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2447,7 +2447,7 @@ func awsRestxml_deserializeOpErrorGetPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2583,7 +2583,7 @@ func awsRestxml_deserializeOpErrorListAccessPoints(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2732,7 +2732,7 @@ func awsRestxml_deserializeOpErrorListJobs(response *smithyhttp.Response, metada
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2890,7 +2890,7 @@ func awsRestxml_deserializeOpErrorListRegionalBuckets(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3011,7 +3011,7 @@ func awsRestxml_deserializeOpErrorPutAccessPointPolicy(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3078,7 +3078,7 @@ func awsRestxml_deserializeOpErrorPutBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3145,7 +3145,7 @@ func awsRestxml_deserializeOpErrorPutBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3212,7 +3212,7 @@ func awsRestxml_deserializeOpErrorPutBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3279,7 +3279,7 @@ func awsRestxml_deserializeOpErrorPutJobTagging(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3358,7 +3358,7 @@ func awsRestxml_deserializeOpErrorPutPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3453,7 +3453,7 @@ func awsRestxml_deserializeOpErrorUpdateJobPriority(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3625,7 +3625,7 @@ func awsRestxml_deserializeOpErrorUpdateJobStatus(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
diff --git a/service/s3control/go.mod b/service/s3control/go.mod
index 51c6190abb6..4ba995fe096 100644
--- a/service/s3control/go.mod
+++ b/service/s3control/go.mod
@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	github.com/aws/aws-sdk-go-v2 v0.26.0
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.1.0
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.0.0-20201014161145-592e24615bd4
 	github.com/awslabs/smithy-go v0.1.2-0.20201012175301-b4d8737f29d1
 )
 

From 24a88063b255c2d06930cd82b74cacc154790101 Mon Sep 17 00:00:00 2001
From: skotambkar <kotambka@amazon.com>
Date: Thu, 15 Oct 2020 12:32:35 -0700
Subject: [PATCH 04/10] limits deriving error code from status to s3

---
 .../smithy/aws/go/codegen/XMLProtocolUtils.java    | 12 +++++++++++-
 service/internal/s3shared/xml_utils.go             |  5 +++--
 service/internal/s3shared/xml_utils_test.go        | 14 +++++++++++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java
index 80932ed71d3..85e19d2123b 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java
+++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java
@@ -275,8 +275,13 @@ public static void writeXmlErrorMessageCodeDeserializer(ProtocolGenerator.Genera
 
         if (requiresS3Customization(service)) {
             writer.addUseImports(AwsCustomGoDependency.S3_SHARED_CUSTOMIZATION);
-            writer.write("errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)");
+            String getErrorComponents = String.format("errorComponents, err := "
+                            + "s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, %s)",
+                    isS3Service(service));
+            writer.write(getErrorComponents);
+
             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 +312,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");
+    }
 }
 
 
diff --git a/service/internal/s3shared/xml_utils.go b/service/internal/s3shared/xml_utils.go
index d26a2fa1657..d4cec6b6d0a 100644
--- a/service/internal/s3shared/xml_utils.go
+++ b/service/internal/s3shared/xml_utils.go
@@ -18,13 +18,14 @@ type ErrorComponents struct {
 }
 
 // GetErrorResponseComponents returns the error fields from an xml error response body
-func GetErrorResponseComponents(r io.Reader, statusCode int) (ErrorComponents, error) {
+func GetErrorResponseComponents(r io.Reader, statusCode int, isS3service bool) (ErrorComponents, error) {
 	var errComponents ErrorComponents
 	if err := xml.NewDecoder(r).Decode(&errComponents); err != nil && err != io.EOF {
 		return ErrorComponents{}, fmt.Errorf("error while deserializing xml error response : %w", err)
 	}
 
-	if len(errComponents.Code) == 0 && len(errComponents.Message) == 0 {
+	// for S3 service, we derive err code and message, if none is found
+	if isS3service && 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)
diff --git a/service/internal/s3shared/xml_utils_test.go b/service/internal/s3shared/xml_utils_test.go
index 460c5607998..64bc1ef148a 100644
--- a/service/internal/s3shared/xml_utils_test.go
+++ b/service/internal/s3shared/xml_utils_test.go
@@ -9,6 +9,7 @@ import (
 
 func TestGetResponseErrorCode(t *testing.T) {
 	cases := map[string]struct {
+		isS3Service            bool
 		status                 int
 		errorResponse          io.Reader
 		expectedErrorCode      string
@@ -17,7 +18,8 @@ func TestGetResponseErrorCode(t *testing.T) {
 		expectedErrorHostID    string
 	}{
 		"standard xml error": {
-			status: 400,
+			isS3Service: true,
+			status:      400,
 			errorResponse: bytes.NewReader([]byte(`<Error>
     <Type>Sender</Type>
     <Code>InvalidGreeting</Code>
@@ -30,17 +32,23 @@ func TestGetResponseErrorCode(t *testing.T) {
 			expectedErrorRequestID: "foo-id",
 			expectedErrorHostID:    "bar-id",
 		},
-		"no response body": {
+		"s3 no response body": {
+			isS3Service:          true,
 			status:               400,
 			errorResponse:        bytes.NewReader([]byte(``)),
 			expectedErrorCode:    "BadRequest",
 			expectedErrorMessage: "Bad Request",
 		},
+		"s3control no response body": {
+			isS3Service:   false,
+			status:        400,
+			errorResponse: bytes.NewReader([]byte(``)),
+		},
 	}
 
 	for name, c := range cases {
 		t.Run(name, func(t *testing.T) {
-			ec, err := GetErrorResponseComponents(c.errorResponse, c.status)
+			ec, err := GetErrorResponseComponents(c.errorResponse, c.status, c.isS3Service)
 			if err != nil {
 				t.Fatalf("expected no error, got %v", err)
 			}

From d050b2db1db64f9e93d6849aed1081c72e65bdaf Mon Sep 17 00:00:00 2001
From: skotambkar <kotambka@amazon.com>
Date: Thu, 15 Oct 2020 12:37:52 -0700
Subject: [PATCH 05/10] updates go hash to use pseudo versioning

---
 .../software/amazon/smithy/aws/go/codegen/AwsGoDependency.java  | 2 +-
 .../aws/go/codegen/customization/AwsCustomGoDependency.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java
index 375dfd2f737..9dbc779304a 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java
+++ b/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-20201014161145-592e24615bd4";
+        private static final String AWS_SDK = "v0.26.1-0.20201015193332-24a88063b255";
     }
 }
diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsCustomGoDependency.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsCustomGoDependency.java
index c1bb423c8c8..84476192956 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsCustomGoDependency.java
+++ b/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.0.0-20201014161145-592e24615bd4";
+        private static final String INTERNAL_S3SHARED = "v0.26.1-0.20201015193332-24a88063b255";
         private static final String INTERNAL_ACCEPTENCODING = "v0.0.0-20200930084954-897dfb99530c";
     }
 }

From 4c0eaff3924073e51bbb93c431f894bb360b2f47 Mon Sep 17 00:00:00 2001
From: skotambkar <kotambka@amazon.com>
Date: Thu, 15 Oct 2020 12:46:50 -0700
Subject: [PATCH 06/10] regenerate s3, s3control client

---
 service/s3/deserializers.go        | 166 ++++++++++++++---------------
 service/s3/go.mod                  |   4 +-
 service/s3control/deserializers.go |  64 +++++------
 service/s3control/go.mod           |   4 +-
 4 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/service/s3/deserializers.go b/service/s3/deserializers.go
index 3cdda3e9f29..536eb002de7 100644
--- a/service/s3/deserializers.go
+++ b/service/s3/deserializers.go
@@ -66,7 +66,7 @@ func awsRestxml_deserializeOpErrorAbortMultipartUpload(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -182,7 +182,7 @@ func awsRestxml_deserializeOpErrorCompleteMultipartUpload(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -410,7 +410,7 @@ func awsRestxml_deserializeOpErrorCopyObject(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -575,7 +575,7 @@ func awsRestxml_deserializeOpErrorCreateBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -694,7 +694,7 @@ func awsRestxml_deserializeOpErrorCreateMultipartUpload(response *smithyhttp.Res
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -892,7 +892,7 @@ func awsRestxml_deserializeOpErrorDeleteBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -959,7 +959,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketAnalyticsConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1026,7 +1026,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketCors(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1093,7 +1093,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketEncryption(response *smithyhttp.Re
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1160,7 +1160,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketInventoryConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1227,7 +1227,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketLifecycle(response *smithyhttp.Res
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1294,7 +1294,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketMetricsConfiguration(response *smi
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1361,7 +1361,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketPolicy(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1428,7 +1428,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketReplication(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1495,7 +1495,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketTagging(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1562,7 +1562,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketWebsite(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1634,7 +1634,7 @@ func awsRestxml_deserializeOpErrorDeleteObject(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1761,7 +1761,7 @@ func awsRestxml_deserializeOpErrorDeleteObjects(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1889,7 +1889,7 @@ func awsRestxml_deserializeOpErrorDeleteObjectTagging(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -1969,7 +1969,7 @@ func awsRestxml_deserializeOpErrorDeletePublicAccessBlock(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -2064,7 +2064,7 @@ func awsRestxml_deserializeOpErrorGetBucketAccelerateConfiguration(response *smi
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -2204,7 +2204,7 @@ func awsRestxml_deserializeOpErrorGetBucketAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -2343,7 +2343,7 @@ func awsRestxml_deserializeOpErrorGetBucketAnalyticsConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -2476,7 +2476,7 @@ func awsRestxml_deserializeOpErrorGetBucketCors(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -2609,7 +2609,7 @@ func awsRestxml_deserializeOpErrorGetBucketEncryption(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -2742,7 +2742,7 @@ func awsRestxml_deserializeOpErrorGetBucketInventoryConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -2875,7 +2875,7 @@ func awsRestxml_deserializeOpErrorGetBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -3008,7 +3008,7 @@ func awsRestxml_deserializeOpErrorGetBucketLocation(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -3148,7 +3148,7 @@ func awsRestxml_deserializeOpErrorGetBucketLogging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -3281,7 +3281,7 @@ func awsRestxml_deserializeOpErrorGetBucketMetricsConfiguration(response *smithy
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -3414,7 +3414,7 @@ func awsRestxml_deserializeOpErrorGetBucketNotificationConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -3559,7 +3559,7 @@ func awsRestxml_deserializeOpErrorGetBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -3702,7 +3702,7 @@ func awsRestxml_deserializeOpErrorGetBucketPolicyStatus(response *smithyhttp.Res
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -3835,7 +3835,7 @@ func awsRestxml_deserializeOpErrorGetBucketReplication(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -3968,7 +3968,7 @@ func awsRestxml_deserializeOpErrorGetBucketRequestPayment(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -4108,7 +4108,7 @@ func awsRestxml_deserializeOpErrorGetBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -4241,7 +4241,7 @@ func awsRestxml_deserializeOpErrorGetBucketVersioning(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -4394,7 +4394,7 @@ func awsRestxml_deserializeOpErrorGetBucketWebsite(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -4527,7 +4527,7 @@ func awsRestxml_deserializeOpErrorGetObject(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -4832,7 +4832,7 @@ func awsRestxml_deserializeOpErrorGetObjectAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -4986,7 +4986,7 @@ func awsRestxml_deserializeOpErrorGetObjectLegalHold(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -5119,7 +5119,7 @@ func awsRestxml_deserializeOpErrorGetObjectLockConfiguration(response *smithyhtt
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -5252,7 +5252,7 @@ func awsRestxml_deserializeOpErrorGetObjectRetention(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -5390,7 +5390,7 @@ func awsRestxml_deserializeOpErrorGetObjectTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -5517,7 +5517,7 @@ func awsRestxml_deserializeOpErrorGetObjectTorrent(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -5632,7 +5632,7 @@ func awsRestxml_deserializeOpErrorGetPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -5737,7 +5737,7 @@ func awsRestxml_deserializeOpErrorHeadBucket(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -5812,7 +5812,7 @@ func awsRestxml_deserializeOpErrorHeadObject(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -6088,7 +6088,7 @@ func awsRestxml_deserializeOpErrorListBucketAnalyticsConfigurations(response *sm
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -6269,7 +6269,7 @@ func awsRestxml_deserializeOpErrorListBucketInventoryConfigurations(response *sm
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -6450,7 +6450,7 @@ func awsRestxml_deserializeOpErrorListBucketMetricsConfigurations(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -6631,7 +6631,7 @@ func awsRestxml_deserializeOpErrorListBuckets(response *smithyhttp.Response, met
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -6770,7 +6770,7 @@ func awsRestxml_deserializeOpErrorListMultipartUploads(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -7067,7 +7067,7 @@ func awsRestxml_deserializeOpErrorListObjects(response *smithyhttp.Response, met
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -7335,7 +7335,7 @@ func awsRestxml_deserializeOpErrorListObjectsV2(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -7636,7 +7636,7 @@ func awsRestxml_deserializeOpErrorListObjectVersions(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -7944,7 +7944,7 @@ func awsRestxml_deserializeOpErrorListParts(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8215,7 +8215,7 @@ func awsRestxml_deserializeOpErrorPutBucketAccelerateConfiguration(response *smi
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8282,7 +8282,7 @@ func awsRestxml_deserializeOpErrorPutBucketAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8349,7 +8349,7 @@ func awsRestxml_deserializeOpErrorPutBucketAnalyticsConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8416,7 +8416,7 @@ func awsRestxml_deserializeOpErrorPutBucketCors(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8483,7 +8483,7 @@ func awsRestxml_deserializeOpErrorPutBucketEncryption(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8550,7 +8550,7 @@ func awsRestxml_deserializeOpErrorPutBucketInventoryConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8617,7 +8617,7 @@ func awsRestxml_deserializeOpErrorPutBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8684,7 +8684,7 @@ func awsRestxml_deserializeOpErrorPutBucketLogging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8751,7 +8751,7 @@ func awsRestxml_deserializeOpErrorPutBucketMetricsConfiguration(response *smithy
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8818,7 +8818,7 @@ func awsRestxml_deserializeOpErrorPutBucketNotificationConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8885,7 +8885,7 @@ func awsRestxml_deserializeOpErrorPutBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -8952,7 +8952,7 @@ func awsRestxml_deserializeOpErrorPutBucketReplication(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9019,7 +9019,7 @@ func awsRestxml_deserializeOpErrorPutBucketRequestPayment(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9086,7 +9086,7 @@ func awsRestxml_deserializeOpErrorPutBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9153,7 +9153,7 @@ func awsRestxml_deserializeOpErrorPutBucketVersioning(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9220,7 +9220,7 @@ func awsRestxml_deserializeOpErrorPutBucketWebsite(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9292,7 +9292,7 @@ func awsRestxml_deserializeOpErrorPutObject(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9417,7 +9417,7 @@ func awsRestxml_deserializeOpErrorPutObjectAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9505,7 +9505,7 @@ func awsRestxml_deserializeOpErrorPutObjectLegalHold(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9590,7 +9590,7 @@ func awsRestxml_deserializeOpErrorPutObjectLockConfiguration(response *smithyhtt
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9675,7 +9675,7 @@ func awsRestxml_deserializeOpErrorPutObjectRetention(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9760,7 +9760,7 @@ func awsRestxml_deserializeOpErrorPutObjectTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9840,7 +9840,7 @@ func awsRestxml_deserializeOpErrorPutPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -9912,7 +9912,7 @@ func awsRestxml_deserializeOpErrorRestoreObject(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -10005,7 +10005,7 @@ func awsRestxml_deserializeOpErrorUploadPart(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
@@ -10143,7 +10143,7 @@ func awsRestxml_deserializeOpErrorUploadPartCopy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
 	if err != nil {
 		return err
 	}
diff --git a/service/s3/go.mod b/service/s3/go.mod
index 6c356e87b74..45d76c53f76 100644
--- a/service/s3/go.mod
+++ b/service/s3/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/s3
 go 1.15
 
 require (
-	github.com/aws/aws-sdk-go-v2 v0.26.0
+	github.com/aws/aws-sdk-go-v2 v0.26.1-0.20201015193332-24a88063b255
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v0.0.0-20200930084954-897dfb99530c
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.0.0-20201014161145-592e24615bd4
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.26.1-0.20201015193332-24a88063b255
 	github.com/awslabs/smithy-go v0.1.2-0.20201012175301-b4d8737f29d1
 )
 
diff --git a/service/s3control/deserializers.go b/service/s3control/deserializers.go
index 951e3751089..4b54c99c0a1 100644
--- a/service/s3control/deserializers.go
+++ b/service/s3control/deserializers.go
@@ -89,7 +89,7 @@ func awsRestxml_deserializeOpErrorCreateAccessPoint(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -237,7 +237,7 @@ func awsRestxml_deserializeOpErrorCreateBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -398,7 +398,7 @@ func awsRestxml_deserializeOpErrorCreateJob(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -525,7 +525,7 @@ func awsRestxml_deserializeOpErrorDeleteAccessPoint(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -592,7 +592,7 @@ func awsRestxml_deserializeOpErrorDeleteAccessPointPolicy(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -659,7 +659,7 @@ func awsRestxml_deserializeOpErrorDeleteBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -726,7 +726,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketLifecycleConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -793,7 +793,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketPolicy(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -860,7 +860,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketTagging(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -927,7 +927,7 @@ func awsRestxml_deserializeOpErrorDeleteJobTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -1003,7 +1003,7 @@ func awsRestxml_deserializeOpErrorDeletePublicAccessBlock(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -1098,7 +1098,7 @@ func awsRestxml_deserializeOpErrorDescribeJob(response *smithyhttp.Response, met
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -1243,7 +1243,7 @@ func awsRestxml_deserializeOpErrorGetAccessPoint(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -1444,7 +1444,7 @@ func awsRestxml_deserializeOpErrorGetAccessPointPolicy(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -1587,7 +1587,7 @@ func awsRestxml_deserializeOpErrorGetAccessPointPolicyStatus(response *smithyhtt
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -1720,7 +1720,7 @@ func awsRestxml_deserializeOpErrorGetBucket(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -1896,7 +1896,7 @@ func awsRestxml_deserializeOpErrorGetBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -2029,7 +2029,7 @@ func awsRestxml_deserializeOpErrorGetBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -2172,7 +2172,7 @@ func awsRestxml_deserializeOpErrorGetBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -2305,7 +2305,7 @@ func awsRestxml_deserializeOpErrorGetJobTagging(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -2447,7 +2447,7 @@ func awsRestxml_deserializeOpErrorGetPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -2583,7 +2583,7 @@ func awsRestxml_deserializeOpErrorListAccessPoints(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -2732,7 +2732,7 @@ func awsRestxml_deserializeOpErrorListJobs(response *smithyhttp.Response, metada
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -2890,7 +2890,7 @@ func awsRestxml_deserializeOpErrorListRegionalBuckets(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -3011,7 +3011,7 @@ func awsRestxml_deserializeOpErrorPutAccessPointPolicy(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -3078,7 +3078,7 @@ func awsRestxml_deserializeOpErrorPutBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -3145,7 +3145,7 @@ func awsRestxml_deserializeOpErrorPutBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -3212,7 +3212,7 @@ func awsRestxml_deserializeOpErrorPutBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -3279,7 +3279,7 @@ func awsRestxml_deserializeOpErrorPutJobTagging(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -3358,7 +3358,7 @@ func awsRestxml_deserializeOpErrorPutPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -3453,7 +3453,7 @@ func awsRestxml_deserializeOpErrorUpdateJobPriority(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
@@ -3625,7 +3625,7 @@ func awsRestxml_deserializeOpErrorUpdateJobStatus(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
 	if err != nil {
 		return err
 	}
diff --git a/service/s3control/go.mod b/service/s3control/go.mod
index 4ba995fe096..04154c4cc74 100644
--- a/service/s3control/go.mod
+++ b/service/s3control/go.mod
@@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/s3control
 go 1.15
 
 require (
-	github.com/aws/aws-sdk-go-v2 v0.26.0
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.0.0-20201014161145-592e24615bd4
+	github.com/aws/aws-sdk-go-v2 v0.26.1-0.20201015193332-24a88063b255
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.26.1-0.20201015193332-24a88063b255
 	github.com/awslabs/smithy-go v0.1.2-0.20201012175301-b4d8737f29d1
 )
 

From 66b2791dafc476bd42fb8bf9fca8eed36b27a280 Mon Sep 17 00:00:00 2001
From: skotambkar <kotambka@amazon.com>
Date: Fri, 16 Oct 2020 04:12:47 -0700
Subject: [PATCH 07/10] separate utils for s3 and s3control

---
 .../smithy/aws/go/codegen/XMLProtocolUtils.java   | 10 ++++++----
 service/internal/s3shared/xml_utils.go            | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java
index 85e19d2123b..857008fddf2 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java
+++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XMLProtocolUtils.java
@@ -275,10 +275,12 @@ public static void writeXmlErrorMessageCodeDeserializer(ProtocolGenerator.Genera
 
         if (requiresS3Customization(service)) {
             writer.addUseImports(AwsCustomGoDependency.S3_SHARED_CUSTOMIZATION);
-            String getErrorComponents = String.format("errorComponents, err := "
-                            + "s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, %s)",
-                    isS3Service(service));
-            writer.write(getErrorComponents);
+            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 }");
 
diff --git a/service/internal/s3shared/xml_utils.go b/service/internal/s3shared/xml_utils.go
index d4cec6b6d0a..fb6fcbdd7c0 100644
--- a/service/internal/s3shared/xml_utils.go
+++ b/service/internal/s3shared/xml_utils.go
@@ -18,19 +18,28 @@ type ErrorComponents struct {
 }
 
 // GetErrorResponseComponents returns the error fields from an xml error response body
-func GetErrorResponseComponents(r io.Reader, statusCode int, isS3service bool) (ErrorComponents, error) {
+func GetErrorResponseComponents(r io.Reader) (ErrorComponents, error) {
 	var errComponents ErrorComponents
 	if err := xml.NewDecoder(r).Decode(&errComponents); err != nil && err != io.EOF {
 		return ErrorComponents{}, fmt.Errorf("error while deserializing xml error response : %w", err)
 	}
+	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 isS3service && len(errComponents.Code) == 0 && len(errComponents.Message) == 0 {
+	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
 }

From 8523ff71af617bff83c5ef7340fa7d4b7cda5be9 Mon Sep 17 00:00:00 2001
From: skotambkar <kotambka@amazon.com>
Date: Fri, 16 Oct 2020 04:15:40 -0700
Subject: [PATCH 08/10] update go hash

---
 .../software/amazon/smithy/aws/go/codegen/AwsGoDependency.java  | 2 +-
 .../aws/go/codegen/customization/AwsCustomGoDependency.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java
index 9dbc779304a..3468b54696e 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java
+++ b/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.26.1-0.20201015193332-24a88063b255";
+        private static final String AWS_SDK = "v0.26.1-0.20201016111247-66b2791dafc4";
     }
 }
diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsCustomGoDependency.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsCustomGoDependency.java
index 84476192956..74425e85541 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsCustomGoDependency.java
+++ b/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.26.1-0.20201015193332-24a88063b255";
+        private static final String INTERNAL_S3SHARED = "v0.26.1-0.20201016111247-66b2791dafc4";
         private static final String INTERNAL_ACCEPTENCODING = "v0.0.0-20200930084954-897dfb99530c";
     }
 }

From 496b7021e21bdfe85468a160f4811eb57b42e3e0 Mon Sep 17 00:00:00 2001
From: skotambkar <kotambka@amazon.com>
Date: Fri, 16 Oct 2020 04:27:06 -0700
Subject: [PATCH 09/10] regenerate s3, s3control client

---
 service/s3/deserializers.go        | 166 ++++++++++++++---------------
 service/s3/go.mod                  |   4 +-
 service/s3control/deserializers.go |  64 +++++------
 service/s3control/go.mod           |   4 +-
 4 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/service/s3/deserializers.go b/service/s3/deserializers.go
index 536eb002de7..52ac1dbcba9 100644
--- a/service/s3/deserializers.go
+++ b/service/s3/deserializers.go
@@ -66,7 +66,7 @@ func awsRestxml_deserializeOpErrorAbortMultipartUpload(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -182,7 +182,7 @@ func awsRestxml_deserializeOpErrorCompleteMultipartUpload(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -410,7 +410,7 @@ func awsRestxml_deserializeOpErrorCopyObject(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -575,7 +575,7 @@ func awsRestxml_deserializeOpErrorCreateBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -694,7 +694,7 @@ func awsRestxml_deserializeOpErrorCreateMultipartUpload(response *smithyhttp.Res
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -892,7 +892,7 @@ func awsRestxml_deserializeOpErrorDeleteBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -959,7 +959,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketAnalyticsConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1026,7 +1026,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketCors(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1093,7 +1093,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketEncryption(response *smithyhttp.Re
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1160,7 +1160,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketInventoryConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1227,7 +1227,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketLifecycle(response *smithyhttp.Res
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1294,7 +1294,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketMetricsConfiguration(response *smi
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1361,7 +1361,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketPolicy(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1428,7 +1428,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketReplication(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1495,7 +1495,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketTagging(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1562,7 +1562,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketWebsite(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1634,7 +1634,7 @@ func awsRestxml_deserializeOpErrorDeleteObject(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1761,7 +1761,7 @@ func awsRestxml_deserializeOpErrorDeleteObjects(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1889,7 +1889,7 @@ func awsRestxml_deserializeOpErrorDeleteObjectTagging(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -1969,7 +1969,7 @@ func awsRestxml_deserializeOpErrorDeletePublicAccessBlock(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2064,7 +2064,7 @@ func awsRestxml_deserializeOpErrorGetBucketAccelerateConfiguration(response *smi
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2204,7 +2204,7 @@ func awsRestxml_deserializeOpErrorGetBucketAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2343,7 +2343,7 @@ func awsRestxml_deserializeOpErrorGetBucketAnalyticsConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2476,7 +2476,7 @@ func awsRestxml_deserializeOpErrorGetBucketCors(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2609,7 +2609,7 @@ func awsRestxml_deserializeOpErrorGetBucketEncryption(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2742,7 +2742,7 @@ func awsRestxml_deserializeOpErrorGetBucketInventoryConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -2875,7 +2875,7 @@ func awsRestxml_deserializeOpErrorGetBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3008,7 +3008,7 @@ func awsRestxml_deserializeOpErrorGetBucketLocation(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3148,7 +3148,7 @@ func awsRestxml_deserializeOpErrorGetBucketLogging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3281,7 +3281,7 @@ func awsRestxml_deserializeOpErrorGetBucketMetricsConfiguration(response *smithy
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3414,7 +3414,7 @@ func awsRestxml_deserializeOpErrorGetBucketNotificationConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3559,7 +3559,7 @@ func awsRestxml_deserializeOpErrorGetBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3702,7 +3702,7 @@ func awsRestxml_deserializeOpErrorGetBucketPolicyStatus(response *smithyhttp.Res
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3835,7 +3835,7 @@ func awsRestxml_deserializeOpErrorGetBucketReplication(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -3968,7 +3968,7 @@ func awsRestxml_deserializeOpErrorGetBucketRequestPayment(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4108,7 +4108,7 @@ func awsRestxml_deserializeOpErrorGetBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4241,7 +4241,7 @@ func awsRestxml_deserializeOpErrorGetBucketVersioning(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4394,7 +4394,7 @@ func awsRestxml_deserializeOpErrorGetBucketWebsite(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4527,7 +4527,7 @@ func awsRestxml_deserializeOpErrorGetObject(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4832,7 +4832,7 @@ func awsRestxml_deserializeOpErrorGetObjectAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -4986,7 +4986,7 @@ func awsRestxml_deserializeOpErrorGetObjectLegalHold(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5119,7 +5119,7 @@ func awsRestxml_deserializeOpErrorGetObjectLockConfiguration(response *smithyhtt
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5252,7 +5252,7 @@ func awsRestxml_deserializeOpErrorGetObjectRetention(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5390,7 +5390,7 @@ func awsRestxml_deserializeOpErrorGetObjectTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5517,7 +5517,7 @@ func awsRestxml_deserializeOpErrorGetObjectTorrent(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5632,7 +5632,7 @@ func awsRestxml_deserializeOpErrorGetPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5737,7 +5737,7 @@ func awsRestxml_deserializeOpErrorHeadBucket(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -5812,7 +5812,7 @@ func awsRestxml_deserializeOpErrorHeadObject(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -6088,7 +6088,7 @@ func awsRestxml_deserializeOpErrorListBucketAnalyticsConfigurations(response *sm
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -6269,7 +6269,7 @@ func awsRestxml_deserializeOpErrorListBucketInventoryConfigurations(response *sm
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -6450,7 +6450,7 @@ func awsRestxml_deserializeOpErrorListBucketMetricsConfigurations(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -6631,7 +6631,7 @@ func awsRestxml_deserializeOpErrorListBuckets(response *smithyhttp.Response, met
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -6770,7 +6770,7 @@ func awsRestxml_deserializeOpErrorListMultipartUploads(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -7067,7 +7067,7 @@ func awsRestxml_deserializeOpErrorListObjects(response *smithyhttp.Response, met
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -7335,7 +7335,7 @@ func awsRestxml_deserializeOpErrorListObjectsV2(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -7636,7 +7636,7 @@ func awsRestxml_deserializeOpErrorListObjectVersions(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -7944,7 +7944,7 @@ func awsRestxml_deserializeOpErrorListParts(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8215,7 +8215,7 @@ func awsRestxml_deserializeOpErrorPutBucketAccelerateConfiguration(response *smi
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8282,7 +8282,7 @@ func awsRestxml_deserializeOpErrorPutBucketAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8349,7 +8349,7 @@ func awsRestxml_deserializeOpErrorPutBucketAnalyticsConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8416,7 +8416,7 @@ func awsRestxml_deserializeOpErrorPutBucketCors(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8483,7 +8483,7 @@ func awsRestxml_deserializeOpErrorPutBucketEncryption(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8550,7 +8550,7 @@ func awsRestxml_deserializeOpErrorPutBucketInventoryConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8617,7 +8617,7 @@ func awsRestxml_deserializeOpErrorPutBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8684,7 +8684,7 @@ func awsRestxml_deserializeOpErrorPutBucketLogging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8751,7 +8751,7 @@ func awsRestxml_deserializeOpErrorPutBucketMetricsConfiguration(response *smithy
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8818,7 +8818,7 @@ func awsRestxml_deserializeOpErrorPutBucketNotificationConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8885,7 +8885,7 @@ func awsRestxml_deserializeOpErrorPutBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -8952,7 +8952,7 @@ func awsRestxml_deserializeOpErrorPutBucketReplication(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9019,7 +9019,7 @@ func awsRestxml_deserializeOpErrorPutBucketRequestPayment(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9086,7 +9086,7 @@ func awsRestxml_deserializeOpErrorPutBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9153,7 +9153,7 @@ func awsRestxml_deserializeOpErrorPutBucketVersioning(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9220,7 +9220,7 @@ func awsRestxml_deserializeOpErrorPutBucketWebsite(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9292,7 +9292,7 @@ func awsRestxml_deserializeOpErrorPutObject(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9417,7 +9417,7 @@ func awsRestxml_deserializeOpErrorPutObjectAcl(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9505,7 +9505,7 @@ func awsRestxml_deserializeOpErrorPutObjectLegalHold(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9590,7 +9590,7 @@ func awsRestxml_deserializeOpErrorPutObjectLockConfiguration(response *smithyhtt
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9675,7 +9675,7 @@ func awsRestxml_deserializeOpErrorPutObjectRetention(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9760,7 +9760,7 @@ func awsRestxml_deserializeOpErrorPutObjectTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9840,7 +9840,7 @@ func awsRestxml_deserializeOpErrorPutPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -9912,7 +9912,7 @@ func awsRestxml_deserializeOpErrorRestoreObject(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -10005,7 +10005,7 @@ func awsRestxml_deserializeOpErrorUploadPart(response *smithyhttp.Response, meta
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
@@ -10143,7 +10143,7 @@ func awsRestxml_deserializeOpErrorUploadPartCopy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, true)
+	errorComponents, err := s3shared.GetS3ErrorResponseComponents(errorBody, response.StatusCode)
 	if err != nil {
 		return err
 	}
diff --git a/service/s3/go.mod b/service/s3/go.mod
index 45d76c53f76..fa167818a06 100644
--- a/service/s3/go.mod
+++ b/service/s3/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/s3
 go 1.15
 
 require (
-	github.com/aws/aws-sdk-go-v2 v0.26.1-0.20201015193332-24a88063b255
+	github.com/aws/aws-sdk-go-v2 v0.26.1-0.20201016111247-66b2791dafc4
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v0.0.0-20200930084954-897dfb99530c
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.26.1-0.20201015193332-24a88063b255
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.26.1-0.20201016111247-66b2791dafc4
 	github.com/awslabs/smithy-go v0.1.2-0.20201012175301-b4d8737f29d1
 )
 
diff --git a/service/s3control/deserializers.go b/service/s3control/deserializers.go
index 4b54c99c0a1..89eb3b5e23d 100644
--- a/service/s3control/deserializers.go
+++ b/service/s3control/deserializers.go
@@ -89,7 +89,7 @@ func awsRestxml_deserializeOpErrorCreateAccessPoint(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -237,7 +237,7 @@ func awsRestxml_deserializeOpErrorCreateBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -398,7 +398,7 @@ func awsRestxml_deserializeOpErrorCreateJob(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -525,7 +525,7 @@ func awsRestxml_deserializeOpErrorDeleteAccessPoint(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -592,7 +592,7 @@ func awsRestxml_deserializeOpErrorDeleteAccessPointPolicy(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -659,7 +659,7 @@ func awsRestxml_deserializeOpErrorDeleteBucket(response *smithyhttp.Response, me
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -726,7 +726,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketLifecycleConfiguration(response *s
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -793,7 +793,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketPolicy(response *smithyhttp.Respon
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -860,7 +860,7 @@ func awsRestxml_deserializeOpErrorDeleteBucketTagging(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -927,7 +927,7 @@ func awsRestxml_deserializeOpErrorDeleteJobTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -1003,7 +1003,7 @@ func awsRestxml_deserializeOpErrorDeletePublicAccessBlock(response *smithyhttp.R
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -1098,7 +1098,7 @@ func awsRestxml_deserializeOpErrorDescribeJob(response *smithyhttp.Response, met
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -1243,7 +1243,7 @@ func awsRestxml_deserializeOpErrorGetAccessPoint(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -1444,7 +1444,7 @@ func awsRestxml_deserializeOpErrorGetAccessPointPolicy(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -1587,7 +1587,7 @@ func awsRestxml_deserializeOpErrorGetAccessPointPolicyStatus(response *smithyhtt
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -1720,7 +1720,7 @@ func awsRestxml_deserializeOpErrorGetBucket(response *smithyhttp.Response, metad
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -1896,7 +1896,7 @@ func awsRestxml_deserializeOpErrorGetBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -2029,7 +2029,7 @@ func awsRestxml_deserializeOpErrorGetBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -2172,7 +2172,7 @@ func awsRestxml_deserializeOpErrorGetBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -2305,7 +2305,7 @@ func awsRestxml_deserializeOpErrorGetJobTagging(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -2447,7 +2447,7 @@ func awsRestxml_deserializeOpErrorGetPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -2583,7 +2583,7 @@ func awsRestxml_deserializeOpErrorListAccessPoints(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -2732,7 +2732,7 @@ func awsRestxml_deserializeOpErrorListJobs(response *smithyhttp.Response, metada
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -2890,7 +2890,7 @@ func awsRestxml_deserializeOpErrorListRegionalBuckets(response *smithyhttp.Respo
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -3011,7 +3011,7 @@ func awsRestxml_deserializeOpErrorPutAccessPointPolicy(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -3078,7 +3078,7 @@ func awsRestxml_deserializeOpErrorPutBucketLifecycleConfiguration(response *smit
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -3145,7 +3145,7 @@ func awsRestxml_deserializeOpErrorPutBucketPolicy(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -3212,7 +3212,7 @@ func awsRestxml_deserializeOpErrorPutBucketTagging(response *smithyhttp.Response
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -3279,7 +3279,7 @@ func awsRestxml_deserializeOpErrorPutJobTagging(response *smithyhttp.Response, m
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -3358,7 +3358,7 @@ func awsRestxml_deserializeOpErrorPutPublicAccessBlock(response *smithyhttp.Resp
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -3453,7 +3453,7 @@ func awsRestxml_deserializeOpErrorUpdateJobPriority(response *smithyhttp.Respons
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
@@ -3625,7 +3625,7 @@ func awsRestxml_deserializeOpErrorUpdateJobStatus(response *smithyhttp.Response,
 	errorCode := "UnknownError"
 	errorMessage := errorCode
 
-	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody, response.StatusCode, false)
+	errorComponents, err := s3shared.GetErrorResponseComponents(errorBody)
 	if err != nil {
 		return err
 	}
diff --git a/service/s3control/go.mod b/service/s3control/go.mod
index 04154c4cc74..4a5a9784cff 100644
--- a/service/s3control/go.mod
+++ b/service/s3control/go.mod
@@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/s3control
 go 1.15
 
 require (
-	github.com/aws/aws-sdk-go-v2 v0.26.1-0.20201015193332-24a88063b255
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.26.1-0.20201015193332-24a88063b255
+	github.com/aws/aws-sdk-go-v2 v0.26.1-0.20201016111247-66b2791dafc4
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.26.1-0.20201016111247-66b2791dafc4
 	github.com/awslabs/smithy-go v0.1.2-0.20201012175301-b4d8737f29d1
 )
 

From 977bf9727f09f34837fe2111019c86461aa5b3b5 Mon Sep 17 00:00:00 2001
From: Jason Del Ponte <delpontej@gmail.com>
Date: Fri, 16 Oct 2020 10:58:58 -0700
Subject: [PATCH 10/10] fixup unit test

---
 service/internal/s3shared/xml_utils_test.go | 44 +++++++++++----------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/service/internal/s3shared/xml_utils_test.go b/service/internal/s3shared/xml_utils_test.go
index 64bc1ef148a..c0f9883d6e2 100644
--- a/service/internal/s3shared/xml_utils_test.go
+++ b/service/internal/s3shared/xml_utils_test.go
@@ -1,54 +1,56 @@
 package s3shared
 
 import (
-	"bytes"
-	"io"
 	"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 {
-		isS3Service            bool
-		status                 int
-		errorResponse          io.Reader
+		getErr                 func() (ErrorComponents, error)
 		expectedErrorCode      string
 		expectedErrorMessage   string
 		expectedErrorRequestID string
 		expectedErrorHostID    string
 	}{
 		"standard xml error": {
-			isS3Service: true,
-			status:      400,
-			errorResponse: bytes.NewReader([]byte(`<Error>
-    <Type>Sender</Type>
-    <Code>InvalidGreeting</Code>
-    <Message>Hi</Message>
-    <HostId>bar-id</HostId>
-    <RequestId>foo-id</RequestId>
-</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": {
-			isS3Service:          true,
-			status:               400,
-			errorResponse:        bytes.NewReader([]byte(``)),
+			getErr: func() (ErrorComponents, error) {
+				errResp := strings.NewReader("")
+				return GetS3ErrorResponseComponents(errResp, 400)
+			},
 			expectedErrorCode:    "BadRequest",
 			expectedErrorMessage: "Bad Request",
 		},
 		"s3control no response body": {
-			isS3Service:   false,
-			status:        400,
-			errorResponse: bytes.NewReader([]byte(``)),
+			getErr: func() (ErrorComponents, error) {
+				errResp := strings.NewReader("")
+				return GetErrorResponseComponents(errResp)
+			},
 		},
 	}
 
 	for name, c := range cases {
 		t.Run(name, func(t *testing.T) {
-			ec, err := GetErrorResponseComponents(c.errorResponse, c.status, c.isS3Service)
+			ec, err := c.getErr()
 			if err != nil {
 				t.Fatalf("expected no error, got %v", err)
 			}