Merge branch 'main' into dependabot/go_modules/github.com/elastic/ela…

…stic-agent-libs-0.9.15

.buildkite/integration.pipeline.yml

@@ -29,9 +29,6 @@ steps:
     artifact_paths:
       - "build/TEST-**"
       - "build/diagnostics/*"
-    retry:
-      automatic:
-        - limit: 1
     agents:
       provider: "gcp"
       machineType: "n1-standard-8"
@@ -53,9 +50,6 @@ steps:
     artifact_paths:
       - "build/TEST-**"
       - "build/diagnostics/*"
-    retry:
-      automatic:
-        - limit: 1
     agents:
       provider: "gcp"
       machineType: "n1-standard-8"
@@ -77,9 +71,6 @@ steps:
     artifact_paths:
       - "build/TEST-**"
       - "build/diagnostics/*"
-    retry:
-      automatic:
-        - limit: 1
     agents:
       provider: "gcp"
       machineType: "n1-standard-8"
@@ -99,9 +90,6 @@ steps:
       buildkite-agent artifact download build/distributions/** . --step 'package-it'
       .buildkite/scripts/steps/beats_tests.sh
     # if: "build.env('CRON') == 'yes'"
-    retry:
-      automatic:
-        - limit: 1
     agents:
       provider: "gcp"
       machineType: "n1-standard-8"

NOTICE.txt

@@ -14415,43 +14415,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
---------------------------------------------------------------------------------
-Dependency : golang.org/x/lint
-Version: v0.0.0-20210508222113-6edffad5e616
-Licence type (autodetected): BSD-3-Clause
---------------------------------------------------------------------------------
-
-Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]/LICENSE:
-
-Copyright (c) 2013 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/sync
 Version: v0.7.0

go.mod

@@ -63,7 +63,6 @@ require (
 	go.elastic.co/go-licence-detector v0.6.1
 	go.uber.org/zap v1.27.0
 	golang.org/x/crypto v0.24.0
-	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
 	golang.org/x/sync v0.7.0
 	golang.org/x/sys v0.21.0
 	golang.org/x/term v0.21.0

go.sum

@@ -1739,7 +1739,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu
 golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=

magefile.go

@@ -66,7 +66,6 @@ import (
 )
 
 const (
-	goLintRepo        = "golang.org/x/lint/golint"
 	goLicenserRepo    = "github.com/elastic/go-licenser"
 	buildDir          = "build"
 	metaDir           = "_meta"
@@ -262,11 +261,6 @@ func (Prepare) InstallGoLicenser() error {
 	return GoInstall(goLicenserRepo)
 }
 
-// InstallGoLint for the code.
-func (Prepare) InstallGoLint() error {
-	return GoInstall(goLintRepo)
-}
-
 // All build all the things for the current projects.
 func (Build) All() {
 	mg.Deps(Build.Binary)
@@ -367,28 +361,6 @@ func (Check) All() {
 	mg.SerialDeps(Check.License, Integration.Check)
 }
 
-// GoLint run the code through the linter.
-func (Check) GoLint() error {
-	mg.Deps(Prepare.InstallGoLint)
-	packagesString, err := sh.Output("go", "list", "./...")
-	if err != nil {
-		return err
-	}
-
-	packages := strings.Split(packagesString, "\n")
-	for _, pkg := range packages {
-		if strings.Contains(pkg, "/vendor/") {
-			continue
-		}
-
-		if e := sh.RunV("golint", "-set_exit_status", pkg); e != nil {
-			err = multierror.Append(err, e)
-		}
-	}
-
-	return err
-}
-
 // License makes sure that all the Golang files have the appropriate license header.
 func (Check) License() error {
 	mg.Deps(Prepare.InstallGoLicenser)

tools/tools.go

@@ -19,7 +19,6 @@ import (
 	_ "gotest.tools/gotestsum/cmd"
 
 	_ "github.com/mitchellh/gox"
-	_ "golang.org/x/lint/golint"
 
 	_ "go.elastic.co/go-licence-detector"