From a6c15a5e60cd4a0efbae670b5f80d1aaa8e34b42 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 28 Aug 2020 14:35:09 +0200 Subject: [PATCH] Replace vbom.ml/util with fvbommel/sortorder The vanity domain is down, and the project has moved to a new location. vendor check started failing because of this: Collecting initial packages Download dependencies unrecognized import path "vbom.ml/util" (https fetch: Get https://vbom.ml/util?go-get=1: dial tcp: lookup vbom.ml on 169.254.169.254:53: no such host) Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 6703919c7149b96b42b8a451bfb335321f70d12e) Signed-off-by: Sebastiaan van Stijn --- cli/command/config/ls.go | 2 +- cli/command/context/list.go | 2 +- cli/command/network/list.go | 2 +- cli/command/node/list.go | 2 +- cli/command/plugin/list.go | 2 +- cli/command/secret/ls.go | 2 +- cli/command/service/list.go | 3 +-- cli/command/stack/list.go | 2 +- cli/command/system/prune.go | 2 +- cli/command/trust/common.go | 2 +- cli/command/trust/inspect_pretty.go | 2 +- cli/command/volume/list.go | 2 +- cli/context/store/metadatastore.go | 2 +- vendor.conf | 2 +- .../{vbom.ml/util => github.com/fvbommel/sortorder}/LICENSE | 0 vendor/github.com/fvbommel/sortorder/README.md | 5 +++++ .../{vbom.ml/util => github.com/fvbommel}/sortorder/doc.go | 2 +- vendor/github.com/fvbommel/sortorder/go.mod | 5 +++++ .../util => github.com/fvbommel}/sortorder/natsort.go | 2 +- vendor/vbom.ml/util/README.md | 5 ----- vendor/vbom.ml/util/sortorder/README.md | 5 ----- 21 files changed, 26 insertions(+), 27 deletions(-) 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 rename vendor/{vbom.ml/util => github.com/fvbommel}/sortorder/natsort.go (97%) delete mode 100644 vendor/vbom.ml/util/README.md delete mode 100644 vendor/vbom.ml/util/sortorder/README.md diff --git a/cli/command/config/ls.go b/cli/command/config/ls.go index c004a718de..57bb13320b 100644 --- a/cli/command/config/ls.go +++ b/cli/command/config/ls.go @@ -9,8 +9,8 @@ import ( "github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/opts" "github.com/docker/docker/api/types" + "github.com/fvbommel/sortorder" "github.com/spf13/cobra" - "vbom.ml/util/sortorder" ) // ListOptions contains options for the docker config ls command. diff --git a/cli/command/context/list.go b/cli/command/context/list.go index 4c540bb256..dbe4c13e17 100644 --- a/cli/command/context/list.go +++ b/cli/command/context/list.go @@ -10,8 +10,8 @@ import ( "github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/cli/context/docker" kubecontext "github.com/docker/cli/cli/context/kubernetes" + "github.com/fvbommel/sortorder" "github.com/spf13/cobra" - "vbom.ml/util/sortorder" ) type listOptions struct { diff --git a/cli/command/network/list.go b/cli/command/network/list.go index b2700552e5..e72703b212 100644 --- a/cli/command/network/list.go +++ b/cli/command/network/list.go @@ -9,8 +9,8 @@ import ( "github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/opts" "github.com/docker/docker/api/types" + "github.com/fvbommel/sortorder" "github.com/spf13/cobra" - "vbom.ml/util/sortorder" ) type listOptions struct { diff --git a/cli/command/node/list.go b/cli/command/node/list.go index fdea329dea..d67f54a042 100644 --- a/cli/command/node/list.go +++ b/cli/command/node/list.go @@ -9,8 +9,8 @@ import ( "github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/opts" "github.com/docker/docker/api/types" + "github.com/fvbommel/sortorder" "github.com/spf13/cobra" - "vbom.ml/util/sortorder" ) type listOptions struct { diff --git a/cli/command/plugin/list.go b/cli/command/plugin/list.go index 16c7db6cf4..c05eefae79 100644 --- a/cli/command/plugin/list.go +++ b/cli/command/plugin/list.go @@ -8,8 +8,8 @@ import ( "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/opts" + "github.com/fvbommel/sortorder" "github.com/spf13/cobra" - "vbom.ml/util/sortorder" ) type listOptions struct { diff --git a/cli/command/secret/ls.go b/cli/command/secret/ls.go index 878f6fe977..5d1d54150a 100644 --- a/cli/command/secret/ls.go +++ b/cli/command/secret/ls.go @@ -9,8 +9,8 @@ import ( "github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/opts" "github.com/docker/docker/api/types" + "github.com/fvbommel/sortorder" "github.com/spf13/cobra" - "vbom.ml/util/sortorder" ) type listOptions struct { diff --git a/cli/command/service/list.go b/cli/command/service/list.go index 90fe330102..59b74131d4 100644 --- a/cli/command/service/list.go +++ b/cli/command/service/list.go @@ -5,8 +5,6 @@ import ( "fmt" "sort" - "vbom.ml/util/sortorder" - "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/formatter" @@ -14,6 +12,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" + "github.com/fvbommel/sortorder" "github.com/spf13/cobra" ) diff --git a/cli/command/stack/list.go b/cli/command/stack/list.go index 697cbcce1d..5793bfdca6 100644 --- a/cli/command/stack/list.go +++ b/cli/command/stack/list.go @@ -9,8 +9,8 @@ import ( "github.com/docker/cli/cli/command/stack/kubernetes" "github.com/docker/cli/cli/command/stack/options" "github.com/docker/cli/cli/command/stack/swarm" + "github.com/fvbommel/sortorder" "github.com/spf13/cobra" - "vbom.ml/util/sortorder" ) func newListCommand(dockerCli command.Cli, common *commonOptions) *cobra.Command { diff --git a/cli/command/system/prune.go b/cli/command/system/prune.go index 0e8f115c5a..c9de08d3a8 100644 --- a/cli/command/system/prune.go +++ b/cli/command/system/prune.go @@ -16,8 +16,8 @@ import ( "github.com/docker/cli/opts" "github.com/docker/docker/api/types/versions" "github.com/docker/go-units" + "github.com/fvbommel/sortorder" "github.com/spf13/cobra" - "vbom.ml/util/sortorder" ) type pruneOptions struct { diff --git a/cli/command/trust/common.go b/cli/command/trust/common.go index 0a5b54716a..1e22bc1fcb 100644 --- a/cli/command/trust/common.go +++ b/cli/command/trust/common.go @@ -10,11 +10,11 @@ import ( "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/image" "github.com/docker/cli/cli/trust" + "github.com/fvbommel/sortorder" "github.com/sirupsen/logrus" "github.com/theupdateframework/notary" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/tuf/data" - "vbom.ml/util/sortorder" ) // trustTagKey represents a unique signed tag and hex-encoded hash pair diff --git a/cli/command/trust/inspect_pretty.go b/cli/command/trust/inspect_pretty.go index dbe0f795e2..0407549b44 100644 --- a/cli/command/trust/inspect_pretty.go +++ b/cli/command/trust/inspect_pretty.go @@ -7,8 +7,8 @@ import ( "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/formatter" + "github.com/fvbommel/sortorder" "github.com/theupdateframework/notary/client" - "vbom.ml/util/sortorder" ) func prettyPrintTrustInfo(cli command.Cli, remote string) error { diff --git a/cli/command/volume/list.go b/cli/command/volume/list.go index f9afef8bf6..4793e72d51 100644 --- a/cli/command/volume/list.go +++ b/cli/command/volume/list.go @@ -8,8 +8,8 @@ import ( "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/opts" + "github.com/fvbommel/sortorder" "github.com/spf13/cobra" - "vbom.ml/util/sortorder" ) type listOptions struct { diff --git a/cli/context/store/metadatastore.go b/cli/context/store/metadatastore.go index df087164ff..0e9bc8889c 100644 --- a/cli/context/store/metadatastore.go +++ b/cli/context/store/metadatastore.go @@ -9,7 +9,7 @@ import ( "reflect" "sort" - "vbom.ml/util/sortorder" + "github.com/fvbommel/sortorder" ) const ( diff --git a/vendor.conf b/vendor.conf index 154e8338be..ffb8d8609d 100755 --- a/vendor.conf +++ b/vendor.conf @@ -26,6 +26,7 @@ github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a github.com/docker/licensing 9781369abdb5281cdc07a2a446c6df01347ec793 github.com/docker/swarmkit 48eb1828ce81be20b25d647f6ca8f33d599f705c github.com/evanphx/json-patch 72bf35d0ff611848c1dc9df0f976c81192392fa5 # v4.1.0 +github.com/fvbommel/sortorder 6b6b45a52fcc54f788363c1880630248b63402a1 # v1.0.0 github.com/gofrs/flock 7f43ea2e6a643ad441fc12d0ecc0d3388b300c53 # v0.7.0 github.com/gogo/googleapis d31c731455cb061f42baff3bda55bad0118b126b # v1.2.0 github.com/gogo/protobuf ba06b47c162d49f2af050fb4c75bcbc86a159d5c # v1.2.1 @@ -99,6 +100,5 @@ k8s.io/kube-openapi 5e45bb682580c9be5ffa4d27d367 k8s.io/kubernetes 641856db18352033a0d96dbc99153fa3b27298e5 # v1.14.0 k8s.io/utils 21c4ce38f2a793ec01e925ddc31216500183b773 sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 # v1.1.0 -vbom.ml/util 256737ac55c46798123f754ab7d2c784e2c71783 # DO NOT EDIT BELOW THIS LINE -------- reserved for downstream projects -------- 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 0000000000..1bb6324028 --- /dev/null +++ b/vendor/github.com/fvbommel/sortorder/README.md @@ -0,0 +1,5 @@ +# sortorder [![GoDoc](https://godoc.org/github.com/fvbommel/sortorder?status.svg)](https://godoc.org/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 61b37a9374..75d5a2928f 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 0000000000..36ab8fcdf4 --- /dev/null +++ b/vendor/github.com/fvbommel/sortorder/go.mod @@ -0,0 +1,5 @@ +module github.com/fvbommel/sortorder + +go 1.13 + +require github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 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 1af08c1bd1..66a52c7125 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/vbom.ml/util/README.md b/vendor/vbom.ml/util/README.md deleted file mode 100644 index 72de507980..0000000000 --- a/vendor/vbom.ml/util/README.md +++ /dev/null @@ -1,5 +0,0 @@ -## util [![GoDoc](https://godoc.org/vbom.ml/util?status.svg)](https://godoc.org/vbom.ml/util) - - import "vbom.ml/util" - -Go utility packages. diff --git a/vendor/vbom.ml/util/sortorder/README.md b/vendor/vbom.ml/util/sortorder/README.md deleted file mode 100644 index ed8da0e29b..0000000000 --- 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.