From 674b9578d7b3dcc39a347600fdfc331036fa8ac6 Mon Sep 17 00:00:00 2001 From: Max U Date: Thu, 28 Jun 2018 15:56:36 -0700 Subject: [PATCH] readability tweak --- internal/config/config_test.go | 5 ++--- plugins/inputs/exec/exec_test.go | 15 ++++++------- plugins/inputs/http/http_test.go | 21 ++++++++----------- plugins/inputs/httpjson/httpjson.go | 6 ++---- .../kafka_consumer/kafka_consumer_test.go | 5 ++--- .../kafka_consumer_legacy_test.go | 6 ++---- .../mqtt_consumer/mqtt_consumer_test.go | 6 ++---- .../nats_consumer/nats_consumer_test.go | 6 ++---- .../inputs/tcp_listener/tcp_listener_test.go | 6 ++---- .../inputs/udp_listener/udp_listener_test.go | 6 ++---- 10 files changed, 31 insertions(+), 51 deletions(-) diff --git a/internal/config/config_test.go b/internal/config/config_test.go index e18a86757..b136fec8c 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -143,11 +143,10 @@ func TestConfig_LoadDirectory(t *testing.T) { "Testdata did not produce correct memcached metadata.") ex := inputs.Inputs["exec"]().(*exec.Exec) - config := &parsers.Config{ + p, err := parsers.NewParser(&parsers.Config{ MetricName: "exec", DataFormat: "json", - } - p, err := parsers.NewParser(config) + }) assert.NoError(t, err) ex.SetParser(p) ex.Command = "/usr/bin/myothercollector --foo=bar" diff --git a/plugins/inputs/exec/exec_test.go b/plugins/inputs/exec/exec_test.go index 9a1376d76..0bfeece54 100644 --- a/plugins/inputs/exec/exec_test.go +++ b/plugins/inputs/exec/exec_test.go @@ -93,11 +93,10 @@ func (r runnerMock) Run(e *Exec, command string, acc telegraf.Accumulator) ([]by } func TestExec(t *testing.T) { - config := &parsers.Config{ + parser, _ := parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "exec", - } - parser, _ := parsers.NewParser(config) + }) e := &Exec{ runner: newRunnerMock([]byte(validJson), nil), Commands: []string{"testcommand arg1"}, @@ -123,11 +122,10 @@ func TestExec(t *testing.T) { } func TestExecMalformed(t *testing.T) { - config := &parsers.Config{ + parser, _ := parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "exec", - } - parser, _ := parsers.NewParser(config) + }) e := &Exec{ runner: newRunnerMock([]byte(malformedJson), nil), Commands: []string{"badcommand arg1"}, @@ -140,11 +138,10 @@ func TestExecMalformed(t *testing.T) { } func TestCommandError(t *testing.T) { - config := &parsers.Config{ + parser, _ := parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "exec", - } - parser, _ := parsers.NewParser(config) + }) e := &Exec{ runner: newRunnerMock(nil, fmt.Errorf("exit status code 1")), Commands: []string{"badcommand"}, diff --git a/plugins/inputs/http/http_test.go b/plugins/inputs/http/http_test.go index 4d1448226..4cd465bce 100644 --- a/plugins/inputs/http/http_test.go +++ b/plugins/inputs/http/http_test.go @@ -26,11 +26,11 @@ func TestHTTPwithJSONFormat(t *testing.T) { URLs: []string{url}, } metricName := "metricName" - config := &parsers.Config{ + + p, _ := parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "metricName", - } - p, _ := parsers.NewParser(config) + }) plugin.SetParser(p) var acc testutil.Accumulator @@ -68,11 +68,10 @@ func TestHTTPHeaders(t *testing.T) { Headers: map[string]string{header: headerValue}, } - config := &parsers.Config{ + p, _ := parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "metricName", - } - p, _ := parsers.NewParser(config) + }) plugin.SetParser(p) var acc testutil.Accumulator @@ -91,11 +90,10 @@ func TestInvalidStatusCode(t *testing.T) { } metricName := "metricName" - config := &parsers.Config{ + p, _ := parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: metricName, - } - p, _ := parsers.NewParser(config) + }) plugin.SetParser(p) var acc testutil.Accumulator @@ -117,11 +115,10 @@ func TestMethod(t *testing.T) { Method: "POST", } - config := &parsers.Config{ + p, _ := parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "metricName", - } - p, _ := parsers.NewParser(config) + }) plugin.SetParser(p) var acc testutil.Accumulator diff --git a/plugins/inputs/httpjson/httpjson.go b/plugins/inputs/httpjson/httpjson.go index dfe0f3549..e09eafc94 100644 --- a/plugins/inputs/httpjson/httpjson.go +++ b/plugins/inputs/httpjson/httpjson.go @@ -181,14 +181,12 @@ func (h *HttpJson) gatherServer( "server": serverURL, } - config := &parsers.Config{ + parser, err := parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: msrmnt_name, TagKeys: h.TagKeys, DefaultTags: tags, - } - - parser, err := parsers.NewParser(config) + }) if err != nil { return err } diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go index 13b298cf7..18f7f80be 100644 --- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go +++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go @@ -125,11 +125,10 @@ func TestRunParserAndGatherJSON(t *testing.T) { k.acc = &acc defer close(k.done) - config := &parsers.Config{ + k.parser, _ = parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "kafka_json_test", - } - k.parser, _ = parsers.NewParser(config) + }) go k.receiver() in <- saramaMsg(testMsgJSON) acc.Wait(1) diff --git a/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go index 90b94f511..38bc48290 100644 --- a/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go +++ b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go @@ -125,12 +125,10 @@ func TestRunParserAndGatherJSON(t *testing.T) { k.acc = &acc defer close(k.done) - config := &parsers.Config{ + k.parser, _ = parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "kafka_json_test", - } - - k.parser, _ = parsers.NewParser(config) + }) go k.receiver() in <- saramaMsg(testMsgJSON) acc.Wait(1) diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go index 73a9abcd4..a2e5deaa8 100644 --- a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go +++ b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go @@ -172,12 +172,10 @@ func TestRunParserAndGatherJSON(t *testing.T) { n.acc = &acc defer close(n.done) - config := &parsers.Config{ + n.parser, _ = parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "nats_json_test", - } - - n.parser, _ = parsers.NewParser(config) + }) go n.receiver() in <- mqttMsg(testMsgJSON) diff --git a/plugins/inputs/nats_consumer/nats_consumer_test.go b/plugins/inputs/nats_consumer/nats_consumer_test.go index d5386145a..a1f499554 100644 --- a/plugins/inputs/nats_consumer/nats_consumer_test.go +++ b/plugins/inputs/nats_consumer/nats_consumer_test.go @@ -108,12 +108,10 @@ func TestRunParserAndGatherJSON(t *testing.T) { n.acc = &acc defer close(n.done) - config := &parsers.Config{ + n.parser, _ = parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "nats_json_test", - } - - n.parser, _ = parsers.NewParser(config) + }) n.wg.Add(1) go n.receiver() in <- natsMsg(testMsgJSON) diff --git a/plugins/inputs/tcp_listener/tcp_listener_test.go b/plugins/inputs/tcp_listener/tcp_listener_test.go index 0df33c8b4..6ff40ad87 100644 --- a/plugins/inputs/tcp_listener/tcp_listener_test.go +++ b/plugins/inputs/tcp_listener/tcp_listener_test.go @@ -300,12 +300,10 @@ func TestRunParserJSONMsg(t *testing.T) { listener.acc = &acc defer close(listener.done) - config := &parsers.Config{ + listener.parser, _ = parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "udp_json_test", - } - - listener.parser, _ = parsers.NewParser(config) + }) listener.wg.Add(1) go listener.tcpParser() diff --git a/plugins/inputs/udp_listener/udp_listener_test.go b/plugins/inputs/udp_listener/udp_listener_test.go index 69f2f4bed..49115434a 100644 --- a/plugins/inputs/udp_listener/udp_listener_test.go +++ b/plugins/inputs/udp_listener/udp_listener_test.go @@ -193,12 +193,10 @@ func TestRunParserJSONMsg(t *testing.T) { listener.acc = &acc defer close(listener.done) - config := &parsers.Config{ + listener.parser, _ = parsers.NewParser(&parsers.Config{ DataFormat: "json", MetricName: "udp_json_test", - } - - listener.parser, _ = parsers.NewParser(config) + }) listener.wg.Add(1) go listener.udpParser()