change bgpserver.Connector

Author: micho7

cmd/db-controller/main.go

@@ -37,13 +37,9 @@ import (
 	"github.com/sakura-internet/distributed-mariadb-controller/pkg/controller"
 	"github.com/sakura-internet/distributed-mariadb-controller/pkg/nftables"
 	"github.com/vishvananda/netlink"
-
-	"golang.org/x/exp/rand"
 )
 
 func main() {
-	rand.Seed(uint64(time.Now().UnixNano()))
-
 	if err := parseAllFlags(os.Args[1:]); err != nil {
 		panic(err)
 	}
@@ -84,14 +80,14 @@ func main() {
 
 	// start bgpserver
 	logger.Debug("starting bgpserver", "hostaddress", myHostAddress)
-	bs := bgpserver.NewDefaultConnector(
+	bgpServerConnect := bgpserver.NewDefaultConnector(
 		logger,
-		uint32(bgpAsNumberFlag),
-		myHostAddress,
-		int32(bgpServingPortFlag),
-		gobgpGrpcPortFlag,
+		bgpserver.WithAsn(uint32(bgpAsNumberFlag)),
+		bgpserver.WithRouterId(myHostAddress),
+		bgpserver.WithListenPort(int32(bgpServingPortFlag)),
+		bgpserver.WithGrpcPort(gobgpGrpcPortFlag),
 	)
-	if err := bs.Start(ctx); err != nil {
+	if err := bgpServerConnect.Start(ctx); err != nil {
 		panic(err)
 	}
 
@@ -102,7 +98,7 @@ func main() {
 	}
 	for _, v := range peers {
 		logger.Debug("adding peer", "neighbor", v)
-		bs.AddPeer(
+		bgpServerConnect.AddPeer(
 			v,
 			uint32(bgpAsNumberFlag),
 			uint32(bgpServingPortFlag),
@@ -124,7 +120,7 @@ func main() {
 		dbReplicaPassword,
 		uint16(dbReplicaSourcePortFlag),
 		chainNameForDBAclFlag,
-		controller.BgpServerConnector(bs),
+		controller.BgpServerConnector(bgpServerConnect),
 		controller.NftablesConnector(nftConnect),
 	)
 

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/prometheus/client_golang v1.21.1
 	github.com/stretchr/testify v1.10.0
 	github.com/vishvananda/netlink v1.3.0
-	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
 	google.golang.org/protobuf v1.36.6
 )
 

go.sum

@@ -257,8 +257,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

pkg/bgpserver/connector.go

@@ -50,16 +50,41 @@ type bgpServerConnector struct {
 	grpcPort   int
 }
 
-func NewDefaultConnector(logger *slog.Logger, asn uint32, routerId string, listenPort int32, grpcPort int) Connector {
-	return &bgpServerConnector{
-		logger:     logger,
-		asn:        asn,
-		routerId:   routerId,
-		listenPort: listenPort,
-		grpcPort:   grpcPort,
-		server: gobgpserver.NewBgpServer(
-			gobgpserver.GrpcListenAddress(fmt.Sprintf("127.0.0.1:%d", grpcPort)),
-		),
+func NewDefaultConnector(logger *slog.Logger, configs ...func(*bgpServerConnector)) Connector {
+	bs := &bgpServerConnector{
+		logger: logger,
+	}
+	for _, f := range configs {
+		f(bs)
+	}
+	bs.server = gobgpserver.NewBgpServer(
+		gobgpserver.GrpcListenAddress(fmt.Sprintf("127.0.0.1:%d", bs.grpcPort)),
+	)
+
+	return bs
+}
+
+func WithAsn(asn uint32) func(*bgpServerConnector) {
+	return func(c *bgpServerConnector) {
+		c.asn = asn
+	}
+}
+
+func WithRouterId(routerId string) func(*bgpServerConnector) {
+	return func(c *bgpServerConnector) {
+		c.routerId = routerId
+	}
+}
+
+func WithListenPort(listenPort int32) func(*bgpServerConnector) {
+	return func(c *bgpServerConnector) {
+		c.listenPort = listenPort
+	}
+}
+
+func WithGrpcPort(grpcPort int) func(*bgpServerConnector) {
+	return func(c *bgpServerConnector) {
+		c.grpcPort = grpcPort
 	}
 }
 

pkg/controller/controller.go

@@ -167,9 +167,10 @@ func NewController(
 		currentState:     StateInitial,
 		currentNeighbors: newNeighborSet(),
 
-		nftablesConnector: nftables.NewDefaultConnector(logger),
-		mariaDBConnector:  mariadb.NewDefaultConnector(logger),
-		systemdConnector:  systemd.NewDefaultConnector(logger),
+		nftablesConnector:  nftables.NewDefaultConnector(logger),
+		mariaDBConnector:   mariadb.NewDefaultConnector(logger),
+		systemdConnector:   systemd.NewDefaultConnector(logger),
+		bgpServerConnector: bgpserver.NewDefaultConnector(logger),
 	}
 
 	for _, cfg := range configs {