change controller.NewController with function options

Author: micho7

cmd/db-controller/main.go

@@ -80,13 +80,13 @@ func main() {
 
 	c := controller.NewController(
 		logger,
-		globalInterfaceNameFlag,
-		myHostAddress,
-		uint16(dbServingPortFlag),
-		dbReplicaUserNameFlag,
-		dbReplicaPassword,
-		uint16(dbReplicaSourcePortFlag),
-		chainNameForDBAclFlag,
+		controller.WithGlobalInterfaceName(globalInterfaceNameFlag),
+		controller.WithHostAddress(myHostAddress),
+		controller.WithDBServingPort(uint16(dbServingPortFlag)),
+		controller.WithDBReplicaUserName(dbReplicaUserNameFlag),
+		controller.WithDBReplicaPassword(dbReplicaPassword),
+		controller.WithDBReplicaSourcePort(uint16(dbReplicaSourcePortFlag)),
+		controller.WithDBAclChainName(chainNameForDBAclFlag),
 	)
 
 	// start goroutines

pkg/controller/controller.go

@@ -119,24 +119,10 @@ type Controller struct {
 
 func NewController(
 	logger *slog.Logger,
-	globalInterfaceName string,
-	hostAddress string,
-	dbServingPort uint16,
-	dbReplicaUserName string,
-	dbReplicaPassword string,
-	dbReplicaSourcePort uint16,
-	dbAclChainName string,
 	configs ...ControllerConfig,
 ) *Controller {
 	c := &Controller{
-		logger:              logger,
-		globalInterfaceName: globalInterfaceName,
-		hostAddress:         hostAddress,
-		dbServingPort:       dbServingPort,
-		dbReplicaUserName:   dbReplicaUserName,
-		dbReplicaPassword:   dbReplicaPassword,
-		dbReplicaSourcePort: dbReplicaSourcePort,
-		dbAclChainName:      dbAclChainName,
+		logger: logger,
 
 		currentState:     StateInitial,
 		currentNeighbors: newNeighborSet(),

pkg/controller/controller_config.go

@@ -24,28 +24,71 @@ import (
 // ControllerConfig is the configuration that is applied into Controller.
 type ControllerConfig func(c *Controller)
 
-// SystemdConnector generates a config that sets the systemd.Connector into Controller.
-func SystemdConnector(connector systemd.Connector) ControllerConfig {
+func WithGlobalInterfaceName(globalInterfaceName string) ControllerConfig {
+	return func(c *Controller) {
+		c.globalInterfaceName = globalInterfaceName
+	}
+}
+
+func WithHostAddress(hostAddress string) ControllerConfig {
+	return func(c *Controller) {
+		c.hostAddress = hostAddress
+	}
+}
+
+func WithDBServingPort(dbServingPort uint16) ControllerConfig {
+	return func(c *Controller) {
+		c.dbServingPort = dbServingPort
+	}
+}
+
+func WithDBReplicaUserName(dbReplicaUserName string) ControllerConfig {
+	return func(c *Controller) {
+		c.dbReplicaUserName = dbReplicaUserName
+	}
+}
+
+func WithDBReplicaPassword(dbReplicaPassword string) ControllerConfig {
+	return func(c *Controller) {
+		c.dbReplicaPassword = dbReplicaPassword
+	}
+}
+
+func WithDBReplicaSourcePort(dbReplicaSourcePort uint16) ControllerConfig {
+	return func(c *Controller) {
+		c.dbReplicaSourcePort = dbReplicaSourcePort
+	}
+}
+
+func WithDBAclChainName(dbAclChainName string) ControllerConfig {
+	return func(c *Controller) {
+		c.dbAclChainName = dbAclChainName
+	}
+}
+
+// WithSystemdConnector generates a config that sets the systemd.Connector into Controller.
+func WithSystemdConnector(connector systemd.Connector) ControllerConfig {
 	return func(c *Controller) {
 		c.systemdConnector = connector
 	}
 }
 
-func MariaDBConnector(connector mariadb.Connector) ControllerConfig {
+// WithMariaDBConnector generates a config that sets the mariadb.Connector into Controller.
+func WithMariaDBConnector(connector mariadb.Connector) ControllerConfig {
 	return func(c *Controller) {
 		c.mariaDBConnector = connector
 	}
 }
 
-// NftablesConnector generates a config that sets the nftables.Connector into Controller.
-func NftablesConnector(connector nftables.Connector) ControllerConfig {
+// WithNftablesConnector generates a config that sets the nftables.Connector into Controller.
+func WithNftablesConnector(connector nftables.Connector) ControllerConfig {
 	return func(c *Controller) {
 		c.nftablesConnector = connector
 	}
 }
 
-// BGPdConnector generates a config that sets the vtysh.BGPdConnector into Controller.
-func BGPdConnector(connector bgpd.BGPdConnector) ControllerConfig {
+// WithBGPdConnector generates a config that sets the vtysh.WithBGPdConnector into Controller.
+func WithBGPdConnector(connector bgpd.BGPdConnector) ControllerConfig {
 	return func(c *Controller) {
 		c.bgpdConnector = connector
 	}

pkg/controller/test_helper.go

@@ -28,17 +28,17 @@ func _newFakeController() *Controller {
 	logger := slog.New(slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{}))
 	c := NewController(
 		logger,
-		"dummy-global-interface-name",
-		"10.0.0.1",
-		3306,
-		"repl",
-		"dummy-db-replica-password",
-		0,
-		"dummy-chain-name",
-		SystemdConnector(systemd.NewFakeSystemdConnector()),
-		MariaDBConnector(mariadb.NewFakeMariaDBConnector()),
-		NftablesConnector(nftables.NewFakeNftablesConnector()),
-		BGPdConnector(bgpd.NewFakeBGPdConnector()),
+		WithGlobalInterfaceName("dummy-global-interface-name"),
+		WithHostAddress("10.0.0.1"),
+		WithDBServingPort(3306),
+		WithDBReplicaUserName("repl"),
+		WithDBReplicaPassword("dummy-db-replica-password"),
+		WithDBReplicaSourcePort(0),
+		WithDBAclChainName("dummy-chain-name"),
+		WithSystemdConnector(systemd.NewFakeSystemdConnector()),
+		WithMariaDBConnector(mariadb.NewFakeMariaDBConnector()),
+		WithNftablesConnector(nftables.NewFakeNftablesConnector()),
+		WithBGPdConnector(bgpd.NewFakeBGPdConnector()),
 	)
 
 	return c