api: make readiness check optional

saucelabs · Sep 8, 2023 · 9f348bd · 9f348bd
1 parent ff88160
commit 9f348bd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/api.go b/api.go
@@ -73,7 +73,7 @@ func (h *APIHandler) healthz(w http.ResponseWriter, _ *http.Request) {
 }
 
 func (h *APIHandler) readyz(w http.ResponseWriter, r *http.Request) {
-	if h.ready(r.Context()) {
+	if h.ready == nil || h.ready(r.Context()) {
 		w.WriteHeader(http.StatusOK)
 		w.Header().Set("Content-Type", "text/plain")
 		w.Write([]byte("OK"))

diff --git a/cmd/forwarder/httpbin/httpbin.go b/cmd/forwarder/httpbin/httpbin.go
@@ -43,7 +43,7 @@ func (c *command) runE(cmd *cobra.Command, _ []string) error {
 	defer s.Close()
 
 	r := prometheus.NewRegistry()
-	a, err := forwarder.NewHTTPServer(c.apiServerConfig, forwarder.NewAPIHandler(r, s.Ready, config, ""), logger.Named("api"))
+	a, err := forwarder.NewHTTPServer(c.apiServerConfig, forwarder.NewAPIHandler(r, nil, config, ""), logger.Named("api"))
 	if err != nil {
 		return err
 	}

diff --git a/cmd/forwarder/run/run.go b/cmd/forwarder/run/run.go
@@ -120,14 +120,17 @@ func (c *command) runE(cmd *cobra.Command, _ []string) error {
 	}
 
 	var g runctx.Group
-	p, err := forwarder.NewHTTPProxy(c.httpProxyConfig, pr, cm, rt, logger.Named("proxy"))
-	if err != nil {
-		return err
+	{
+		p, err := forwarder.NewHTTPProxy(c.httpProxyConfig, pr, cm, rt, logger.Named("proxy"))
+		if err != nil {
+			return err
+		}
+		defer p.Close()
+		g.Add(p.Run)
 	}
-	g.Add(p.Run)
 
 	if c.apiServerConfig.Addr != "" {
-		h := forwarder.NewAPIHandler(c.promReg, p.Ready, config, script)
+		h := forwarder.NewAPIHandler(c.promReg, nil, config, script)
 		a, err := forwarder.NewHTTPServer(c.apiServerConfig, h, logger.Named("api"))
 		if err != nil {
 			return err