diff --git a/.golangci.yml b/.golangci.yml index 2b89ff6ad..0364ae59d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -63,6 +63,9 @@ formatters: settings: gofumpt: extra-rules: true + goimports: + local-prefixes: + - github.com/grpc-ecosystem/go-grpc-middleware issues: # Maximum issues count per one linter. diff --git a/Makefile b/Makefile index a989ec222..6198c22ae 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ fmt: $(GOIMPORTS) @for file in $(GO_FILES_TO_FMT) ; do \ ./goimports.sh "$${file}"; \ done - @$(GOIMPORTS) -w $(GO_FILES_TO_FMT) + @$(GOIMPORTS) -local github.com/grpc-ecosystem/go-grpc-middleware -w $(GO_FILES_TO_FMT) .PHONY: test test: diff --git a/README.md b/README.md index 72fac8e0f..c59a3774d 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ This repository offers ready-to-use middlewares that implements gRPC interceptor Additional great feature of interceptors is the fact we can chain those. For example below you can find example server side chain of interceptors with full observabiliy correlation, auth and panic recovery: -```go mdox-exec="sed -n '143,163p' examples/server/main.go" +```go mdox-exec="sed -n '144,164p' examples/server/main.go" grpcSrv := grpc.NewServer( grpc.StatsHandler(otelgrpc.NewServerHandler()), grpc.ChainUnaryInterceptor( diff --git a/examples/client/main.go b/examples/client/main.go index 76282fa30..23e3d8052 100644 --- a/examples/client/main.go +++ b/examples/client/main.go @@ -11,11 +11,6 @@ import ( "syscall" "time" - grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/timeout" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/oklog/run" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" @@ -28,6 +23,12 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" grpcMetadata "google.golang.org/grpc/metadata" + + grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/timeout" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) const ( diff --git a/examples/server/main.go b/examples/server/main.go index 8250d08a2..72be33550 100644 --- a/examples/server/main.go +++ b/examples/server/main.go @@ -12,14 +12,6 @@ import ( "runtime/debug" "syscall" - grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/selector" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/oklog/run" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" @@ -34,6 +26,15 @@ import ( "google.golang.org/grpc/codes" healthpb "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/status" + + grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/selector" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) const ( diff --git a/interceptors/auth/auth.go b/interceptors/auth/auth.go index c1b3bdeee..2dfc7b424 100644 --- a/interceptors/auth/auth.go +++ b/interceptors/auth/auth.go @@ -6,8 +6,9 @@ package auth import ( "context" - middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2" "google.golang.org/grpc" + + middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2" ) // AuthFunc is the pluggable function that performs authentication. diff --git a/interceptors/auth/auth_test.go b/interceptors/auth/auth_test.go index 57769365a..48eba862d 100644 --- a/interceptors/auth/auth_test.go +++ b/interceptors/auth/auth_test.go @@ -9,9 +9,6 @@ import ( "testing" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "golang.org/x/oauth2" @@ -20,6 +17,10 @@ import ( "google.golang.org/grpc/credentials/oauth" grpcMetadata "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) type authedMarker struct{} diff --git a/interceptors/auth/examples_test.go b/interceptors/auth/examples_test.go index 5ac50ba14..42b24578f 100644 --- a/interceptors/auth/examples_test.go +++ b/interceptors/auth/examples_test.go @@ -7,12 +7,13 @@ import ( "context" "log" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) type tokenInfoKey struct{} diff --git a/interceptors/auth/metadata_test.go b/interceptors/auth/metadata_test.go index 747a57de9..fae06dd39 100644 --- a/interceptors/auth/metadata_test.go +++ b/interceptors/auth/metadata_test.go @@ -7,12 +7,13 @@ import ( "context" "testing" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" grpcMetadata "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" ) func TestAuthFromMD(t *testing.T) { diff --git a/interceptors/client_test.go b/interceptors/client_test.go index 82084da3b..e7ed80dfd 100644 --- a/interceptors/client_test.go +++ b/interceptors/client_test.go @@ -12,13 +12,14 @@ import ( "testing" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) type mockReport struct { diff --git a/interceptors/logging/examples/kit/example_test.go b/interceptors/logging/examples/kit/example_test.go index e41bada31..7ff11b16e 100644 --- a/interceptors/logging/examples/kit/example_test.go +++ b/interceptors/logging/examples/kit/example_test.go @@ -9,8 +9,9 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" ) // InterceptorLogger adapts go-kit logger to interceptor logger. diff --git a/interceptors/logging/examples/log/example_test.go b/interceptors/logging/examples/log/example_test.go index 44dacc56e..092d4a755 100644 --- a/interceptors/logging/examples/log/example_test.go +++ b/interceptors/logging/examples/log/example_test.go @@ -9,8 +9,9 @@ import ( "log" "os" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" ) // InterceptorLogger adapts standard Go logger to interceptor logger. diff --git a/interceptors/logging/examples/logr/example_test.go b/interceptors/logging/examples/logr/example_test.go index 8f1bf89d3..49dc5140c 100644 --- a/interceptors/logging/examples/logr/example_test.go +++ b/interceptors/logging/examples/logr/example_test.go @@ -8,9 +8,10 @@ import ( "fmt" "github.com/go-logr/logr" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "google.golang.org/grpc" "k8s.io/klog/v2" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" ) // verbosity https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/logging.md#what-method-to-use diff --git a/interceptors/logging/examples/logrus/example_test.go b/interceptors/logging/examples/logrus/example_test.go index 23e33a3b7..7ffc7741f 100644 --- a/interceptors/logging/examples/logrus/example_test.go +++ b/interceptors/logging/examples/logrus/example_test.go @@ -7,9 +7,10 @@ import ( "context" "fmt" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "github.com/sirupsen/logrus" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" ) // InterceptorLogger adapts logrus logger to interceptor logger. diff --git a/interceptors/logging/examples/skip_healthchecks/example_test.go b/interceptors/logging/examples/skip_healthchecks/example_test.go index 920d9f949..9ed64b89e 100644 --- a/interceptors/logging/examples/skip_healthchecks/example_test.go +++ b/interceptors/logging/examples/skip_healthchecks/example_test.go @@ -7,10 +7,11 @@ import ( "context" "fmt" + "google.golang.org/grpc" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/selector" - "google.golang.org/grpc" ) func InterceptorLogger() logging.Logger { @@ -25,7 +26,6 @@ func SkipHealthAndReflectionRequests(_ context.Context, c interceptors.CallMeta) } func ExampleInterceptorLogger() { - opts := []logging.Option{ logging.WithLogOnEvents(logging.StartCall, logging.FinishCall), } diff --git a/interceptors/logging/examples/slog/example_test.go b/interceptors/logging/examples/slog/example_test.go index 979305f41..118812463 100644 --- a/interceptors/logging/examples/slog/example_test.go +++ b/interceptors/logging/examples/slog/example_test.go @@ -8,8 +8,9 @@ import ( "log/slog" "os" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" ) // InterceptorLogger adapts slog logger to interceptor logger. diff --git a/interceptors/logging/examples/zap/example_test.go b/interceptors/logging/examples/zap/example_test.go index fd3041751..b941d0a7b 100644 --- a/interceptors/logging/examples/zap/example_test.go +++ b/interceptors/logging/examples/zap/example_test.go @@ -7,9 +7,10 @@ import ( "context" "fmt" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "go.uber.org/zap" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" ) // InterceptorLogger adapts zap logger to interceptor logger. diff --git a/interceptors/logging/examples/zerolog/example_test.go b/interceptors/logging/examples/zerolog/example_test.go index 76fe24403..e45d95b50 100644 --- a/interceptors/logging/examples/zerolog/example_test.go +++ b/interceptors/logging/examples/zerolog/example_test.go @@ -8,9 +8,10 @@ import ( "fmt" "os" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "github.com/rs/zerolog" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" ) // InterceptorLogger adapts zerolog logger to interceptor logger. diff --git a/interceptors/logging/interceptors.go b/interceptors/logging/interceptors.go index 3d6c28868..44bbb1dab 100644 --- a/interceptors/logging/interceptors.go +++ b/interceptors/logging/interceptors.go @@ -10,10 +10,11 @@ import ( "io" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" "google.golang.org/grpc" "google.golang.org/grpc/peer" "google.golang.org/protobuf/proto" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" ) type reporter struct { diff --git a/interceptors/logging/interceptors_test.go b/interceptors/logging/interceptors_test.go index a2178dcdb..1f9994950 100644 --- a/interceptors/logging/interceptors_test.go +++ b/interceptors/logging/interceptors_test.go @@ -18,9 +18,6 @@ import ( "testing" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" @@ -28,6 +25,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) type testDisposableFields map[string]string diff --git a/interceptors/logging/options.go b/interceptors/logging/options.go index a97505f25..452194b9c 100644 --- a/interceptors/logging/options.go +++ b/interceptors/logging/options.go @@ -8,9 +8,10 @@ import ( "fmt" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" ) // LoggableEvent defines the events a log line can be added on. diff --git a/interceptors/protovalidate/example_stream_test.go b/interceptors/protovalidate/example_stream_test.go index 116b62aa3..f795c6f24 100644 --- a/interceptors/protovalidate/example_stream_test.go +++ b/interceptors/protovalidate/example_stream_test.go @@ -7,9 +7,10 @@ import ( "net" "buf.build/go/protovalidate" + "google.golang.org/grpc" + protovalidate_middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/protovalidate" testvalidatev1 "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testvalidate/v1" - "google.golang.org/grpc" ) type StreamService struct { diff --git a/interceptors/protovalidate/example_unary_test.go b/interceptors/protovalidate/example_unary_test.go index 8568e3987..e8fcf72e5 100644 --- a/interceptors/protovalidate/example_unary_test.go +++ b/interceptors/protovalidate/example_unary_test.go @@ -8,9 +8,10 @@ import ( "net" "buf.build/go/protovalidate" + "google.golang.org/grpc" + protovalidate_middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/protovalidate" testvalidatev1 "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testvalidate/v1" - "google.golang.org/grpc" ) type UnaryService struct { diff --git a/interceptors/protovalidate/protovalidate_test.go b/interceptors/protovalidate/protovalidate_test.go index 8adbac028..3611f163b 100644 --- a/interceptors/protovalidate/protovalidate_test.go +++ b/interceptors/protovalidate/protovalidate_test.go @@ -11,9 +11,6 @@ import ( "buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate" "buf.build/go/protovalidate" - protovalidate_middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/protovalidate" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testvalidate" - testvalidatev1 "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testvalidate/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc" @@ -24,6 +21,10 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/types/descriptorpb" + + protovalidate_middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/protovalidate" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testvalidate" + testvalidatev1 "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testvalidate/v1" ) func TestUnaryServerInterceptor(t *testing.T) { diff --git a/interceptors/ratelimit/examples_test.go b/interceptors/ratelimit/examples_test.go index 73fa96272..62439bcb2 100644 --- a/interceptors/ratelimit/examples_test.go +++ b/interceptors/ratelimit/examples_test.go @@ -6,8 +6,9 @@ package ratelimit_test import ( "context" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/ratelimit" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/ratelimit" ) // alwaysPassLimiter is an example limiter which implements Limiter interface. diff --git a/interceptors/realip/examples_test.go b/interceptors/realip/examples_test.go index 12a7aa320..2c3efb236 100644 --- a/interceptors/realip/examples_test.go +++ b/interceptors/realip/examples_test.go @@ -6,8 +6,9 @@ package realip_test import ( "net/netip" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/realip" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/realip" ) // Simple example of a unary server initialization code. diff --git a/interceptors/recovery/examples_test.go b/interceptors/recovery/examples_test.go index e3e767c4c..8dd06a794 100644 --- a/interceptors/recovery/examples_test.go +++ b/interceptors/recovery/examples_test.go @@ -7,10 +7,11 @@ package recovery_test import ( - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery" ) var customFunc recovery.RecoveryHandlerFunc diff --git a/interceptors/recovery/interceptors_test.go b/interceptors/recovery/interceptors_test.go index 9f4c03d0f..a271b3eee 100644 --- a/interceptors/recovery/interceptors_test.go +++ b/interceptors/recovery/interceptors_test.go @@ -10,12 +10,13 @@ import ( "context" "testing" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/stretchr/testify/suite" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) type recoveryAssertService struct { diff --git a/interceptors/retry/examples_test.go b/interceptors/retry/examples_test.go index 469ff70e7..2d10bb15d 100644 --- a/interceptors/retry/examples_test.go +++ b/interceptors/retry/examples_test.go @@ -9,9 +9,10 @@ import ( "io" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) var cc *grpc.ClientConn diff --git a/interceptors/retry/retry.go b/interceptors/retry/retry.go index 9e6944fbf..1dabab59b 100644 --- a/interceptors/retry/retry.go +++ b/interceptors/retry/retry.go @@ -11,11 +11,12 @@ import ( "sync" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" "google.golang.org/grpc" "google.golang.org/grpc/codes" grpcMetadata "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" ) const ( diff --git a/interceptors/retry/retry_test.go b/interceptors/retry/retry_test.go index 0e21c88dd..4153cbb7e 100644 --- a/interceptors/retry/retry_test.go +++ b/interceptors/retry/retry_test.go @@ -13,7 +13,6 @@ import ( "testing" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" @@ -21,6 +20,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) var ( diff --git a/interceptors/selector/selector.go b/interceptors/selector/selector.go index 1431f8bf9..47d889d4d 100644 --- a/interceptors/selector/selector.go +++ b/interceptors/selector/selector.go @@ -6,8 +6,9 @@ package selector import ( "context" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" ) // Matcher allows matching. diff --git a/interceptors/selector/selector_example_test.go b/interceptors/selector/selector_example_test.go index 7349ddb43..e6b775b2a 100644 --- a/interceptors/selector/selector_example_test.go +++ b/interceptors/selector/selector_example_test.go @@ -6,14 +6,15 @@ package selector_test import ( "context" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/ratelimit" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/selector" - "google.golang.org/grpc" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) // alwaysPassLimiter is an example limiter which implements Limiter interface. diff --git a/interceptors/selector/selector_test.go b/interceptors/selector/selector_test.go index 90ff83aa1..92b085186 100644 --- a/interceptors/selector/selector_test.go +++ b/interceptors/selector/selector_test.go @@ -8,10 +8,11 @@ import ( "errors" "testing" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" ) // allow matches only given methods. diff --git a/interceptors/server_test.go b/interceptors/server_test.go index f7e523dc7..c1c2b7554 100644 --- a/interceptors/server_test.go +++ b/interceptors/server_test.go @@ -12,12 +12,13 @@ import ( "testing" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/stretchr/testify/suite" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) func TestServerInterceptorSuite(t *testing.T) { diff --git a/interceptors/timeout/examples_test.go b/interceptors/timeout/examples_test.go index e7110e795..3d0b3b0b4 100644 --- a/interceptors/timeout/examples_test.go +++ b/interceptors/timeout/examples_test.go @@ -8,9 +8,10 @@ import ( "log" "time" + "google.golang.org/grpc" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/timeout" "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" - "google.golang.org/grpc" ) // Initialization shows an initialization sequence with a custom client request timeout. diff --git a/interceptors/timeout/timeout_test.go b/interceptors/timeout/timeout_test.go index 097dca2f1..a84d30685 100644 --- a/interceptors/timeout/timeout_test.go +++ b/interceptors/timeout/timeout_test.go @@ -8,11 +8,12 @@ import ( "testing" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/timeout" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/timeout" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) type TimeoutTestServiceServer struct { diff --git a/interceptors/validator/interceptors_test.go b/interceptors/validator/interceptors_test.go index 2bec4e98b..75b44523b 100644 --- a/interceptors/validator/interceptors_test.go +++ b/interceptors/validator/interceptors_test.go @@ -9,13 +9,14 @@ import ( "io" "testing" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/validator" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/validator" + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) type ValidatorTestSuite struct { diff --git a/interceptors/validator/validator_test.go b/interceptors/validator/validator_test.go index 9386a6212..ff8bf1bde 100644 --- a/interceptors/validator/validator_test.go +++ b/interceptors/validator/validator_test.go @@ -7,9 +7,10 @@ import ( "context" "testing" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) func TestValidateWrapper(t *testing.T) { diff --git a/metadata/metadata_test.go b/metadata/metadata_test.go index 604620ace..bc7d7132b 100644 --- a/metadata/metadata_test.go +++ b/metadata/metadata_test.go @@ -7,9 +7,10 @@ import ( "context" "testing" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" "github.com/stretchr/testify/assert" grpcMetadata "google.golang.org/grpc/metadata" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" ) type parentKey struct{} diff --git a/providers/prometheus/client_metrics.go b/providers/prometheus/client_metrics.go index 5c8ba2076..fe56a4182 100644 --- a/providers/prometheus/client_metrics.go +++ b/providers/prometheus/client_metrics.go @@ -4,9 +4,10 @@ package prometheus import ( - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" ) // ClientMetrics represents a collection of metrics to be registered on a diff --git a/providers/prometheus/client_test.go b/providers/prometheus/client_test.go index d19c611dd..a6b534907 100644 --- a/providers/prometheus/client_test.go +++ b/providers/prometheus/client_test.go @@ -8,11 +8,12 @@ import ( "io" "testing" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/stretchr/testify/suite" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) func TestClientInterceptorSuite(t *testing.T) { diff --git a/providers/prometheus/context_labels_test.go b/providers/prometheus/context_labels_test.go index c0e02b52b..864ee3355 100644 --- a/providers/prometheus/context_labels_test.go +++ b/providers/prometheus/context_labels_test.go @@ -8,12 +8,13 @@ import ( "testing" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" ) func TestContextLabels(t *testing.T) { diff --git a/providers/prometheus/reporter.go b/providers/prometheus/reporter.go index 268beb3e6..16d1f9b1b 100644 --- a/providers/prometheus/reporter.go +++ b/providers/prometheus/reporter.go @@ -7,8 +7,9 @@ import ( "context" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" "github.com/prometheus/client_golang/prometheus" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" ) type reporter struct { diff --git a/providers/prometheus/server_metrics.go b/providers/prometheus/server_metrics.go index fc7c845c6..a89d1e583 100644 --- a/providers/prometheus/server_metrics.go +++ b/providers/prometheus/server_metrics.go @@ -4,10 +4,11 @@ package prometheus import ( - "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc" "google.golang.org/grpc/reflection" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" ) // ServerMetrics represents a collection of metrics to be registered on a diff --git a/providers/prometheus/server_test.go b/providers/prometheus/server_test.go index 725e50fe4..57a4e2279 100644 --- a/providers/prometheus/server_test.go +++ b/providers/prometheus/server_test.go @@ -16,7 +16,6 @@ import ( "testing" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/testutil" @@ -25,6 +24,8 @@ import ( "github.com/stretchr/testify/suite" "google.golang.org/grpc" "google.golang.org/grpc/codes" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/testing/testpb" ) func TestServerInterceptorSuite(t *testing.T) { diff --git a/util/backoffutils/backoff_test.go b/util/backoffutils/backoff_test.go index 7ca54f681..2c693f99e 100644 --- a/util/backoffutils/backoff_test.go +++ b/util/backoffutils/backoff_test.go @@ -7,8 +7,9 @@ import ( "testing" "time" - "github.com/grpc-ecosystem/go-grpc-middleware/v2/util/backoffutils" "github.com/stretchr/testify/assert" + + "github.com/grpc-ecosystem/go-grpc-middleware/v2/util/backoffutils" ) // scale duration by a factor