Changed to string array

TykTechnologies · Oct 23, 2017 · 46cdc47 · 46cdc47
1 parent 8f911e7
commit 46cdc47
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/analytics_test.go b/analytics_test.go
@@ -89,10 +89,10 @@ func TestTagHeaders(t *testing.T) {
 	req.Header.Set("X-Ignore-Me", "4")
 
 	existingTags := []string{"first", "second"}
-	existingTags = tagHeaders(req, map[string]interface{}{
-		"x-tag-me":  0,
-		"x-tag-me2": 0,
-		"x-tag-me3": 0},
+	existingTags = tagHeaders(req, []string{
+		"x-tag-me",
+		"x-tag-me2",
+		"x-tag-me3"},
 		existingTags)
 
 	if len(existingTags) == 2 {

diff --git a/api_loader.go b/api_loader.go
@@ -112,9 +112,10 @@ func processSpec(spec *APISpec, apisByListen map[string]int,
 
 	if len(spec.TagHeaders) > 0 {
 		// Ensure all headers marked for tagging are lowercase
-		lowerCaseHeaders := make(map[string]interface{})
-		for k, v := range spec.TagHeaders {
-			lowerCaseHeaders[strings.ToLower(k)] = v
+		lowerCaseHeaders := make([]string, len(spec.TagHeaders))
+		for i, k := range spec.TagHeaders {
+			lowerCaseHeaders[i] = strings.ToLower(k)
+
 		}
 		spec.TagHeaders = lowerCaseHeaders
 	}

diff --git a/apidef/api_definitions.go b/apidef/api_definitions.go
@@ -352,7 +352,7 @@ type APIDefinition struct {
 	Tags              []string               `bson:"tags" json:"tags"`
 	EnableContextVars bool                   `bson:"enable_context_vars" json:"enable_context_vars"`
 	ConfigData        map[string]interface{} `bson:"config_data" json:"config_data"`
-	TagHeaders        map[string]interface{} `bson:"tag_headers" json:"tag_headers"`
+	TagHeaders        []string               `bson:"tag_headers" json:"tag_headers"`
 	GlobalRateLimit   GlobalRateLimit        `bson:"global_rate_limit" json:"global_rate_limit"`
 }
 

diff --git a/handler_success.go b/handler_success.go
@@ -45,10 +45,17 @@ type SuccessHandler struct {
 	BaseMiddleware
 }
 
-func tagHeaders(r *http.Request, th map[string]interface{}, tags []string) []string {
+func tagHeaders(r *http.Request, th []string, tags []string) []string {
 	for k, v := range r.Header {
 		cleanK := strings.ToLower(k)
-		_, ok := th[cleanK]
+		ok := false
+		for _, hname := range th {
+			if hname == cleanK {
+				ok = true
+				break
+			}
+		}
+
 		if ok {
 			for _, val := range v {
 				tagName := fmt.Sprintf("%s-%s", cleanK, val)