feat: add headers http trigger (#642)

argoproj · May 6, 2020 · 1db7e26 · 1db7e26
1 parent 00594f8
commit 1db7e26
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 6 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -1494,6 +1494,16 @@
           "description": "BasicAuth configuration for the http request.",
           "$ref": "#/definitions/io.argoproj.sensor.v1alpha1.BasicAuth"
         },
+        "headers": {
+          "description": "Headers for the HTTP request.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
         "method": {
           "description": "Method refers to the type of the HTTP request. Refer https://golang.org/src/net/http/method.go for more info. Default value is POST.",
           "type": "string"
@@ -1504,15 +1514,15 @@
           "items": {
             "$ref": "#/definitions/io.argoproj.sensor.v1alpha1.TriggerParameter"
           },
-          "x-kubernetes-list-type": "triggerParameters"
+          "x-kubernetes-list-type": "atomic"
         },
         "payload": {
           "description": "Payload is the list of key-value extracted from an event payload to construct the HTTP request payload.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/io.argoproj.sensor.v1alpha1.TriggerParameter"
           },
-          "x-kubernetes-list-type": "payloadParameters"
+          "x-kubernetes-list-type": "atomic"
         },
         "timeout": {
           "description": "Timeout refers to the HTTP request timeout in seconds. Default value is 60 seconds.",

diff --git a/api/sensor.html b/api/sensor.html
@@ -1382,6 +1382,18 @@ <h3 id="argoproj.io/v1alpha1.HTTPTrigger">HTTPTrigger
 <p>BasicAuth configuration for the http request.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>headers</code></br>
+<em>
+map[string][]string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Headers for the HTTP request.</p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="argoproj.io/v1alpha1.JSONType">JSONType

diff --git a/api/sensor.md b/api/sensor.md
@@ -2779,6 +2779,28 @@ BasicAuth configuration for the http request.
 
 </tr>
 
+<tr>
+
+<td>
+
+<code>headers</code></br> <em> map\[string\]\[\]string </em>
+
+</td>
+
+<td>
+
+<em>(Optional)</em>
+
+<p>
+
+Headers for the HTTP request.
+
+</p>
+
+</td>
+
+</tr>
+
 </tbody>
 
 </table>

diff --git a/pkg/apis/sensor/v1alpha1/openapi_generated.go b/pkg/apis/sensor/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/sensor/v1alpha1/types.go b/pkg/apis/sensor/v1alpha1/types.go
@@ -388,7 +388,7 @@ type HTTPTrigger struct {
 	// URL refers to the URL to send HTTP request to.
 	URL string `json:"url" protobuf:"bytes,1,name=url"`
 	// Payload is the list of key-value extracted from an event payload to construct the HTTP request payload.
-	// +listType=payloadParameters
+	// +listType=atomic
 	Payload []TriggerParameter `json:"payload" protobuf:"bytes,2,rep,name=payload"`
 	// TLS configuration for the HTTP client.
 	// +optional
@@ -400,7 +400,7 @@ type HTTPTrigger struct {
 	Method string `json:"method,omitempty" protobuf:"bytes,4,opt,name=method"`
 	// Parameters is the list of key-value extracted from event's payload that are applied to
 	// the HTTP trigger resource.
-	// +listType=triggerParameters
+	// +listType=atomic
 	Parameters []TriggerParameter `json:"parameters,omitempty" protobuf:"bytes,5,rep,name=parameters"`
 	// Timeout refers to the HTTP request timeout in seconds.
 	// Default value is 60 seconds.
@@ -409,6 +409,10 @@ type HTTPTrigger struct {
 	// BasicAuth configuration for the http request.
 	// +optional
 	BasicAuth *BasicAuth `json:"basicAuth,omitempty" protobuf:"bytes,7,opt,name=basicAuth"`
+	// Headers for the HTTP request.
+	// +mapType=granular
+	// +optional
+	Headers map[string][]string `json:"headers,omitempty" protobuf:"bytes,8,opt,name=headers"`
 }
 
 // TLSConfig refers to TLS configuration for the HTTP client

diff --git a/pkg/apis/sensor/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/sensor/v1alpha1/zz_generated.deepcopy.go
diff --git a/sensors/triggers/http/http.go b/sensors/triggers/http/http.go
@@ -155,6 +155,10 @@ func (t *HTTPTrigger) Execute(resource interface{}) (interface{}, error) {
 		return nil, errors.Wrapf(err, "failed to construct request for %s", trigger.URL)
 	}
 
+	if trigger.Headers != nil {
+		request.Header = trigger.Headers
+	}
+
 	basicAuth := trigger.BasicAuth
 
 	if basicAuth != nil {