datatransfer: move into bigquery dir

Also picks up doc update for trace. Change is pubsub was picked up from change to Java sample code. It only changes the tests though, so it isn't user-visible. Change-Id: I102e8ff974631cd7d9c85c4fd7606cb917348ae6 Reviewed-on: https://code-review.googlesource.com/20390 Reviewed-by: Jonathan Amsterdam <[email protected]>
zhongduo · Dec 6, 2017 · 3051b91 · 3051b91
1 parent 5733118
commit 3051b91
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 28 deletions.
diff --git a/...atatransfer/apiv1/data_transfer_client.go → ...atatransfer/apiv1/data_transfer_client.go b/...atatransfer/apiv1/data_transfer_client.go → ...atatransfer/apiv1/data_transfer_client.go
diff --git a/...piv1/data_transfer_client_example_test.go → ...piv1/data_transfer_client_example_test.go b/...piv1/data_transfer_client_example_test.go → ...piv1/data_transfer_client_example_test.go
@@ -17,7 +17,7 @@
 package datatransfer_test
 
 import (
-	"cloud.google.com/go/cloud/bigquery/datatransfer/apiv1"
+	"cloud.google.com/go/bigquery/datatransfer/apiv1"
 	"golang.org/x/net/context"
 	"google.golang.org/api/iterator"
 	datatransferpb "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1"

diff --git a/cloud/bigquery/datatransfer/apiv1/doc.go → bigquery/datatransfer/apiv1/doc.go b/cloud/bigquery/datatransfer/apiv1/doc.go → bigquery/datatransfer/apiv1/doc.go
@@ -21,7 +21,7 @@
 //
 // Transfers data from partner SaaS applications to Google BigQuery on a
 // scheduled, managed basis.
-package datatransfer // import "cloud.google.com/go/cloud/bigquery/datatransfer/apiv1"
+package datatransfer // import "cloud.google.com/go/bigquery/datatransfer/apiv1"
 
 import (
 	"golang.org/x/net/context"

diff --git a/.../bigquery/datatransfer/apiv1/mock_test.go → bigquery/datatransfer/apiv1/mock_test.go b/.../bigquery/datatransfer/apiv1/mock_test.go → bigquery/datatransfer/apiv1/mock_test.go
diff --git a/pubsub/apiv1/mock_test.go b/pubsub/apiv1/mock_test.go
@@ -18,6 +18,7 @@ package pubsub
 
 import (
 	emptypb "github.com/golang/protobuf/ptypes/empty"
+	timestamppb "github.com/golang/protobuf/ptypes/timestamp"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	pubsubpb "google.golang.org/genproto/googleapis/pubsub/v1"
 	field_maskpb "google.golang.org/genproto/protobuf/field_mask"
@@ -1025,12 +1026,12 @@ func TestSubscriberGetSubscriptionError(t *testing.T) {
 func TestSubscriberUpdateSubscription(t *testing.T) {
 	var name string = "name3373707"
 	var topic string = "topic110546223"
-	var ackDeadlineSeconds int32 = 2135351438
+	var ackDeadlineSeconds2 int32 = -921632575
 	var retainAckedMessages bool = false
 	var expectedResponse = &pubsubpb.Subscription{
 		Name:                name,
 		Topic:               topic,
-		AckDeadlineSeconds:  ackDeadlineSeconds,
+		AckDeadlineSeconds:  ackDeadlineSeconds2,
 		RetainAckedMessages: retainAckedMessages,
 	}
 
@@ -1039,8 +1040,15 @@ func TestSubscriberUpdateSubscription(t *testing.T) {
 
 	mockSubscriber.resps = append(mockSubscriber.resps[:0], expectedResponse)
 
-	var subscription *pubsubpb.Subscription = &pubsubpb.Subscription{}
-	var updateMask *field_maskpb.FieldMask = &field_maskpb.FieldMask{}
+	var ackDeadlineSeconds int32 = 42
+	var subscription = &pubsubpb.Subscription{
+		AckDeadlineSeconds: ackDeadlineSeconds,
+	}
+	var pathsElement string = "ack_deadline_seconds"
+	var paths = []string{pathsElement}
+	var updateMask = &field_maskpb.FieldMask{
+		Paths: paths,
+	}
 	var request = &pubsubpb.UpdateSubscriptionRequest{
 		Subscription: subscription,
 		UpdateMask:   updateMask,
@@ -1070,8 +1078,15 @@ func TestSubscriberUpdateSubscriptionError(t *testing.T) {
 	errCode := codes.PermissionDenied
 	mockSubscriber.err = gstatus.Error(errCode, "test error")
 
-	var subscription *pubsubpb.Subscription = &pubsubpb.Subscription{}
-	var updateMask *field_maskpb.FieldMask = &field_maskpb.FieldMask{}
+	var ackDeadlineSeconds int32 = 42
+	var subscription = &pubsubpb.Subscription{
+		AckDeadlineSeconds: ackDeadlineSeconds,
+	}
+	var pathsElement string = "ack_deadline_seconds"
+	var paths = []string{pathsElement}
+	var updateMask = &field_maskpb.FieldMask{
+		Paths: paths,
+	}
 	var request = &pubsubpb.UpdateSubscriptionRequest{
 		Subscription: subscription,
 		UpdateMask:   updateMask,
@@ -1681,8 +1696,18 @@ func TestSubscriberUpdateSnapshot(t *testing.T) {
 
 	mockSubscriber.resps = append(mockSubscriber.resps[:0], expectedResponse)
 
-	var snapshot *pubsubpb.Snapshot = &pubsubpb.Snapshot{}
-	var updateMask *field_maskpb.FieldMask = &field_maskpb.FieldMask{}
+	var seconds int64 = 123456
+	var expireTime = &timestamppb.Timestamp{
+		Seconds: seconds,
+	}
+	var snapshot = &pubsubpb.Snapshot{
+		ExpireTime: expireTime,
+	}
+	var pathsElement string = "expire_time"
+	var paths = []string{pathsElement}
+	var updateMask = &field_maskpb.FieldMask{
+		Paths: paths,
+	}
 	var request = &pubsubpb.UpdateSnapshotRequest{
 		Snapshot:   snapshot,
 		UpdateMask: updateMask,
@@ -1712,8 +1737,18 @@ func TestSubscriberUpdateSnapshotError(t *testing.T) {
 	errCode := codes.PermissionDenied
 	mockSubscriber.err = gstatus.Error(errCode, "test error")
 
-	var snapshot *pubsubpb.Snapshot = &pubsubpb.Snapshot{}
-	var updateMask *field_maskpb.FieldMask = &field_maskpb.FieldMask{}
+	var seconds int64 = 123456
+	var expireTime = &timestamppb.Timestamp{
+		Seconds: seconds,
+	}
+	var snapshot = &pubsubpb.Snapshot{
+		ExpireTime: expireTime,
+	}
+	var pathsElement string = "expire_time"
+	var paths = []string{pathsElement}
+	var updateMask = &field_maskpb.FieldMask{
+		Paths: paths,
+	}
 	var request = &pubsubpb.UpdateSnapshotRequest{
 		Snapshot:   snapshot,
 		UpdateMask: updateMask,

diff --git a/trace/apiv1/doc.go b/trace/apiv1/doc.go
@@ -19,11 +19,11 @@
 //
 //   NOTE: This package is in alpha. It is not stable, and is likely to change.
 //
-// Send and retrieve trace data from Stackdriver Trace. Data is generated and
-// available by default for all App Engine applications. Data from other
-// applications can be written to Stackdriver Trace for display, reporting,
-// and
-// analysis.
+// Sends application trace data to Stackdriver Trace for viewing. Trace data
+// is
+// collected for all App Engine applications by default. Trace data from
+// other
+// applications can be provided using this API.
 //
 // Use the client at cloud.google.com/go/trace in preference to this.
 package trace // import "cloud.google.com/go/trace/apiv1"

diff --git a/trace/apiv2/doc.go b/trace/apiv2/doc.go
@@ -19,11 +19,11 @@
 //
 //   NOTE: This package is in alpha. It is not stable, and is likely to change.
 //
-// Send and retrieve trace data from Stackdriver Trace. Data is generated and
-// available by default for all App Engine applications. Data from other
-// applications can be written to Stackdriver Trace for display, reporting,
-// and
-// analysis.
+// Sends application trace data to Stackdriver Trace for viewing. Trace data
+// is
+// collected for all App Engine applications by default. Trace data from
+// other
+// applications can be provided using this API.
 package trace // import "cloud.google.com/go/trace/apiv2"
 
 import (

diff --git a/trace/apiv2/trace_client.go b/trace/apiv2/trace_client.go
@@ -141,11 +141,8 @@ func SpanPath(project, trace, span string) string {
 		""
 }
 
-// BatchWriteSpans sends new spans to Stackdriver Trace or updates existing traces. If the
-// name of a trace that you send matches that of an existing trace, new spans
-// are added to the existing trace. Attempt to update existing spans results
-// undefined behavior. If the name does not match, a new trace is created
-// with given set of spans.
+// BatchWriteSpans sends new spans to new or existing traces. You cannot update
+// existing spans.
 func (c *Client) BatchWriteSpans(ctx context.Context, req *cloudtracepb.BatchWriteSpansRequest, opts ...gax.CallOption) error {
 	ctx = insertMetadata(ctx, c.xGoogMetadata)
 	opts = append(c.CallOptions.BatchWriteSpans[0:len(c.CallOptions.BatchWriteSpans):len(c.CallOptions.BatchWriteSpans)], opts...)
@@ -157,7 +154,7 @@ func (c *Client) BatchWriteSpans(ctx context.Context, req *cloudtracepb.BatchWri
 	return err
 }
 
-// CreateSpan creates a new Span.
+// CreateSpan creates a new span.
 func (c *Client) CreateSpan(ctx context.Context, req *cloudtracepb.Span, opts ...gax.CallOption) (*cloudtracepb.Span, error) {
 	ctx = insertMetadata(ctx, c.xGoogMetadata)
 	opts = append(c.CallOptions.CreateSpan[0:len(c.CallOptions.CreateSpan):len(c.CallOptions.CreateSpan)], opts...)