From 8b9794bff62ada0e90108281365f81e8fc37c119 Mon Sep 17 00:00:00 2001 From: stealthybox Date: Wed, 9 Dec 2020 00:17:29 +0000 Subject: [PATCH] [automated] Update go dependencies --- go.mod | 2 +- go.sum | 4 ++-- vendor/golang.org/x/tools/internal/imports/mod.go | 6 +++++- vendor/modules.txt | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 26f723963..8cc6e7eb8 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/weaveworks/libgitops v0.0.0-20200611103311-2c871bbbbf0c golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f - golang.org/x/tools v0.0.0-20201125231158-b5590deeca9b // indirect + golang.org/x/tools v0.0.0-20201208233053-a543418bbed2 // indirect gotest.tools v2.2.0+incompatible k8s.io/apimachinery v0.18.3 k8s.io/code-generator v0.19.2 diff --git a/go.sum b/go.sum index e818c4e07..2fc25c9cf 100644 --- a/go.sum +++ b/go.sum @@ -1005,8 +1005,8 @@ golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnf golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200616133436-c1934b75d054 h1:HHeAlu5H9b71C+Fx0K+1dGgVFN1DM1/wz4aoGOA5qS8= golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20201125231158-b5590deeca9b h1:Lq5JUTFhiybGVf28jB6QRpqd13/JPOaCnET17PVzYJE= -golang.org/x/tools v0.0.0-20201125231158-b5590deeca9b/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2 h1:vEtypaVub6UvKkiXZ2xx9QIvp9TL7sI7xp7vdi2kezA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= diff --git a/vendor/golang.org/x/tools/internal/imports/mod.go b/vendor/golang.org/x/tools/internal/imports/mod.go index 73f7a4958..ce3269a43 100644 --- a/vendor/golang.org/x/tools/internal/imports/mod.go +++ b/vendor/golang.org/x/tools/internal/imports/mod.go @@ -88,7 +88,11 @@ func (r *ModuleResolver) init() error { if gmc := r.env.Env["GOMODCACHE"]; gmc != "" { r.moduleCacheDir = gmc } else { - r.moduleCacheDir = filepath.Join(filepath.SplitList(goenv["GOPATH"])[0], "/pkg/mod") + gopaths := filepath.SplitList(goenv["GOPATH"]) + if len(gopaths) == 0 { + return fmt.Errorf("empty GOPATH") + } + r.moduleCacheDir = filepath.Join(gopaths[0], "/pkg/mod") } sort.Slice(r.modsByModPath, func(i, j int) bool { diff --git a/vendor/modules.txt b/vendor/modules.txt index 1ba199903..dabdbe984 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -527,7 +527,7 @@ golang.org/x/text/transform golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm golang.org/x/text/width -# golang.org/x/tools v0.0.0-20201125231158-b5590deeca9b +# golang.org/x/tools v0.0.0-20201208233053-a543418bbed2 ## explicit golang.org/x/tools/go/ast/astutil golang.org/x/tools/imports