golang.org/x/net/context => context (#201)

grpc-ecosystem · Jul 23, 2019 · e0797f4 · e0797f4
1 parent 606c733
commit e0797f4
Show file tree

Hide file tree

Showing 50 changed files with 227 additions and 139 deletions.
diff --git a/auth/auth.go b/auth/auth.go
@@ -4,8 +4,9 @@
 package grpc_auth
 
 import (
+	"context"
+
 	"github.com/grpc-ecosystem/go-grpc-middleware"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 

diff --git a/auth/auth_test.go b/auth/auth_test.go
@@ -4,13 +4,9 @@
 package grpc_auth_test
 
 import (
-	"testing"
-
-	"github.com/stretchr/testify/suite"
-	"google.golang.org/grpc"
-
+	"context"
 	"fmt"
-
+	"testing"
 	"time"
 
 	"github.com/grpc-ecosystem/go-grpc-middleware/auth"
@@ -19,8 +15,9 @@ import (
 	"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
+	"github.com/stretchr/testify/suite"
 	"golang.org/x/oauth2"
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/oauth"
 	"google.golang.org/grpc/metadata"

diff --git a/auth/examples_test.go b/auth/examples_test.go
@@ -1,9 +1,10 @@
 package grpc_auth_test
 
 import (
+	"context"
+
 	"github.com/grpc-ecosystem/go-grpc-middleware/auth"
 	"github.com/grpc-ecosystem/go-grpc-middleware/tags"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 )

diff --git a/auth/metadata.go b/auth/metadata.go
@@ -4,10 +4,10 @@
 package grpc_auth
 
 import (
+	"context"
 	"strings"
 
 	"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 )

diff --git a/auth/metadata_test.go b/auth/metadata_test.go
@@ -4,11 +4,11 @@
 package grpc_auth
 
 import (
+	"context"
 	"testing"
 
 	"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"

diff --git a/chain.go b/chain.go
@@ -6,7 +6,8 @@
 package grpc_middleware
 
 import (
-	"golang.org/x/net/context"
+	"context"
+
 	"google.golang.org/grpc"
 )
 

diff --git a/chain_test.go b/chain_test.go
@@ -4,11 +4,11 @@
 package grpc_middleware
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )

diff --git a/logging/common.go b/logging/common.go
@@ -4,7 +4,8 @@
 package grpc_logging
 
 import (
-	"golang.org/x/net/context"
+	"context"
+
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 )

diff --git a/logging/logrus/client_interceptors.go b/logging/logrus/client_interceptors.go
@@ -4,11 +4,11 @@
 package grpc_logrus
 
 import (
+	"context"
 	"path"
 	"time"
 
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 

diff --git a/logging/logrus/context.go b/logging/logrus/context.go
@@ -1,9 +1,10 @@
 package grpc_logrus
 
 import (
+	"context"
+
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 // AddFields adds logrus fields to the logger.

diff --git a/logging/logrus/ctxlogrus/context.go b/logging/logrus/ctxlogrus/context.go
@@ -1,9 +1,10 @@
 package ctxlogrus
 
 import (
+	"context"
+
 	"github.com/grpc-ecosystem/go-grpc-middleware/tags"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 type ctxLoggerMarker struct{}

diff --git a/logging/logrus/ctxlogrus/examples_test.go b/logging/logrus/ctxlogrus/examples_test.go
@@ -1,10 +1,11 @@
 package ctxlogrus_test
 
 import (
+	"context"
+
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
 	"github.com/grpc-ecosystem/go-grpc-middleware/tags"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 var logrusLogger *logrus.Logger

diff --git a/logging/logrus/examples_test.go b/logging/logrus/examples_test.go
@@ -1,6 +1,7 @@
 package grpc_logrus_test
 
 import (
+	"context"
 	"time"
 
 	"github.com/grpc-ecosystem/go-grpc-middleware"
@@ -9,7 +10,6 @@ import (
 	"github.com/grpc-ecosystem/go-grpc-middleware/tags/logrus"
 	pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/testing/testproto"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 

diff --git a/logging/logrus/options_test.go b/logging/logrus/options_test.go
@@ -1,9 +1,10 @@
 package grpc_logrus
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDurationToTimeMillisField(t *testing.T) {

diff --git a/logging/logrus/payload_interceptors.go b/logging/logrus/payload_interceptors.go
@@ -2,14 +2,14 @@ package grpc_logrus
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging"
 	"github.com/grpc-ecosystem/go-grpc-middleware/tags/logrus"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 

diff --git a/logging/logrus/payload_interceptors_test.go b/logging/logrus/payload_interceptors_test.go
@@ -1,6 +1,7 @@
 package grpc_logrus_test
 
 import (
+	"context"
 	"io"
 	"io/ioutil"
 	"runtime"
@@ -15,7 +16,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 

diff --git a/logging/logrus/server_interceptors.go b/logging/logrus/server_interceptors.go
@@ -3,14 +3,14 @@
 package grpc_logrus
 
 import (
+	"context"
 	"path"
 	"time"
 
 	"github.com/grpc-ecosystem/go-grpc-middleware"
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
 	"github.com/grpc-ecosystem/go-grpc-middleware/tags/logrus"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 

diff --git a/logging/logrus/shared_test.go b/logging/logrus/shared_test.go
@@ -2,6 +2,7 @@ package grpc_logrus_test
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"io"
 	"testing"
@@ -12,7 +13,6 @@ import (
 	"github.com/grpc-ecosystem/go-grpc-middleware/testing"
 	pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/testing/testproto"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 )
 

diff --git a/logging/zap/client_interceptors.go b/logging/zap/client_interceptors.go
@@ -4,12 +4,12 @@
 package grpc_zap
 
 import (
+	"context"
 	"path"
 	"time"
 
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 

diff --git a/logging/zap/context.go b/logging/zap/context.go
@@ -1,10 +1,11 @@
 package grpc_zap
 
 import (
+	"context"
+
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"golang.org/x/net/context"
 )
 
 // AddFields adds zap fields to the logger.

diff --git a/logging/zap/ctxzap/context.go b/logging/zap/ctxzap/context.go
@@ -1,10 +1,11 @@
 package ctxzap
 
 import (
+	"context"
+
 	"github.com/grpc-ecosystem/go-grpc-middleware/tags"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"golang.org/x/net/context"
 )
 
 type ctxMarker struct{}

diff --git a/logging/zap/options_test.go b/logging/zap/options_test.go
@@ -1,11 +1,12 @@
 package grpc_zap
 
 import (
-	"github.com/stretchr/testify/assert"
-	"go.uber.org/zap/zapcore"
 	"math"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"go.uber.org/zap/zapcore"
 )
 
 func TestDurationToTimeMillisField(t *testing.T) {

diff --git a/logging/zap/payload_interceptors.go b/logging/zap/payload_interceptors.go
@@ -2,6 +2,7 @@ package grpc_zap
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 
 	"github.com/golang/protobuf/jsonpb"
@@ -10,7 +11,6 @@ import (
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 

diff --git a/logging/zap/payload_interceptors_test.go b/logging/zap/payload_interceptors_test.go
@@ -1,22 +1,20 @@
 package grpc_zap_test
 
 import (
+	"context"
+	"io"
 	"runtime"
-	"testing"
-
 	"strings"
+	"testing"
 
 	"github.com/stretchr/testify/suite"
 	"google.golang.org/grpc"
 
-	"io"
-
 	"github.com/grpc-ecosystem/go-grpc-middleware"
 	"github.com/grpc-ecosystem/go-grpc-middleware/tags"
 	pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/testing/testproto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
 	"go.uber.org/zap"

diff --git a/logging/zap/server_interceptors.go b/logging/zap/server_interceptors.go
@@ -1,6 +1,7 @@
 package grpc_zap
 
 import (
+	"context"
 	"path"
 	"time"
 
@@ -9,7 +10,6 @@ import (
 	"github.com/grpc-ecosystem/go-grpc-middleware/tags/zap"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 

diff --git a/logging/zap/shared_test.go b/logging/zap/shared_test.go
@@ -2,6 +2,7 @@ package grpc_zap_test
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"io"
 	"testing"
@@ -12,7 +13,6 @@ import (
 	pb_testproto "github.com/grpc-ecosystem/go-grpc-middleware/testing/testproto"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"golang.org/x/net/context"
 )
 
 var (

diff --git a/makefile b/makefile
@@ -8,7 +8,8 @@ fmt:
 	go fmt $(GOFILES_NOVENDOR)
 
 vet:
-	go vet $(GOFILES_NOVENDOR)
+	# do not check lostcancel, they are intentional.
+	go vet -lostcancel=false $(GOFILES_NOVENDOR)
 
 test: vet
 	./scripts/test_all.sh

diff --git a/recovery/interceptors.go b/recovery/interceptors.go
@@ -4,7 +4,8 @@
 package grpc_recovery
 
 import (
-	"golang.org/x/net/context"
+	"context"
+
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 )