From 0c4b40c8e0fc3c0cb79adfe83da2bc4007b9de0c Mon Sep 17 00:00:00 2001 From: Frits van Bommel Date: Sun, 13 Sep 2020 16:29:07 +0200 Subject: [PATCH] chore(deps): migrate to new sortorder import path See fvbommel/util#7 --- cmd/karma/alerts.go | 2 +- go.mod | 3 +-- go.sum | 6 ++---- internal/models/api.go | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cmd/karma/alerts.go b/cmd/karma/alerts.go index 570c6d1f3..edc8215f2 100644 --- a/cmd/karma/alerts.go +++ b/cmd/karma/alerts.go @@ -5,8 +5,8 @@ import ( "math" "sort" + "github.com/fvbommel/sortorder" "github.com/gin-gonic/gin" - "vbom.ml/util/sortorder" "github.com/prymitive/karma/internal/alertmanager" "github.com/prymitive/karma/internal/config" diff --git a/go.mod b/go.mod index a934e7a65..57db024c2 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894 // indirect github.com/cnf/structhash v0.0.0-20180104161610-62a607eb0224 github.com/elazarl/go-bindata-assetfs v1.0.1 + github.com/fvbommel/sortorder v1.0.1 github.com/getsentry/raven-go v0.2.0 github.com/gin-contrib/cors v1.3.1 github.com/gin-contrib/gzip v0.0.2 @@ -33,12 +34,10 @@ require ( github.com/rogpeppe/go-internal v1.6.2 github.com/sirupsen/logrus v1.6.0 github.com/spf13/pflag v1.0.5 - github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect go.mongodb.org/mongo-driver v1.3.5 // indirect golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect golang.org/x/sys v0.0.0-20200722175500-76b94024e4b6 // indirect google.golang.org/protobuf v1.25.0 // indirect gopkg.in/go-playground/colors.v1 v1.2.0 gopkg.in/yaml.v2 v2.3.0 - vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 ) diff --git a/go.sum b/go.sum index 61426a3f3..6717ad95e 100644 --- a/go.sum +++ b/go.sum @@ -86,6 +86,8 @@ github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= 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/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -522,8 +524,6 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= 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= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= @@ -738,5 +738,3 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/internal/models/api.go b/internal/models/api.go index 40f05d180..872c6470d 100644 --- a/internal/models/api.go +++ b/internal/models/api.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "vbom.ml/util/sortorder" + "github.com/fvbommel/sortorder" "github.com/prymitive/karma/internal/slices" )