Use Header.Set() to override the existing header value

Header.Add() appends string if there are same header key exists. Use Header.Set() to prevent this.
fission · Dec 19, 2018 · 1988fc8 · 1988fc8
1 parent 34b9be0
commit 1988fc8
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/builder/builder.go b/builder/builder.go
@@ -142,7 +142,7 @@ func (builder *Builder) reply(w http.ResponseWriter, pkgFilename string, buildLo
 		statusCode = http.StatusInternalServerError
 	}
 
-	w.Header().Add("Content-Type", "application/json")
+	w.Header().Set("Content-Type", "application/json")
 	// should write header before writing the body,
 	// or client will receive HTTP 200 regardless the real status code
 	w.WriteHeader(statusCode)

diff --git a/environments/fetcher/fetcher.go b/environments/fetcher/fetcher.go
@@ -482,7 +482,7 @@ func (fetcher *Fetcher) UploadHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	log.Println("Completed upload request")
-	w.Header().Add("Content-Type", "application/json")
+	w.Header().Set("Content-Type", "application/json")
 	w.Write(rBody)
 	w.WriteHeader(http.StatusOK)
 }

diff --git a/mqtrigger/messageQueue/asq.go b/mqtrigger/messageQueue/asq.go
@@ -313,14 +313,14 @@ func invokeTriggeredFunction(conn AzureStorageConnection, sub *AzureQueueSubscri
 			continue
 		}
 
-		request.Header.Add("X-Fission-MQTrigger-Topic", sub.queueName)
+		request.Header.Set("X-Fission-MQTrigger-Topic", sub.queueName)
 		if len(sub.outputQueueName) > 0 {
-			request.Header.Add("X-Fission-MQTrigger-RespTopic", sub.outputQueueName)
+			request.Header.Set("X-Fission-MQTrigger-RespTopic", sub.outputQueueName)
 		}
 		if i > 0 {
-			request.Header.Add("X-Fission-MQTrigger-RetryCount", strconv.Itoa(i))
+			request.Header.Set("X-Fission-MQTrigger-RetryCount", strconv.Itoa(i))
 		}
-		request.Header.Add("Content-Type", sub.contentType)
+		request.Header.Set("Content-Type", sub.contentType)
 
 		response, err := conn.httpClient.Do(request)
 		if err != nil {

diff --git a/mqtrigger/messageQueue/kafka.go b/mqtrigger/messageQueue/kafka.go
@@ -133,7 +133,7 @@ func kafkaMsgHandler(kafka *Kafka, producer sarama.SyncProducer, trigger *crd.Me
 	}
 
 	for k, v := range headers {
-		req.Header.Add(k, v)
+		req.Header.Set(k, v)
 	}
 	// Make the request
 	var resp *http.Response

diff --git a/mqtrigger/messageQueue/nats.go b/mqtrigger/messageQueue/nats.go
@@ -122,7 +122,7 @@ func msgHandler(nats *Nats, trigger *crd.MessageQueueTrigger) func(*ns.Msg) {
 		}
 
 		for k, v := range headers {
-			req.Header.Add(k, v)
+			req.Header.Set(k, v)
 		}
 
 		var resp *http.Response

diff --git a/publisher/webhookPublisher.go b/publisher/webhookPublisher.go
@@ -84,7 +84,7 @@ func (p *WebhookPublisher) makeHttpRequest(r *publishRequest) {
 	// Create request
 	req, err := http.NewRequest("POST", url, &buf)
 	for k, v := range r.headers {
-		req.Header.Add(k, v)
+		req.Header.Set(k, v)
 	}
 
 	// Make the request

diff --git a/redis/redisApi.go b/redis/redisApi.go
@@ -401,7 +401,7 @@ func ReplayRequest(routerUrl string, request *redisCache.Request) ([]string, err
 		}
 	}
 
-	req.Header.Add("X-Fission-Replayed", "true")
+	req.Header.Set("X-Fission-Replayed", "true")
 	resp, err := client.Do(req)
 
 	if err != nil {

diff --git a/router/functionHandler.go b/router/functionHandler.go
@@ -404,14 +404,14 @@ func (fh functionHandler) handler(responseWriter http.ResponseWriter, request *h
 	// retrieve url params and add them to request header
 	vars := mux.Vars(request)
 	for k, v := range vars {
-		request.Header.Add(fmt.Sprintf("X-Fission-Params-%v", k), v)
+		request.Header.Set(fmt.Sprintf("X-Fission-Params-%v", k), v)
 	}
 
 	var reqUID string
 	if len(fh.recorderName) > 0 {
 		UID := strings.ToLower(uuid.NewV4().String())
 		reqUID = "REQ" + UID
-		request.Header.Add("X-Fission-ReqUID", reqUID)
+		request.Header.Set("X-Fission-ReqUID", reqUID)
 		log.Print("Record request with ReqUID: ", reqUID)
 	}
 

diff --git a/router/util.go b/router/util.go
@@ -13,10 +13,10 @@ const (
 )
 
 func MetadataToHeaders(prefix string, meta *metav1.ObjectMeta, request *http.Request) {
-	request.Header.Add(fmt.Sprintf("X-%s-Uid", prefix), string(meta.UID))
-	request.Header.Add(fmt.Sprintf("X-%s-Name", prefix), meta.Name)
-	request.Header.Add(fmt.Sprintf("X-%s-Namespace", prefix), meta.Namespace)
-	request.Header.Add(fmt.Sprintf("X-%s-ResourceVersion", prefix), meta.ResourceVersion)
+	request.Header.Set(fmt.Sprintf("X-%s-Uid", prefix), string(meta.UID))
+	request.Header.Set(fmt.Sprintf("X-%s-Name", prefix), meta.Name)
+	request.Header.Set(fmt.Sprintf("X-%s-Namespace", prefix), meta.Namespace)
+	request.Header.Set(fmt.Sprintf("X-%s-ResourceVersion", prefix), meta.ResourceVersion)
 }
 
 func HeadersToMetadata(prefix string, headers http.Header) *metav1.ObjectMeta {