Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

Commit

Permalink
Consolidate go modules to top level directory (bp #954) (#963)
Browse files Browse the repository at this point in the history
* Consolidate go modules to top level directory (#954)

* Consolidate go modules to top level directory

This allows developers who utilize things such as language server protocol to
easily resolve package level signatures across similar modules that make up the
project.

Fixes #557

Signed-off-by: Adam Stokes <[email protected]>

* Update go.mod

Co-authored-by: Manuel de la Peña <[email protected]>

* Remove e2e-testing modules from go.mod

This was causing some invalid import errors

Signed-off-by: Adam Stokes <[email protected]>

* add proper godog deps

Signed-off-by: Adam Stokes <[email protected]>

* Address issue with godog import

For now it is recommended to use the latest commit hash from go.elastic.co/apm
until the next official release is out. That release cleans up some internals in
that project making godog not a hard requirement when using apm as a dependency

Signed-off-by: Adam Stokes <[email protected]>

Co-authored-by: Manuel de la Peña <[email protected]>
(cherry picked from commit e0617f3)

# Conflicts:
#	cli/go.mod
#	cli/go.sum

* chore: remove files after merge conflicts

Co-authored-by: Adam Stokes <[email protected]>
Co-authored-by: Manuel de la Peña <[email protected]>
  • Loading branch information
3 people authored Mar 30, 2021
1 parent b7f1f18 commit e04999d
Show file tree
Hide file tree
Showing 7 changed files with 1,082 additions and 1,010 deletions.
36 changes: 0 additions & 36 deletions cli/go.mod

This file was deleted.

328 changes: 0 additions & 328 deletions cli/go.sum

This file was deleted.

5 changes: 0 additions & 5 deletions doc.go

This file was deleted.

26 changes: 0 additions & 26 deletions e2e/go.mod

This file was deleted.

615 changes: 0 additions & 615 deletions e2e/go.sum

This file was deleted.

27 changes: 27 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
module github.com/elastic/e2e-testing

go 1.14

require (
github.com/Flaque/filet v0.0.0-20201012163910-45f684403088
github.com/Jeffail/gabs/v2 v2.6.0
github.com/cenkalti/backoff/v4 v4.1.0
github.com/cucumber/godog v0.11.0
github.com/cucumber/messages-go/v10 v10.0.3
github.com/docker/docker v20.10.5+incompatible
github.com/elastic/go-elasticsearch/v8 v8.0.0-20210317102009-a9d74cec0186
github.com/gobuffalo/packr/v2 v2.8.1
github.com/google/uuid v1.2.0
github.com/kr/text v0.2.0 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
github.com/mitchellh/go-homedir v1.1.0
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.1.3
github.com/stretchr/testify v1.7.0
github.com/testcontainers/testcontainers-go v0.10.0
go.elastic.co/apm v1.10.1-0.20210325024138-f936e4b8474d
go.elastic.co/apm/module/apmelasticsearch v1.10.0
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/src-d/go-git.v4 v4.13.1
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
)
Loading

0 comments on commit e04999d

Please sign in to comment.