Fix handling of http headers

http.go

@@ -63,7 +63,7 @@ type httpRunner struct {
 type httpRequest struct {
 	path      string
 	method    string
-	headers   map[string]string
+	headers   http.Header
 	mediaType string
 	body      any
 	useCookie *bool
@@ -302,7 +302,7 @@ func (r *httpRequest) setCookieHeader(req *http.Request, cookies map[string]map[
 	}
 }
 
-func (r *httpRequest) setTraceHeader(req *http.Request, s *step) error {
+func (r *httpRequest) setTraceHeader(s *step) error {
 	if r.trace == nil || !*r.trace {
 		return nil
 	}
@@ -314,7 +314,7 @@ func (r *httpRequest) setTraceHeader(req *http.Request, s *step) error {
 		return err
 	}
 	// Set Trace in the header
-	req.Header.Set("X-Runn-Trace", string(tj))
+	r.headers.Set("X-Runn-Trace", string(tj))
 	return nil
 }
 
@@ -361,6 +361,19 @@ func (rnr *httpRunner) run(ctx context.Context, r *httpRequest, s *step) error {
 		return err
 	}
 
+	// Override useCookie
+	if r.useCookie == nil && rnr.useCookie != nil && *rnr.useCookie {
+		r.useCookie = rnr.useCookie
+	}
+
+	// Override trace
+	if r.trace == nil && rnr.trace != nil && *rnr.trace {
+		r.trace = rnr.trace
+	}
+	if err := r.setTraceHeader(s); err != nil {
+		return err
+	}
+
 	var (
 		req *http.Request
 		res *http.Response
@@ -416,23 +429,14 @@ func (rnr *httpRunner) run(ctx context.Context, r *httpRequest, s *step) error {
 			return err
 		}
 		r.setContentTypeHeader(req)
-
-		// Override useCookie
-		if r.useCookie == nil && rnr.useCookie != nil && *rnr.useCookie {
-			r.useCookie = rnr.useCookie
-		}
 		r.setCookieHeader(req, o.store.cookies)
-		// Override trace
-		if r.trace == nil && rnr.trace != nil && *rnr.trace {
-			r.trace = rnr.trace
-		}
-		if err := r.setTraceHeader(req, s); err != nil {
-			return err
-		}
 		for k, v := range r.headers {
-			req.Header.Set(k, v)
-			if k == "Host" {
-				req.Host = v
+			req.Header.Del(k)
+			for _, vv := range v {
+				req.Header.Add(k, vv)
+				if k == "Host" {
+					req.Host = vv
+				}
 			}
 		}
 
@@ -453,7 +457,13 @@ func (rnr *httpRunner) run(ctx context.Context, r *httpRequest, s *step) error {
 			req.Header.Set("Content-Type", r.mediaType)
 		}
 		for k, v := range r.headers {
-			req.Header.Set(k, v)
+			req.Header.Del(k)
+			for _, vv := range v {
+				req.Header.Add(k, vv)
+				if k == "Host" {
+					req.Host = vv
+				}
+			}
 		}
 
 		o.capturers.captureHTTPRequest(rnr.name, req)

http_test.go

@@ -33,8 +33,8 @@ func TestHTTPRunnerRunUsingGitHubAPI(t *testing.T) {
 				path:      "/users/k1LoW",
 				method:    http.MethodGet,
 				mediaType: MediaTypeApplicationJSON,
-				headers: map[string]string{
-					"Authorization": fmt.Sprintf("token %s", os.Getenv("GITHUB_TOKEN")),
+				headers: http.Header{
+					"Authorization": []string{fmt.Sprintf("token %s", os.Getenv("GITHUB_TOKEN"))},
 				},
 			},
 			true,
@@ -45,8 +45,8 @@ func TestHTTPRunnerRunUsingGitHubAPI(t *testing.T) {
 				path:      "/invalid/endpoint",
 				method:    http.MethodGet,
 				mediaType: MediaTypeApplicationJSON,
-				headers: map[string]string{
-					"Authorization": fmt.Sprintf("token %s", os.Getenv("GITHUB_TOKEN")),
+				headers: http.Header{
+					"Authorization": []string{fmt.Sprintf("token %s", os.Getenv("GITHUB_TOKEN"))},
 				},
 			},
 			false,
@@ -507,7 +507,7 @@ func TestNotFollowRedirect(t *testing.T) {
 			&httpRequest{
 				path:    "/redirect",
 				method:  http.MethodGet,
-				headers: map[string]string{},
+				headers: http.Header{},
 			},
 			false,
 			http.StatusNotFound,
@@ -516,7 +516,7 @@ func TestNotFollowRedirect(t *testing.T) {
 			&httpRequest{
 				path:    "/redirect",
 				method:  http.MethodGet,
-				headers: map[string]string{},
+				headers: http.Header{},
 			},
 			true,
 			http.StatusFound,
@@ -576,7 +576,7 @@ func TestHTTPCerts(t *testing.T) {
 	req := &httpRequest{
 		path:    "/users/1",
 		method:  http.MethodGet,
-		headers: map[string]string{},
+		headers: http.Header{},
 	}
 	for i, tt := range tests {
 		t.Run(fmt.Sprintf("%v", i), func(t *testing.T) {
@@ -624,7 +624,7 @@ func TestHTTPRunnerInitializeWithCerts(t *testing.T) {
 	req := &httpRequest{
 		path:    "/users/1",
 		method:  http.MethodGet,
-		headers: map[string]string{},
+		headers: http.Header{},
 	}
 	for i, tt := range tests {
 		t.Run(fmt.Sprintf("%v", i), func(t *testing.T) {
@@ -817,16 +817,13 @@ func TestSetTraceHeader(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(fmt.Sprintf("trace:%v", *tt.trace), func(t *testing.T) {
 			r := &httpRequest{
-				trace: tt.trace,
+				headers: http.Header{},
+				trace:   tt.trace,
 			}
-			req := &http.Request{
-				Method: http.MethodPost,
-				Header: http.Header{"Content-Type": []string{"application/json"}},
+			if err := r.setTraceHeader(tt.step); err != nil {
+				t.Error(err)
 			}
-
-			r.setTraceHeader(req, tt.step)
-			got := req.Header.Get("X-Runn-Trace")
-
+			got := r.headers.Get("X-Runn-Trace")
 			if got != tt.want {
 				t.Errorf("got %v\nwant %v", got, tt.want)
 			}

parse.go

@@ -2,6 +2,7 @@ package runn
 
 import (
 	"fmt"
+	"net/http"
 	"regexp"
 	"strings"
 	"time"
@@ -14,7 +15,7 @@ import (
 func parseHTTPRequest(v map[string]any) (*httpRequest, error) {
 	v = trimDelimiter(v)
 	req := &httpRequest{
-		headers: map[string]string{},
+		headers: http.Header{},
 	}
 	part, err := yaml.Marshal(v)
 	if err != nil {
@@ -45,8 +46,14 @@ func parseHTTPRequest(v map[string]any) (*httpRequest, error) {
 					return nil, fmt.Errorf("invalid request: %s", string(part))
 				}
 				for k, v := range hm {
-					req.headers[k], ok = v.(string)
-					if !ok {
+					switch v := v.(type) {
+					case string:
+						req.headers.Add(k, v)
+					case []any:
+						for _, vv := range v {
+							req.headers.Add(k, vv.(string))
+						}
+					default:
 						return nil, fmt.Errorf("invalid request: %s", string(part))
 					}
 				}
@@ -178,6 +185,8 @@ func parseGrpcRequest(v map[string]any, expand func(any) (any, error)) (*grpcReq
 					for _, vv := range v {
 						req.headers.Append(k, vv.(string))
 					}
+				default:
+					return nil, fmt.Errorf("invalid request: %s", string(part))
 				}
 			}
 		}

parse_test.go

@@ -30,7 +30,7 @@ func TestParseHTTPRequest(t *testing.T) {
 				path:      "/login",
 				method:    http.MethodPost,
 				mediaType: MediaTypeApplicationJSON,
-				headers:   map[string]string{},
+				headers:   http.Header{},
 				body: map[string]any{
 					"key": "value",
 				},
@@ -47,7 +47,7 @@ func TestParseHTTPRequest(t *testing.T) {
 				path:      "/users/k1LoW",
 				method:    http.MethodGet,
 				mediaType: "",
-				headers:   map[string]string{},
+				headers:   http.Header{},
 				body:      nil,
 				useCookie: nil,
 				trace:     nil,
@@ -82,7 +82,7 @@ func TestParseHTTPRequest(t *testing.T) {
 				path:      "/users/k1LoW",
 				method:    http.MethodGet,
 				mediaType: "",
-				headers:   map[string]string{},
+				headers:   http.Header{},
 				body:      nil,
 				useCookie: &use,
 				trace:     nil,
@@ -100,7 +100,7 @@ func TestParseHTTPRequest(t *testing.T) {
 				path:      "/users/k1LoW",
 				method:    http.MethodGet,
 				mediaType: "",
-				headers:   map[string]string{},
+				headers:   http.Header{},
 				body:      nil,
 				useCookie: nil,
 				trace:     &use,
@@ -130,7 +130,7 @@ func TestParseHTTPRequest(t *testing.T) {
 				path:      "/users/k1LoW?page=2",
 				method:    http.MethodGet,
 				mediaType: "",
-				headers:   map[string]string{},
+				headers:   http.Header{},
 				body:      nil,
 				useCookie: &notUse,
 				trace:     &notUse,

testdata/book/http.yml

@@ -70,6 +70,9 @@ steps:
         get:
           headers:
             Authorization: 'Bearer xxxxx'
+            Multivalues:
+              - a
+              - b
           body:
             application/json:
               null

testdata/http.yml.runbook.golden

@@ -75,6 +75,7 @@ steps:
       get:
         headers:
           Authorization: Bearer xxxxx
+          Multivalues: a
         body:
           application/json: null
   test: |

testdata/pick_step.http.yml.8.golden

@@ -1,10 +1,10 @@
-88   fileupload:
-89     desc: Post /upload with single file
-90     req:
-91       /upload:
-92         post:
-93           body:
-94             multipart/form-data:
-95               upload0: ../dummy.png
-96     test: |
-97       current.res.status == 201
+ 91   fileupload:
+ 92     desc: Post /upload with single file
+ 93     req:
+ 94       /upload:
+ 95         post:
+ 96           body:
+ 97             multipart/form-data:
+ 98               upload0: ../dummy.png
+ 99     test: |
+100       current.res.status == 201