init tests and mqtt client init refactoring

cmd/main.go

@@ -15,6 +15,10 @@ func main() {
 		panic(fmt.Errorf("error while creating container: %w", err))
 	}
 
+	if err = cont.Mqtt.Connect(); err != nil {
+		panic(fmt.Errorf("error while connecting to mqtt: %w", err))
+	}
+
 	entityManagerDone := cont.EntityManager.Run()
 	policyDone := cont.PolicyStorage.Run()
 

internal/app/init.go

@@ -23,15 +23,18 @@ import (
 	"keeneticToMqtt/internal/storages/policy"
 )
 
+// Container with dependencies.
 type Container struct {
 	Logger            *slog.Logger
 	Config            *config.Config
 	ClientListService *clientlist.ClientList
 	DiscoveryService  *discovery.Discovery
 	EntityManager     *homeassistant.EntityManager
 	PolicyStorage     *policy.Storage
+	Mqtt              *mqtt.Client
 }
 
+// NewContainer creates new Container.
 func NewContainer() (*Container, error) {
 	cont := Container{}
 
@@ -45,17 +48,18 @@ func NewContainer() (*Container, error) {
 
 	cookie, _ := cookiejar.New(&cookiejar.Options{})
 
+	cont.Mqtt = mqtt.NewClient(cont.Config.Mqtt.Host, cont.Config.Mqtt.ClientID, cont.Config.Mqtt.Login, cont.Config.Mqtt.Password, cont.Logger)
+
 	authClient := auth.NewAuth(cont.Config.Keenetic.Host, cont.Config.Keenetic.Login, cont.Config.Keenetic.Password, cookie)
 	keeneticClient := keenetic.NewKeenetic(authClient, cookie, cont.Config.Keenetic.Host, cont.Config.Keenetic.Login, cont.Config.Keenetic.Password, cont.Logger)
 	policyClient := accessupdate.NewAccessUpdate(cont.Config.Keenetic.Host, keeneticClient)
 	policyList := policylist.NewPolicyList(cont.Config.Keenetic.Host, keeneticClient)
 	listClient := list.NewList(cont.Config.Keenetic.Host, keeneticClient)
-	mqttClient := mqtt.NewClient(cont.Config.Mqtt.Host, cont.Config.Mqtt.ClientID, cont.Config.Mqtt.Login, cont.Config.Mqtt.Password, cont.Logger)
 
 	cont.PolicyStorage = policy.NewStorage(policyList, time.Second*10, cont.Logger)
 
 	cont.ClientListService = clientlist.NewClientList(listClient, cont.Config.Homeassistant.WhiteList)
-	cont.DiscoveryService = discovery.NewDiscovery("", cont.Config.Homeassistant.DeviceID, mqttClient)
+	cont.DiscoveryService = discovery.NewDiscovery("", cont.Config.Homeassistant.DeviceID, cont.Mqtt)
 
 	clientPolicy := clientpolicy.NewClientPolicy(cont.Config.Mqtt.BaseTopic, cont.DiscoveryService, policyClient, cont.PolicyStorage)
 	clientPermit := clientpermit.NewClientPermit(cont.Config.Mqtt.BaseTopic, cont.DiscoveryService, policyClient)
@@ -70,7 +74,7 @@ func NewContainer() (*Container, error) {
 			rxBytes,
 		},
 		cont.ClientListService,
-		mqttClient,
+		cont.Mqtt,
 		cont.Config.Homeassistant.UpdateInterval,
 		cont.Logger,
 	)

internal/app/init_test.go

@@ -0,0 +1,23 @@
+package app
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewContainer(t *testing.T) {
+	f, _ := os.Create("config.yml")
+	defer func() {
+		_ = os.RemoveAll(f.Name())
+	}()
+	_ = os.Setenv("CONFIG_PATH", f.Name())
+
+	_, err := NewContainer()
+	assert.Nil(t, err)
+
+	_ = os.Setenv("CONFIG_PATH", "")
+	_, err = NewContainer()
+	assert.Error(t, err)
+}

internal/clients/mqtt/client.go

@@ -2,7 +2,6 @@ package mqtt
 
 import (
 	"fmt"
-	"os"
 	"time"
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
@@ -18,39 +17,37 @@ type Client struct {
 	topicPrefix string
 	client      mqtt.Client
 	logger      logger
+	broker      string
 }
 
 func NewClient(broker, clientID, username, password string, log logger) *Client {
-	var f mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-	}
-
-	opts := mqtt.NewClientOptions().AddBroker(broker).SetClientID(clientID)
-	opts.SetKeepAlive(2 * time.Second)
-	opts.SetDefaultPublishHandler(f)
-	opts.SetPingTimeout(1 * time.Second)
-	opts.SetUsername(username)
-	opts.SetPassword(password)
+	opts := mqtt.
+		NewClientOptions().
+		AddBroker(broker).
+		SetClientID(clientID).
+		SetKeepAlive(2 * time.Second).
+		SetPingTimeout(1 * time.Second).
+		SetUsername(username).
+		SetPassword(password)
 
 	c := mqtt.NewClient(opts)
-	if token := c.Connect(); token.Wait() && token.Error() != nil {
-		panic(token.Error())
-	}
-
-	if token := c.Subscribe("go-mqtt/sample", 0, func(client mqtt.Client, message mqtt.Message) {
-		fmt.Printf(string(message.Payload()))
-	}); token.Wait() && token.Error() != nil {
-		fmt.Println(token.Error())
-		os.Exit(1)
-	}
 
 	return &Client{
 		client: c,
 		logger: log,
+		broker: broker,
 	}
 }
 
+func (c *Client) Connect() error {
+	if token := c.client.Connect(); token.Wait() && token.Error() != nil {
+		return token.Error()
+	}
+	c.logger.Info("connected to mqtt", "broker", c.broker)
+
+	return nil
+}
+
 func (c *Client) SendMessage(topic, message string, retained bool) {
 	c.logger.Debug("start sending mqtt message",
 		"topic", topic,