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

* Update Go dependencies

Some of the `indirect` dependencies required to be updated.

- Update beats to latest master and the indirect dependencies
- Update containerd 2.8.1
- Update distribution to 1.5.1
- Move from jwt-go golang-jwt/jwt (new maintained version)

(cherry picked from commit ba22241)

* update beats

(cherry picked from commit ac5cfe5)

* Depends on elastic/elastic-agent modules

(cherry picked from commit 1962755)

* updating beats

(cherry picked from commit 7eac829)

* Dependencies tidy

(cherry picked from commit d1cfa99)

* add overrides for e2e-testing

(cherry picked from commit ea589c8)

* Correctly fix the `goe` dependency

This add the required overrides and rules for the CC0,
The CC0 is in our green light list.

Notes: This is an indirect dependencies coming from beats, this is
present in both beats and apm-server. Both of theses project doesn't
have rules or overrides in place to allow it. I've lost time to investigate why
the license detector didn't raise any issue in their repository.

Looking at both projects `go.sum` the dependencies is defined.
If you run `go list -m all` you will see it. The output of this command
result is used by our `go-licence-detector` to flag incompatible license.

(cherry picked from commit 3aa593e)

* Update server.New method signature

(cherry picked from commit 9d4f2e9)

Co-authored-by: Pier-Hugues Pellerin <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

cmd/fleet/main_integration_test.go

@@ -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"
@@ -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)

dev-tools/notice/overrides.json

@@ -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"}
@@ -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" }

dev-tools/notice/rules.json

@@ -10,7 +10,8 @@
     "MIT",
     "MPL-2.0",
     "Public Domain",
-    "Zlib"
+    "Zlib",
+    "CC0"
   ],
   "maybelist": [
     "EPL-1.0",

go.mod

@@ -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
@@ -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
@@ -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
@@ -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
 )