align whole flow to use map[string][]string for headers

Author: Jon Bernard

ldk/go/examples/network/loop/loop.go

@@ -73,8 +73,8 @@ func (c *Loop) LoopStart(sidekick ldk.Sidekick) error {
 		URL:    "https://api.fda.gov/food/enforcement.json?search=report_date:[" + now.AddDate(0, -3, 0).Format("20060102") + "+TO+" + now.Format("20060102") + "]&limit=1",
 		Method: "GET",
 		Body:   nil,
-		Headers: map[string]string{
-			"A-Header-Name": "a header value",
+		Headers: map[string][]string{
+			"A-Header-Name": []string{"a header value", "another header value"},
 		},
 	})
 	if err != nil {

ldk/go/networkClient.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/open-olive/loop-development-kit/ldk/go/proto"
-	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 // NetworkClient is the client used by the NetworkService
@@ -17,33 +16,55 @@ type NetworkClient struct {
 type HTTPResponse struct {
 	ResponseCode int
 	Data         []byte
-	Headers      map[string]*structpb.ListValue
+	Headers      map[string][]string
 }
 
 // HTTPRequest is the structure received from HttpRequest
 type HTTPRequest struct {
 	URL     string
 	Method  string
 	Body    []byte
-	Headers map[string]string
+	Headers map[string][]string
 }
 
 func (n *NetworkClient) HTTPRequest(ctx context.Context, req *HTTPRequest) (*HTTPResponse, error) {
+	reqHeaders := make(map[string]*proto.HTTPHeader)
+
+	for name, values := range req.Headers {
+		header := make([]string, len(values))
+		for index, value := range values {
+			header[index] = value
+		}
+		reqHeaders[name] = &proto.HTTPHeader{
+			Values: header,
+		}
+	}
+
 	resp, err := n.client.HTTPRequest(ctx, &proto.HTTPRequestMsg{
 		Session: n.session.ToProto(),
 		Url:     req.URL,
 		Method:  req.Method,
 		Body:    req.Body,
-		Headers: req.Headers,
+		Headers: reqHeaders,
 	})
 
 	if err != nil {
 		return nil, err
 	}
 
+	respHeaders := make(map[string][]string)
+
+	for name, values := range resp.Headers {
+		header := make([]string, len(values.Values))
+		for index, value := range values.Values {
+			header[index] = value
+		}
+		respHeaders[name] = header
+	}
+
 	return &HTTPResponse{
 		ResponseCode: int(resp.ResponseCode),
 		Data:         resp.Data,
-		Headers:      resp.Headers,
+		Headers:      respHeaders,
 	}, err
 }

ldk/go/networkServer.go

@@ -16,23 +16,45 @@ func (ns *NetworkServer) HTTPRequest(ctx context.Context, req *proto.HTTPRequest
 		return nil, err
 	}
 
+	reqHeaders := make(map[string][]string)
+
+	for name, values := range req.Headers {
+		header := make([]string, len(values.Values))
+		for index, value := range values.Values {
+			header[index] = value
+		}
+		reqHeaders[name] = header
+	}
+
 	resp, err := ns.Impl.HTTPRequest(
 		context.WithValue(ctx, Session{}, session),
 		&HTTPRequest{
 			URL:     req.Url,
 			Method:  req.Method,
 			Body:    req.Body,
-			Headers: req.Headers,
+			Headers: reqHeaders,
 		},
 	)
 	if err != nil {
 		return nil, err
 	}
 
+	respHeaders := make(map[string]*proto.HTTPHeader)
+
+	for name, values := range resp.Headers {
+		header := make([]string, len(values))
+		for index, value := range values {
+			header[index] = value
+		}
+		respHeaders[name] = &proto.HTTPHeader{
+			Values: header,
+		}
+	}
+
 	return &proto.HTTPResponseMsg{
 		ResponseCode: uint32(resp.ResponseCode),
 		Data:         resp.Data,
-		Headers:      resp.Headers,
+		Headers:      respHeaders,
 	}, nil
 
 }