From ad3891df1badb92034371ce02fc929652c9f4263 Mon Sep 17 00:00:00 2001 From: Eddie Zaneski Date: Wed, 2 Sep 2020 17:44:42 -0600 Subject: [PATCH] Fix broken dependency vbom.ml/util The author of this dependency is removing the vanity url and has instructed users to use the GitHub path. This updates the dependency to the module-less pin to the v1 module tag. https://github.com/fvbommel/util/issues/5 https://github.com/fvbommel/util/issues/6 Signed-off-by: Eddie Zaneski --- .../fvbommel/sortorder}/LICENSE | 4 ++-- go.mod | 3 +-- go.sum | 6 ++---- vendor/BUILD | 2 +- .../github.com/fvbommel/sortorder/.gitignore | 19 +++++++++++++++++++ .../fvbommel}/sortorder/BUILD | 4 ++-- .../fvbommel/sortorder}/LICENSE | 0 .../github.com/fvbommel/sortorder/README.md | 5 +++++ .../fvbommel}/sortorder/doc.go | 2 +- vendor/github.com/fvbommel/sortorder/go.mod | 3 +++ vendor/github.com/fvbommel/sortorder/go.sum | 0 .../fvbommel}/sortorder/natsort.go | 2 +- vendor/modules.txt | 7 +++---- vendor/vbom.ml/util/sortorder/README.md | 5 ----- 14 files changed, 40 insertions(+), 22 deletions(-) rename LICENSES/vendor/{vbom.ml/util => github.com/fvbommel/sortorder}/LICENSE (88%) create mode 100644 vendor/github.com/fvbommel/sortorder/.gitignore rename vendor/{vbom.ml/util => github.com/fvbommel}/sortorder/BUILD (79%) rename vendor/{vbom.ml/util => github.com/fvbommel/sortorder}/LICENSE (100%) create mode 100644 vendor/github.com/fvbommel/sortorder/README.md rename vendor/{vbom.ml/util => github.com/fvbommel}/sortorder/doc.go (78%) create mode 100644 vendor/github.com/fvbommel/sortorder/go.mod create mode 100644 vendor/github.com/fvbommel/sortorder/go.sum rename vendor/{vbom.ml/util => github.com/fvbommel}/sortorder/natsort.go (97%) delete mode 100644 vendor/vbom.ml/util/sortorder/README.md diff --git a/LICENSES/vendor/vbom.ml/util/LICENSE b/LICENSES/vendor/github.com/fvbommel/sortorder/LICENSE similarity index 88% rename from LICENSES/vendor/vbom.ml/util/LICENSE rename to LICENSES/vendor/github.com/fvbommel/sortorder/LICENSE index e710de327f4..4eadd661c72 100644 --- a/LICENSES/vendor/vbom.ml/util/LICENSE +++ b/LICENSES/vendor/github.com/fvbommel/sortorder/LICENSE @@ -1,4 +1,4 @@ -= vendor/vbom.ml/util licensed under: = += vendor/github.com/fvbommel/sortorder licensed under: = The MIT License (MIT) Copyright (c) 2015 Frits van Bommel @@ -18,4 +18,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -= vendor/vbom.ml/util/LICENSE 9f7e1d7e8f527330ebb5f4c32e0f3e40 += vendor/github.com/fvbommel/sortorder/LICENSE 9f7e1d7e8f527330ebb5f4c32e0f3e40 diff --git a/go.mod b/go.mod index 9d561087803..113697b4879 100644 --- a/go.mod +++ b/go.mod @@ -244,6 +244,7 @@ replace ( github.com/flynn/go-shlex => github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 github.com/fogleman/gg => github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90 github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.9 + github.com/fvbommel/sortorder => github.com/fvbommel/sortorder v1.0.1 github.com/ghodss/yaml => github.com/ghodss/yaml v1.0.0 github.com/go-acme/lego => github.com/go-acme/lego v2.5.0+incompatible github.com/go-bindata/go-bindata => github.com/go-bindata/go-bindata v3.1.1+incompatible @@ -411,7 +412,6 @@ replace ( github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.0-20200520041808-52d707b772fe github.com/vmware/govmomi => github.com/vmware/govmomi v0.20.3 github.com/xiang90/probing => github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 - github.com/xlab/handysort => github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 github.com/xordataexchange/crypt => github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 github.com/yuin/goldmark => github.com/yuin/goldmark v1.1.27 go.etcd.io/bbolt => go.etcd.io/bbolt v1.3.5 @@ -501,5 +501,4 @@ replace ( sigs.k8s.io/kustomize => sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.0.1 sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0 - vbom.ml/util => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc ) diff --git a/go.sum b/go.sum index 5bed6676c10..503b612f007 100644 --- a/go.sum +++ b/go.sum @@ -169,6 +169,8 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqFfzE= +github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M= @@ -461,8 +463,6 @@ github.com/vmware/govmomi v0.20.3 h1:gpw/0Ku+6RgF3jsi7fnCLmlcikBHfKBCUcu1qgc16OU github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 h1:j2hhcujLRHAg872RWAV5yaUrEjHEObwDv3aImCaNLek= -github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= @@ -573,5 +573,3 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSq sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc= -vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/vendor/BUILD b/vendor/BUILD index 45582bdbb7b..7e001ae867b 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -108,6 +108,7 @@ filegroup( "//vendor/github.com/exponent-io/jsonpath:all-srcs", "//vendor/github.com/fatih/camelcase:all-srcs", "//vendor/github.com/fsnotify/fsnotify:all-srcs", + "//vendor/github.com/fvbommel/sortorder:all-srcs", "//vendor/github.com/ghodss/yaml:all-srcs", "//vendor/github.com/go-bindata/go-bindata:all-srcs", "//vendor/github.com/go-logr/logr:all-srcs", @@ -525,7 +526,6 @@ filegroup( "//vendor/sigs.k8s.io/structured-merge-diff/v4/typed:all-srcs", "//vendor/sigs.k8s.io/structured-merge-diff/v4/value:all-srcs", "//vendor/sigs.k8s.io/yaml:all-srcs", - "//vendor/vbom.ml/util/sortorder:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/vendor/github.com/fvbommel/sortorder/.gitignore b/vendor/github.com/fvbommel/sortorder/.gitignore new file mode 100644 index 00000000000..c021733e255 --- /dev/null +++ b/vendor/github.com/fvbommel/sortorder/.gitignore @@ -0,0 +1,19 @@ +# Compiled Object files, Static and Dynamic libs (Shared Objects) +*.o +*.a +*.so +# Folders +_obj +_test +# Architecture specific extensions/prefixes +*.[568vq] +[568vq].out +*.cgo1.go +*.cgo2.c +_cgo_defun.c +_cgo_gotypes.go +_cgo_export.* +_testmain.go +*.exe +*.test +*.prof diff --git a/vendor/vbom.ml/util/sortorder/BUILD b/vendor/github.com/fvbommel/sortorder/BUILD similarity index 79% rename from vendor/vbom.ml/util/sortorder/BUILD rename to vendor/github.com/fvbommel/sortorder/BUILD index fb0c34cfd1d..572872004b8 100644 --- a/vendor/vbom.ml/util/sortorder/BUILD +++ b/vendor/github.com/fvbommel/sortorder/BUILD @@ -6,8 +6,8 @@ go_library( "doc.go", "natsort.go", ], - importmap = "k8s.io/kubernetes/vendor/vbom.ml/util/sortorder", - importpath = "vbom.ml/util/sortorder", + importmap = "k8s.io/kubernetes/vendor/github.com/fvbommel/sortorder", + importpath = "github.com/fvbommel/sortorder", visibility = ["//visibility:public"], ) diff --git a/vendor/vbom.ml/util/LICENSE b/vendor/github.com/fvbommel/sortorder/LICENSE similarity index 100% rename from vendor/vbom.ml/util/LICENSE rename to vendor/github.com/fvbommel/sortorder/LICENSE diff --git a/vendor/github.com/fvbommel/sortorder/README.md b/vendor/github.com/fvbommel/sortorder/README.md new file mode 100644 index 00000000000..7ebcab1d16e --- /dev/null +++ b/vendor/github.com/fvbommel/sortorder/README.md @@ -0,0 +1,5 @@ +# sortorder [![PkgGoDev](https://pkg.go.dev/badge/github.com/fvbommel/sortorder)](https://pkg.go.dev/github.com/fvbommel/sortorder) + + import "github.com/fvbommel/sortorder" + +Sort orders and comparison functions. diff --git a/vendor/vbom.ml/util/sortorder/doc.go b/vendor/github.com/fvbommel/sortorder/doc.go similarity index 78% rename from vendor/vbom.ml/util/sortorder/doc.go rename to vendor/github.com/fvbommel/sortorder/doc.go index 61b37a9374d..75d5a2928f3 100644 --- a/vendor/vbom.ml/util/sortorder/doc.go +++ b/vendor/github.com/fvbommel/sortorder/doc.go @@ -2,4 +2,4 @@ // // Currently, it only implements so-called "natural order", where integers // embedded in strings are compared by value. -package sortorder // import "vbom.ml/util/sortorder" +package sortorder diff --git a/vendor/github.com/fvbommel/sortorder/go.mod b/vendor/github.com/fvbommel/sortorder/go.mod new file mode 100644 index 00000000000..57c8175e3ef --- /dev/null +++ b/vendor/github.com/fvbommel/sortorder/go.mod @@ -0,0 +1,3 @@ +module github.com/fvbommel/sortorder + +go 1.13 diff --git a/vendor/github.com/fvbommel/sortorder/go.sum b/vendor/github.com/fvbommel/sortorder/go.sum new file mode 100644 index 00000000000..e69de29bb2d diff --git a/vendor/vbom.ml/util/sortorder/natsort.go b/vendor/github.com/fvbommel/sortorder/natsort.go similarity index 97% rename from vendor/vbom.ml/util/sortorder/natsort.go rename to vendor/github.com/fvbommel/sortorder/natsort.go index 1af08c1bd10..66a52c7125d 100644 --- a/vendor/vbom.ml/util/sortorder/natsort.go +++ b/vendor/github.com/fvbommel/sortorder/natsort.go @@ -57,7 +57,7 @@ func NaturalLess(str1, str2 string) bool { if len1, len2 := idx1-nonZero1, idx2-nonZero2; len1 != len2 { return len1 < len2 } - // If they're not equal, string comparison is correct. + // If they're equal, string comparison is correct. if nr1, nr2 := str1[nonZero1:idx1], str2[nonZero2:idx2]; nr1 != nr2 { return nr1 < nr2 } diff --git a/vendor/modules.txt b/vendor/modules.txt index 87b5098e9c7..94445b7991c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -388,6 +388,9 @@ github.com/fatih/camelcase ## explicit github.com/fsnotify/fsnotify # github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.9 +# github.com/fvbommel/sortorder v1.0.1 => github.com/fvbommel/sortorder v1.0.1 +github.com/fvbommel/sortorder +# github.com/fvbommel/sortorder => github.com/fvbommel/sortorder v1.0.1 # github.com/ghodss/yaml v1.0.0 => github.com/ghodss/yaml v1.0.0 github.com/ghodss/yaml # github.com/ghodss/yaml => github.com/ghodss/yaml v1.0.0 @@ -1088,7 +1091,6 @@ github.com/vmware/govmomi/vim25/xml # github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 => github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 github.com/xiang90/probing # github.com/xiang90/probing => github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 -# github.com/xlab/handysort => github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 # github.com/xordataexchange/crypt => github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 # github.com/yuin/goldmark => github.com/yuin/goldmark v1.1.27 # go.etcd.io/bbolt v1.3.5 => go.etcd.io/bbolt v1.3.5 @@ -2516,6 +2518,3 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit sigs.k8s.io/yaml # sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0 -# vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc -# vbom.ml/util => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc -vbom.ml/util/sortorder diff --git a/vendor/vbom.ml/util/sortorder/README.md b/vendor/vbom.ml/util/sortorder/README.md deleted file mode 100644 index ed8da0e29b5..00000000000 --- a/vendor/vbom.ml/util/sortorder/README.md +++ /dev/null @@ -1,5 +0,0 @@ -## sortorder [![GoDoc](https://godoc.org/vbom.ml/util/sortorder?status.svg)](https://godoc.org/vbom.ml/util/sortorder) - - import "vbom.ml/util/sortorder" - -Sort orders and comparison functions.