vendor: update all dependencies

vendor/cloud.google.com/go/speech/apiv1beta1/SyncRecognize_smoke_test.go

@@ -0,0 +1,78 @@
+// 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.
+
+// AUTO-GENERATED CODE. DO NOT EDIT.
+
+package speech
+
+import (
+	speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1beta1"
+)
+
+import (
+	"strconv"
+	"testing"
+	"time"
+
+	"cloud.google.com/go/internal/testutil"
+	"golang.org/x/net/context"
+	"google.golang.org/api/iterator"
+	"google.golang.org/api/option"
+)
+
+var _ = iterator.Done
+var _ = strconv.FormatUint
+var _ = time.Now
+
+func TestSpeechSmoke(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping smoke test in short mode")
+	}
+	ctx := context.Background()
+	ts := testutil.TokenSource(ctx, DefaultAuthScopes()...)
+	if ts == nil {
+		t.Skip("Integration tests skipped. See CONTRIBUTING.md for details")
+	}
+
+	projectId := testutil.ProjID()
+	_ = projectId
+
+	c, err := NewClient(ctx, option.WithTokenSource(ts))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var languageCode string = "en-US"
+	var sampleRate int32 = 44100
+	var encoding speechpb.RecognitionConfig_AudioEncoding = speechpb.RecognitionConfig_FLAC
+	var config = &speechpb.RecognitionConfig{
+		LanguageCode: languageCode,
+		SampleRate:   sampleRate,
+		Encoding:     encoding,
+	}
+	var uri string = "gs://gapic-toolkit/hello.flac"
+	var audio = &speechpb.RecognitionAudio{
+		AudioSource: &speechpb.RecognitionAudio_Uri{
+			Uri: uri,
+		},
+	}
+	var request = &speechpb.SyncRecognizeRequest{
+		Config: config,
+		Audio:  audio,
+	}
+
+	if _, err := c.SyncRecognize(ctx, request); err != nil {
+		t.Error(err)
+	}
+}

vendor/cloud.google.com/go/speech/apiv1beta1/doc.go

@@ -15,7 +15,7 @@
 // AUTO-GENERATED CODE. DO NOT EDIT.
 
 // Package speech is an experimental, auto-generated package for the
-// speech API.
+// Google Cloud Speech API.
 //
 // Google Cloud Speech API.
 package speech // import "cloud.google.com/go/speech/apiv1beta1"
@@ -25,9 +25,17 @@ import (
 	"google.golang.org/grpc/metadata"
 )
 
