Modifies REST V2 encoder to not lower-case header names (#472)

Modifies the REST v2 encoder to not lower-case values, but use the provided Set/Add headers which will canonicalize the headers.
aws · Apr 14, 2020 · 9a77f74 · 9a77f74
1 parent c3a274d
commit 9a77f74
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/aws/protocol/rest/encode_test.go b/aws/protocol/rest/encode_test.go
@@ -21,8 +21,8 @@ func TestEncoder(t *testing.T) {
 	expected := http.Request{
 		Header: map[string][]string{
 			"custom-user-header": {"someValue"},
-			"x-amzn-header-foo":  {"someValue"},
-			"x-amzn-meta-foo":    {"someValue"},
+			"X-Amzn-Header-Foo":  {"someValue"},
+			"X-Amzn-Meta-Foo":    {"someValue"},
 		},
 		URL: &url.URL{
 			Path:     "/some/someValue/path",

diff --git a/aws/protocol/rest/header.go b/aws/protocol/rest/header.go
@@ -43,17 +43,11 @@ func newHeaderValue(header http.Header, key string, append bool) HeaderValue {
 }
 
 func (h HeaderValue) modifyHeader(value string) {
-	lk := strings.ToLower(h.key)
-
-	val := h.header[lk]
-
 	if h.append {
-		val = append(val, value)
+		h.header.Add(h.key, value)
 	} else {
-		val = append(val[:0], value)
+		h.header.Set(h.key, value)
 	}
-
-	h.header[lk] = val
 }
 
 // String encodes the value v as the header string value

diff --git a/aws/protocol/rest/header_test.go b/aws/protocol/rest/header_test.go
@@ -13,7 +13,7 @@ import (
 
 func TestHeaderValue(t *testing.T) {
 	const keyName = "test-key"
-	const expectedKeyName = keyName
+	const expectedKeyName = "Test-Key"
 
 	cases := map[string]struct {
 		header   http.Header
@@ -142,29 +142,29 @@ func TestHeaders(t *testing.T) {
 	}{
 		"set": {
 			headers: http.Header{
-				"x-amzn-meta-foo": {"bazValue"},
+				"X-Amzn-Meta-Foo": {"bazValue"},
 			},
 			values: map[string]string{
 				"foo":   "fooValue",
 				" bar ": "barValue",
 			},
 			expected: http.Header{
-				"x-amzn-meta-foo": {"fooValue"},
-				"x-amzn-meta-bar": {"barValue"},
+				"X-Amzn-Meta-Foo": {"fooValue"},
+				"X-Amzn-Meta-Bar": {"barValue"},
 			},
 		},
 		"add": {
 			headers: http.Header{
-				"x-amzn-meta-foo": {"bazValue"},
+				"X-Amzn-Meta-Foo": {"bazValue"},
 			},
 			values: map[string]string{
 				"foo":   "fooValue",
 				" bar ": "barValue",
 			},
 			append: true,
 			expected: http.Header{
-				"x-amzn-meta-foo": {"bazValue", "fooValue"},
-				"x-amzn-meta-bar": {"barValue"},
+				"X-Amzn-Meta-Foo": {"bazValue", "fooValue"},
+				"X-Amzn-Meta-Bar": {"barValue"},
 			},
 		},
 	}