vendor: update all dependencies to latest versions

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

@@ -16,6 +16,7 @@
 package internal
 
 import (
+	"errors"
 	"net/http"
 
 	"golang.org/x/oauth2"
@@ -34,4 +35,20 @@ type DialSettings struct {
 	HTTPClient      *http.Client
 	GRPCDialOpts    []grpc.DialOption
 	GRPCConn        *grpc.ClientConn
+	NoAuth          bool
+}
+
+// Validate reports an error if ds is invalid.
+func (ds *DialSettings) Validate() error {
+	hasCreds := ds.APIKey != "" || ds.TokenSource != nil || ds.CredentialsFile != ""
+	if ds.NoAuth && hasCreds {
+		return errors.New("options.WithoutAuthentication is incompatible with any option that provides credentials")
+	}
+	if ds.HTTPClient != nil && ds.GRPCConn != nil {
+		return errors.New("WithHTTPClient is incompatible with WithGRPCConn")
+	}
+	if ds.HTTPClient != nil && ds.GRPCDialOpts != nil {
+		return errors.New("WithHTTPClient is incompatible with gRPC dial options")
+	}
+	return nil
 }

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

@@ -0,0 +1,66 @@
+// 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"
+	"testing"
+
+	"google.golang.org/grpc"
+
+	"golang.org/x/oauth2"
+)
+
+func TestSettingsValidate(t *testing.T) {
+	// Valid.
+	for _, ds := range []DialSettings{
+		{},
+		{APIKey: "x"},
+		{Scopes: []string{"s"}},
+		{CredentialsFile: "f"},
+		{TokenSource: dummyTS{}},
+		{HTTPClient: &http.Client{}},
+		{GRPCConn: &grpc.ClientConn{}},
+		// Although NoAuth and Scopes are technically incompatible, too many
+		// cloud clients add WithScopes to user-provided options to make
+		// the check feasible.
+		{NoAuth: true, Scopes: []string{"s"}},
+	} {
+		err := ds.Validate()
+		if err != nil {
+			t.Errorf("%+v: got %v, want nil", ds, err)
+		}
+	}
+
+	// Invalid.
+	for _, ds := range []DialSettings{
+		{NoAuth: true, APIKey: "x"},
+		{NoAuth: true, CredentialsFile: "f"},
+		{NoAuth: true, TokenSource: dummyTS{}},
+		{HTTPClient: &http.Client{}, GRPCConn: &grpc.ClientConn{}},
+		{HTTPClient: &http.Client{}, GRPCDialOpts: []grpc.DialOption{grpc.WithInsecure()}},
+	} {
+		err := ds.Validate()
+		if err == nil {
+			t.Errorf("%+v: got nil, want error", ds)
+		}
+	}
+
+}
+
+type dummyTS struct{}
+
+func (dummyTS) Token() (*oauth2.Token, error) { return nil, nil }