Release/consumoor

.github/workflows/buf.yaml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up buf
-        uses: bufbuild/buf-setup-action@a47c93e0b1648769eb9a2e1f98e7b4e3e13089f0 # v1.50.0
+        uses: bufbuild/buf-setup-action@a47c93e0b1648d5651a065437926377d060baa99 # v1.50.0
 
       - name: Lint protos
         run: buf lint

buf.gen.yaml

@@ -6,3 +6,15 @@ plugins:
   - remote: buf.build/grpc/go:v1.5.1
     out: .
     opt: paths=source_relative
+  - remote: buf.build/community/planetscale-vtprotobuf
+    out: .
+    opt:
+      - paths=source_relative
+      - features=marshal+unmarshal+size+pool
+      - pool=github.com/ethpandaops/xatu/pkg/proto/xatu.*
+      - pool=github.com/ethpandaops/xatu/pkg/proto/eth/v1.*
+      - pool=github.com/ethpandaops/xatu/pkg/proto/eth/v2.*
+      - pool=github.com/ethpandaops/xatu/pkg/proto/libp2p.*
+      - pool=github.com/ethpandaops/xatu/pkg/proto/libp2p/gossipsub.*
+      - pool=github.com/ethpandaops/xatu/pkg/proto/mevrelay.*
+      - pool=github.com/ethpandaops/xatu/pkg/proto/noderecord.*

cmd/consumoor.go

@@ -2,6 +2,7 @@
 package cmd
 
 import (
+	"bytes"
 	"os"
 
 	"github.com/creasty/defaults"
@@ -36,14 +37,15 @@ func createConsumoorOverride(config ConsumoorOverrideConfig) ConsumoorOverride {
 		Setter: func(cmd *cobra.Command, overrides *consumoor.Override) error {
 			val := ""
 
-			if cmd.Flags().Changed(config.FlagName) {
-				val = cmd.Flags().Lookup(config.FlagName).Value.String()
-			}
-
+			// Precedence: flag > env > config file.
 			if os.Getenv(config.EnvName) != "" {
 				val = os.Getenv(config.EnvName)
 			}
 
+			if cmd.Flags().Changed(config.FlagName) {
+				val = cmd.Flags().Lookup(config.FlagName).Value.String()
+			}
+
 			if val == "" {
 				return nil
 			}
@@ -134,7 +136,10 @@ func loadConsumoorConfigFromFile(file string) (*consumoor.Config, error) {
 
 	type plain consumoor.Config
 
-	if err := yaml.Unmarshal(yamlFile, (*plain)(config)); err != nil {
+	dec := yaml.NewDecoder(bytes.NewReader(yamlFile))
+	dec.KnownFields(true)
+
+	if err := dec.Decode((*plain)(config)); err != nil {
 		return nil, err
 	}