swap what was just content-type for headers

- om curl now has the abilty to specify headers instead
of just Content-Type

Author: zachgersh

api/request_service.go

@@ -7,10 +7,10 @@ import (
 )
 
 type RequestServiceInvokeInput struct {
-	Path        string
-	Method      string
-	Data        io.Reader
-	ContentType string
+	Path    string
+	Method  string
+	Data    io.Reader
+	Headers http.Header
 }
 
 type RequestServiceInvokeOutput struct {
@@ -33,7 +33,7 @@ func (rs RequestService) Invoke(input RequestServiceInvokeInput) (RequestService
 		return RequestServiceInvokeOutput{}, fmt.Errorf("failed constructing request: %s", err)
 	}
 
-	request.Header.Set("Content-Type", input.ContentType)
+	request.Header = input.Headers
 	response, err := rs.client.Do(request)
 	if err != nil {
 		return RequestServiceInvokeOutput{}, fmt.Errorf("failed submitting request: %s", err)

api/request_service_test.go

@@ -35,10 +35,10 @@ var _ = Describe("RequestService", func() {
 			}, nil)
 
 			output, err := service.Invoke(api.RequestServiceInvokeInput{
-				Method:      "PUT",
-				Path:        "/api/v0/api/endpoint",
-				Data:        strings.NewReader("some-request-body"),
-				ContentType: "application/json",
+				Method:  "PUT",
+				Path:    "/api/v0/api/endpoint",
+				Data:    strings.NewReader("some-request-body"),
+				Headers: http.Header{"Content-Type": []string{"application/json"}},
 			})
 			Expect(err).NotTo(HaveOccurred())
 

commands/curl.go

@@ -24,11 +24,11 @@ type Curl struct {
 	stdout         logger
 	stderr         logger
 	Options        struct {
-		Path        string `short:"p" long:"path"    description:"path to api endpoint"`
-		Method      string `short:"x" long:"request" description:"http verb" default:"GET"`
-		Data        string `short:"d" long:"data"    description:"api request payload"`
-		Silent      bool   `short:"s" long:"silent"  description:"only write response headers to stderr if response status is 4XX or 5XX"`
-		ContentType string `short:"c" long:"content-type" description:"content type of payload" default:"application/json"`
+		Path    string            `short:"p" long:"path"    description:"path to api endpoint"`
+		Method  string            `short:"x" long:"request" description:"http verb" default:"GET"`
+		Data    string            `short:"d" long:"data"    description:"api request payload"`
+		Silent  bool              `short:"s" long:"silent"  description:"only write response headers to stderr if response status is 4XX or 5XX"`
+		Headers flags.StringSlice `short:"H" long:"header"  description:"used to specify custom headers with your command" default:"Content-Type: application/json"`
 	}
 }
 
@@ -46,11 +46,18 @@ func (c Curl) Execute(args []string) error {
 		return errors.New("could not parse curl flags: -path is a required parameter. Please run `om curl --help` for more info.")
 	}
 
+	requestHeaders := make(http.Header)
+
+	for _, h := range c.Options.Headers {
+		split := strings.Split(h, " ")
+		requestHeaders.Set(strings.TrimSuffix(split[0], ":"), split[1])
+	}
+
 	input := api.RequestServiceInvokeInput{
-		Path:        c.Options.Path,
-		Method:      c.Options.Method,
-		Data:        strings.NewReader(c.Options.Data),
-		ContentType: c.Options.ContentType,
+		Path:    c.Options.Path,
+		Method:  c.Options.Method,
+		Data:    strings.NewReader(c.Options.Data),
+		Headers: requestHeaders,
 	}
 
 	output, err := c.requestService.Invoke(input)

commands/curl_test.go

@@ -58,7 +58,7 @@ var _ = Describe("Curl", func() {
 			input := requestService.InvokeArgsForCall(0)
 			Expect(input.Path).To(Equal("/api/v0/some/path"))
 			Expect(input.Method).To(Equal("POST"))
-			Expect(input.ContentType).To(Equal("application/json"))
+			Expect(input.Headers).To(HaveKeyWithValue("Content-Type", []string{"application/json"}))
 
 			data, err := ioutil.ReadAll(input.Data)
 			Expect(err).NotTo(HaveOccurred())
@@ -152,14 +152,14 @@ var _ = Describe("Curl", func() {
 					"--path", "/api/v0/some/path",
 					"--request", "POST",
 					"--data", `some_key=some_value`,
-					"--content-type", "application/x-www-form-urlencoded",
+					"--header", "Content-Type: application/x-www-form-urlencoded",
 				})
 				Expect(err).NotTo(HaveOccurred())
 
 				input := requestService.InvokeArgsForCall(0)
 				Expect(input.Path).To(Equal("/api/v0/some/path"))
 				Expect(input.Method).To(Equal("POST"))
-				Expect(input.ContentType).To(Equal("application/x-www-form-urlencoded"))
+				Expect(input.Headers).To(HaveKeyWithValue("Content-Type", []string{"application/x-www-form-urlencoded"}))
 			})
 		})