Moved imports to v2; Moved to Go 1.14.2

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

README.md

@@ -27,7 +27,7 @@ some of them itself, but also will link to useful external repos.
 `middleware` itself provides support for chaining interceptors, here's an example:
 
 ```go
-import "github.com/grpc-ecosystem/go-grpc-middleware"
+import "github.com/grpc-ecosystem/go-grpc-middleware/v2"
 
 myServer := grpc.NewServer(
  grpc.StreamInterceptor(middleware.ChainStreamServer(

auth/auth.go

@@ -6,7 +6,7 @@ package auth
 import (
  "context"
 
- middleware "github.com/grpc-ecosystem/go-grpc-middleware"
+ middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2"
  "google.golang.org/grpc"
 )
 

auth/auth_test.go

@@ -9,10 +9,10 @@ import (
  "testing"
  "time"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/auth"
- "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting"
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
- "github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/auth"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/util/metautils"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"

auth/examples_test.go

@@ -3,8 +3,8 @@ package auth_test
 import (
  "context"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/auth"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tags"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/auth"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tags"
  "google.golang.org/grpc"
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/status"

auth/metadata.go

@@ -7,7 +7,7 @@ import (
  "context"
  "strings"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/util/metautils"
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/status"
 )

auth/metadata_test.go

@@ -7,7 +7,7 @@ import (
  "context"
  "testing"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/util/metautils"
  "github.com/stretchr/testify/assert"
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/metadata"

go.mod

@@ -1,4 +1,6 @@
-module github.com/grpc-ecosystem/go-grpc-middleware
+module github.com/grpc-ecosystem/go-grpc-middleware/v2
+
+go 1.14
 
 require (
  github.com/gogo/protobuf v1.2.1
@@ -10,5 +12,3 @@ require (
  google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
  google.golang.org/grpc v1.19.0
 )
-
-go 1.13

grpctesting/interceptor_suite.go

@@ -11,7 +11,7 @@ import (
  "runtime"
  "time"
 
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
  "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"
  "google.golang.org/grpc"

grpctesting/pingservice.go

@@ -12,7 +12,7 @@ import (
  "io"
  "testing"
 
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/status"
 )

interceptors/client_test.go

@@ -11,8 +11,8 @@ import (
  "testing"
  "time"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting"
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
  "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"
  "google.golang.org/grpc"

interceptors/logging/interceptors.go

@@ -6,8 +6,8 @@ import (
  "io"
  "time"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tags"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tags"
  "google.golang.org/grpc"
 )
 

interceptors/logging/interceptors_test.go

@@ -9,18 +9,18 @@ import (
  "sync"
  "testing"
 
- middleware "github.com/grpc-ecosystem/go-grpc-middleware"
- "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/logging"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tags"
+ middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting"
+ "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/tags"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"
  "google.golang.org/grpc"
  "google.golang.org/grpc/codes"
 
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
 )
 
 var (

interceptors/logging/logging.go

@@ -8,7 +8,7 @@ import (
  "io"
 
  "github.com/golang/protobuf/proto"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors"
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/status"
 )

interceptors/logging/payload.go

@@ -8,8 +8,8 @@ import (
 
  "github.com/golang/protobuf/jsonpb"
  "github.com/golang/protobuf/proto"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tags"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tags"
  "google.golang.org/grpc"
 )
 

interceptors/logging/payload_test.go

@@ -8,12 +8,12 @@ import (
  "strings"
  "testing"
 
- middleware "github.com/grpc-ecosystem/go-grpc-middleware"
- "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting"
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/logging"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tags"
+ middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
+ "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/tags"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"

interceptors/ratelimit/examples_test.go

@@ -1,8 +1,8 @@
 package ratelimit_test
 
 import (
- middleware "github.com/grpc-ecosystem/go-grpc-middleware"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/ratelimit"
+ middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/ratelimit"
  "google.golang.org/grpc"
 )
 

interceptors/recovery/examples_test.go

@@ -4,8 +4,8 @@
 package recovery_test
 
 import (
- middleware "github.com/grpc-ecosystem/go-grpc-middleware"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/recovery"
+ middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery"
  "google.golang.org/grpc"
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/status"

interceptors/recovery/interceptors_test.go

@@ -7,10 +7,10 @@ import (
  "context"
  "testing"
 
- middleware "github.com/grpc-ecosystem/go-grpc-middleware"
- "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting"
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/recovery"
+ middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"

interceptors/retry/backoff.go

@@ -6,7 +6,7 @@ package retry
 import (
  "time"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/util/backoffutils"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/util/backoffutils"
 )
 
 // BackoffLinear is very simple: it waits for a fixed period of time between calls.

interceptors/retry/examples_test.go

@@ -9,8 +9,8 @@ import (
  "io"
  "time"
 
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/retry"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/retry"
  "google.golang.org/grpc"
  "google.golang.org/grpc/codes"
 )

interceptors/retry/retry.go

@@ -10,7 +10,7 @@ import (
  "sync"
  "time"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/util/metautils"
  "golang.org/x/net/trace"
  "google.golang.org/grpc"
  "google.golang.org/grpc/codes"

interceptors/retry/retry_test.go

@@ -10,10 +10,10 @@ import (
  "testing"
  "time"
 
- middleware "github.com/grpc-ecosystem/go-grpc-middleware"
- "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting"
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/retry"
+ middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/retry"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"

interceptors/server_test.go

@@ -11,10 +11,10 @@ import (
  "testing"
  "time"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting"
  "google.golang.org/grpc/status"
 
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
  "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"
  "google.golang.org/grpc"

interceptors/tags/examples_test.go

@@ -1,7 +1,7 @@
 package tags_test
 
 import (
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tags"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tags"
  "google.golang.org/grpc"
 )
 

interceptors/tags/fieldextractor_test.go

@@ -7,9 +7,9 @@ import (
  "testing"
  "time"
 
- pb_gogotestproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/gogotestproto"
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tags"
+ pb_gogotestproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/gogotestproto"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tags"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
 )

interceptors/tags/interceptors.go

@@ -7,7 +7,7 @@ import (
  "context"
  "time"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors"
  "google.golang.org/grpc"
  "google.golang.org/grpc/peer"
 )

interceptors/tags/interceptors_test.go

@@ -7,9 +7,9 @@ import (
  "testing"
  "time"
 
- grpctesting "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting"
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tags"
+ grpctesting "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tags"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"

interceptors/tracing/client.go

@@ -8,8 +8,8 @@ import (
  "io"
  "time"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors"
- "github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/util/metautils"
  "github.com/opentracing/opentracing-go"
  "github.com/opentracing/opentracing-go/ext"
  "github.com/opentracing/opentracing-go/log"

interceptors/tracing/id_extract.go

@@ -3,7 +3,7 @@ package tracing
 import (
  "strings"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tags"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tags"
  "github.com/opentracing/opentracing-go"
  "google.golang.org/grpc/grpclog"
 )

interceptors/tracing/interceptors_test.go

@@ -13,7 +13,7 @@ import (
  "strings"
  "testing"
 
- middleware "github.com/grpc-ecosystem/go-grpc-middleware"
+ middleware "github.com/grpc-ecosystem/go-grpc-middleware/v2"
  "github.com/opentracing/opentracing-go"
  "github.com/opentracing/opentracing-go/mocktracer"
  "github.com/stretchr/testify/assert"
@@ -22,10 +22,10 @@ import (
  "google.golang.org/grpc"
  "google.golang.org/grpc/codes"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting"
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tags"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tracing"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tags"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tracing"
 )
 
 var (

interceptors/tracing/server.go

@@ -7,9 +7,9 @@ import (
  "context"
  "time"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/tags"
- "github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tags"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/util/metautils"
  "github.com/opentracing/opentracing-go"
  "github.com/opentracing/opentracing-go/ext"
  "github.com/opentracing/opentracing-go/log"

interceptors/validator/validator_test.go

@@ -7,9 +7,9 @@ import (
  "io"
  "testing"
 
- "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting"
- pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/grpctesting/testproto"
- "github.com/grpc-ecosystem/go-grpc-middleware/interceptors/validator"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting"
+ pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/v2/grpctesting/testproto"
+ "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/validator"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"