Skip to content

Commit

Permalink
Follow-up after rebasing on top of master i.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kvch
kvch committed Feb 28, 2020
1 parent 5330fe8 commit cc275ad
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion dev-tools/mage/integtest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func runInIntegTestEnv(mageTarget string, test func() error, passThroughEnvVars
"-e", "TESTING_ENVIRONMENT=" + StackEnvironment,
}
if UseVendor {
args = append(args, "--env", "GOFLAGS=-mod=vendor")
args = append(args, "-e", "GOFLAGS=-mod=vendor")
}
args, err = addUidGidEnvArgs(args)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions x-pack/metricbeat/module/aws/vpc/vpc_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"fmt"
"testing"

"github.com/elastic/beats/libbeat/common"
mbtest "github.com/elastic/beats/metricbeat/mb/testing"
"github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest"
"github.com/elastic/beats/v7/libbeat/common"
mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
"github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest"
)

func TestData(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions x-pack/metricbeat/module/aws/vpc/vpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ package vpc
import (
"os"

"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/v7/metricbeat/mb"

// Register input module and metricset
_ "github.com/elastic/beats/x-pack/metricbeat/module/aws"
_ "github.com/elastic/beats/x-pack/metricbeat/module/aws/cloudwatch"
_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws"
_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/redisenterprise/fields.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions x-pack/metricbeat/module/redisenterprise/node/node_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (

"github.com/stretchr/testify/assert"

"github.com/elastic/beats/libbeat/tests/compose"
"github.com/elastic/beats/metricbeat/mb"
mbtest "github.com/elastic/beats/metricbeat/mb/testing"
_ "github.com/elastic/beats/metricbeat/module/prometheus"
_ "github.com/elastic/beats/metricbeat/module/prometheus/collector"
"github.com/elastic/beats/v7/libbeat/tests/compose"
"github.com/elastic/beats/v7/metricbeat/mb"
mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
_ "github.com/elastic/beats/v7/metricbeat/module/prometheus"
_ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector"
)

func init() {
Expand Down
10 changes: 5 additions & 5 deletions x-pack/metricbeat/module/redisenterprise/node/node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (
"os"
"testing"

"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/mb"
mbtest "github.com/elastic/beats/metricbeat/mb/testing"
"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v7/metricbeat/mb"
mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"

// Register input module and metricset
_ "github.com/elastic/beats/metricbeat/module/prometheus"
_ "github.com/elastic/beats/metricbeat/module/prometheus/collector"
_ "github.com/elastic/beats/v7/metricbeat/module/prometheus"
_ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector"
)

func init() {
Expand Down
10 changes: 5 additions & 5 deletions x-pack/metricbeat/module/redisenterprise/proxy/proxy_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (

"github.com/stretchr/testify/assert"

"github.com/elastic/beats/libbeat/tests/compose"
"github.com/elastic/beats/metricbeat/mb"
mbtest "github.com/elastic/beats/metricbeat/mb/testing"
_ "github.com/elastic/beats/metricbeat/module/prometheus"
_ "github.com/elastic/beats/metricbeat/module/prometheus/collector"
"github.com/elastic/beats/v7/libbeat/tests/compose"
"github.com/elastic/beats/v7/metricbeat/mb"
mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
_ "github.com/elastic/beats/v7/metricbeat/module/prometheus"
_ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector"
)

func init() {
Expand Down
10 changes: 5 additions & 5 deletions x-pack/metricbeat/module/redisenterprise/proxy/proxy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (
"os"
"testing"

"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/mb"
mbtest "github.com/elastic/beats/metricbeat/mb/testing"
"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v7/metricbeat/mb"
mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"

// Register input module and metricset
_ "github.com/elastic/beats/metricbeat/module/prometheus"
_ "github.com/elastic/beats/metricbeat/module/prometheus/collector"
_ "github.com/elastic/beats/v7/metricbeat/module/prometheus"
_ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector"
)

func init() {
Expand Down

0 comments on commit cc275ad

Please sign in to comment.