separate utils for s3 and s3control

Author: skotambkar

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 }");
 

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
 }