Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.2](backport #1270) Update Go dependencies #1300

Merged
merged 9 commits into from
Apr 6, 2022
Merged

[8.2](backport #1270) Update Go dependencies #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
753d97b
Update Go dependencies
ph Mar 29, 2022
5854a62
update beats
ph Mar 30, 2022
0e0885e
Depends on elastic/elastic-agent modules
ph Mar 31, 2022
ba4b810
updating beats
ph Mar 31, 2022
dd5c656
Dependencies tidy
ph Mar 31, 2022
f30c6e3
add overrides for e2e-testing
ph Mar 31, 2022
1d843bf
Correctly fix the `goe` dependency
ph Apr 1, 2022
6fad3dd
Update server.New method signature
ph Apr 1, 2022
bde6502
Merge branch '8.2' into mergify/bp/8.2/pr-1270
mergify[bot] Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24,875 changes: 16,367 additions & 8,508 deletions NOTICE.txt
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions cmd/fleet/main_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"time"

"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/core/logger"
"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/core/server"
"github.com/elastic/elastic-agent-client/v7/pkg/proto"
"github.com/elastic/elastic-agent/pkg/core/logger"
"github.com/elastic/elastic-agent/pkg/core/server"
"github.com/elastic/go-ucfg"
"github.com/gofrs/uuid"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -193,7 +193,7 @@ func newDebugLogger(t *testing.T) *logger.Logger {

func createAndStartControlServer(t *testing.T, handler server.Handler, extraConfigs ...func(*server.Server)) *server.Server {
t.Helper()
srv, err := server.New(newDebugLogger(t), "localhost:0", handler)
srv, err := server.New(newDebugLogger(t), "localhost:0", handler, nil)
require.NoError(t, err)
for _, extra := range extraConfigs {
extra(srv)
Expand Down
4 changes: 2 additions & 2 deletions dev-tools/buildlimits/buildlimits.go
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions dev-tools/notice/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{"name": "github.com/chzyer/logex", "licenceType": "MIT"}
{"name": "github.com/elastic/beats/v7", "licenceType": "Elastic"}
{"name": "github.com/elastic/elastic-agent", "licenceType": "Elastic"}
{"name": "github.com/elastic/elastic-agent-client/v7", "licenceType": "Elastic"}
{"name": "github.com/elastic/e2e-testing", "licenceType": "Elastic"}
{"name": "github.com/gorhill/cronexpr", "licenceType": "Apache-2.0"}
{"name": "github.com/kr/logfmt", "licenceType": "MIT"}
{"name": "github.com/miekg/dns", "licenceType": "BSD-3-Clause"}
Expand All @@ -14,3 +16,5 @@
{"name": "gopkg.in/yaml.v1", "licenceType": "Apache-2.0"}
{"name": "kernel.org/pub/linux/libs/security/libcap/cap", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
{"name": "kernel.org/pub/linux/libs/security/libcap/psx", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
{"name": "github.com/awslabs/kinesis-aggregation/go", "licenceType": "Apache-2.0", "url": "https://github.com/awslabs/kinesis-aggregation/blob/master/LICENSE.txt"}
{"name": "github.com/pascaldekloe/goe", "licenceType": "CC0", "url": "https://github.com/pascaldekloe/goe/blob/v0.1.0/LICENSE" }
3 changes: 2 additions & 1 deletion dev-tools/notice/rules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"MIT",
"MPL-2.0",
"Public Domain",
"Zlib"
"Zlib",
"CC0"
],
"maybelist": [
"EPL-1.0",
Expand Down
37 changes: 21 additions & 16 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ go 1.17
require (
github.com/Pallinder/go-randomdata v1.2.0
github.com/dgraph-io/ristretto v0.1.0
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20211207150041-4641f759226c
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220331164621-376a87f3bbd8
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210922110810-e6f1f402a9ed
github.com/elastic/go-elasticsearch/v7 v7.15.1
github.com/elastic/go-elasticsearch/v7 v7.16.0
github.com/elastic/go-ucfg v0.8.4
github.com/gofrs/uuid v4.2.0+incompatible
github.com/google/go-cmp v0.5.6
github.com/hashicorp/go-cleanhttp v0.5.1
github.com/hashicorp/go-cleanhttp v0.5.2
github.com/hashicorp/go-version v1.3.0
github.com/hashicorp/golang-lru v0.5.4
github.com/julienschmidt/httprouter v1.3.0
Expand All @@ -21,24 +21,24 @@ require (
github.com/pkg/errors v0.9.1
github.com/rs/xid v1.2.1
github.com/rs/zerolog v1.22.0
github.com/spf13/cobra v1.0.0
github.com/spf13/cobra v1.3.0
github.com/stretchr/testify v1.7.0
go.elastic.co/apm v1.14.0
go.elastic.co/apm v1.15.0
go.elastic.co/apm/module/apmelasticsearch v1.14.0
go.uber.org/zap v1.19.1
go.uber.org/zap v1.21.0
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
)

require go.elastic.co/ecszerolog v0.1.0

require (
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/docker v20.10.7+incompatible // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/elastic/elastic-agent-libs v0.1.1 // indirect
github.com/elastic/go-licenser v0.4.0 // indirect
github.com/elastic/go-structform v0.0.9 // indirect
github.com/elastic/go-sysinfo v1.7.1 // indirect
Expand All @@ -47,27 +47,32 @@ require (
github.com/gofrs/flock v0.8.1 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/magefile/mage v1.11.0 // indirect
github.com/magefile/mage v1.13.0 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.elastic.co/apm/module/apmhttp v1.14.0 // indirect
go.elastic.co/apm/module/apmgrpc v1.15.0 // indirect
go.elastic.co/apm/module/apmhttp v1.15.0 // indirect
go.elastic.co/fastjson v1.1.0 // indirect
go.uber.org/goleak v1.1.12 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

require (
github.com/elastic/elastic-agent v0.0.0-20220331132956-07a476d59135
github.com/fatih/color v1.13.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand All @@ -79,11 +84,11 @@ require (
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
golang.org/x/net v0.0.0-20211207213349-853792941377 // indirect
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
golang.org/x/tools v0.1.8 // indirect
google.golang.org/genproto v0.0.0-20211207154714-918901c715cf // indirect
google.golang.org/grpc v1.42.0 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/grpc v1.43.0 // indirect
howett.net/plist v1.0.0 // indirect
)

Expand Down
Loading