From 7fcad4fbce881daa13e31a90b6a9e18da55c19b3 Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Thu, 30 Apr 2020 14:16:01 -0400 Subject: [PATCH] mage fmt --- .../container/container_integration_test.go | 3 ++- .../kubernetes/node/node_integration_test.go | 3 ++- .../kubernetes/pod/pod_integration_test.go | 3 ++- .../kubernetes/proxy/proxy_integration_test.go | 3 ++- .../scheduler/scheduler_integration_test.go | 3 ++- .../system/system_integration_test.go | 9 +++++---- .../module/kubernetes/test/integration.go | 17 ++++++++--------- .../volume/volume_integration_test.go | 3 ++- 8 files changed, 25 insertions(+), 19 deletions(-) diff --git a/metricbeat/module/kubernetes/container/container_integration_test.go b/metricbeat/module/kubernetes/container/container_integration_test.go index baaae24aa2f3..18df4cdd2d13 100644 --- a/metricbeat/module/kubernetes/container/container_integration_test.go +++ b/metricbeat/module/kubernetes/container/container_integration_test.go @@ -20,9 +20,10 @@ package container import ( - "github.com/stretchr/testify/assert" "testing" + "github.com/stretchr/testify/assert" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" ) diff --git a/metricbeat/module/kubernetes/node/node_integration_test.go b/metricbeat/module/kubernetes/node/node_integration_test.go index 37eb6bb934b0..7d1c73bc20ba 100644 --- a/metricbeat/module/kubernetes/node/node_integration_test.go +++ b/metricbeat/module/kubernetes/node/node_integration_test.go @@ -20,9 +20,10 @@ package node import ( - "github.com/stretchr/testify/assert" "testing" + "github.com/stretchr/testify/assert" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" ) diff --git a/metricbeat/module/kubernetes/pod/pod_integration_test.go b/metricbeat/module/kubernetes/pod/pod_integration_test.go index 2be31362e9f6..9202891f84d6 100644 --- a/metricbeat/module/kubernetes/pod/pod_integration_test.go +++ b/metricbeat/module/kubernetes/pod/pod_integration_test.go @@ -20,9 +20,10 @@ package pod import ( - "github.com/stretchr/testify/assert" "testing" + "github.com/stretchr/testify/assert" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" ) diff --git a/metricbeat/module/kubernetes/proxy/proxy_integration_test.go b/metricbeat/module/kubernetes/proxy/proxy_integration_test.go index ffd3ee48a3f9..d596fb545f86 100644 --- a/metricbeat/module/kubernetes/proxy/proxy_integration_test.go +++ b/metricbeat/module/kubernetes/proxy/proxy_integration_test.go @@ -20,9 +20,10 @@ package proxy import ( - "github.com/stretchr/testify/assert" "testing" + "github.com/stretchr/testify/assert" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" ) diff --git a/metricbeat/module/kubernetes/scheduler/scheduler_integration_test.go b/metricbeat/module/kubernetes/scheduler/scheduler_integration_test.go index 72322ee91456..90d986404dcd 100644 --- a/metricbeat/module/kubernetes/scheduler/scheduler_integration_test.go +++ b/metricbeat/module/kubernetes/scheduler/scheduler_integration_test.go @@ -20,9 +20,10 @@ package scheduler import ( - "github.com/stretchr/testify/assert" "testing" + "github.com/stretchr/testify/assert" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" ) diff --git a/metricbeat/module/kubernetes/system/system_integration_test.go b/metricbeat/module/kubernetes/system/system_integration_test.go index a8d9eb9f9389..5b876f0caffa 100644 --- a/metricbeat/module/kubernetes/system/system_integration_test.go +++ b/metricbeat/module/kubernetes/system/system_integration_test.go @@ -20,11 +20,12 @@ package system import ( -"github.com/stretchr/testify/assert" -"testing" + "testing" -mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" -"github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + "github.com/stretchr/testify/assert" + + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/test/integration.go b/metricbeat/module/kubernetes/test/integration.go index f741c3f70503..0ae88b963fdf 100644 --- a/metricbeat/module/kubernetes/test/integration.go +++ b/metricbeat/module/kubernetes/test/integration.go @@ -68,10 +68,10 @@ func GetKubeletConfig(t *testing.T, metricSetName string) map[string]interface{} func GetKubeProxyConfig(t *testing.T, metricSetName string) map[string]interface{} { t.Helper() return map[string]interface{}{ - "module": "kubernetes", - "metricsets": []string{metricSetName}, - "host": "${NODE_NAME}", - "hosts": []string{"localhost:10252"}, + "module": "kubernetes", + "metricsets": []string{metricSetName}, + "host": "${NODE_NAME}", + "hosts": []string{"localhost:10252"}, } } @@ -79,10 +79,9 @@ func GetKubeProxyConfig(t *testing.T, metricSetName string) map[string]interface func GetSchedulerConfig(t *testing.T, metricSetName string) map[string]interface{} { t.Helper() return map[string]interface{}{ - "module": "kubernetes", - "metricsets": []string{metricSetName}, - "host": "${NODE_NAME}", - "hosts": []string{"localhost:10251"}, + "module": "kubernetes", + "metricsets": []string{metricSetName}, + "host": "${NODE_NAME}", + "hosts": []string{"localhost:10251"}, } } - diff --git a/metricbeat/module/kubernetes/volume/volume_integration_test.go b/metricbeat/module/kubernetes/volume/volume_integration_test.go index fd907c1a63d5..c0934a8cae09 100644 --- a/metricbeat/module/kubernetes/volume/volume_integration_test.go +++ b/metricbeat/module/kubernetes/volume/volume_integration_test.go @@ -20,9 +20,10 @@ package volume import ( - "github.com/stretchr/testify/assert" "testing" + "github.com/stretchr/testify/assert" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" )