private/protocol/rest: Trim space in header key and value (#291)

jasdel · web-flow · commit 80eda21e3854 · 2019-04-10T12:01:56.000-07:00
Updates the REST protocol marshaler to trip leading and trailing space from header keys and values before setting the HTTP request header. Fixes a bug when using S3 metadata where metadata values with leading spaces would trigger request signature validation errors when the request is received by the service. V2 SDK port of: aws/aws-sdk-go#2460
diff --git a/models/protocol_tests/generate.go b/models/protocol_tests/generate.go
@@ -186,7 +186,7 @@ func Test{{ .OpName }}(t *testing.T) {
 	// assert headers
 	{{ range $k, $v := .TestCase.InputTest.Headers -}}
 		if e, a := "{{ $v }}", r.Header.Get("{{ $k }}"); e != a {
-			t.Errorf("expect %v to be %v", e, a)
+			t.Errorf("expect %v, got %v", e, a)
 		}
 	{{ end }}
 }
diff --git a/models/protocol_tests/input/rest-json.json b/models/protocol_tests/input/rest-json.json
@@ -1586,5 +1586,76 @@
         }
       }
     ]
+  },
+  {
+    "description": "Header whitespace",
+    "metadata": {
+      "protocol": "rest-json",
+      "apiVersion": "2014-01-01"
+    },
+    "shapes": {
+      "InputShape": {
+        "type": "structure",
+        "members": {
+          "Header1": {
+            "shape": "StringType",
+            "location": "header"
+          },
+          "HeaderMap": {
+            "shape": "StringMap",
+            "location": "headers",
+            "locationName": "header-map-"
+          }
+        }
+      },
+      "StringType": {
+        "type": "string"
+      },
+      "StringMap": {
+        "type": "map",
+        "key": {
+          "shape": "StringType"
+        },
+        "value": {
+          "shape": "StringType"
+        }
+      }
+    },
+    "cases": [
+      {
+        "given": {
+          "http": {
+            "method": "GET",
+            "requestUri": "/"
+          },
+          "input": {
+            "shape": "InputShape"
+          },
+          "name": "OperationName"
+        },
+        "params": {
+          "Header1": "   headerValue",
+          "HeaderMap": {
+              "leading-space": "   value",
+              "with-space": "   value   ",
+              "leading-tab": "    value",
+              "   key-leading-space": "value",
+              "   key-with-space   ": "value"
+          }
+        },
+        "serialized": {
+          "body": "",
+          "uri": "/",
+          "headers": {
+              "header1": "headerValue",
+              "header-map-leading-space": "value",
+              "header-map-with-space": "value",
+              "header-map-leading-tab": "value",
+              "header-map-key-leading-space": "value",
+              "header-map-key-with-space": "value"
+          }
+        }
+      }
+    ]
   }
 ]
diff --git a/models/protocol_tests/input/rest-xml.json b/models/protocol_tests/input/rest-xml.json
@@ -1864,5 +1864,76 @@
         }
       }
     ]
+  },
+  {
+    "description": "Header whitespace",
+    "metadata": {
+      "protocol": "rest-xml",
+      "apiVersion": "2014-01-01"
+    },
+    "shapes": {
+      "InputShape": {
+        "type": "structure",
+        "members": {
+          "Header1": {
+            "shape": "StringType",
+            "location": "header"
+          },
+          "HeaderMap": {
+            "shape": "StringMap",
+            "location": "headers",
+            "locationName": "header-map-"
+          }
+        }
+      },
+      "StringType": {
+        "type": "string"
+      },
+      "StringMap": {
+        "type": "map",
+        "key": {
+          "shape": "StringType"
+        },
+        "value": {
+          "shape": "StringType"
+        }
+      }
+    },
+    "cases": [
+      {
+        "given": {
+          "http": {
+            "method": "GET",
+            "requestUri": "/"
+          },
+          "input": {
+            "shape": "InputShape"
+          },
+          "name": "OperationName"
+        },
+        "params": {
+          "Header1": "   headerValue",
+          "HeaderMap": {
+              "leading-space": "   value",
+              "with-space": "   value   ",
+              "leading-tab": "    value",
+              "   key-leading-space": "value",
+              "   key-with-space   ": "value"
+          }
+        },
+        "serialized": {
+          "body": "",
+          "uri": "/",
+          "headers": {
+              "header1": "headerValue",
+              "header-map-leading-space": "value",
+              "header-map-with-space": "value",
+              "header-map-leading-tab": "value",
+              "header-map-key-leading-space": "value",
+              "header-map-key-with-space": "value"
+          }
+        }
+      }
+    ]
   }
 ]
