temporary remote HTTP response support

Maciej Winnicki · Maciej Winnicki · commit ff37ade5c07b · 2017-08-15T17:43:18.000+02:00
diff --git a/README.md b/README.md
@@ -304,16 +304,6 @@ Request: arbitrary payload, subscribed function receives an event in above schem
 
 Response: function response
 
-### Respond to an HTTP Event
-
-To respond to an HTTP event a function needs to return object with following fields:
-
-- `statusCode` - `int` - response status code, default: 200
-- `headers` - `object` - response headers
-- `body` - `string` - response body
-
-Currently, the event gateway supports only string responses.
-
 ### Invoking a Registered Function (Sync Function Invocation)
 
 `POST /` with `Event` header set to `invoke` and `Function-ID` set to function ID.
diff --git a/router/event.go b/router/event.go
@@ -39,13 +39,6 @@ type HTTPEvent struct {
 	Method  string              `json:"method"`
 }
 
-// HTTPResponse is a response schema returned by subscribed function in case of HTTP event.
-type HTTPResponse struct {
-	StatusCode int               `json:"statusCode"`
-	Headers    map[string]string `json:"headers"`
-	Body       string            `json:"body"`
-}
-
 const (
 	mimeJSON       = "application/json"
 	mimeOctetStrem = "application/octet-stream"
diff --git a/router/integration_test.go b/router/integration_test.go
@@ -144,55 +144,6 @@ func TestIntegration_HTTPSubscription(t *testing.T) {
 	shutdownGuard.ShutdownAndWait()
 }
 
-func TestIntegration_HTTPResponse(t *testing.T) {
-	logCfg := zap.NewDevelopmentConfig()
-	logCfg.DisableStacktrace = true
-	log, _ := logCfg.Build()
-
-	kv, shutdownGuard := newTestEtcd()
-
-	testAPIServer := newConfigAPIServer(kv, log)
-	defer testAPIServer.Close()
-
-	router, testRouterServer := newTestRouterServer(kv, log)
-	defer testRouterServer.Close()
-
-	testTargetServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, `{"statusCode":201,"headers":{"content-type":"text/html"},"body":"<head></head>"}`)
-	}))
-	defer testTargetServer.Close()
-
-	post(testAPIServer.URL+"/v1/functions",
-		functions.Function{
-			ID: functions.FunctionID("httpresponse"),
-			Provider: &functions.Provider{
-				Type: functions.HTTPEndpoint,
-				URL:  testTargetServer.URL,
-			},
-		})
-
-	post(testAPIServer.URL+"/v1/subscriptions", subscriptions.Subscription{
-		FunctionID: functions.FunctionID("httpresponse"),
-		Event:      "http",
-		Method:     "GET",
-		Path:       "/httpresponse",
-	})
-
-	select {
-	case <-router.WaitForEndpoint(subscriptions.NewEndpointID("GET", "/httpresponse")):
-	case <-time.After(10 * time.Second):
-		panic("timed out waiting for endpoint to be configured!")
-	}
-
-	statusCode, headers, body := get(testRouterServer.URL + "/httpresponse")
-	assert.Equal(t, statusCode, 201)
-	assert.Equal(t, headers.Get("content-type"), "text/html")
-	assert.Equal(t, body, "<head></head>")
-
-	router.Drain()
-	shutdownGuard.ShutdownAndWait()
-}
-
 func wait10Seconds(ch <-chan struct{}, errMsg string) {
 	select {
 	case <-ch:
diff --git a/router/router.go b/router/router.go
@@ -207,20 +207,6 @@ func (router *Router) handleSyncEvent(name string, payload []byte, w http.Respon
 		zap.String("functionId", string(functionID)), zap.String("event", string(payload)),
 		zap.String("response", string(resp)))
 
-	if name == eventHTTP {
-		httpResponse := &HTTPResponse{StatusCode: http.StatusOK}
-		err = json.Unmarshal(resp, httpResponse)
-		if err == nil {
-			for key, value := range httpResponse.Headers {
-				w.Header().Set(key, value)
-			}
-
-			w.WriteHeader(httpResponse.StatusCode)
-
-			resp = []byte(httpResponse.Body)
-		}
-	}
-
 	_, err = w.Write(resp)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
