Skip to content

Commit d8887df

Browse files
codyosscodyoss
authored
feat(datastore): reference new protos (#10724)
1 parent 5e67869 commit d8887df

19 files changed

+22
-18
lines changed

‎datastore/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
"net/url"
2121
"time"
2222

23+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2324
"cloud.google.com/go/datastore/internal"
2425
cloudinternal "cloud.google.com/go/internal"
2526
"cloud.google.com/go/internal/trace"
2627
"cloud.google.com/go/internal/version"
2728
gax "github.com/googleapis/gax-go/v2"
28-
pb "google.golang.org/genproto/googleapis/datastore/v1"
2929
"google.golang.org/grpc"
3030
"google.golang.org/grpc/codes"
3131
"google.golang.org/grpc/metadata"

‎datastore/datastore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323
"reflect"
2424
"time"
2525

26+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2627
"cloud.google.com/go/internal/trace"
2728
"google.golang.org/api/option"
2829
"google.golang.org/api/option/internaloption"
2930
"google.golang.org/api/transport"
3031
gtransport "google.golang.org/api/transport/grpc"
31-
pb "google.golang.org/genproto/googleapis/datastore/v1"
3232
"google.golang.org/grpc"
3333
"google.golang.org/protobuf/types/known/timestamppb"
3434
)

‎datastore/datastore_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"testing"
2323
"time"
2424

25+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2526
"cloud.google.com/go/internal/testutil"
2627
"github.com/google/go-cmp/cmp"
2728
"google.golang.org/api/option"
2829
"google.golang.org/api/transport/grpc"
29-
pb "google.golang.org/genproto/googleapis/datastore/v1"
3030
"google.golang.org/protobuf/proto"
3131
"google.golang.org/protobuf/types/known/timestamppb"
3232
)

‎datastore/integration_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ import (
2929
"testing"
3030
"time"
3131

32+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
3233
"cloud.google.com/go/internal/testutil"
3334
"cloud.google.com/go/internal/uid"
3435
"cloud.google.com/go/rpcreplay"
3536
"github.com/google/go-cmp/cmp/cmpopts"
3637
"google.golang.org/api/iterator"
3738
"google.golang.org/api/option"
38-
pb "google.golang.org/genproto/googleapis/datastore/v1"
3939
"google.golang.org/grpc"
4040
"google.golang.org/grpc/codes"
4141
"google.golang.org/grpc/status"

‎datastore/key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"strconv"
2424
"strings"
2525

26-
pb "google.golang.org/genproto/googleapis/datastore/v1"
26+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2727
"google.golang.org/protobuf/proto"
2828
)
2929

‎datastore/load.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"time"
2222

2323
"cloud.google.com/go/civil"
24+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2425
"cloud.google.com/go/internal/fields"
25-
pb "google.golang.org/genproto/googleapis/datastore/v1"
2626
)
2727

2828
var (

‎datastore/load_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"time"
2323

2424
"cloud.google.com/go/civil"
25+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2526
"cloud.google.com/go/internal/testutil"
2627
"github.com/google/go-cmp/cmp/cmpopts"
27-
pb "google.golang.org/genproto/googleapis/datastore/v1"
2828
"google.golang.org/protobuf/types/known/timestamppb"
2929
)
3030

‎datastore/mock_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"reflect"
2828
"testing"
2929

30+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
3031
"cloud.google.com/go/internal/testutil"
3132
"google.golang.org/api/option"
32-
pb "google.golang.org/genproto/googleapis/datastore/v1"
3333
"google.golang.org/grpc"
3434
"google.golang.org/grpc/credentials/insecure"
3535
"google.golang.org/protobuf/encoding/prototext"

‎datastore/mutation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package datastore
1717
import (
1818
"fmt"
1919

20-
pb "google.golang.org/genproto/googleapis/datastore/v1"
20+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2121
)
2222

2323
// A Mutation represents a change to a Datastore entity.

‎datastore/mutation_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package datastore
1717
import (
1818
"testing"
1919

20+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2021
"cloud.google.com/go/internal/testutil"
21-
pb "google.golang.org/genproto/googleapis/datastore/v1"
2222
)
2323

2424
func TestMutationProtos(t *testing.T) {

‎datastore/prop_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"strings"
2020
"testing"
2121

22+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2223
"cloud.google.com/go/internal/testutil"
23-
pb "google.golang.org/genproto/googleapis/datastore/v1"
2424
)
2525

2626
func TestLoadSavePLS(t *testing.T) {

‎datastore/query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"strings"
2626
"time"
2727

28+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2829
"cloud.google.com/go/internal/protostruct"
2930
"cloud.google.com/go/internal/trace"
3031
"google.golang.org/api/iterator"
31-
pb "google.golang.org/genproto/googleapis/datastore/v1"
3232
wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
3333
)
3434

‎datastore/query_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"strings"
2424
"testing"
2525

26+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2627
"cloud.google.com/go/internal/testutil"
2728
"github.com/google/go-cmp/cmp"
28-
pb "google.golang.org/genproto/googleapis/datastore/v1"
2929
"google.golang.org/grpc"
3030
"google.golang.org/protobuf/proto"
3131
)

‎datastore/save.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"unicode/utf8"
2323

2424
"cloud.google.com/go/civil"
25-
pb "google.golang.org/genproto/googleapis/datastore/v1"
25+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2626
llpb "google.golang.org/genproto/googleapis/type/latlng"
2727
timepb "google.golang.org/protobuf/types/known/timestamppb"
2828
)

‎datastore/save_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"time"
2121

2222
"cloud.google.com/go/civil"
23+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2324
"cloud.google.com/go/internal/testutil"
24-
pb "google.golang.org/genproto/googleapis/datastore/v1"
2525
)
2626

2727
func TestInterfaceToProtoNil(t *testing.T) {

‎datastore/transaction.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"sync"
2121
"time"
2222

23+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2324
"cloud.google.com/go/internal/trace"
2425
gax "github.com/googleapis/gax-go/v2"
25-
pb "google.golang.org/genproto/googleapis/datastore/v1"
2626
"google.golang.org/grpc/codes"
2727
"google.golang.org/grpc/status"
2828
"google.golang.org/protobuf/types/known/timestamppb"

‎datastore/transaction_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"testing"
2222
"time"
2323

24+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2425
gax "github.com/googleapis/gax-go/v2"
25-
pb "google.golang.org/genproto/googleapis/datastore/v1"
2626
"google.golang.org/grpc/codes"
2727
"google.golang.org/grpc/status"
2828
"google.golang.org/protobuf/proto"

‎datastore/util_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"testing"
2525
"time"
2626

27+
pb "cloud.google.com/go/datastore/apiv1/datastorepb"
2728
"cloud.google.com/go/internal/testutil"
2829
"github.com/google/go-cmp/cmp"
29-
pb "google.golang.org/genproto/googleapis/datastore/v1"
3030
"google.golang.org/grpc"
3131
)
3232

‎internal/aliasfix/mappings.go

+4
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,10 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
710710
ImportPath: "cloud.google.com/go/datastore/admin/apiv1/adminpb",
711711
Status: StatusMigrated,
712712
},
713+
"google.golang.org/genproto/googleapis/datastore/v1": {
714+
ImportPath: "cloud.google.com/go/datastore/apiv1/datastorepb",
715+
Status: StatusMigrated,
716+
},
713717
"google.golang.org/genproto/googleapis/devtools/artifactregistry/v1": {
714718
ImportPath: "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb",
715719
Status: StatusMigrated,

0 commit comments

Comments
 (0)