From eb137acca5b2b32ac50a064f9d0d3c6b23671010 Mon Sep 17 00:00:00 2001 From: Takumasa Sakao Date: Tue, 6 Apr 2021 02:01:39 +0900 Subject: [PATCH 1/2] Bump importas to HEAD Diff: https://github.com/julz/importas/compare/d0bf5cb4e1db...a22c8f743dc9 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fe272673e161..b9e82bb0e950 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/jgautheron/goconst v1.4.0 github.com/jingyugao/rowserrcheck v0.0.0-20210315055705-d907ca737bb1 github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af - github.com/julz/importas v0.0.0-20210228071311-d0bf5cb4e1db + github.com/julz/importas v0.0.0-20210405141620-a22c8f743dc9 github.com/kisielk/errcheck v1.6.0 github.com/kulti/thelper v0.4.0 github.com/kunwardeep/paralleltest v1.0.2 diff --git a/go.sum b/go.sum index 10018f974ee3..4b9649b0776d 100644 --- a/go.sum +++ b/go.sum @@ -347,8 +347,8 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julz/importas v0.0.0-20210228071311-d0bf5cb4e1db h1:ZmwBthGFMVAieuVpLzuedUH9l4pY/0iFG16DN9dS38o= -github.com/julz/importas v0.0.0-20210228071311-d0bf5cb4e1db/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= +github.com/julz/importas v0.0.0-20210405141620-a22c8f743dc9 h1:CyQB3TMIEjaoKL2AdYyrkRYX0NV8F4pO/zRBgbZfvIY= +github.com/julz/importas v0.0.0-20210405141620-a22c8f743dc9/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= From a74a754739003f1e1792707c5426633e4d0d73d6 Mon Sep 17 00:00:00 2001 From: Takumasa Sakao Date: Tue, 6 Apr 2021 02:23:49 +0900 Subject: [PATCH 2/2] Add regexp rule example of importas --- .golangci.example.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.golangci.example.yml b/.golangci.example.yml index ee6dd9bff300..f7485b088543 100644 --- a/.golangci.example.yml +++ b/.golangci.example.yml @@ -464,6 +464,10 @@ linters-settings: servingv1: knative.dev/serving/pkg/apis/serving/v1 # using `autoscalingv1alpha1` alias for `knative.dev/serving/pkg/apis/autoscaling/v1alpha1` package autoscalingv1alpha1: knative.dev/serving/pkg/apis/autoscaling/v1alpha1 + # You can specify the package path by regular expression, + # and alias by regular expression expansion syntax like below. + # see https://github.com/julz/importas#use-regular-expression for details + "$1$2": 'knative.dev/serving/pkg/apis/(\w+)/(v[\w\d]+)' gomoddirectives: # Allow local `replace` directives. Default is false. replace-local: false