fix(config): add metrics socket mode

Signed-off-by: Xe Iaso <me@xeiaso.net>

lib/config/config.go

@@ -415,8 +415,9 @@ func Load(fin io.Reader, fname string) (*Config, error) {
 		},
 		Logging: (Logging{}).Default(),
 		Metrics: &Metrics{
-			Bind:    flagLookup("metrics-bind"),
+			Bind:       flagLookup("metrics-bind"),
-			Network: flagLookup("metrics-bind-network"),
+			Network:    flagLookup("metrics-bind-network"),
+			SocketMode: flagLookup("socket-mode"),
 		},
 	}
 

lib/config/metrics.go

@@ -1,17 +1,24 @@
 package config
 
-import "errors"
+import (
+	"errors"
+	"fmt"
+	"strconv"
+)
 
 var (
-	ErrInvalidMetricsConfig  = errors.New("config: invalid metrics configuration")
+	ErrInvalidMetricsConfig     = errors.New("config: invalid metrics configuration")
-	ErrNoMetricsBind         = errors.New("config.Metrics: must define bind")
+	ErrNoMetricsBind            = errors.New("config.Metrics: must define bind")
-	ErrNoMetricsNetwork      = errors.New("config.Metrics: must define network")
+	ErrNoMetricsNetwork         = errors.New("config.Metrics: must define network")
-	ErrInvalidMetricsNetwork = errors.New("config.Metrics: invalid metrics network")
+	ErrNoMetricsSocketMode      = errors.New("config.Metrics: must define socket mode when using unix sockets")
+	ErrInvalidMetricsSocketMode = errors.New("config.Metrics: invalid unix socket mode")
+	ErrInvalidMetricsNetwork    = errors.New("config.Metrics: invalid metrics network")
 )
 
 type Metrics struct {
-	Bind    string `json:"bind" yaml:"bind"`
+	Bind       string `json:"bind" yaml:"bind"`
-	Network string `json:"network" yaml:"network"`
+	Network    string `json:"network" yaml:"network"`
+	SocketMode string `json:"socketMode" yaml:"socketMode"`
 }
 
 func (m *Metrics) Valid() error {
@@ -26,7 +33,15 @@ func (m *Metrics) Valid() error {
 	}
 
 	switch m.Network {
-	case "tcp", "tcp4", "tcp6", "unix": // https://pkg.go.dev/net#Listen
+	case "tcp", "tcp4", "tcp6": // https://pkg.go.dev/net#Listen
+	case "unix":
+		if m.SocketMode == "" {
+			errs = append(errs, ErrNoMetricsSocketMode)
+		}
+
+		if _, err := strconv.ParseUint(m.SocketMode, 8, 0); err != nil {
+			errs = append(errs, fmt.Errorf("%w: %w", ErrInvalidMetricsSocketMode, err))
+		}
 	default:
 		errs = append(errs, ErrInvalidMetricsNetwork)
 	}

lib/config/metrics_test.go

@@ -18,6 +18,28 @@ func TestMetricsValid(t *testing.T) {
 				Network: "tcp",
 			},
 		},
+		{
+			name: "basic TCP4",
+			input: &Metrics{
+				Bind:    ":9090",
+				Network: "tcp4",
+			},
+		},
+		{
+			name: "basic TCP6",
+			input: &Metrics{
+				Bind:    ":9090",
+				Network: "tcp6",
+			},
+		},
+		{
+			name: "basic unix",
+			input: &Metrics{
+				Bind:       "/tmp/anubis-metrics.sock",
+				Network:    "unix",
+				SocketMode: "0770",
+			},
+		},
 		{
 			name:  "no bind",
 			input: &Metrics{},
@@ -28,6 +50,23 @@ func TestMetricsValid(t *testing.T) {
 			input: &Metrics{},
 			err:   ErrNoMetricsNetwork,
 		},
+		{
+			name: "no unix socket mode",
+			input: &Metrics{
+				Bind:    "/tmp/anubis-metrics.sock",
+				Network: "unix",
+			},
+			err: ErrNoMetricsSocketMode,
+		},
+		{
+			name: "invalid unix socket mode",
+			input: &Metrics{
+				Bind:       "/tmp/anubis-metrics.sock",
+				Network:    "unix",
+				SocketMode: "taco bell",
+			},
+			err: ErrInvalidMetricsSocketMode,
+		},
 		{
 			name: "invalid network",
 			input: &Metrics{