Skip to content

Commit

Permalink
Address Feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
skmcgrail committed Jan 6, 2020
1 parent 5e9c1a2 commit 02a5e66
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
11 changes: 3 additions & 8 deletions private/protocol/rest/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func buildLocationElements(r *request.Request, v reflect.Value, buildGETQuery bo
var err error
switch field.Tag.Get("location") {
case "headers": // header maps
err = buildHeaderMap(&r.HTTPRequest.Header, m, field.Tag, aws.BoolValue(r.Config.LowerCaseHeaderMaps))
err = buildHeaderMap(&r.HTTPRequest.Header, m, field.Tag)
case "header":
err = buildHeader(&r.HTTPRequest.Header, m, name, field.Tag)
case "uri":
Expand Down Expand Up @@ -173,7 +173,7 @@ func buildHeader(header *http.Header, v reflect.Value, name string, tag reflect.
return nil
}

func buildHeaderMap(header *http.Header, v reflect.Value, tag reflect.StructTag, normalize bool) error {
func buildHeaderMap(header *http.Header, v reflect.Value, tag reflect.StructTag) error {
prefix := tag.Get("locationName")
for _, key := range v.MapKeys() {
str, err := convertType(v.MapIndex(key), tag)
Expand All @@ -186,12 +186,7 @@ func buildHeaderMap(header *http.Header, v reflect.Value, tag reflect.StructTag,
keyStr := strings.TrimSpace(key.String())
str = strings.TrimSpace(str)

if normalize {
lk := strings.ToLower(prefix + keyStr)
(*header)[lk] = append((*header)[lk], str)
} else {
header.Add(prefix+keyStr, str)
}
header.Add(prefix+keyStr, str)
}
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions private/protocol/rest/rest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ func TestNormalizedHeaders(t *testing.T) {
"BAR": aws.String("barValue"),
},
expectedInputHeaders: http.Header{
"x-amz-meta-baz": []string{"bazValue"},
"x-amz-meta-bar": []string{"barValue"},
"X-Amz-Meta-Baz": []string{"bazValue"},
"X-Amz-Meta-Bar": []string{"barValue"},
},
outputValues: http.Header{
"X-Amz-Meta-Baz": []string{"bazValue"},
Expand Down

0 comments on commit 02a5e66

Please sign in to comment.