PR Feedback

aws/signer/v4/header_rules.go

@@ -1,7 +1,7 @@
 package v4
 
 import (
-	"github.com/aws/aws-sdk-go/aws/awsutil"
+	"github.com/aws/aws-sdk-go/internal/strings"
 )
 
 // validator houses a set of rule needed for validation of a
@@ -60,7 +60,7 @@ type patterns []string
 // been found
 func (p patterns) IsValid(value string) bool {
 	for _, pattern := range p {
-		if awsutil.StringHasPrefixFold(value, pattern) {
+		if strings.HasPrefixFold(value, pattern) {
 			return true
 		}
 	}

internal/strings/strings.go

@@ -0,0 +1,11 @@
+package strings
+
+import (
+	"strings"
+)
+
+// HasPrefixFold tests whether the string s begins with prefix, interpreted as UTF-8 strings,
+// under Unicode case-folding.
+func HasPrefixFold(s, prefix string) bool {
+	return len(s) >= len(prefix) && strings.EqualFold(s[0:len(prefix)], prefix)
+}

aws/awsutil/strings_test.go → internal/strings/strings_test.go

@@ -1,13 +1,13 @@
 // +build go1.7
 
-package awsutil
+package strings
 
 import (
 	"strings"
 	"testing"
 )
 
-func TestStringPrefixFold(t *testing.T) {
+func TestHasPrefixFold(t *testing.T) {
 	type args struct {
 		s      string
 		prefix string
@@ -57,18 +57,25 @@ func TestStringPrefixFold(t *testing.T) {
 			},
 			want: true,
 		},
+		"mixed-case prefixes": {
+			args: args{
+				s:      "SoMe String",
+				prefix: "sOme",
+			},
+			want: true,
+		},
 	}
 	for name, tt := range tests {
 		t.Run(name, func(t *testing.T) {
-			if got := StringHasPrefixFold(tt.args.s, tt.args.prefix); got != tt.want {
-				t.Errorf("StringHasPrefixFold() = %v, want %v", got, tt.want)
+			if got := HasPrefixFold(tt.args.s, tt.args.prefix); got != tt.want {
+				t.Errorf("HasPrefixFold() = %v, want %v", got, tt.want)
 			}
 		})
 	}
 }
 
-func BenchmarkStringHasPrefixFold(b *testing.B) {
-	StringHasPrefixFold("SoME string", "sOmE")
+func BenchmarkHasPrefixFold(b *testing.B) {
+	HasPrefixFold("SoME string", "sOmE")
 }
 
 func BenchmarkHasPrefix(b *testing.B) {

private/protocol/rest/rest_test.go

@@ -1,3 +1,5 @@
+// +build go1.7
+
 package rest_test
 
 import (

private/protocol/rest/unmarshal.go

@@ -14,8 +14,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/awsutil"
 	"github.com/aws/aws-sdk-go/aws/request"
+	awsStrings "github.com/aws/aws-sdk-go/internal/strings"
 	"github.com/aws/aws-sdk-go/private/protocol"
 )
 
@@ -154,7 +154,7 @@ func unmarshalHeaderMap(r reflect.Value, headers http.Header, prefix string, nor
 	case map[string]*string: // we only support string map value types
 		out := map[string]*string{}
 		for k, v := range headers {
-			if awsutil.StringHasPrefixFold(k, prefix) {
+			if awsStrings.HasPrefixFold(k, prefix) {
 				if normalize == true {
 					k = strings.ToLower(k)
 				} else {