Support Go 1.6 (#120)

tbpg · hiranya911 · commit c8a6b24e1b7a · 2018-06-11T16:51:39.000-07:00
* all: use golang.org/x/net/context

* internal: use ctxhttp to use /x/ context

The 1.6 Request type doesn't have WithContext.

* all: don't use subtests to keep 1.6 compatibility

* integration: use float64 for fields with exp value

Values like -7e+07 cannot be parsed into ints in Go 1.6. So, use
floats instead.

* integration/messaging: use t.Fatal not log.Fatal

* travis: add 1.6.x

* changelog: mention addition of 1.6 support

* readme: mention go version support
diff --git a/README.md b/README.md
@@ -20,6 +20,8 @@ Admin Go SDK enables access to Firebase services from privileged environments
 (such as servers or cloud) in Go. Currently this SDK provides
 Firebase custom authentication support.
 
+Go versions >= 1.6 are supported.
+
 For more information, visit the
 [Firebase Admin SDK setup guide](https://firebase.google.com/docs/admin/setup/).
 
diff --git a/auth/auth.go b/auth/auth.go
@@ -16,7 +16,6 @@
 package auth
 
 import (
-	"context"
 	"crypto/rsa"
 	"encoding/json"
 	"errors"
diff --git a/auth/auth_appengine.go b/auth/auth_appengine.go
@@ -17,7 +17,7 @@
 package auth
 
 import (
-	"context"
+	"golang.org/x/net/context"
 
 	"google.golang.org/appengine"
 )
diff --git a/auth/auth_std.go b/auth/auth_std.go
@@ -16,7 +16,7 @@
 
 package auth // import "firebase.google.com/go/auth"
 
-import "context"
+import "golang.org/x/net/context"
 
 func newSigner(ctx context.Context) (signer, error) {
 	return serviceAcctSigner{}, nil
diff --git a/auth/auth_test.go b/auth/auth_test.go
@@ -15,7 +15,6 @@
 package auth
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
diff --git a/auth/user_mgt.go b/auth/user_mgt.go
@@ -15,7 +15,6 @@
 package auth
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
diff --git a/auth/user_mgt_test.go b/auth/user_mgt_test.go
@@ -16,7 +16,6 @@ package auth
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
diff --git a/firebase.go b/firebase.go
@@ -18,7 +18,6 @@
 package firebase // import "firebase.google.com/go"
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"io/ioutil"
diff --git a/firebase_test.go b/firebase_test.go
@@ -15,7 +15,6 @@
 package firebase
 
 import (
-	"context"
 	"fmt"
 	"io/ioutil"
 	"log"
diff --git a/iid/iid.go b/iid/iid.go
@@ -16,7 +16,6 @@
 package iid // import "firebase.google.com/go/iid"
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"net/http"
diff --git a/iid/iid_test.go b/iid/iid_test.go
@@ -15,7 +15,6 @@
 package iid
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
diff --git a/integration/auth/auth_test.go b/integration/auth/auth_test.go
@@ -17,7 +17,6 @@ package auth
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"flag"
 	"fmt"
diff --git a/integration/auth/user_mgt_test.go b/integration/auth/user_mgt_test.go
@@ -16,7 +16,6 @@
 package auth
 
 import (
-	"context"
 	"fmt"
 	"reflect"
 	"testing"
diff --git a/integration/firestore/firestore_test.go b/integration/firestore/firestore_test.go
@@ -15,7 +15,6 @@
 package firestore
 
 import (
-	"context"
 	"log"
 	"reflect"
 	"testing"
diff --git a/integration/iid/iid_test.go b/integration/iid/iid_test.go
@@ -16,7 +16,6 @@
 package iid
 
 import (
-	"context"
 	"flag"
 	"log"
 	"os"
diff --git a/integration/internal/internal.go b/integration/internal/internal.go
@@ -16,14 +16,15 @@
 package internal
 
 import (
-	"context"
 	"encoding/json"
 	"go/build"
 	"io/ioutil"
 	"net/http"
 	"path/filepath"
 	"strings"
 
+	"golang.org/x/net/context"
+
 	firebase "firebase.google.com/go"
 	"firebase.google.com/go/internal"
 	"google.golang.org/api/option"
diff --git a/integration/messaging/messaging_test.go b/integration/messaging/messaging_test.go
@@ -15,13 +15,14 @@
 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/integration/storage/storage_test.go b/integration/storage/storage_test.go
@@ -15,7 +15,6 @@
 package storage
 
 import (
-	"context"
 	"flag"
 	"fmt"
 	"io/ioutil"
diff --git a/internal/http_client_test.go b/internal/http_client_test.go
@@ -14,13 +14,14 @@
 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/messaging/messaging.go b/messaging/messaging.go
@@ -17,7 +17,6 @@
 package messaging // import "firebase.google.com/go/messaging"
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -26,6 +25,8 @@ import (
 	"strings"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"firebase.google.com/go/internal"
 	"golang.org/x/net/context"
 
diff --git a/messaging/messaging_test.go b/messaging/messaging_test.go
@@ -15,7 +15,6 @@
 package messaging
 
 import (
-	"context"
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
diff --git a/snippets/auth.go b/snippets/auth.go
@@ -15,7 +15,6 @@
 package snippets
 
 import (
-	"context"
 	"log"
 
 	"golang.org/x/net/context"
diff --git a/snippets/messaging.go b/snippets/messaging.go
@@ -15,7 +15,6 @@
 package snippets
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"time"
diff --git a/storage/storage.go b/storage/storage.go
@@ -16,7 +16,6 @@
 package storage // import "firebase.google.com/go/storage"
 
 import (
-	"context"
 	"errors"
 
 	"golang.org/x/net/context"
diff --git a/storage/storage_test.go b/storage/storage_test.go
@@ -15,7 +15,6 @@
 package storage
 
 import (
-	"context"
 	"testing"
 
 	"golang.org/x/net/context"

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`package auth`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "context"`
	`20`	`+ "golang.org/x/net/context"`
`21`	`21`
`22`	`22`	`"google.golang.org/appengine"`
`23`	`23`	`)`