-func insertXGoog(ctx context.Context, val string) context.Context {
-	md, _ := metadata.FromContext(ctx)
+func insertXGoog(ctx context.Context, val []string) context.Context {
+	md, _ := metadata.FromOutgoingContext(ctx)
 	md = md.Copy()
-	md["x-goog-api-client"] = []string{val}
-	return metadata.NewContext(ctx, md)
+	md["x-goog-api-client"] = val
+	return metadata.NewOutgoingContext(ctx, md)
+}
+
+// DefaultAuthScopes reports the authentication scopes required
+// by this package.
+func DefaultAuthScopes() []string {
+	return []string{
+		"https://www.googleapis.com/auth/cloud-platform",
+	}
 }

vendor/cloud.google.com/go/speech/apiv1beta1/mock_test.go

@@ -23,10 +23,12 @@ import (
 
 import (
 	"flag"
+	"fmt"
 	"io"
 	"log"
 	"net"
 	"os"
+	"strings"
 	"testing"
 
 	"github.com/golang/protobuf/proto"
@@ -36,6 +38,8 @@ import (
 	status "google.golang.org/genproto/googleapis/rpc/status"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/metadata"
+	gstatus "google.golang.org/grpc/status"
 )
 
 var _ = io.EOF
@@ -57,7 +61,11 @@ type mockSpeechServer struct {
 	resps []proto.Message
 }
 
-func (s *mockSpeechServer) SyncRecognize(_ context.Context, req *speechpb.SyncRecognizeRequest) (*speechpb.SyncRecognizeResponse, error) {
+func (s *mockSpeechServer) SyncRecognize(ctx context.Context, req *speechpb.SyncRecognizeRequest) (*speechpb.SyncRecognizeResponse, error) {
+	md, _ := metadata.FromIncomingContext(ctx)
+	if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
+		return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
+	}
 	s.reqs = append(s.reqs, req)
 	if s.err != nil {
 		return nil, s.err
@@ -65,7 +73,11 @@ func (s *mockSpeechServer) SyncRecognize(_ context.Context, req *speechpb.SyncRe
 	return s.resps[0].(*speechpb.SyncRecognizeResponse), nil
 }
 
-func (s *mockSpeechServer) AsyncRecognize(_ context.Context, req *speechpb.AsyncRecognizeRequest) (*longrunningpb.Operation, error) {
+func (s *mockSpeechServer) AsyncRecognize(ctx context.Context, req *speechpb.AsyncRecognizeRequest) (*longrunningpb.Operation, error) {
+	md, _ := metadata.FromIncomingContext(ctx)
+	if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
+		return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
+	}
 	s.reqs = append(s.reqs, req)
 	if s.err != nil {
 		return nil, s.err
@@ -74,6 +86,10 @@ func (s *mockSpeechServer) AsyncRecognize(_ context.Context, req *speechpb.Async
 }
 
 func (s *mockSpeechServer) StreamingRecognize(stream speechpb.Speech_StreamingRecognizeServer) error {
+	md, _ := metadata.FromIncomingContext(stream.Context())
+	if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
+		return fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
+	}
 	for {
 		if req, err := stream.Recv(); err == io.EOF {
 			break
@@ -169,8 +185,8 @@ func TestSpeechSyncRecognize(t *testing.T) {
 }
 
 func TestSpeechSyncRecognizeError(t *testing.T) {
-	errCode := codes.Internal
-	mockSpeech.err = grpc.Errorf(errCode, "test error")
+	errCode := codes.PermissionDenied
+	mockSpeech.err = gstatus.Error(errCode, "test error")
 
 	var encoding speechpb.RecognitionConfig_AudioEncoding = speechpb.RecognitionConfig_FLAC
 	var sampleRate int32 = 44100
@@ -196,7 +212,9 @@ func TestSpeechSyncRecognizeError(t *testing.T) {
 
 	resp, err := c.SyncRecognize(context.Background(), request)
 
-	if c := grpc.Code(err); c != errCode {
+	if st, ok := gstatus.FromError(err); !ok {
+		t.Errorf("got error %v, expected grpc error", err)
+	} else if c := st.Code(); c != errCode {
 		t.Errorf("got error code %q, want %q", c, errCode)
 	}
 	_ = resp
@@ -259,7 +277,7 @@ func TestSpeechAsyncRecognize(t *testing.T) {
 }
 
 func TestSpeechAsyncRecognizeError(t *testing.T) {
-	errCode := codes.Internal
+	errCode := codes.PermissionDenied
 	mockSpeech.err = nil
 	mockSpeech.resps = append(mockSpeech.resps[:0], &longrunningpb.Operation{
 		Name: "longrunning-test",
@@ -300,7 +318,9 @@ func TestSpeechAsyncRecognizeError(t *testing.T) {
 	}
 	resp, err := respLRO.Wait(context.Background())
 
-	if c := grpc.Code(err); c != errCode {
+	if st, ok := gstatus.FromError(err); !ok {
+		t.Errorf("got error %v, expected grpc error", err)
+	} else if c := st.Code(); c != errCode {
 		t.Errorf("got error code %q, want %q", c, errCode)
 	}
 	_ = resp
@@ -349,8 +369,8 @@ func TestSpeechStreamingRecognize(t *testing.T) {
 }
 
 func TestSpeechStreamingRecognizeError(t *testing.T) {
-	errCode := codes.Internal
-	mockSpeech.err = grpc.Errorf(errCode, "test error")
+	errCode := codes.PermissionDenied
+	mockSpeech.err = gstatus.Error(errCode, "test error")
 
 	var request *speechpb.StreamingRecognizeRequest = &speechpb.StreamingRecognizeRequest{}
 
@@ -371,7 +391,9 @@ func TestSpeechStreamingRecognizeError(t *testing.T) {
 	}
 	resp, err := stream.Recv()
 
-	if c := grpc.Code(err); c != errCode {
+	if st, ok := gstatus.FromError(err); !ok {
+		t.Errorf("got error %v, expected grpc error", err)
+	} else if c := st.Code(); c != errCode {
 		t.Errorf("got error code %q, want %q", c, errCode)
 	}
 	_ = resp

vendor/cloud.google.com/go/speech/apiv1beta1/speech_client.go

@@ -21,6 +21,7 @@ import (
 
 	"cloud.google.com/go/internal/version"
 	"cloud.google.com/go/longrunning"
+	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go"
 	"golang.org/x/net/context"
 	"google.golang.org/api/option"
@@ -41,9 +42,7 @@ type CallOptions struct {
 func defaultClientOptions() []option.ClientOption {
 	return []option.ClientOption{
 		option.WithEndpoint("speech.googleapis.com:443"),
-		option.WithScopes(
-			"https://www.googleapis.com/auth/cloud-platform",
-		),
+		option.WithScopes(DefaultAuthScopes()...),
 	}
 }
 
@@ -61,17 +60,6 @@ func defaultCallOptions() *CallOptions {
 				})
 			}),
 		},
-		{"default", "non_idempotent"}: {
-			gax.WithRetry(func() gax.Retryer {
-				return gax.OnCodes([]codes.Code{
-					codes.Unavailable,
-				}, gax.Backoff{
-					Initial:    100 * time.Millisecond,
-					Max:        60000 * time.Millisecond,
-					Multiplier: 1.3,
-				})
-			}),
-		},
 	}
 	return &CallOptions{
 		SyncRecognize:      retry[[2]string{"default", "idempotent"}],
@@ -88,11 +76,16 @@ type Client struct {
 	// The gRPC API client.
 	client speechpb.SpeechClient
 
+	// LROClient is used internally to handle longrunning operations.
+	// It is exposed so that its CallOptions can be modified if required.
+	// Users should not Close this client.
+	LROClient *lroauto.OperationsClient
+
 	// The call options for this service.
 	CallOptions *CallOptions
 
 	// The metadata to be sent with each request.
-	xGoogHeader string
+	xGoogHeader []string
 }
 
 // NewClient creates a new speech client.
@@ -110,6 +103,17 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*Client, error
 		client: speechpb.NewSpeechClient(conn),
 	}
 	c.SetGoogleClientInfo()
+
+	c.LROClient, err = lroauto.NewOperationsClient(ctx, option.WithGRPCConn(conn))
+	if err != nil {
+		// This error "should not happen", since we are just reusing old connection
+		// and never actually need to dial.
+		// If this does happen, we could leak conn. However, we cannot close conn:
+		// If the user invoked the function with option.WithGRPCConn,
+		// we would close a connection that's still in use.
+		// TODO(pongad): investigate error conditions.
+		return nil, err
+	}
 	return c, nil
 }
 
@@ -129,81 +133,86 @@ func (c *Client) Close() error {
 // use by Google-written clients.
 func (c *Client) SetGoogleClientInfo(keyval ...string) {
 	kv := append([]string{"gl-go", version.Go()}, keyval...)
-	kv = append(kv, "gapic", version.Repo, "gax", gax.Version, "grpc", "")
-	c.xGoogHeader = gax.XGoogHeader(kv...)
+	kv = append(kv, "gapic", version.Repo, "gax", gax.Version, "grpc", grpc.Version)
+	c.xGoogHeader = []string{gax.XGoogHeader(kv...)}
 }
 
-// SyncRecognize perform synchronous speech-recognition: receive results after all audio
+// SyncRecognize performs synchronous speech recognition: receive results after all audio
 // has been sent and processed.
-func (c *Client) SyncRecognize(ctx context.Context, req *speechpb.SyncRecognizeRequest) (*speechpb.SyncRecognizeResponse, error) {
+func (c *Client) SyncRecognize(ctx context.Context, req *speechpb.SyncRecognizeRequest, opts ...gax.CallOption) (*speechpb.SyncRecognizeResponse, error) {
 	ctx = insertXGoog(ctx, c.xGoogHeader)
+	opts = append(c.CallOptions.SyncRecognize[0:len(c.CallOptions.SyncRecognize):len(c.CallOptions.SyncRecognize)], opts...)
 	var resp *speechpb.SyncRecognizeResponse
-	err := gax.Invoke(ctx, func(ctx context.Context) error {
+	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
-		resp, err = c.client.SyncRecognize(ctx, req)
+		resp, err = c.client.SyncRecognize(ctx, req, settings.GRPC...)
 		return err
-	}, c.CallOptions.SyncRecognize...)
+	}, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return resp, nil
 }
 
-// AsyncRecognize perform asynchronous speech-recognition: receive results via the
-// google.longrunning.Operations interface. Returns either an
+// AsyncRecognize performs asynchronous speech recognition: receive results via the
+// [google.longrunning.Operations]
+// (/speech/reference/rest/v1beta1/operations#Operation)
+// interface. Returns either an
 // `Operation.error` or an `Operation.response` which contains
 // an `AsyncRecognizeResponse` message.
-func (c *Client) AsyncRecognize(ctx context.Context, req *speechpb.AsyncRecognizeRequest) (*AsyncRecognizeResponseOperation, error) {
+func (c *Client) AsyncRecognize(ctx context.Context, req *speechpb.AsyncRecognizeRequest, opts ...gax.CallOption) (*AsyncRecognizeOperation, error) {
 	ctx = insertXGoog(ctx, c.xGoogHeader)
+	opts = append(c.CallOptions.AsyncRecognize[0:len(c.CallOptions.AsyncRecognize):len(c.CallOptions.AsyncRecognize)], opts...)
 	var resp *longrunningpb.Operation
-	err := gax.Invoke(ctx, func(ctx context.Context) error {
+	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
-		resp, err = c.client.AsyncRecognize(ctx, req)
+		resp, err = c.client.AsyncRecognize(ctx, req, settings.GRPC...)
 		return err
-	}, c.CallOptions.AsyncRecognize...)
+	}, opts...)
 	if err != nil {
 		return nil, err
 	}
-	return &AsyncRecognizeResponseOperation{
-		lro: longrunning.InternalNewOperation(c.Connection(), resp),
+	return &AsyncRecognizeOperation{
+		lro: longrunning.InternalNewOperation(c.LROClient, resp),
 	}, nil
 }
 
-// StreamingRecognize perform bidirectional streaming speech-recognition: receive results while
+// StreamingRecognize performs bidirectional streaming speech recognition: receive results while
 // sending audio. This method is only available via the gRPC API (not REST).
-func (c *Client) StreamingRecognize(ctx context.Context) (speechpb.Speech_StreamingRecognizeClient, error) {
+func (c *Client) StreamingRecognize(ctx context.Context, opts ...gax.CallOption) (speechpb.Speech_StreamingRecognizeClient, error) {
 	ctx = insertXGoog(ctx, c.xGoogHeader)
+	opts = append(c.CallOptions.StreamingRecognize[0:len(c.CallOptions.StreamingRecognize):len(c.CallOptions.StreamingRecognize)], opts...)
 	var resp speechpb.Speech_StreamingRecognizeClient
-	err := gax.Invoke(ctx, func(ctx context.Context) error {
+	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
-		resp, err = c.client.StreamingRecognize(ctx)
+		resp, err = c.client.StreamingRecognize(ctx, settings.GRPC...)
 		return err
-	}, c.CallOptions.StreamingRecognize...)
+	}, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return resp, nil
 }
 
-// AsyncRecognizeResponseOperation manages a long-running operation yielding speechpb.AsyncRecognizeResponse.
-type AsyncRecognizeResponseOperation struct {
+// AsyncRecognizeOperation manages a long-running operation from AsyncRecognize.
+type AsyncRecognizeOperation struct {
 	lro *longrunning.Operation
 }
 
-// AsyncRecognizeResponseOperation returns a new AsyncRecognizeResponseOperation from a given name.
-// The name must be that of a previously created AsyncRecognizeResponseOperation, possibly from a different process.
-func (c *Client) AsyncRecognizeResponseOperation(name string) *AsyncRecognizeResponseOperation {
-	return &AsyncRecognizeResponseOperation{
-		lro: longrunning.InternalNewOperation(c.Connection(), &longrunningpb.Operation{Name: name}),
+// AsyncRecognizeOperation returns a new AsyncRecognizeOperation from a given name.
+// The name must be that of a previously created AsyncRecognizeOperation, possibly from a different process.
+func (c *Client) AsyncRecognizeOperation(name string) *AsyncRecognizeOperation {
+	return &AsyncRecognizeOperation{
+		lro: longrunning.InternalNewOperation(c.LROClient, &longrunningpb.Operation{Name: name}),
 	}
 }
 
 // Wait blocks until the long-running operation is completed, returning the response and any errors encountered.
 //
 // See documentation of Poll for error-handling information.
-func (op *AsyncRecognizeResponseOperation) Wait(ctx context.Context) (*speechpb.AsyncRecognizeResponse, error) {
+func (op *AsyncRecognizeOperation) Wait(ctx context.Context, opts ...gax.CallOption) (*speechpb.AsyncRecognizeResponse, error) {
 	var resp speechpb.AsyncRecognizeResponse
-	if err := op.lro.Wait(ctx, &resp); err != nil {
+	if err := op.lro.Wait(ctx, &resp, opts...); err != nil {
 		return nil, err
 	}
 	return &resp, nil
@@ -218,9 +227,9 @@ func (op *AsyncRecognizeResponseOperation) Wait(ctx context.Context) (*speechpb.
 // If Poll succeeds and the operation has completed successfully,
 // op.Done will return true, and the response of the operation is returned.
 // If Poll succeeds and the operation has not completed, the returned response and error are both nil.
-func (op *AsyncRecognizeResponseOperation) Poll(ctx context.Context) (*speechpb.AsyncRecognizeResponse, error) {
+func (op *AsyncRecognizeOperation) Poll(ctx context.Context, opts ...gax.CallOption) (*speechpb.AsyncRecognizeResponse, error) {
 	var resp speechpb.AsyncRecognizeResponse
-	if err := op.lro.Poll(ctx, &resp); err != nil {
+	if err := op.lro.Poll(ctx, &resp, opts...); err != nil {
 		return nil, err
 	}
 	if !op.Done() {
@@ -233,7 +242,7 @@ func (op *AsyncRecognizeResponseOperation) Poll(ctx context.Context) (*speechpb.
 // Metadata itself does not contact the server, but Poll does.
 // To get the latest metadata, call this method after a successful call to Poll.
 // If the metadata is not available, the returned metadata and error are both nil.
-func (op *AsyncRecognizeResponseOperation) Metadata() (*speechpb.AsyncRecognizeMetadata, error) {
+func (op *AsyncRecognizeOperation) Metadata() (*speechpb.AsyncRecognizeMetadata, error) {
 	var meta speechpb.AsyncRecognizeMetadata
 	if err := op.lro.Metadata(&meta); err == longrunning.ErrNoMetadata {
 		return nil, nil
@@ -244,12 +253,12 @@ func (op *AsyncRecognizeResponseOperation) Metadata() (*speechpb.AsyncRecognizeM
 }
 
 // Done reports whether the long-running operation has completed.
-func (op *AsyncRecognizeResponseOperation) Done() bool {
+func (op *AsyncRecognizeOperation) Done() bool {
 	return op.lro.Done()
 }
 
 // Name returns the name of the long-running operation.
 // The name is assigned by the server and is unique within the service from which the operation is created.
-func (op *AsyncRecognizeResponseOperation) Name() string {
+func (op *AsyncRecognizeOperation) Name() string {
 	return op.lro.Name()
 }