feat(metrics): adapt tests

Author: tschaefer

internal/controller/agent_test.go

@@ -71,15 +71,26 @@ func Test_RegisterAgentReturnsError_BadParameters(t *testing.T) {
 	ctrl := New(model, &mockedConfig)
 	assert.NotNil(t, ctrl, "create controller")
 
-	_, err := ctrl.RegisterAgent("", nil, nil, false, false)
+	data := Agent{
+		Hostname:       "",
+		Tags:           nil,
+		LogSources:     nil,
+		Metrics:        false,
+		MetricsTargets: nil,
+		Profiles:       false,
+	}
+
+	_, err := ctrl.RegisterAgent(&data)
 	expected := "hostname must not be empty"
 	assert.EqualError(t, err, expected, "register agent with empty hostname")
 
-	_, err = ctrl.RegisterAgent("test-host", nil, nil, false, false)
+	data.Hostname = "test-host"
+	_, err = ctrl.RegisterAgent(&data)
 	expected = "at least one log source must be specified"
 	assert.EqualError(t, err, expected, "register agent with no log sources")
 
-	_, err = ctrl.RegisterAgent("test-host", nil, []string{"invalid://source"}, false, false)
+	data.LogSources = []string{"invalid://source"}
+	_, err = ctrl.RegisterAgent(&data)
 	expected = "no valid log source specified"
 	assert.EqualError(t, err, expected, "register agent with invalid log source")
 }
@@ -92,7 +103,16 @@ func Test_RegisterAgentReturnsError_InvalidSecret(t *testing.T) {
 	ctrl := New(model, &config)
 	assert.NotNil(t, ctrl, "create controller")
 
-	_, err := ctrl.RegisterAgent("test-host", []string{"tag1"}, []string{"journal://"}, false, false)
+	data := Agent{
+		Hostname:       "test-host",
+		Tags:           []string{"tag1"},
+		LogSources:     []string{"journal://"},
+		Metrics:        false,
+		MetricsTargets: nil,
+		Profiles:       false,
+	}
+
+	_, err := ctrl.RegisterAgent(&data)
 	assert.Error(t, err, "register agent with invalid config secret")
 }
 
@@ -102,7 +122,16 @@ func Test_RegisterAgentReturnsResourceId(t *testing.T) {
 	ctrl := New(model, &mockedConfig)
 	assert.NotNil(t, ctrl, "create controller")
 
-	rid, err := ctrl.RegisterAgent("test-host", []string{"tag1", "tag2"}, []string{"file:///var/log/syslog"}, false, false)
+	data := Agent{
+		Hostname:       "test-host",
+		Tags:           []string{"tag1", "tag2"},
+		LogSources:     []string{"file:///var/log/syslog"},
+		Metrics:        false,
+		MetricsTargets: nil,
+		Profiles:       false,
+	}
+
+	rid, err := ctrl.RegisterAgent(&data)
 	assert.NoError(t, err, "register agent with valid parameters")
 
 	assert.NotEmpty(t, rid, "resource ID not empty")
@@ -133,7 +162,16 @@ func Test_DeregisterAgentReturnsNil(t *testing.T) {
 	ctrl := New(model, &mockedConfig)
 	assert.NotNil(t, ctrl, "create controller")
 
-	rid, err := ctrl.RegisterAgent("test-host", []string{"tag1"}, []string{"file:///var/log/syslog"}, false, false)
+	data := Agent{
+		Hostname:       "test-host",
+		Tags:           []string{"tag1"},
+		LogSources:     []string{"file:///var/log/syslog"},
+		Metrics:        false,
+		MetricsTargets: nil,
+		Profiles:       false,
+	}
+
+	rid, err := ctrl.RegisterAgent(&data)
 	assert.NoError(t, err, "register agent with valid parameters")
 
 	err = ctrl.DeregisterAgent(rid)
@@ -157,7 +195,16 @@ func Test_CreateAgentConfigReturnsConfig(t *testing.T) {
 	ctrl := New(model, &mockedConfig)
 	assert.NotNil(t, ctrl, "create controller")
 
-	rid, err := ctrl.RegisterAgent("test-host", []string{"tag1"}, []string{"file:///var/log/syslog"}, false, false)
+	data := Agent{
+		Hostname:       "test-host",
+		Tags:           []string{"tag1"},
+		LogSources:     []string{"file:///var/log/syslog"},
+		Metrics:        false,
+		MetricsTargets: nil,
+		Profiles:       false,
+	}
+
+	rid, err := ctrl.RegisterAgent(&data)
 	assert.NoError(t, err, "register agent with valid parameters")
 
 	config, err := ctrl.CreateAgentConfig(rid)
@@ -182,7 +229,16 @@ func Test_GetAgentReturnsAgent(t *testing.T) {
 	ctrl := New(model, &mockedConfig)
 	assert.NotNil(t, ctrl, "create controller")
 
-	rid, err := ctrl.RegisterAgent("test-host", []string{"tag1"}, []string{"file:///var/log/syslog"}, false, false)
+	data := Agent{
+		Hostname:       "test-host",
+		Tags:           []string{"tag1"},
+		LogSources:     []string{"file:///var/log/syslog"},
+		Metrics:        false,
+		MetricsTargets: nil,
+		Profiles:       false,
+	}
+
+	rid, err := ctrl.RegisterAgent(&data)
 	assert.NoError(t, err, "register agent with valid parameters")
 
 	agent, err := ctrl.GetAgent(rid)
@@ -207,10 +263,28 @@ func Test_ListAgentsReturnsAgents(t *testing.T) {
 	ctrl := New(model, &mockedConfig)
 	assert.NotNil(t, ctrl, "create controller")
 
-	_, err := ctrl.RegisterAgent("test-host-1", []string{"tag1"}, []string{"file:///var/log/syslog"}, false, false)
+	data := Agent{
+		Hostname:       "test-host-1",
+		Tags:           []string{"tag1"},
+		LogSources:     []string{"file:///var/log/syslog"},
+		Metrics:        false,
+		MetricsTargets: nil,
+		Profiles:       false,
+	}
+
+	_, err := ctrl.RegisterAgent(&data)
 	assert.NoError(t, err, "register first agent")
 
-	_, err = ctrl.RegisterAgent("test-host-2", []string{"tag2"}, []string{"file:///var/log/syslog"}, false, false)
+	data = Agent{
+		Hostname:       "test-host-2",
+		Tags:           []string{"tag2"},
+		LogSources:     []string{"file:///var/log/syslog"},
+		Metrics:        false,
+		MetricsTargets: nil,
+		Profiles:       false,
+	}
+
+	_, err = ctrl.RegisterAgent(&data)
 	assert.NoError(t, err, "register second agent")
 
 	agents, err := ctrl.ListAgents()

internal/handler/agent_test.go

@@ -50,7 +50,7 @@ var mockedConfig = mockConfig{
 
 type mockController struct{}
 
-func (m *mockController) RegisterAgent(hostname string, tags, logSources []string, metrics bool, profiles bool) (string, error) {
+func (m *mockController) RegisterAgent(data *controller.Agent) (string, error) {
 	return "rid:12345", nil
 }
 func (m *mockController) DeregisterAgent(rid string) error {