Vendorize goimports (elastic#8619)

(cherry picked from commit d1734f4)
ruflin · Oct 16, 2018 · 62602f0 · 62602f0
1 parent 89deca8
commit 62602f0
Show file tree

Hide file tree

Showing 18 changed files with 12,392 additions and 11 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -2771,8 +2771,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------
 Dependency: golang.org/x/tools
-Version: release-branch.go1.9
-Revision: 5d2fd3ccab986d52112bf301d47a819783339d0e
+Version: release-branch.go1.10
+Revision: 156d532d4f67148ceab07c3b59ed7fa13bdbf00c
 License type (autodetected): BSD-3-Clause
 ./vendor/golang.org/x/tools/LICENSE:
 --------------------------------------------------------------------

diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile
@@ -112,7 +112,7 @@ crosscompile: $(GOFILES)
 .PHONY: check
 check: check-headers python-env prepare-tests ## @build Checks project and source code if everything is according to standard
 	@go vet ${GOPACKAGES}
-	@go get $(GOIMPORTS_REPO)
+	@go get $(ES_BEATS)/vendor/$(GOIMPORTS_REPO)
 	@goimports -local ${GOIMPORTS_LOCAL_PREFIX} -l ${GOFILES_NOVENDOR} | (! grep .) || (echo "Code differs from goimports' style ^" && false)
 	@${FIND} -name '*.py' -exec autopep8 -d --max-line-length 120  {} \; | (! grep . -q) || (echo "Code differs from autopep8's style" && false)
 	@${FIND} -wholename "*tests/system/test_*.py" -perm ${PERM_EXEC} -exec false {} + || (echo "Python test files shouldn't be executable, otherwise nose doesn't find them" && false)

diff --git a/vendor/golang.org/x/tools/cmd/goimports/doc.go b/vendor/golang.org/x/tools/cmd/goimports/doc.go