Merge pull request #62 from hslatman/automatic-user-agent-version-2

Add automatic module version detection

Author: hslatman

internal/bouncer/bouncer.go

@@ -27,18 +27,26 @@ import (
 
 	"github.com/crowdsecurity/crowdsec/pkg/models"
 	csbouncer "github.com/crowdsecurity/go-cs-bouncer"
+	"github.com/hslatman/caddy-crowdsec-bouncer/internal/version"
 
 	"go.uber.org/zap"
 )
 
 const (
-	userAgentName    = "caddy-cs-bouncer"
-	userAgentVersion = "v0.8.0"
-	userAgent        = userAgentName + "/" + userAgentVersion
-
+	userAgentName             = "caddy-cs-bouncer"
 	maxNumberOfDecisionsToLog = 10
 )
 
+var (
+	userAgent        string
+	userAgentVersion string
+)
+
+func init() {
+	userAgentVersion = version.Current()
+	userAgent = userAgentName + "/" + userAgentVersion
+}
+
 // Bouncer is a wrapper for a CrowdSec bouncer. It supports both the
 // streaming and live bouncer implementations. The streaming bouncer is
 // backed by an immutable radix tree storing known bad IPs and IP ranges.

internal/version/version.go

@@ -0,0 +1,25 @@
+package version
+
+import (
+	"runtime/debug"
+)
+
+const (
+	modulePath = "github.com/hslatman/caddy-crowdsec-bouncer"
+	fallback   = "v0.8.0"
+)
+
+func Current() string {
+	info, ok := debug.ReadBuildInfo()
+	if !ok {
+		return fallback
+	}
+
+	for _, d := range info.Deps {
+		if d.Path == modulePath {
+			return d.Version
+		}
+	}
+
+	return fallback
+}

internal/version/version_test.go

@@ -0,0 +1,13 @@
+package version
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCurrent(t *testing.T) {
+	v := Current()
+
+	assert.Equal(t, "v0.8.0", v) // fallback
+}