Switch to using the dep tool and update all the dependencies

vendor/google.golang.org/api/internal/pool.go

@@ -0,0 +1,59 @@
+// Copyright 2016 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package internal
+
+import (
+	"errors"
+	"google.golang.org/grpc/naming"
+)
+
+// PoolResolver provides a fixed list of addresses to load balance between
+// and does not provide further updates.
+type PoolResolver struct {
+	poolSize int
+	dialOpt  *DialSettings
+	ch       chan []*naming.Update
+}
+
+// NewPoolResolver returns a PoolResolver
+// This is an EXPERIMENTAL API and may be changed or removed in the future.
+func NewPoolResolver(size int, o *DialSettings) *PoolResolver {
+	return &PoolResolver{poolSize: size, dialOpt: o}
+}
+
+// Resolve returns a Watcher for the endpoint defined by the DialSettings
+// provided to NewPoolResolver.
+func (r *PoolResolver) Resolve(target string) (naming.Watcher, error) {
+	if r.dialOpt.Endpoint == "" {
+		return nil, errors.New("No endpoint configured")
+	}
+	addrs := make([]*naming.Update, 0, r.poolSize)
+	for i := 0; i < r.poolSize; i++ {
+		addrs = append(addrs, &naming.Update{Op: naming.Add, Addr: r.dialOpt.Endpoint, Metadata: i})
+	}
+	r.ch = make(chan []*naming.Update, 1)
+	r.ch <- addrs
+	return r, nil
+}
+
+// Next returns a static list of updates on the first call,
+// and blocks indefinitely until Close is called on subsequent calls.
+func (r *PoolResolver) Next() ([]*naming.Update, error) {
+	return <-r.ch, nil
+}
+
+func (r *PoolResolver) Close() {
+	close(r.ch)
+}

vendor/google.golang.org/api/internal/pool_test.go

@@ -0,0 +1,82 @@
+/*
+Copyright 2016 Google Inc. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package internal
+
+import (
+	"google.golang.org/grpc/naming"
+	"testing"
+	"time"
+)
+
+func TestConnectionPool(t *testing.T) {
+	addr := "127.0.0.1:123"
+	ds := DialSettings{Endpoint: addr}
+	pr := NewPoolResolver(4, &ds)
+	watcher, err := pr.Resolve(addr)
+	if err != nil {
+		t.Fatalf("Resolve: %v", err)
+	}
+
+	updates, err := watcher.Next()
+	if err != nil {
+		t.Fatalf("Next: %v", err)
+	}
+	if len(updates) != 4 {
+		t.Fatalf("Update count: %v", err)
+	}
+	metaSeen := make(map[interface{}]bool)
+	for _, u := range updates {
+		if u.Addr != addr {
+			t.Errorf("Addr from update: wanted %v, got %v", addr, u.Addr)
+		}
+		// Metadata must be unique
+		if metaSeen[u.Metadata] {
+			t.Errorf("Wanted %v to be unique, got %v", u.Metadata, metaSeen)
+		}
+		metaSeen[u.Metadata] = true
+	}
+	// Test that Next blocks until Close and returns nil.
+	nextc := make(chan []*naming.Update)
+	closedc := make(chan bool)
+	go func() {
+		next, err := watcher.Next()
+		if err != nil {
+			t.Errorf("Next: expected success, got %v", err)
+		}
+		nextc <- next
+	}()
+	go func() {
+		time.Sleep(50 * time.Millisecond)
+		watcher.Close()
+		close(closedc)
+	}()
+
+	select {
+	case <-nextc:
+		t.Fatalf("Next: second invocation didn't block, returned before Close()")
+	case <-closedc:
+		// OK, watcher was closed before Next() returned.
+	}
+	select {
+	case next := <-nextc:
+		if next != nil {
+			t.Errorf("Next: expected nil, got %v", next)
+		}
+	case <-time.After(100 * time.Millisecond):
+		t.Error("Next: did not return after 100ms")
+	}
+}

vendor/google.golang.org/api/internal/settings.go

@@ -0,0 +1,37 @@
+// Copyright 2017 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package internal supports the options and transport packages.
+package internal
+
+import (
+	"net/http"
+
+	"golang.org/x/oauth2"
+	"google.golang.org/grpc"
+)
+
+// DialSettings holds information needed to establish a connection with a
+// Google API service.
+type DialSettings struct {
+	Endpoint                   string
+	Scopes                     []string
+	ServiceAccountJSONFilename string // if set, TokenSource is ignored.
+	TokenSource                oauth2.TokenSource
+	UserAgent                  string
+	APIKey                     string
+	HTTPClient                 *http.Client
+	GRPCDialOpts               []grpc.DialOption
+	GRPCConn                   *grpc.ClientConn
+}