diff --git a/private/protocol/header_encoder.go b/private/protocol/header_encoder.go
@@ -3,6 +3,7 @@ package protocol
 import (
 	"fmt"
 	"net/http"
+	"strings"
 )
 
 // HeaderMapEncoder builds a map valu
@@ -24,6 +25,9 @@ func (e *HeaderMapEncoder) MapSetValue(k string, v ValueMarshaler) {
 		return
 	}
 
+	k = strings.TrimSpace(k)
+	str = strings.TrimSpace(str)
+
 	if len(e.Prefix) > 0 {
 		k = e.Prefix + k
 	}
diff --git a/private/protocol/jsonrpc/build_test.go b/private/protocol/jsonrpc/build_test.go
@@ -1733,10 +1733,10 @@ func TestInputService1ProtocolTestScalarMembersCase1(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -1771,10 +1771,10 @@ func TestInputService2ProtocolTestTimestampValuesCase1(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -1809,10 +1809,10 @@ func TestInputService3ProtocolTestBase64EncodedBlobsCase1(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -1850,10 +1850,10 @@ func TestInputService3ProtocolTestBase64EncodedBlobsCase2(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -1891,10 +1891,10 @@ func TestInputService4ProtocolTestNestedBlobsCase1(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -1931,10 +1931,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase1(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -1973,10 +1973,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase2(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -2019,10 +2019,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase3(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -2066,10 +2066,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase4(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -2115,10 +2115,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase5(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -2162,10 +2162,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase6(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -2200,10 +2200,10 @@ func TestInputService6ProtocolTestEmptyMapsCase1(t *testing.T) {
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -2360,10 +2360,10 @@ func TestInputService9ProtocolTestEndpointHostTraitStaticPrefixCase1(t *testing.
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.StaticOp", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
@@ -2398,10 +2398,10 @@ func TestInputService9ProtocolTestEndpointHostTraitStaticPrefixCase2(t *testing.
 
 	// assert headers
 	if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 	if e, a := "com.amazonaws.foo.MemberRefOp", r.Header.Get("X-Amz-Target"); e != a {
-		t.Errorf("expect %v to be %v", e, a)
+		t.Errorf("expect %v, got %v", e, a)
 	}
 
 }
diff --git a/private/protocol/rest/build.go b/private/protocol/rest/build.go
@@ -166,6 +166,9 @@ func buildHeader(header *http.Header, v reflect.Value, name string, tag reflect.
 		return awserr.New("SerializationError", "failed to encode REST request", err)
 	}
 
+	name = strings.TrimSpace(name)
+	str = strings.TrimSpace(str)
+
 	header.Add(name, str)
 
 	return nil
@@ -181,8 +184,10 @@ func buildHeaderMap(header *http.Header, v reflect.Value, tag reflect.StructTag)
 			return awserr.New("SerializationError", "failed to encode REST request", err)
 
 		}
+		keyStr := strings.TrimSpace(key.String())
+		str = strings.TrimSpace(str)
 
-		header.Add(prefix+key.String(), str)
+		header.Add(prefix+keyStr, str)
 	}
 	return nil
 }
diff --git a/private/protocol/rest/encode.go b/private/protocol/rest/encode.go
diff --git a/private/protocol/restjson/build_test.go b/private/protocol/restjson/build_test.go
diff --git a/private/protocol/restxml/build_test.go b/private/protocol/restxml/build_test.go

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ func Test{{ .OpName }}(t *testing.T) {`
`186`	`186`	`// assert headers`
`187`	`187`	`{{ range $k, $v := .TestCase.InputTest.Headers -}}`
`188`	`188`	`if e, a := "{{ $v }}", r.Header.Get("{{ $k }}"); e != a {`
`189`		`- t.Errorf("expect %v to be %v", e, a)`
	`189`	`+ t.Errorf("expect %v, got %v", e, a)`
`190`	`190`	`}`
`191`	`191`	`{{ end }}`
`192`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package protocol`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"net/http"`
	`6`	`+ "strings"`
`6`	`7`	`)`
`7`	`8`
`8`	`9`	`// HeaderMapEncoder builds a map valu`
`@@ -24,6 +25,9 @@ func (e *HeaderMapEncoder) MapSetValue(k string, v ValueMarshaler) {`
`24`	`25`	`return`
`25`	`26`	`}`
`26`	`27`
	`28`	`+ k = strings.TrimSpace(k)`
	`29`	`+ str = strings.TrimSpace(str)`
	`30`	`+`
`27`	`31`	`if len(e.Prefix) > 0 {`
`28`	`32`	`k = e.Prefix + k`
`29`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1733,10 +1733,10 @@ func TestInputService1ProtocolTestScalarMembersCase1(t *testing.T) {`
`1733`	`1733`
`1734`	`1734`	`// assert headers`
`1735`	`1735`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`1736`		`- t.Errorf("expect %v to be %v", e, a)`
	`1736`	`+ t.Errorf("expect %v, got %v", e, a)`
`1737`	`1737`	`}`
`1738`	`1738`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`1739`		`- t.Errorf("expect %v to be %v", e, a)`
	`1739`	`+ t.Errorf("expect %v, got %v", e, a)`
`1740`	`1740`	`}`
`1741`	`1741`
`1742`	`1742`	`}`
`@@ -1771,10 +1771,10 @@ func TestInputService2ProtocolTestTimestampValuesCase1(t *testing.T) {`
`1771`	`1771`
`1772`	`1772`	`// assert headers`
`1773`	`1773`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`1774`		`- t.Errorf("expect %v to be %v", e, a)`
	`1774`	`+ t.Errorf("expect %v, got %v", e, a)`
`1775`	`1775`	`}`
`1776`	`1776`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`1777`		`- t.Errorf("expect %v to be %v", e, a)`
	`1777`	`+ t.Errorf("expect %v, got %v", e, a)`
`1778`	`1778`	`}`
`1779`	`1779`
`1780`	`1780`	`}`
`@@ -1809,10 +1809,10 @@ func TestInputService3ProtocolTestBase64EncodedBlobsCase1(t *testing.T) {`
`1809`	`1809`
`1810`	`1810`	`// assert headers`
`1811`	`1811`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`1812`		`- t.Errorf("expect %v to be %v", e, a)`
	`1812`	`+ t.Errorf("expect %v, got %v", e, a)`
`1813`	`1813`	`}`
`1814`	`1814`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`1815`		`- t.Errorf("expect %v to be %v", e, a)`
	`1815`	`+ t.Errorf("expect %v, got %v", e, a)`
`1816`	`1816`	`}`
`1817`	`1817`
`1818`	`1818`	`}`
`@@ -1850,10 +1850,10 @@ func TestInputService3ProtocolTestBase64EncodedBlobsCase2(t *testing.T) {`
`1850`	`1850`
`1851`	`1851`	`// assert headers`
`1852`	`1852`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`1853`		`- t.Errorf("expect %v to be %v", e, a)`
	`1853`	`+ t.Errorf("expect %v, got %v", e, a)`
`1854`	`1854`	`}`
`1855`	`1855`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`1856`		`- t.Errorf("expect %v to be %v", e, a)`
	`1856`	`+ t.Errorf("expect %v, got %v", e, a)`
`1857`	`1857`	`}`
`1858`	`1858`
`1859`	`1859`	`}`
`@@ -1891,10 +1891,10 @@ func TestInputService4ProtocolTestNestedBlobsCase1(t *testing.T) {`
`1891`	`1891`
`1892`	`1892`	`// assert headers`
`1893`	`1893`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`1894`		`- t.Errorf("expect %v to be %v", e, a)`
	`1894`	`+ t.Errorf("expect %v, got %v", e, a)`
`1895`	`1895`	`}`
`1896`	`1896`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`1897`		`- t.Errorf("expect %v to be %v", e, a)`
	`1897`	`+ t.Errorf("expect %v, got %v", e, a)`
`1898`	`1898`	`}`
`1899`	`1899`
`1900`	`1900`	`}`
`@@ -1931,10 +1931,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase1(t *testing.T) {`
`1931`	`1931`
`1932`	`1932`	`// assert headers`
`1933`	`1933`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`1934`		`- t.Errorf("expect %v to be %v", e, a)`
	`1934`	`+ t.Errorf("expect %v, got %v", e, a)`
`1935`	`1935`	`}`
`1936`	`1936`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`1937`		`- t.Errorf("expect %v to be %v", e, a)`
	`1937`	`+ t.Errorf("expect %v, got %v", e, a)`
`1938`	`1938`	`}`
`1939`	`1939`
`1940`	`1940`	`}`
`@@ -1973,10 +1973,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase2(t *testing.T) {`
`1973`	`1973`
`1974`	`1974`	`// assert headers`
`1975`	`1975`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`1976`		`- t.Errorf("expect %v to be %v", e, a)`
	`1976`	`+ t.Errorf("expect %v, got %v", e, a)`
`1977`	`1977`	`}`
`1978`	`1978`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`1979`		`- t.Errorf("expect %v to be %v", e, a)`
	`1979`	`+ t.Errorf("expect %v, got %v", e, a)`
`1980`	`1980`	`}`
`1981`	`1981`
`1982`	`1982`	`}`
`@@ -2019,10 +2019,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase3(t *testing.T) {`
`2019`	`2019`
`2020`	`2020`	`// assert headers`
`2021`	`2021`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`2022`		`- t.Errorf("expect %v to be %v", e, a)`
	`2022`	`+ t.Errorf("expect %v, got %v", e, a)`
`2023`	`2023`	`}`
`2024`	`2024`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`2025`		`- t.Errorf("expect %v to be %v", e, a)`
	`2025`	`+ t.Errorf("expect %v, got %v", e, a)`
`2026`	`2026`	`}`
`2027`	`2027`
`2028`	`2028`	`}`
`@@ -2066,10 +2066,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase4(t *testing.T) {`
`2066`	`2066`
`2067`	`2067`	`// assert headers`
`2068`	`2068`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`2069`		`- t.Errorf("expect %v to be %v", e, a)`
	`2069`	`+ t.Errorf("expect %v, got %v", e, a)`
`2070`	`2070`	`}`
`2071`	`2071`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`2072`		`- t.Errorf("expect %v to be %v", e, a)`
	`2072`	`+ t.Errorf("expect %v, got %v", e, a)`
`2073`	`2073`	`}`
`2074`	`2074`
`2075`	`2075`	`}`
`@@ -2115,10 +2115,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase5(t *testing.T) {`
`2115`	`2115`
`2116`	`2116`	`// assert headers`
`2117`	`2117`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`2118`		`- t.Errorf("expect %v to be %v", e, a)`
	`2118`	`+ t.Errorf("expect %v, got %v", e, a)`
`2119`	`2119`	`}`
`2120`	`2120`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`2121`		`- t.Errorf("expect %v to be %v", e, a)`
	`2121`	`+ t.Errorf("expect %v, got %v", e, a)`
`2122`	`2122`	`}`
`2123`	`2123`
`2124`	`2124`	`}`
`@@ -2162,10 +2162,10 @@ func TestInputService5ProtocolTestRecursiveShapesCase6(t *testing.T) {`
`2162`	`2162`
`2163`	`2163`	`// assert headers`
`2164`	`2164`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`2165`		`- t.Errorf("expect %v to be %v", e, a)`
	`2165`	`+ t.Errorf("expect %v, got %v", e, a)`
`2166`	`2166`	`}`
`2167`	`2167`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`2168`		`- t.Errorf("expect %v to be %v", e, a)`
	`2168`	`+ t.Errorf("expect %v, got %v", e, a)`
`2169`	`2169`	`}`
`2170`	`2170`
`2171`	`2171`	`}`
`@@ -2200,10 +2200,10 @@ func TestInputService6ProtocolTestEmptyMapsCase1(t *testing.T) {`
`2200`	`2200`
`2201`	`2201`	`// assert headers`
`2202`	`2202`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`2203`		`- t.Errorf("expect %v to be %v", e, a)`
	`2203`	`+ t.Errorf("expect %v, got %v", e, a)`
`2204`	`2204`	`}`
`2205`	`2205`	`if e, a := "com.amazonaws.foo.OperationName", r.Header.Get("X-Amz-Target"); e != a {`
`2206`		`- t.Errorf("expect %v to be %v", e, a)`
	`2206`	`+ t.Errorf("expect %v, got %v", e, a)`
`2207`	`2207`	`}`
`2208`	`2208`
`2209`	`2209`	`}`
`@@ -2360,10 +2360,10 @@ func TestInputService9ProtocolTestEndpointHostTraitStaticPrefixCase1(t *testing.`
`2360`	`2360`
`2361`	`2361`	`// assert headers`
`2362`	`2362`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`2363`		`- t.Errorf("expect %v to be %v", e, a)`
	`2363`	`+ t.Errorf("expect %v, got %v", e, a)`
`2364`	`2364`	`}`
`2365`	`2365`	`if e, a := "com.amazonaws.foo.StaticOp", r.Header.Get("X-Amz-Target"); e != a {`
`2366`		`- t.Errorf("expect %v to be %v", e, a)`
	`2366`	`+ t.Errorf("expect %v, got %v", e, a)`
`2367`	`2367`	`}`
`2368`	`2368`
`2369`	`2369`	`}`
`@@ -2398,10 +2398,10 @@ func TestInputService9ProtocolTestEndpointHostTraitStaticPrefixCase2(t *testing.`
`2398`	`2398`
`2399`	`2399`	`// assert headers`
`2400`	`2400`	`if e, a := "application/x-amz-json-1.1", r.Header.Get("Content-Type"); e != a {`
`2401`		`- t.Errorf("expect %v to be %v", e, a)`
	`2401`	`+ t.Errorf("expect %v, got %v", e, a)`
`2402`	`2402`	`}`
`2403`	`2403`	`if e, a := "com.amazonaws.foo.MemberRefOp", r.Header.Get("X-Amz-Target"); e != a {`
`2404`		`- t.Errorf("expect %v to be %v", e, a)`
	`2404`	`+ t.Errorf("expect %v, got %v", e, a)`
`2405`	`2405`	`}`
`2406`	`2406`
`2407`	`2407`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,9 @@ func buildHeader(header *http.Header, v reflect.Value, name string, tag reflect.`
`166`	`166`	`return awserr.New("SerializationError", "failed to encode REST request", err)`
`167`	`167`	`}`
`168`	`168`
	`169`	`+ name = strings.TrimSpace(name)`
	`170`	`+ str = strings.TrimSpace(str)`
	`171`	`+`
`169`	`172`	`header.Add(name, str)`
`170`	`173`
`171`	`174`	`return nil`
`@@ -181,8 +184,10 @@ func buildHeaderMap(header *http.Header, v reflect.Value, tag reflect.StructTag)`
`181`	`184`	`return awserr.New("SerializationError", "failed to encode REST request", err)`
`182`	`185`
`183`	`186`	`}`
	`187`	`+ keyStr := strings.TrimSpace(key.String())`
	`188`	`+ str = strings.TrimSpace(str)`
`184`	`189`
`185`		`- header.Add(prefix+key.String(), str)`
	`190`	`+ header.Add(prefix+keyStr, str)`
`186`	`191`	`}`
`187`	`192`	`return nil`
`188`	`193`	`}`