Remove vendor folder from repository (elastic#18655)

To update or add a dependency use the standard tools provided by Golang. (cherry picked from commit 5426df0)
kvch · Jun 29, 2020 · 358000f · 358000f
1 parent 9a41c4a
commit 358000f
Show file tree

Hide file tree

Showing 10,670 changed files with 152,725 additions and 2,984,917 deletions.
diff --git a/.ci/scripts/install-tools.bat b/.ci/scripts/install-tools.bat
@@ -14,7 +14,7 @@ IF ERRORLEVEL 1 (
 FOR /f "tokens=*" %%i IN ('"gvm.exe" use %GO_VERSION% --format=batch') DO %%i
 
 go env
-go install -mod=vendor github.com/magefile/mage
+go get github.com/magefile/mage
 mage -version
 where mage
 

diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc
@@ -84,3 +84,4 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
 - Add support for a `TEST_TAGS` environment variable to add tags for tests selection following go build tags semantics, this environment variable is used by mage test targets to add build tags. Python tests can also be tagged with a decorator (`@beat.tag('sometag')`). {pull}16937[16937] {pull}17075[17075]
 - Add fields validation for histogram subfields. {pull}17759[17759]
 - Events intended for the Elasticsearch output can now take an `op_type` metadata field of type events.OpType or string to indicate the `op_type` to use for bulk indexing. {pull}12606[12606]
+- Remove vendor folder from repository. {pull}18655[18655]
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1324,7 +1324,7 @@ def getVendorPatterns(beatName){
     "PATH=${env.WORKSPACE}/bin:${goRoot}/bin:${env.PATH}",
   ]) {
     output = sh(label: 'Get vendor dependency patterns', returnStdout: true, script: """
-      go list -mod=vendor -f '{{ .ImportPath }}{{ "\\n" }}{{ join .Deps "\\n" }}' ./${beatName}\
+      go list -mod=mod -f '{{ .ImportPath }}{{ "\\n" }}{{ join .Deps "\\n" }}' ./${beatName}\
         |awk '{print \$1"/.*"}'\
         |sed -e "s#github.com/elastic/beats/v7/##g"
     """)

diff --git a/Makefile b/Makefile
@@ -148,9 +148,18 @@ docs:
 
 ## notice : Generates the NOTICE file.
 .PHONY: notice
-notice: python-env
+notice:
 	@echo "Generating NOTICE"
-	@${PYTHON_ENV_EXE} dev-tools/generate_notice.py .
+	go mod tidy
+	go mod download
+	go list -m -json all | go run go.elastic.co/go-licence-detector \
+		-includeIndirect \
+		-rules dev-tools/notice/rules.json \
+		-overrides dev-tools/notice/overrides.json \
+		-noticeTemplate dev-tools/notice/NOTICE.txt.tmpl \
+		-noticeOut NOTICE.txt \
+		-depsOut ""
+
 
 ## python-env : Sets up the virtual python environment.
 .PHONY: python-env

diff --git a/NOTICE.txt b/NOTICE.txt
diff --git a/auditbeat/datastore/datastore.go b/auditbeat/datastore/datastore.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"sync"
 
-	bolt "github.com/coreos/bbolt"
+	bolt "go.etcd.io/bbolt"
 
 	"github.com/elastic/beats/v7/libbeat/paths"
 )

diff --git a/auditbeat/make.bat b/auditbeat/make.bat
@@ -6,6 +6,6 @@ REM
 REM After running this once you may invoke mage.exe directly.
 
 WHERE mage
-IF %ERRORLEVEL% NEQ 0 go install github.com/elastic/beats/vendor/github.com/magefile/mage
+IF %ERRORLEVEL% NEQ 0 go get github.com/magefile/mage
 
 mage %*
diff --git a/auditbeat/module/file_integrity/metricset.go b/auditbeat/module/file_integrity/metricset.go
@@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"time"
 
-	bolt "github.com/coreos/bbolt"
 	"github.com/pkg/errors"
+	bolt "go.etcd.io/bbolt"
 
 	"github.com/elastic/beats/v7/auditbeat/datastore"
 	"github.com/elastic/beats/v7/libbeat/logp"
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ import ( @@
     	"os"
     	"sync"
-    	bolt "github.com/coreos/bbolt"
+    	bolt "go.etcd.io/bbolt"
     	"github.com/elastic/beats/v7/libbeat/paths"
     )
@@ Expand Down @@