From 5e6aebee58ab886b6c26d12a9a9efe9589d8a23c Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Thu, 16 Jan 2020 14:46:08 +0530 Subject: [PATCH] Exclude snapshot changes Signed-off-by: Humble Chirammal --- Gopkg.lock | 40 +++++++++---------- Gopkg.toml | 2 +- vendor/github.com/pkg/errors/cause.go | 29 -------------- vendor/github.com/pkg/errors/errors.go | 26 ++++++++++++ vendor/github.com/pkg/errors/go113.go | 33 --------------- .../x/crypto/ssh/terminal/terminal.go | 4 ++ .../x/crypto/ssh/terminal/util_windows.go | 4 +- vendor/golang.org/x/net/http2/transport.go | 2 +- .../golang.org/x/sys/windows/types_windows.go | 19 ++++++--- 9 files changed, 67 insertions(+), 92 deletions(-) delete mode 100644 vendor/github.com/pkg/errors/cause.go diff --git a/Gopkg.lock b/Gopkg.lock index a84fcab4f..f8f4f2ba1 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -336,12 +336,12 @@ version = "v1.2" [[projects]] - digest = "1:61df16db1199caa2523f1c19b870cb465af1749f74d6649c694510c3f2b5f823" + digest = "1:4047c378584616813d610c9f993bf90dd0d07aed8d94bd3bc299cd35ececdcba" name = "github.com/pkg/errors" packages = ["."] pruneopts = "NUT" - revision = "49f8f617296114c890ae0b7ac18c5953d2b1ca0f" - version = "v0.9.0" + revision = "614d223910a179a466c1767a985424175c39b465" + version = "v0.9.1" [[projects]] digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" @@ -483,7 +483,7 @@ [[projects]] branch = "master" - digest = "1:30dfd6369964d090996dfc693a94d9a857ce1b9b41db91b939d5c70121dec12c" + digest = "1:9afdf9f791078f6d18f1c085d496c6a906a5bf4b573e69218658d3ba694de100" name = "golang.org/x/crypto" packages = [ "chacha20", @@ -497,7 +497,7 @@ "ssh/terminal", ] pruneopts = "NUT" - revision = "61a87790db17894570dfb32dbaa0a4af9ce60cb4" + revision = "6d4e4cb37c7d6416dfea8472e751c7b6615267a6" [[projects]] branch = "master" @@ -512,7 +512,7 @@ [[projects]] branch = "master" - digest = "1:cd148de9baaf0a3c052982e16c2bb83d03b8c501f115793055e3ff4533c9a1b7" + digest = "1:fbb9d7f20a8c3ef134ede7de0ce4d3b39b1f8e37d083a0ac58bbeeaf95db991a" name = "golang.org/x/net" packages = [ "context", @@ -529,7 +529,7 @@ "websocket", ] pruneopts = "NUT" - revision = "c0dbc17a35534bf2e581d7a942408dc936316da4" + revision = "6afb5195e5aab057fda82e27171243402346b0ad" [[projects]] branch = "master" @@ -544,7 +544,7 @@ [[projects]] branch = "master" - digest = "1:79742237f49a9764ee1ad7c88b949d95f87ceae293746bbc3a113d0f48c99d56" + digest = "1:da13d38692786279dc68e2cc90f790f39e447ae7618fbfbc77f46a65afd7a1e1" name = "golang.org/x/sys" packages = [ "cpu", @@ -552,7 +552,7 @@ "windows", ] pruneopts = "NUT" - revision = "86b910548bc16777f40503131aa424ae0a092199" + revision = "b77594299b429d05028403d72b68172959c7dad5" [[projects]] digest = "1:28deae5fe892797ff37a317b5bcda96d11d1c90dadd89f1337651df3bc4c586e" @@ -620,7 +620,7 @@ "internal/semver", ] pruneopts = "NUT" - revision = "d31a08c2edf2cd930cbead4c1e6e3e1b26e94bd5" + revision = "473961ec044c1c001df816e5edb29e4a31db4c01" [[projects]] branch = "master" @@ -655,7 +655,7 @@ name = "google.golang.org/genproto" packages = ["googleapis/rpc/status"] pruneopts = "NUT" - revision = "e1de0a7b01eb2fc11d735e4bfb79d2e53ec9edb3" + revision = "ca5a22157cba8746e7aa978de1b1ac4085150840" [[projects]] digest = "1:ccd346dd78e7a2f2d16f45f098d3d8e59c16789606a91823bca1eb7225b62c76" @@ -1147,8 +1147,8 @@ "volume/helpers", ] pruneopts = "NUT" - revision = "c2aacd33d446994829d9e8830d83b047cfb11fda" - version = "v0.17.0" + revision = "23c4c4effb51a3aa6dc504c28a900e4ce4bd74ec" + version = "v0.17.1" [[projects]] digest = "1:e6a82ae3de82cac318c221ea731f1a45ca0de9840afd9c6fecf39f78d6c05e93" @@ -1163,8 +1163,8 @@ "version", ] pruneopts = "NUT" - revision = "d28e171e54a29670f44b1cc6eed68fd609028f62" - version = "v0.17.0" + revision = "e22fc98bf46cf388fdc8cb047daf7a6b4f208954" + version = "v0.17.1" [[projects]] digest = "1:5e496d711fa03e4aaf3cab0d7de079634a9465ebf940613b69b34f5cc6513db8" @@ -1172,7 +1172,7 @@ packages = ["pkg/apis/runtime/v1alpha2"] pruneopts = "NUT" revision = "775aa3c1cf7380ba8b7362f5a52f1e6d2e130bb9" - version = "v0.17.0" + version = "v0.17.1" [[projects]] digest = "1:4b46bd1574fc1f259245a11cb3c0faeb0b6d72894084266e450b5db019c344f5" @@ -1182,8 +1182,8 @@ "plugins", ] pruneopts = "NUT" - revision = "e1a1220f9bb032328eb1ff8b3d83993143f87b32" - version = "v0.17.0" + revision = "56993244bb3eebfad40d35c1d0a5cd2c3f098250" + version = "v0.17.1" [[projects]] digest = "1:c0693cb981f43d82a767a3217b7640a4bdb341731d3814b38602f4e5dc4f01b3" @@ -1206,8 +1206,8 @@ name = "k8s.io/kubectl" packages = ["pkg/scale"] pruneopts = "NUT" - revision = "04231514142e0d039c8cee57130e3e4af0d70d59" - version = "v0.17.0" + revision = "13567bf040c53c783d939965a87147d5ec56a72e" + version = "v0.17.1" [[projects]] digest = "1:fb50eeed2b6304f7bb018ed240c2a968f1d1e94950e7ca89ee9f0b66c2c2bf10" diff --git a/Gopkg.toml b/Gopkg.toml index 66903568f..724942b4f 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -69,7 +69,7 @@ [[constraint]] name = "github.com/kubernetes-csi/csi-lib-utils" - version = "=v0.6.1" + version = "v0.6.1" [prune] go-tests = true diff --git a/vendor/github.com/pkg/errors/cause.go b/vendor/github.com/pkg/errors/cause.go deleted file mode 100644 index 566f88bb0..000000000 --- a/vendor/github.com/pkg/errors/cause.go +++ /dev/null @@ -1,29 +0,0 @@ -// +build !go1.13 - -package errors - -// Cause recursively unwraps an error chain and returns the underlying cause of -// the error, if possible. An error value has a cause if it implements the -// following interface: -// -// type causer interface { -// Cause() error -// } -// -// If the error does not implement Cause, the original error will -// be returned. If the error is nil, nil will be returned without further -// investigation. -func Cause(err error) error { - type causer interface { - Cause() error - } - - for err != nil { - cause, ok := err.(causer) - if !ok { - break - } - err = cause.Cause() - } - return err -} diff --git a/vendor/github.com/pkg/errors/errors.go b/vendor/github.com/pkg/errors/errors.go index a9840ecee..161aea258 100644 --- a/vendor/github.com/pkg/errors/errors.go +++ b/vendor/github.com/pkg/errors/errors.go @@ -260,3 +260,29 @@ func (w *withMessage) Format(s fmt.State, verb rune) { io.WriteString(s, w.Error()) } } + +// Cause returns the underlying cause of the error, if possible. +// An error value has a cause if it implements the following +// interface: +// +// type causer interface { +// Cause() error +// } +// +// If the error does not implement Cause, the original error will +// be returned. If the error is nil, nil will be returned without further +// investigation. +func Cause(err error) error { + type causer interface { + Cause() error + } + + for err != nil { + cause, ok := err.(causer) + if !ok { + break + } + err = cause.Cause() + } + return err +} diff --git a/vendor/github.com/pkg/errors/go113.go b/vendor/github.com/pkg/errors/go113.go index ed0dc7a6d..be0d10d0c 100644 --- a/vendor/github.com/pkg/errors/go113.go +++ b/vendor/github.com/pkg/errors/go113.go @@ -36,36 +36,3 @@ func As(err error, target interface{}) bool { return stderrors.As(err, target) } func Unwrap(err error) error { return stderrors.Unwrap(err) } - -// Cause recursively unwraps an error chain and returns the underlying cause of -// the error, if possible. There are two ways that an error value may provide a -// cause. First, the error may implement the following interface: -// -// type causer interface { -// Cause() error -// } -// -// Second, the error may return a non-nil value when passed as an argument to -// the Unwrap function. This makes Cause forwards-compatible with Go 1.13 error -// chains. -// -// If an error value satisfies both methods of unwrapping, Cause will use the -// causer interface. -// -// If the error is nil, nil will be returned without further investigation. -func Cause(err error) error { - type causer interface { - Cause() error - } - - for err != nil { - if cause, ok := err.(causer); ok { - err = cause.Cause() - } else if unwrapped := Unwrap(err); unwrapped != nil { - err = unwrapped - } else { - break - } - } - return err -} diff --git a/vendor/golang.org/x/crypto/ssh/terminal/terminal.go b/vendor/golang.org/x/crypto/ssh/terminal/terminal.go index 2f04ee5b5..dd7378c8a 100644 --- a/vendor/golang.org/x/crypto/ssh/terminal/terminal.go +++ b/vendor/golang.org/x/crypto/ssh/terminal/terminal.go @@ -947,6 +947,10 @@ func readPasswordLine(reader io.Reader) ([]byte, error) { n, err := reader.Read(buf[:]) if n > 0 { switch buf[0] { + case '\b': + if len(ret) > 0 { + ret = ret[:len(ret)-1] + } case '\n': return ret, nil case '\r': diff --git a/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go b/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go index 5cfdf8f3f..f614e9cb6 100644 --- a/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go +++ b/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go @@ -85,8 +85,8 @@ func ReadPassword(fd int) ([]byte, error) { } old := st - st &^= (windows.ENABLE_ECHO_INPUT) - st |= (windows.ENABLE_PROCESSED_INPUT | windows.ENABLE_LINE_INPUT | windows.ENABLE_PROCESSED_OUTPUT) + st &^= (windows.ENABLE_ECHO_INPUT | windows.ENABLE_LINE_INPUT) + st |= (windows.ENABLE_PROCESSED_OUTPUT | windows.ENABLE_PROCESSED_INPUT) if err := windows.SetConsoleMode(windows.Handle(fd), st); err != nil { return nil, err } diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go index 8e0059db6..d948e96ee 100644 --- a/vendor/golang.org/x/net/http2/transport.go +++ b/vendor/golang.org/x/net/http2/transport.go @@ -93,7 +93,7 @@ type Transport struct { // send in the initial settings frame. It is how many bytes // of response headers are allowed. Unlike the http2 spec, zero here // means to use a default limit (currently 10MB). If you actually - // want to advertise an ulimited value to the peer, Transport + // want to advertise an unlimited value to the peer, Transport // interprets the highest possible value here (0xffffffff or 1<<32-1) // to mean no limit. MaxHeaderListSize uint32 diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go index aefb7fc39..809fff0b4 100644 --- a/vendor/golang.org/x/sys/windows/types_windows.go +++ b/vendor/golang.org/x/sys/windows/types_windows.go @@ -681,19 +681,26 @@ const ( AF_UNSPEC = 0 AF_UNIX = 1 AF_INET = 2 - AF_INET6 = 23 AF_NETBIOS = 17 + AF_INET6 = 23 + AF_IRDA = 26 + AF_BTH = 32 SOCK_STREAM = 1 SOCK_DGRAM = 2 SOCK_RAW = 3 + SOCK_RDM = 4 SOCK_SEQPACKET = 5 - IPPROTO_IP = 0 - IPPROTO_ICMP = 1 - IPPROTO_IPV6 = 0x29 - IPPROTO_TCP = 6 - IPPROTO_UDP = 17 + IPPROTO_IP = 0 + IPPROTO_ICMP = 1 + IPPROTO_IGMP = 2 + BTHPROTO_RFCOMM = 3 + IPPROTO_TCP = 6 + IPPROTO_UDP = 17 + IPPROTO_IPV6 = 41 + IPPROTO_ICMPV6 = 58 + IPPROTO_RM = 113 SOL_SOCKET = 0xffff SO_REUSEADDR = 4