Merge pull request #12 from DoodleScheduling/fix-wait

fix: don't await responses

Author: raffis

config/samples/requestclone.yaml

@@ -2,9 +2,8 @@ apiVersion: proxy.infra.doodle.com/v1beta1
 kind: RequestClone
 metadata:
   name: webhook-receiver
-  namespace: apps
 spec:
   host: webhook-receiver.example.com
   backend:
     serviceName: webhook-receiver-app-1
-    servicePort: http
+    servicePort: http

main.go

@@ -22,6 +22,7 @@ import (
 	"net/http"
 	"os"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/spf13/pflag"
@@ -193,10 +194,18 @@ func main() {
 		MaxHeaderBytes: 1 << 20,
 	}
 
+	var wg sync.WaitGroup
+	wg.Add(1)
+
 	go func() {
+		defer wg.Done()
 		if err := s.ListenAndServe(); err != nil {
 			setupLog.Error(err, "HTTP server error")
 		}
+
+		s.RegisterOnShutdown(func() {
+			proxy.Close()
+		})
 	}()
 
 	pReconciler := &controllers.RequestCloneReconciler{
@@ -218,4 +227,7 @@ func main() {
 		setupLog.Error(err, "problem running manager")
 		os.Exit(1)
 	}
+
+	s.Shutdown(context.TODO())
+	wg.Wait()
 }

proxy/http.go

@@ -34,6 +34,7 @@ type HttpProxy struct {
 	mutex         sync.Mutex
 	log           logr.Logger
 	bodySizeLimit int64
+	wg            sync.WaitGroup
 }
 
 type Options struct {
@@ -92,7 +93,6 @@ func (h *HttpProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		found bool
 		b     []byte
 		err   error
-		wg    sync.WaitGroup
 	)
 
 	if h.bodySizeLimit == 0 {
@@ -111,10 +111,10 @@ func (h *HttpProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		if dst.Host == r.Host {
 			found = true
 			h.log.Info("found matching http backend for request", "request", r.RequestURI, "host", dst.Host, "service", dst.Service, "port", dst.Port)
-			wg.Add(1)
+			h.wg.Add(1)
 
 			go func(dst RequestClone, r *http.Request, b []byte) {
-				defer wg.Done()
+				defer h.wg.Done()
 				clone := r.Clone(context.TODO())
 
 				clone.URL.Scheme = "http"
@@ -139,6 +139,8 @@ func (h *HttpProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		// We don't have any matching RequestClone resources matching the host
 		w.WriteHeader(http.StatusServiceUnavailable)
 	}
+}
 
-	wg.Wait()
+func (h *HttpProxy) Close() {
+	h.wg.Wait()
 }

proxy/http_test.go

@@ -184,6 +184,8 @@ func TestServeHTTP(t *testing.T) {
 
 			w := httptest.NewRecorder()
 			proxy.ServeHTTP(w, test.request())
+			proxy.Close()
+
 			g.Expect(test.expectHTTPCode).To(Equal(w.Code))
 			_ = w.Result()