Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/auth
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2019-01-14 13:29:56 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-01-14 14:52:18 +0300
commitc07aae65345e7da6929eb03e5085ea9093c020cf (patch)
treecc0db5314fce8e6caf8844db75d9ccfbdae8b831 /auth
parent4f46cf40ea14cb15157143a79fae3d8dcee38963 (diff)
Replace net/context with context package
Leveraging `go fix` these changes were made, I only applied some regexp to get the import grouping correct. The old package can't be removed from vendor directory yet, as other dependencies depend on it.
Diffstat (limited to 'auth')
-rw-r--r--auth/extract_test.go2
-rw-r--r--auth/rpccredentials.go2
-rw-r--r--auth/token.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/auth/extract_test.go b/auth/extract_test.go
index 7d6df8fb0..db742ddec 100644
--- a/auth/extract_test.go
+++ b/auth/extract_test.go
@@ -1,12 +1,12 @@
package gitalyauth
import (
+ "context"
"testing"
"time"
"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
"github.com/stretchr/testify/require"
- "golang.org/x/net/context"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/metadata"
diff --git a/auth/rpccredentials.go b/auth/rpccredentials.go
index c35cd4d61..ca54901da 100644
--- a/auth/rpccredentials.go
+++ b/auth/rpccredentials.go
@@ -1,12 +1,12 @@
package gitalyauth
import (
+ "context"
"encoding/base64"
"fmt"
"strconv"
"time"
- "golang.org/x/net/context"
"google.golang.org/grpc/credentials"
)
diff --git a/auth/token.go b/auth/token.go
index a5b5747c4..6eb62e6d9 100644
--- a/auth/token.go
+++ b/auth/token.go
@@ -1,6 +1,7 @@
package gitalyauth
import (
+ "context"
"crypto/hmac"
"crypto/sha256"
"crypto/subtle"
@@ -11,7 +12,6 @@ import (
"time"
grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth"
- "golang.org/x/net/context"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)