Use context from stdlib in google physical backends (#4922)

* Use context from stdlib in google physical backends * Do not prefix logs (Vault will do it)
hashicorp · Jul 13, 2018 · 1ce2513 · 1ce2513
1 parent 11c8eb8
commit 1ce2513
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/physical/gcs/gcs.go b/physical/gcs/gcs.go
@@ -1,6 +1,7 @@
 package gcs
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -18,7 +19,6 @@ import (
 
 	"cloud.google.com/go/storage"
 	"github.com/armon/go-metrics"
-	"golang.org/x/net/context"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 )

diff --git a/physical/gcs/gcs_ha.go b/physical/gcs/gcs_ha.go
@@ -1,6 +1,7 @@
 package gcs
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"sync"
@@ -12,7 +13,6 @@ import (
 	uuid "github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/vault/physical"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 	"google.golang.org/api/googleapi"
 )
 

diff --git a/physical/gcs/gcs_ha_test.go b/physical/gcs/gcs_ha_test.go
@@ -1,6 +1,7 @@
 package gcs
 
 import (
+	"context"
 	"fmt"
 	"math/rand"
 	"os"
@@ -11,7 +12,6 @@ import (
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/helper/logging"
 	"github.com/hashicorp/vault/physical"
-	"golang.org/x/net/context"
 )
 
 func TestHABackend(t *testing.T) {

diff --git a/physical/gcs/gcs_test.go b/physical/gcs/gcs_test.go
@@ -1,6 +1,7 @@
 package gcs
 
 import (
+	"context"
 	"fmt"
 	"math/rand"
 	"os"
@@ -11,7 +12,6 @@ import (
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/helper/logging"
 	"github.com/hashicorp/vault/physical"
-	"golang.org/x/net/context"
 	"google.golang.org/api/googleapi"
 )
 

diff --git a/physical/spanner/spanner.go b/physical/spanner/spanner.go
@@ -1,6 +1,7 @@
 package spanner
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"sort"
@@ -20,7 +21,6 @@ import (
 
 	"cloud.google.com/go/spanner"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 // Verify Backend satisfies the correct interfaces

diff --git a/physical/spanner/spanner_ha.go b/physical/spanner/spanner_ha.go
@@ -1,6 +1,7 @@
 package spanner
 
 import (
+	"context"
 	"fmt"
 	"sync"
 	"time"
@@ -11,7 +12,6 @@ import (
 	uuid "github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/vault/physical"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 )
 

diff --git a/physical/spanner/spanner_ha_test.go b/physical/spanner/spanner_ha_test.go
@@ -1,14 +1,14 @@
 package spanner
 
 import (
+	"context"
 	"os"
 	"testing"
 
 	"cloud.google.com/go/spanner"
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/helper/logging"
 	"github.com/hashicorp/vault/physical"
-	"golang.org/x/net/context"
 )
 
 func TestHABackend(t *testing.T) {

diff --git a/physical/spanner/spanner_test.go b/physical/spanner/spanner_test.go
@@ -1,14 +1,14 @@
 package spanner
 
 import (
+	"context"
 	"os"
 	"testing"
 
 	"cloud.google.com/go/spanner"
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/vault/helper/logging"
 	"github.com/hashicorp/vault/physical"
-	"golang.org/x/net/context"
 )
 
 func testCleanup(t testing.TB, client *spanner.Client, table string) {