Skip to content

Commit

Permalink
Clean up kataras dependency (#3240)
Browse files Browse the repository at this point in the history
* cleanup kataras_iris dependency, which is only used in test

* go mod tidy

* bazel run //:gazelle -- update-repos --from_file=go.mod
  • Loading branch information
jingzhang36 authored Mar 9, 2020
1 parent b2662f2 commit 7033903
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 40 deletions.
44 changes: 25 additions & 19 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -769,7 +763,7 @@ go_repository(

go_repository(
name = "org_golang_x_crypto",
commit = "4def268fd1a4",
commit = "9756ffdc2472",
importpath = "golang.org/x/crypto",
)

Expand All @@ -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",
)

Expand All @@ -800,7 +794,7 @@ go_repository(

go_repository(
name = "org_golang_x_sys",
commit = "fde4db37ae7a",
commit = "c7b8b68b1456",
importpath = "golang.org/x/sys",
)

Expand All @@ -818,7 +812,7 @@ go_repository(

go_repository(
name = "org_golang_x_tools",
commit = "922a4ee32d1a",
commit = "6cdbf07be9d0",
importpath = "golang.org/x/tools",
)

Expand Down Expand Up @@ -902,7 +896,7 @@ go_repository(

go_repository(
name = "com_github_google_pprof",
commit = "34ac40c74b70",
commit = "54271f7e092f",
importpath = "github.com/google/pprof",
)

Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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",
)

Expand All @@ -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",
)
1 change: 0 additions & 1 deletion backend/src/common/util/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion backend/src/common/util/formatter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 0 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
15 changes: 0 additions & 15 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7033903

Please sign in to comment.