Support Go 1.6 (#120)

tbpg · avishalom · commit 0c849e992d63 · 2018-03-15T14:30:30.000-04: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/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: go
 
 go:
+  - 1.6.x
   - 1.7.x
   - 1.8.x
   - 1.9.x
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- [added] Added support for Go 1.6.
 - [changed] Fixed a bug in the
   [`UnsubscribeFromTopic()`](https://godoc.org/firebase.google.com/go/messaging#Client.UnsubscribeFromTopic)
   function.
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"
 	"crypto/x509"
 	"encoding/json"
@@ -25,6 +24,8 @@ import (
 	"fmt"
 	"strings"
 
+	"golang.org/x/net/context"
+
 	"firebase.google.com/go/internal"
 	"google.golang.org/api/identitytoolkit/v3"
 	"google.golang.org/api/transport"
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 "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"
@@ -26,6 +25,8 @@ 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
@@ -15,7 +15,6 @@
 package auth
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -24,6 +23,8 @@ 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
@@ -16,7 +16,6 @@ package auth
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -27,6 +26,8 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"firebase.google.com/go/internal"
 
 	"golang.org/x/oauth2"
diff --git a/firebase.go b/firebase.go
@@ -18,12 +18,13 @@
 package firebase
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"io/ioutil"
 	"os"
 
+	"golang.org/x/net/context"
+
 	"cloud.google.com/go/firestore"
 
 	"firebase.google.com/go/auth"
diff --git a/firebase_test.go b/firebase_test.go
@@ -15,8 +15,6 @@
 package firebase
 
 import (
-	"context"
-	"fmt"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -28,6 +26,8 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"golang.org/x/oauth2/google"
 
 	"google.golang.org/api/transport"
@@ -539,15 +539,13 @@ func TestAutoInit(t *testing.T) {
 	defer reinstateEnv(credEnvVar, credOld)
 
 	for _, test := range tests {
-		t.Run(fmt.Sprintf("NewApp(%s)", test.name), func(t *testing.T) {
-			overwriteEnv(firebaseEnvName, test.optionsConfig)
-			app, err := NewApp(context.Background(), test.initOptions)
-			if err != nil {
-				t.Error(err)
-			} else {
-				compareConfig(app, test.wantOptions, t)
-			}
-		})
+		overwriteEnv(firebaseEnvName, test.optionsConfig)
+		app, err := NewApp(context.Background(), test.initOptions)
+		if err != nil {
+			t.Errorf("NewApp(%s): %v", test.name, err)
+		} else {
+			compareConfig(app, test.wantOptions, t)
+		}
 	}
 }
 
@@ -577,13 +575,11 @@ func TestAutoInitInvalidFiles(t *testing.T) {
 	defer reinstateEnv(credEnvVar, credOld)
 
 	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			overwriteEnv(firebaseEnvName, test.filename)
-			_, err := NewApp(context.Background(), nil)
-			if err == nil || err.Error() != test.wantError {
-				t.Errorf("got error = %s; want = %s", err, test.wantError)
-			}
-		})
+		overwriteEnv(firebaseEnvName, test.filename)
+		_, err := NewApp(context.Background(), nil)
+		if err == nil || err.Error() != test.wantError {
+			t.Errorf("%s got error = %s; want = %s", test.name, err, test.wantError)
+		}
 	}
 }
 
diff --git a/iid/iid.go b/iid/iid.go
@@ -16,11 +16,12 @@
 package iid
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"net/http"
 
+	"golang.org/x/net/context"
+
 	"google.golang.org/api/transport"
 
 	"firebase.google.com/go/internal"
diff --git a/iid/iid_test.go b/iid/iid_test.go
@@ -15,12 +15,13 @@
 package iid
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
+	"golang.org/x/net/context"
+
 	"google.golang.org/api/option"
 
 	"firebase.google.com/go/internal"
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"
@@ -28,6 +27,8 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"firebase.google.com/go/auth"
 	"firebase.google.com/go/integration/internal"
 )
