From d430999f3163aa905644d6267a8f62348852d232 Mon Sep 17 00:00:00 2001 From: Avishalom Shalit Date: Wed, 7 Feb 2018 18:09:00 -0500 Subject: [PATCH 1/2] import context from standard package --- auth/auth.go | 2 +- auth/auth_appengine.go | 2 +- auth/auth_test.go | 2 +- auth/user_mgt.go | 2 +- auth/user_mgt_test.go | 2 +- firebase.go | 2 +- firebase_test.go | 2 +- iid/iid.go | 3 +-- iid/iid_test.go | 3 +-- integration/auth/auth_test.go | 3 +-- integration/auth/user_mgt_test.go | 3 +-- integration/internal/internal.go | 3 +-- integration/storage/storage_test.go | 2 +- internal/http_client.go | 3 +-- internal/http_client_test.go | 3 +-- storage/storage_test.go | 2 +- 16 files changed, 16 insertions(+), 23 deletions(-) diff --git a/auth/auth.go b/auth/auth.go index f6605c7b..a0b206a8 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -16,6 +16,7 @@ package auth import ( + "context" "crypto/rsa" "crypto/x509" "encoding/json" @@ -25,7 +26,6 @@ import ( "strings" "firebase.google.com/go/internal" - "golang.org/x/net/context" "google.golang.org/api/identitytoolkit/v3" "google.golang.org/api/transport" ) diff --git a/auth/auth_appengine.go b/auth/auth_appengine.go index 351f61c1..5e05cdb1 100644 --- a/auth/auth_appengine.go +++ b/auth/auth_appengine.go @@ -17,7 +17,7 @@ package auth import ( - "golang.org/x/net/context" + "context" "google.golang.org/appengine" ) diff --git a/auth/auth_test.go b/auth/auth_test.go index 690b5d6f..2676f6c4 100644 --- a/auth/auth_test.go +++ b/auth/auth_test.go @@ -15,6 +15,7 @@ package auth import ( + "context" "encoding/json" "errors" "fmt" @@ -25,7 +26,6 @@ import ( "testing" "time" - "golang.org/x/net/context" "golang.org/x/oauth2/google" "google.golang.org/api/option" diff --git a/auth/user_mgt.go b/auth/user_mgt.go index 423ceece..551753ea 100644 --- a/auth/user_mgt.go +++ b/auth/user_mgt.go @@ -15,6 +15,7 @@ package auth import ( + "context" "encoding/json" "fmt" "net/http" @@ -23,7 +24,6 @@ import ( "strings" "time" - "golang.org/x/net/context" "google.golang.org/api/identitytoolkit/v3" "google.golang.org/api/iterator" ) diff --git a/auth/user_mgt_test.go b/auth/user_mgt_test.go index db7b7300..6a95312a 100644 --- a/auth/user_mgt_test.go +++ b/auth/user_mgt_test.go @@ -16,6 +16,7 @@ package auth import ( "bytes" + "context" "encoding/json" "fmt" "io/ioutil" @@ -28,7 +29,6 @@ import ( "firebase.google.com/go/internal" - "golang.org/x/net/context" "golang.org/x/oauth2" "google.golang.org/api/identitytoolkit/v3" "google.golang.org/api/iterator" diff --git a/firebase.go b/firebase.go index ed09ac6d..b533c12d 100644 --- a/firebase.go +++ b/firebase.go @@ -18,6 +18,7 @@ package firebase import ( + "context" "encoding/json" "errors" "io/ioutil" @@ -31,7 +32,6 @@ import ( "firebase.google.com/go/messaging" "firebase.google.com/go/storage" - "golang.org/x/net/context" "golang.org/x/oauth2/google" "google.golang.org/api/option" "google.golang.org/api/transport" diff --git a/firebase_test.go b/firebase_test.go index 7b17755b..fc3d50d3 100644 --- a/firebase_test.go +++ b/firebase_test.go @@ -15,6 +15,7 @@ package firebase import ( + "context" "fmt" "io/ioutil" "log" @@ -32,7 +33,6 @@ import ( "encoding/json" - "golang.org/x/net/context" "golang.org/x/oauth2" "google.golang.org/api/option" ) diff --git a/iid/iid.go b/iid/iid.go index 980a7bed..b282db40 100644 --- a/iid/iid.go +++ b/iid/iid.go @@ -16,6 +16,7 @@ package iid import ( + "context" "errors" "fmt" "net/http" @@ -23,8 +24,6 @@ import ( "google.golang.org/api/transport" "firebase.google.com/go/internal" - - "golang.org/x/net/context" ) const iidEndpoint = "https://console.firebase.google.com/v1" diff --git a/iid/iid_test.go b/iid/iid_test.go index 6d154650..b3e69638 100644 --- a/iid/iid_test.go +++ b/iid/iid_test.go @@ -15,6 +15,7 @@ package iid import ( + "context" "fmt" "net/http" "net/http/httptest" @@ -23,8 +24,6 @@ import ( "google.golang.org/api/option" "firebase.google.com/go/internal" - - "golang.org/x/net/context" ) var testIIDConfig = &internal.InstanceIDConfig{ diff --git a/integration/auth/auth_test.go b/integration/auth/auth_test.go index 5e027d44..33d8cf2c 100644 --- a/integration/auth/auth_test.go +++ b/integration/auth/auth_test.go @@ -17,6 +17,7 @@ package auth import ( "bytes" + "context" "encoding/json" "flag" "fmt" @@ -29,8 +30,6 @@ import ( "firebase.google.com/go/auth" "firebase.google.com/go/integration/internal" - - "golang.org/x/net/context" ) const apiURL = "https://www.googleapis.com/identitytoolkit/v3/relyingparty/verifyCustomToken?key=%s" diff --git a/integration/auth/user_mgt_test.go b/integration/auth/user_mgt_test.go index 4c19f6e5..4121d62c 100644 --- a/integration/auth/user_mgt_test.go +++ b/integration/auth/user_mgt_test.go @@ -16,6 +16,7 @@ package auth import ( + "context" "fmt" "reflect" "testing" @@ -24,8 +25,6 @@ import ( "google.golang.org/api/iterator" "firebase.google.com/go/auth" - - "golang.org/x/net/context" ) var testFixtures = struct { diff --git a/integration/internal/internal.go b/integration/internal/internal.go index bc52a16a..1fe112a3 100644 --- a/integration/internal/internal.go +++ b/integration/internal/internal.go @@ -16,14 +16,13 @@ package internal import ( + "context" "encoding/json" "go/build" "io/ioutil" "path/filepath" "strings" - "golang.org/x/net/context" - firebase "firebase.google.com/go" "google.golang.org/api/option" ) diff --git a/integration/storage/storage_test.go b/integration/storage/storage_test.go index 5efe92d2..b6fc2301 100644 --- a/integration/storage/storage_test.go +++ b/integration/storage/storage_test.go @@ -15,6 +15,7 @@ package storage import ( + "context" "flag" "fmt" "io/ioutil" @@ -25,7 +26,6 @@ import ( gcs "cloud.google.com/go/storage" "firebase.google.com/go/integration/internal" "firebase.google.com/go/storage" - "golang.org/x/net/context" ) var ctx context.Context diff --git a/internal/http_client.go b/internal/http_client.go index bd40c366..984e8a1d 100644 --- a/internal/http_client.go +++ b/internal/http_client.go @@ -16,13 +16,12 @@ package internal import ( "bytes" + "context" "encoding/json" "fmt" "io" "io/ioutil" "net/http" - - "golang.org/x/net/context" ) // HTTPClient is a convenient API to make HTTP calls. diff --git a/internal/http_client_test.go b/internal/http_client_test.go index bdac7474..14729d17 100644 --- a/internal/http_client_test.go +++ b/internal/http_client_test.go @@ -14,14 +14,13 @@ package internal import ( + "context" "encoding/json" "io/ioutil" "net/http" "net/http/httptest" "reflect" "testing" - - "golang.org/x/net/context" ) var cases = []struct { diff --git a/storage/storage_test.go b/storage/storage_test.go index 833aedf3..7a77e60c 100644 --- a/storage/storage_test.go +++ b/storage/storage_test.go @@ -15,12 +15,12 @@ package storage import ( + "context" "testing" "google.golang.org/api/option" "firebase.google.com/go/internal" - "golang.org/x/net/context" ) var opts = []option.ClientOption{ From 1798a7758a2dd68dcd109edccb05b6860921395a Mon Sep 17 00:00:00 2001 From: Avishalom Shalit Date: Tue, 27 Feb 2018 14:39:54 -0500 Subject: [PATCH 2/2] context import --- auth/auth_std.go | 2 +- integration/firestore/firestore_test.go | 3 +-- integration/iid/iid_test.go | 3 +-- integration/messaging/messaging_test.go | 3 +-- messaging/messaging.go | 3 +-- messaging/messaging_test.go | 2 +- snippets/auth.go | 2 +- snippets/messaging.go | 2 +- storage/storage.go | 3 +-- 9 files changed, 9 insertions(+), 14 deletions(-) diff --git a/auth/auth_std.go b/auth/auth_std.go index 2055af38..f593a7cc 100644 --- a/auth/auth_std.go +++ b/auth/auth_std.go @@ -16,7 +16,7 @@ package auth -import "golang.org/x/net/context" +import "context" func newSigner(ctx context.Context) (signer, error) { return serviceAcctSigner{}, nil diff --git a/integration/firestore/firestore_test.go b/integration/firestore/firestore_test.go index 6e7b4e28..6c367205 100644 --- a/integration/firestore/firestore_test.go +++ b/integration/firestore/firestore_test.go @@ -15,13 +15,12 @@ package firestore import ( + "context" "log" "reflect" "testing" "firebase.google.com/go/integration/internal" - - "golang.org/x/net/context" ) func TestFirestore(t *testing.T) { diff --git a/integration/iid/iid_test.go b/integration/iid/iid_test.go index 9be5dce0..55cf5620 100644 --- a/integration/iid/iid_test.go +++ b/integration/iid/iid_test.go @@ -16,6 +16,7 @@ package iid import ( + "context" "flag" "log" "os" @@ -23,8 +24,6 @@ import ( "firebase.google.com/go/iid" "firebase.google.com/go/integration/internal" - - "golang.org/x/net/context" ) var client *iid.Client diff --git a/integration/messaging/messaging_test.go b/integration/messaging/messaging_test.go index d7bb0693..231aab34 100644 --- a/integration/messaging/messaging_test.go +++ b/integration/messaging/messaging_test.go @@ -15,14 +15,13 @@ package messaging import ( + "context" "flag" "log" "os" "regexp" "testing" - "golang.org/x/net/context" - "firebase.google.com/go/integration/internal" "firebase.google.com/go/messaging" ) diff --git a/messaging/messaging.go b/messaging/messaging.go index 97b77d64..a3d71e97 100644 --- a/messaging/messaging.go +++ b/messaging/messaging.go @@ -17,6 +17,7 @@ package messaging import ( + "context" "encoding/json" "errors" "fmt" @@ -25,8 +26,6 @@ import ( "strings" "time" - "golang.org/x/net/context" - "firebase.google.com/go/internal" "google.golang.org/api/transport" ) diff --git a/messaging/messaging_test.go b/messaging/messaging_test.go index 6706f217..53b0650a 100644 --- a/messaging/messaging_test.go +++ b/messaging/messaging_test.go @@ -15,6 +15,7 @@ package messaging import ( + "context" "encoding/json" "io/ioutil" "net/http" @@ -25,7 +26,6 @@ import ( "time" "firebase.google.com/go/internal" - "golang.org/x/net/context" "google.golang.org/api/option" ) diff --git a/snippets/auth.go b/snippets/auth.go index 68847869..d9548e94 100644 --- a/snippets/auth.go +++ b/snippets/auth.go @@ -15,11 +15,11 @@ package snippets import ( + "context" "log" firebase "firebase.google.com/go" "firebase.google.com/go/auth" - "golang.org/x/net/context" "google.golang.org/api/iterator" ) diff --git a/snippets/messaging.go b/snippets/messaging.go index f558b40c..18f6e462 100644 --- a/snippets/messaging.go +++ b/snippets/messaging.go @@ -15,13 +15,13 @@ package snippets import ( + "context" "fmt" "log" "time" "firebase.google.com/go" "firebase.google.com/go/messaging" - "golang.org/x/net/context" ) func sendToToken(app *firebase.App) { diff --git a/storage/storage.go b/storage/storage.go index 985b6eb7..878e2175 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -16,12 +16,11 @@ package storage import ( + "context" "errors" "cloud.google.com/go/storage" "firebase.google.com/go/internal" - - "golang.org/x/net/context" ) // Client is the interface for the Firebase Storage service.