From 7033903e4fd86849affbe10340214cb4f346ee9b Mon Sep 17 00:00:00 2001 From: jingzhang36 Date: Mon, 9 Mar 2020 17:51:44 +0800 Subject: [PATCH] Clean up kataras dependency (#3240) * cleanup kataras_iris dependency, which is only used in test * go mod tidy * bazel run //:gazelle -- update-repos --from_file=go.mod --- WORKSPACE | 44 +++++++++++++---------- backend/src/common/util/BUILD.bazel | 1 - backend/src/common/util/formatter_test.go | 2 +- go.mod | 4 --- go.sum | 15 -------- 5 files changed, 26 insertions(+), 40 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 92db6b589a4..7acd72f1d82 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -138,8 +138,8 @@ http_archive( go_repository( name = "co_honnef_go_tools", + commit = "ea95bdfd59fc", importpath = "honnef.co/go/tools", - tag = "v0.0.1-2019.2.2", ) go_repository( @@ -454,12 +454,6 @@ go_repository( tag = "v4.2.1", ) -go_repository( - name = "com_github_kataras_iris", - importpath = "github.com/kataras/iris", - tag = "v10.6.7", -) - go_repository( name = "com_github_kisielk_gotool", importpath = "github.com/kisielk/gotool", @@ -511,7 +505,7 @@ go_repository( go_repository( name = "com_github_minio_minio_go", importpath = "github.com/minio/minio-go", - tag = "v6.0.5", + tag = "v6.0.14", ) go_repository( @@ -655,7 +649,7 @@ go_repository( go_repository( name = "com_github_stretchr_testify", importpath = "github.com/stretchr/testify", - tag = "v1.2.2", + tag = "v1.3.0", ) go_repository( @@ -769,7 +763,7 @@ go_repository( go_repository( name = "org_golang_x_crypto", - commit = "4def268fd1a4", + commit = "9756ffdc2472", importpath = "golang.org/x/crypto", ) @@ -782,7 +776,7 @@ go_repository( go_repository( name = "org_golang_x_net", build_file_proto_mode = "disable_global", - commit = "74dc4d7220e7", + commit = "ba9fcec4b297", importpath = "golang.org/x/net", ) @@ -800,7 +794,7 @@ go_repository( go_repository( name = "org_golang_x_sys", - commit = "fde4db37ae7a", + commit = "c7b8b68b1456", importpath = "golang.org/x/sys", ) @@ -818,7 +812,7 @@ go_repository( go_repository( name = "org_golang_x_tools", - commit = "922a4ee32d1a", + commit = "6cdbf07be9d0", importpath = "golang.org/x/tools", ) @@ -902,7 +896,7 @@ go_repository( go_repository( name = "com_github_google_pprof", - commit = "34ac40c74b70", + commit = "54271f7e092f", importpath = "github.com/google/pprof", ) @@ -993,7 +987,7 @@ go_repository( go_repository( name = "com_github_kr_pty", importpath = "github.com/kr/pty", - tag = "v1.1.8", + tag = "v1.1.1", ) go_repository( @@ -1035,24 +1029,24 @@ go_repository( go_repository( name = "org_golang_google_api", importpath = "google.golang.org/api", - tag = "v0.8.0", + tag = "v0.9.0", ) go_repository( name = "org_golang_x_exp", - commit = "ec7cb31e5a56", + commit = "efd6b22b2522", importpath = "golang.org/x/exp", ) go_repository( name = "org_golang_x_image", - commit = "cff245a6509b", + commit = "0694c2d4d067", importpath = "golang.org/x/image", ) go_repository( name = "org_golang_x_mobile", - commit = "e8b3e6111d02", + commit = "d3739f865fa6", importpath = "golang.org/x/mobile", ) @@ -1067,3 +1061,15 @@ go_repository( commit = "a985d3407aa7", importpath = "golang.org/x/xerrors", ) + +go_repository( + name = "com_github_stretchr_objx", + importpath = "github.com/stretchr/objx", + tag = "v0.1.0", +) + +go_repository( + name = "io_k8s_sigs_testing_frameworks", + importpath = "sigs.k8s.io/testing_frameworks", + tag = "v0.1.1", +) diff --git a/backend/src/common/util/BUILD.bazel b/backend/src/common/util/BUILD.bazel index b1925073e31..0c667a360f2 100644 --- a/backend/src/common/util/BUILD.bazel +++ b/backend/src/common/util/BUILD.bazel @@ -63,7 +63,6 @@ go_test( "//backend/src/crd/pkg/apis/scheduledworkflow/v1beta1:go_default_library", "@com_github_argoproj_argo//pkg/apis/workflow/v1alpha1:go_default_library", "@com_github_ghodss_yaml//:go_default_library", - "@com_github_kataras_iris//core/errors:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@io_k8s_apimachinery//pkg/api/errors:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", diff --git a/backend/src/common/util/formatter_test.go b/backend/src/common/util/formatter_test.go index 61376b5e8d7..28db64bb2e3 100644 --- a/backend/src/common/util/formatter_test.go +++ b/backend/src/common/util/formatter_test.go @@ -15,11 +15,11 @@ package util import ( + "errors" "testing" "time" "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" - "github.com/kataras/iris/core/errors" "github.com/stretchr/testify/assert" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/go.mod b/go.mod index 5db7ad3b6f7..80586a0dd6a 100644 --- a/go.mod +++ b/go.mod @@ -38,13 +38,11 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.6.3 github.com/hashicorp/golang-lru v0.5.3 // indirect github.com/imdario/mergo v0.3.5 // indirect - github.com/iris-contrib/go.uuid v2.0.0+incompatible // indirect github.com/jinzhu/gorm v1.9.1 github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a // indirect github.com/jinzhu/now v0.0.0-20181116074157-8ec929ed50c3 // indirect github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be // indirect github.com/jtolds/gls v4.2.1+incompatible // indirect - github.com/kataras/iris v10.6.7+incompatible github.com/kr/pretty v0.1.0 // indirect github.com/lib/pq v1.0.0 // indirect github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a // indirect @@ -63,7 +61,6 @@ require ( github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect github.com/spf13/viper v1.3.0 - github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.3.0 github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 // indirect @@ -73,7 +70,6 @@ require ( golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 // indirect - golang.org/x/tools v0.0.0-20190829164954-f4d897724609 // indirect google.golang.org/api v0.9.0 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 google.golang.org/grpc v1.23.0 diff --git a/go.sum b/go.sum index e5c628805ab..333dc517446 100644 --- a/go.sum +++ b/go.sum @@ -97,7 +97,6 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -136,8 +135,6 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/iris-contrib/go.uuid v2.0.0+incompatible h1:XZubAYg61/JwnJNbZilGjf3b3pB80+OQg2qf6c8BfWE= -github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= github.com/jinzhu/gorm v1.9.1 h1:lDSDtsCt5AGGSKTs8AHlSDbbgif4G4+CKJ8ETBDVHTA= github.com/jinzhu/gorm v1.9.1/go.mod h1:Vla75njaFJ8clLU1W44h34PjIkijhjHIYnZxMqCdxqo= github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a h1:eeaG9XMUvRBYXJi4pg1ZKM7nxc5AfXfojeLLW7O5J3k= @@ -149,8 +146,6 @@ github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBv github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/kataras/iris v10.6.7+incompatible h1:K0K2vh7wJTkMCjCbWmuPDP7YpPAOj9L2AtU7AN79pdM= -github.com/kataras/iris v10.6.7+incompatible/go.mod h1:ki9XPua5SyAJbIxDdsssxevgGrbpBmmvoQmo/A0IodY= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -224,8 +219,6 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/viper v1.3.0 h1:cO6QlTTeK9RQDhFAbGLV5e3fHXbRpin/Gi8qfL4rdLk= github.com/spf13/viper v1.3.0/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= @@ -249,8 +242,6 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 h1:Gv7RPwsi3eZ2Fgewe3CBsuOebPwO27PoXzRpJPsvSSM= golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -276,8 +267,6 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= @@ -302,8 +291,6 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 h1:ng0gs1AKnRRuEMZoTLLlbOd+C17zUDepwGQBb/n+JVg= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= @@ -325,8 +312,6 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190829164954-f4d897724609/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0 h1:VGGbLNyPF7dvYHhcUGYBBGCRDDK0RRJAI6KCvo0CL+E=