refactor: change config types

soerenschneider · Sep 5, 2023 · f9a3f47 · f9a3f47
1 parent 286f2c5
commit f9a3f47
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/cmd/deps/app.go b/cmd/deps/app.go
@@ -2,6 +2,7 @@ package deps
 
 import (
 	"fmt"
+
 	"github.com/soerenschneider/conditional-reboot/internal"
 	"github.com/soerenschneider/conditional-reboot/internal/group"
 )
@@ -10,7 +11,7 @@ func BuildGroups(groupUpdates chan *group.Group, conf *internal.ConditionalReboo
 	var groups []*group.Group
 
 	for _, groupConf := range conf.Groups {
-		group, err := BuildGroup(groupUpdates, groupConf)
+		group, err := BuildGroup(groupUpdates, &groupConf)
 		if err != nil {
 			return nil, fmt.Errorf("could not build group '%s': %w", groupConf.Name, err)
 		}

diff --git a/cmd/deps/group.go b/cmd/deps/group.go
@@ -1,11 +1,12 @@
 package deps
 
 import (
+	"strings"
+
 	"github.com/soerenschneider/conditional-reboot/internal"
 	"github.com/soerenschneider/conditional-reboot/internal/agent/state"
 	"github.com/soerenschneider/conditional-reboot/internal/group"
 	"github.com/soerenschneider/conditional-reboot/internal/group/state_evaluator"
-	"strings"
 )
 
 func BuildGroup(groupUpdates chan *group.Group, conf *internal.GroupConf) (*group.Group, error) {
@@ -30,7 +31,7 @@ func BuildGroup(groupUpdates chan *group.Group, conf *internal.GroupConf) (*grou
 func BuildAgents(conf *internal.GroupConf) ([]state.Agent, error) {
 	var agents []state.Agent
 	for _, agentConf := range conf.Agents {
-		agent, err := BuildAgent(agentConf)
+		agent, err := BuildAgent(&agentConf)
 		if err != nil {
 			return nil, err
 		}

diff --git a/internal/config.go b/internal/config.go
@@ -2,6 +2,7 @@ package internal
 
 import (
 	"encoding/json"
+
 	"github.com/rs/zerolog/log"
 	"github.com/soerenschneider/conditional-reboot/internal/agent/state"
 )
@@ -13,10 +14,10 @@ const (
 )
 
 type ConditionalRebootConfig struct {
-	Groups            []*GroupConf `json:"groups" validate:"dive,required"`
-	JournalFile       string       `json:"journal_file" validate:"omitempty,filepath"`
-	MetricsListenAddr string       `json:"metrics_listen_addr" validate:"excluded_with=MetricsDir"`
-	MetricsDir        string       `json:"metrics_dir" validate:"excluded_with=MetricsListenAddr,omitempty,dirpath"`
+	Groups            []GroupConf `json:"groups" validate:"dive,required"`
+	JournalFile       string      `json:"journal_file" validate:"omitempty,filepath"`
+	MetricsListenAddr string      `json:"metrics_listen_addr" validate:"excluded_with=MetricsDir"`
+	MetricsDir        string      `json:"metrics_dir" validate:"excluded_with=MetricsListenAddr,omitempty,dirpath"`
 }
 
 func (conf *ConditionalRebootConfig) Print() {
@@ -30,8 +31,8 @@ func (conf *ConditionalRebootConfig) Print() {
 }
 
 type GroupConf struct {
-	Agents []*AgentConf `json:"agents" validate:"dive"`
-	Name   string       `json:"name" validate:"required"`
+	Agents []AgentConf `json:"agents" validate:"dive"`
+	Name   string      `json:"name" validate:"required"`
 
 	StateEvaluatorName string            `json:"state_evaluator_name"`
 	StateEvaluatorArgs map[string]string `json:"state_evaluator_args" validate:"required"`