Add convoy version header

api/api.go

@@ -2,6 +2,10 @@ package api
 
 import (
 	"embed"
+	"fmt"
+	"github.com/frain-dev/convoy"
+	"github.com/frain-dev/convoy/util"
+	"github.com/go-chi/render"
 	"io/fs"
 	"net/http"
 	"path"
@@ -43,13 +47,6 @@ func reactRootHandler(rw http.ResponseWriter, req *http.Request) {
 	http.FileServer(http.FS(static)).ServeHTTP(rw, req)
 }
 
-const (
-	GET    = "GET"
-	POST   = "POST"
-	PUT    = "PUT"
-	DELETE = "DELETE"
-)
-
 const (
 	VersionHeader = "X-Convoy-Version"
 	serverName    = "apiserver"
@@ -114,6 +111,7 @@ func (a *ApplicationHandler) buildRouter() *chi.Mux {
 	router.Use(chiMiddleware.RequestID)
 	router.Use(chiMiddleware.Recoverer)
 	router.Use(middleware.WriteRequestIDHeader)
+	router.Use(middleware.WriteVersionHeader(VersionHeader, a.cfg.APIVersion))
 	router.Use(middleware.InstrumentRequests(serverName, router))
 	router.Use(middleware.LogHttpRequest(a.A))
 	router.Use(chiMiddleware.Maybe(middleware.SetupCORS, shouldApplyCORS))
@@ -495,6 +493,10 @@ func (a *ApplicationHandler) BuildControlPlaneRoutes() *chi.Mux {
 		router.HandleFunc("/metrics", promhttp.HandlerFor(metrics.Reg(), promhttp.HandlerOpts{Registry: metrics.Reg()}).ServeHTTP)
 	}
 
+	router.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
+		_ = render.Render(w, r, util.NewServerResponse(fmt.Sprintf("Convoy %v", convoy.GetVersion()), nil, http.StatusOK))
+	})
+
 	router.HandleFunc("/*", reactRootHandler)
 
 	a.Router = router
@@ -509,6 +511,10 @@ func (a *ApplicationHandler) BuildDataPlaneRoutes() *chi.Mux {
 		router.HandleFunc("/metrics", promhttp.HandlerFor(metrics.Reg(), promhttp.HandlerOpts{Registry: metrics.Reg()}).ServeHTTP)
 	}
 
+	router.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
+		_ = render.Render(w, r, util.NewServerResponse(fmt.Sprintf("Convoy %v", convoy.GetVersion()), nil, http.StatusOK))
+	})
+
 	// Ingestion API.
 	router.Route("/ingest", func(ingestRouter chi.Router) {
 		ingestRouter.Use(middleware.RateLimiterHandler(a.A.Rate, a.cfg.ApiRateLimit))

go.mod

@@ -58,6 +58,7 @@ require (
 	github.com/slack-go/slack v0.10.2
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
+	github.com/stealthrocket/netjail v0.1.2
 	github.com/stretchr/testify v1.9.0
 	github.com/subomi/requestmigrations v0.4.0
 	github.com/swaggo/swag v1.16.3
@@ -205,7 +206,6 @@ require (
 	github.com/shirou/gopsutil/v3 v3.23.12 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
-	github.com/stealthrocket/netjail v0.1.2 // indirect
 	github.com/theupdateframework/notary v0.7.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect

internal/pkg/middleware/middleware.go

@@ -96,6 +96,15 @@ func WriteRequestIDHeader(next http.Handler) http.Handler {
 	})
 }
 
+func WriteVersionHeader(header, version string) func(next http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Set(header, version)
+			next.ServeHTTP(w, r)
+		})
+	}
+}
+
 func CanAccessFeature(fflag *fflag.FFlag, featureKey fflag.FeatureFlagKey) func(next http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -351,7 +360,7 @@ func requestLogFields(r *http.Request) map[string]interface{} {
 	return requestFields
 }
 
-func responseLogFields(w middleware.WrapResponseWriter, wbuf *bytes.Buffer, t time.Time, lvl logrus.Level) map[string]interface{} {
+func responseLogFields(w middleware.WrapResponseWriter, wbuf *bytes.Buffer, t time.Time, _ logrus.Level) map[string]interface{} {
 	responseFields := map[string]interface{}{
 		"status":  w.Status(),
 		"byes":    w.BytesWritten(),

util/endpoint.go

@@ -28,7 +28,7 @@ func ValidateEndpoint(s string, enforceSecure bool) (string, error) {
 			return "", errors.New("only https endpoints allowed")
 		}
 	case "https":
-		client := &http.Client{Timeout: 60 * time.Second, Transport: &http.Transport{
+		client := &http.Client{Timeout: 10 * time.Second, Transport: &http.Transport{
 			DialTLSContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
 				conn, err := tls.Dial(network, addr, &tls.Config{MinVersion: tls.VersionTLS12})
 				return conn, err