fix: refactor to apiv2

googleapis · Jul 15, 2021 · d10fffb · d10fffb
1 parent 3e54d74
commit d10fffb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/storage/reader.go b/storage/reader.go
@@ -29,7 +29,7 @@ import (
 
 	"cloud.google.com/go/internal/trace"
 	"google.golang.org/api/googleapi"
-	storagepb "google.golang.org/genproto/googleapis/storage/v1"
+	storagepb "google.golang.org/genproto/googleapis/storage/v2"
 )
 
 var crc32cTable = crc32.MakeTable(crc32.Castagnoli)
@@ -100,14 +100,14 @@ func (o *ObjectHandle) NewRangeReaderWithGRPC(ctx context.Context, offset, lengt
 		return
 	}
 
-	req := &storagepb.GetObjectMediaRequest{
+	req := &storagepb.ReadObjectRequest{
 		Bucket: o.bucket,
 		Object: o.object,
 	}
 
 	// Define a function that initiates a Read with offset and length, assuming we
 	// have already read seen bytes.
-	reopen := func(seen int64) (storagepb.Storage_GetObjectMediaClient, error) {
+	reopen := func(seen int64) (storagepb.Storage_ReadObjectClient, error) {
 		// If the context has already expired, return immediately without making a
 		// call.
 		if err := ctx.Err(); err != nil {
@@ -121,7 +121,7 @@ func (o *ObjectHandle) NewRangeReaderWithGRPC(ctx context.Context, offset, lengt
 		}
 		req.ReadOffset = start
 
-		res, err := o.c.gc.GetObjectMedia(ctx, req)
+		res, err := o.c.gc.ReadObject(ctx, req)
 		if err != nil {
 			return nil, err
 		}
@@ -400,8 +400,8 @@ type Reader struct {
 	gotCRC             uint32 // running crc
 	reopen             func(seen int64) (*http.Response, error)
 
-	stream         storagepb.Storage_GetObjectMediaClient
-	reopenWithGRPC func(seen int64) (storagepb.Storage_GetObjectMediaClient, error)
+	stream         storagepb.Storage_ReadObjectClient
+	reopenWithGRPC func(seen int64) (storagepb.Storage_ReadObjectClient, error)
 	leftovers      []byte
 }
 

diff --git a/storage/storage.go b/storage/storage.go
@@ -41,7 +41,7 @@ import (
 	"cloud.google.com/go/internal/optional"
 	"cloud.google.com/go/internal/trace"
 	"cloud.google.com/go/internal/version"
-	gapic "cloud.google.com/go/storage/internal/apiv1"
+	gapic "cloud.google.com/go/storage/internal/apiv2"
 	"google.golang.org/api/googleapi"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"