Add --header/-H to dapr invoke

cmd/invoke.go

@@ -18,6 +18,7 @@ import (
 	"net/http"
 	"os"
 	"runtime"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -34,6 +35,7 @@ var (
 	invokeVerb      string
 	invokeDataFile  string
 	invokeSocket    string
+	invokeHeaders   = make([]string, 0)
 )
 
 var InvokeCmd = &cobra.Command{
@@ -43,6 +45,9 @@ var InvokeCmd = &cobra.Command{
 # Invoke a sample method on target app with POST Verb
 dapr invoke --app-id target --method sample --data '{"key":"value"}
 
+# Invoke a sample method on target app with customized Header
+dapr invoke --app-id target --method sample --data '{"key":"value"} --header Customized-Header=Value
+
 # Invoke a sample method on target app with GET Verb
 dapr invoke --app-id target --method sample --verb GET
 
@@ -78,7 +83,25 @@ dapr invoke --unix-domain-socket --app-id target --method sample --verb GET
 			}
 		}
 
-		response, err := client.Invoke(invokeAppID, invokeAppMethod, bytePayload, invokeVerb, invokeSocket)
+		header := http.Header{}
+		for _, h := range invokeHeaders {
+			p := strings.Split(strings.TrimSpace(h), "=")
+			if len(p) != 2 {
+				print.FailureStatusEvent(os.Stderr, "Should one \"=\" in HTTP header.")
+				os.Exit(1)
+			}
+
+			if p[0] == "" {
+				print.FailureStatusEvent(os.Stderr, "A header name is required.")
+				os.Exit(1)
+			} else if p[1] == "" {
+				print.FailureStatusEvent(os.Stderr, "Value for header name is required.")
+				os.Exit(1)
+			}
+			header.Add(p[0], p[1])
+		}
+
+		response, err := client.Invoke(invokeAppID, invokeAppMethod, bytePayload, invokeVerb, header, invokeSocket)
 		if err != nil {
 			err = fmt.Errorf("error invoking app %s: %w", invokeAppID, err)
 			print.FailureStatusEvent(os.Stderr, err.Error())
@@ -98,6 +121,7 @@ func init() {
 	InvokeCmd.Flags().StringVarP(&invokeData, "data", "d", "", "The JSON serialized data string (optional)")
 	InvokeCmd.Flags().StringVarP(&invokeVerb, "verb", "v", defaultHTTPVerb, "The HTTP verb to use")
 	InvokeCmd.Flags().StringVarP(&invokeDataFile, "data-file", "f", "", "A file containing the JSON serialized data (optional)")
+	InvokeCmd.Flags().StringArrayVarP(&invokeHeaders, "header", "H", []string{}, "0 or more HTTP Header")
 	InvokeCmd.Flags().BoolP("help", "h", false, "Print this help message")
 	InvokeCmd.Flags().StringVarP(&invokeSocket, "unix-domain-socket", "u", "", "Path to a unix domain socket dir. If specified, Dapr API servers will use Unix Domain Sockets")
 	InvokeCmd.MarkFlagRequired("app-id")

pkg/standalone/client.go

@@ -13,6 +13,8 @@ limitations under the License.
 
 package standalone
 
+import "net/http"
+
 type DaprProcess interface {
 	List() ([]ListOutput, error)
 }
@@ -22,7 +24,7 @@ type daprProcess struct{}
 // Client is the interface the wraps all the methods exposed by the Dapr CLI.
 type Client interface {
 	// Invoke is a command to invoke a remote or local dapr instance.
-	Invoke(appID, method string, data []byte, verb string, socket string) (string, error)
+	Invoke(appID, method string, data []byte, verb string, header http.Header, socket string) (string, error)
 	// Publish is used to publish event to a topic in a pubsub for an app ID.
 	Publish(publishAppID, pubsubName, topic string, payload []byte, socket string, metadata map[string]interface{}) error
 }

pkg/standalone/invoke.go

@@ -26,7 +26,7 @@ import (
 )
 
 // Invoke is a command to invoke a remote or local dapr instance.
-func (s *Standalone) Invoke(appID, method string, data []byte, verb string, path string) (string, error) {
+func (s *Standalone) Invoke(appID, method string, data []byte, verb string, header http.Header, path string) (string, error) {
 	list, err := s.process.List()
 	if err != nil {
 		return "", err
@@ -39,7 +39,13 @@ func (s *Standalone) Invoke(appID, method string, data []byte, verb string, path
 			if err != nil {
 				return "", err
 			}
+
 			req.Header.Set("Content-Type", "application/json")
+			for h, vs := range header {
+				for _, v := range vs {
+					req.Header.Add(h, v)
+				}
+			}
 
 			var httpc http.Client
 

pkg/standalone/invoke_test.go

@@ -15,6 +15,7 @@ package standalone
 
 import (
 	"fmt"
+	"net/http"
 	"os"
 	"runtime"
 	"testing"
@@ -35,13 +36,15 @@ func TestInvoke(t *testing.T) {
 		listErr       error
 		expectedPath  string
 		postResponse  string
+		header        http.Header
 		resp          string
 	}{
 		{
 			name:          "list apps error",
 			errorExpected: true,
 			errString:     assert.AnError.Error(),
 			listErr:       assert.AnError,
+			header:        nil,
 		},
 		{
 			name:          "appID not found",
@@ -51,6 +54,7 @@ func TestInvoke(t *testing.T) {
 			lo: ListOutput{
 				AppID: "testapp",
 			},
+			header: nil,
 		},
 		{
 			name:   "appID found successful invoke empty response",
@@ -59,6 +63,7 @@ func TestInvoke(t *testing.T) {
 			lo: ListOutput{
 				AppID: "testapp",
 			},
+			header: nil,
 		},
 		{
 			name:   "appID found successful invoke",
@@ -69,8 +74,23 @@ func TestInvoke(t *testing.T) {
 			},
 			expectedPath: "/v1.0/invoke/testapp/method/test",
 			postResponse: "test payload",
+			header:       nil,
 			resp:         "successful invoke",
 		},
+		{
+			name:   "appID found successful invoke with customized header",
+			appID:  "testapp",
+			method: "test",
+			lo: ListOutput{
+				AppID: "testapp",
+			},
+			expectedPath: "/v1.0/invoke/testapp/method/test",
+			postResponse: "test payload",
+			resp:         "successful invoke",
+			header: http.Header{
+				"Customized-Header": []string{"Value"},
+			},
+		},
 	}
 
 	for _, socket := range []string{"", "/tmp"} {
@@ -105,7 +125,7 @@ func TestInvoke(t *testing.T) {
 					},
 				}
 
-				res, err := client.Invoke(tc.appID, tc.method, []byte(tc.resp), "GET", socket)
+				res, err := client.Invoke(tc.appID, tc.method, []byte(tc.resp), "GET", tc.header, socket)
 				if tc.errorExpected {
 					assert.Error(t, err, "expected an error")
 					assert.Equal(t, tc.errString, err.Error(), "expected error strings to match")
@@ -137,7 +157,7 @@ func TestInvoke(t *testing.T) {
 						Err: tc.listErr,
 					},
 				}
-				res, err := client.Invoke(tc.appID, tc.method, []byte(tc.resp), "POST", socket)
+				res, err := client.Invoke(tc.appID, tc.method, []byte(tc.resp), "POST", tc.header, socket)
 				if tc.errorExpected {
 					assert.Error(t, err, "expected an error")
 					assert.Equal(t, tc.errString, err.Error(), "expected error strings to match")
@@ -169,7 +189,7 @@ func TestInvoke(t *testing.T) {
 						Err: tc.listErr,
 					},
 				}
-				res, err := client.Invoke(tc.appID, tc.method, []byte(tc.resp), "DELETE", socket)
+				res, err := client.Invoke(tc.appID, tc.method, []byte(tc.resp), "DELETE", tc.header, socket)
 				if tc.errorExpected {
 					assert.Error(t, err, "expected an error")
 					assert.Equal(t, tc.errString, err.Error(), "expected error strings to match")
@@ -202,7 +222,7 @@ func TestInvoke(t *testing.T) {
 						Err: tc.listErr,
 					},
 				}
-				res, err := client.Invoke(tc.appID, tc.method, []byte(tc.resp), "PUT", socket)
+				res, err := client.Invoke(tc.appID, tc.method, []byte(tc.resp), "PUT", tc.header, socket)
 				if tc.errorExpected {
 					assert.Error(t, err, "expected an error")
 					assert.Equal(t, tc.errString, err.Error(), "expected error strings to match")