diff --git a/integration/auth/user_mgt_test.go b/integration/auth/user_mgt_test.go
@@ -16,12 +16,13 @@
 package auth
 
 import (
-	"context"
 	"fmt"
 	"reflect"
 	"testing"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"google.golang.org/api/iterator"
 
 	"firebase.google.com/go/auth"
@@ -52,11 +53,10 @@ func TestUserManagement(t *testing.T) {
 		{"Delete test users", testDeleteUsers},
 	}
 	// The tests are meant to be run in sequence. A failure in creating the users
-	// should be fatal so non of the other tests run. However calling Fatal from a
-	// subtest does not prevent the other subtests from running, hence we check the
-	// success of each subtest before proceeding.
+	// should be fatal so none of the other tests run.
 	for _, run := range orderedRuns {
-		if ok := t.Run(run.name, run.testFunc); !ok {
+		run.testFunc(t)
+		if t.Failed() {
 			t.Fatalf("Failed run %v", run.name)
 		}
 	}
diff --git a/integration/db/db_test.go b/integration/db/db_test.go
@@ -690,11 +690,11 @@ func protectedRef(t *testing.T, p string) string {
 }
 
 type Dinosaur struct {
-	Appeared int     `json:"appeared"`
+	Appeared float64 `json:"appeared"`
 	Height   float64 `json:"height"`
 	Length   float64 `json:"length"`
 	Order    string  `json:"order"`
-	Vanished int     `json:"vanished"`
+	Vanished float64 `json:"vanished"`
 	Weight   int     `json:"weight"`
 	Ratings  Ratings `json:"ratings"`
 }
diff --git a/integration/firestore/firestore_test.go b/integration/firestore/firestore_test.go
@@ -15,11 +15,12 @@
 package firestore
 
 import (
-	"context"
 	"log"
 	"reflect"
 	"testing"
 
+	"golang.org/x/net/context"
+
 	"firebase.google.com/go/integration/internal"
 )
 
diff --git a/integration/iid/iid_test.go b/integration/iid/iid_test.go
@@ -16,12 +16,13 @@
 package iid
 
 import (
-	"context"
 	"flag"
 	"log"
 	"os"
 	"testing"
 
+	"golang.org/x/net/context"
+
 	"firebase.google.com/go/iid"
 	"firebase.google.com/go/integration/internal"
 )
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"
 )
@@ -88,7 +89,7 @@ func TestSend(t *testing.T) {
 	}
 	name, err := client.SendDryRun(context.Background(), msg)
 	if err != nil {
-		log.Fatalln(err)
+		t.Fatal(err)
 	}
 	const pattern = "^projects/.*/messages/.*$"
 	if !regexp.MustCompile(pattern).MatchString(name) {
diff --git a/integration/storage/storage_test.go b/integration/storage/storage_test.go
@@ -15,14 +15,15 @@
 package storage
 
 import (
-	"context"
 	"flag"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"os"
 	"testing"
 
+	"golang.org/x/net/context"
+
 	"firebase.google.com/go"
 
 	gcs "cloud.google.com/go/storage"
diff --git a/internal/http_client.go b/internal/http_client.go
@@ -16,12 +16,15 @@ package internal
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
+
+	"golang.org/x/net/context/ctxhttp"
+
+	"golang.org/x/net/context"
 )
 
 // HTTPClient is a convenient API to make HTTP calls.
@@ -43,7 +46,7 @@ func (c *HTTPClient) Do(ctx context.Context, r *Request) (*Response, error) {
 		return nil, err
 	}
 
-	resp, err := c.Client.Do(req.WithContext(ctx))
+	resp, err := ctxhttp.Do(ctx, c.Client, req)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/http_client_test.go b/internal/http_client_test.go
diff --git a/messaging/messaging.go b/messaging/messaging.go
diff --git a/messaging/messaging_test.go b/messaging/messaging_test.go
diff --git a/snippets/auth.go b/snippets/auth.go
diff --git a/snippets/db.go b/snippets/db.go
diff --git a/snippets/init.go b/snippets/init.go
diff --git a/snippets/messaging.go b/snippets/messaging.go
diff --git a/snippets/storage.go b/snippets/storage.go
diff --git a/storage/storage.go b/storage/storage.go
diff --git a/storage/storage_test.go b/storage/storage_test.go

-Original file line number
+Diff line change
@@ @@ -1,6 +1,7 @@ @@
 language: go
 go:
 +  - 1.6.x
   - 1.7.x
   - 1.8.x
   - 1.9.x
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`	`)`