pkg/gcs: simplify interface, remove proxy type

Author: tarasmadan

dashboard/app/api.go

@@ -188,13 +188,9 @@ func gcsPayloadHandler(handler APIHandler) APIHandler {
 			return nil, fmt.Errorf("gcs.NewClient: %w", err)
 		}
 		defer clientGCS.Close()
-		gcsFile, err := clientGCS.Read(gcsURL)
+		gcsPayloadReader, err := clientGCS.FileReader(gcsURL)
 		if err != nil {
-			return nil, fmt.Errorf("clientGCS.Read: %w", err)
-		}
-		gcsPayloadReader, err := gcsFile.Reader()
-		if err != nil {
-			return nil, fmt.Errorf("gcsFile.Reader: %w", err)
+			return nil, fmt.Errorf("clientGCS.FileReader: %w", err)
 		}
 		gz, err := gzip.NewReader(gcsPayloadReader)
 		if err != nil {

pkg/covermerger/bq_csv_reader.go

@@ -100,12 +100,8 @@ func (r *bqCSVReader) initGCSFileReaders(ctx context.Context, bucket, path strin
 		return fmt.Errorf("err enumerating gcs files: %w", err)
 	}
 	for _, obj := range gcsFiles {
-		var file *gcs.File
-		if file, err = gcsClient.Read(bucket + "/" + obj.Path); err != nil {
-			return fmt.Errorf("failed to start reading %s: %w", obj.Path, err)
-		}
 		var readCloser io.ReadCloser
-		if readCloser, err = file.Reader(); err != nil {
+		if readCloser, err = gcsClient.FileReader(bucket + "/" + obj.Path); err != nil {
 			return fmt.Errorf("failed to get %s reader: %w", obj.Path, err)
 		}
 		r.closers = append(r.closers, readCloser)

pkg/gcs/gcs.go

@@ -24,7 +24,7 @@ import (
 
 type Client interface {
 	Close() error
-	Read(path string) (*File, error)
+	FileReader(path string) (io.ReadCloser, error)
 	FileWriter(path string, contentType string, contentEncoding string) (io.WriteCloser, error)
 	DeleteFile(path string) error
 	FileExists(path string) (bool, error)
@@ -71,17 +71,6 @@ type client struct {
 	ctx    context.Context
 }
 
-type File struct {
-	Updated time.Time
-
-	ctx    context.Context
-	handle *storage.ObjectHandle
-}
-
-func (file *File) Reader() (io.ReadCloser, error) {
-	return file.handle.NewReader(file.ctx)
-}
-
 func NewClient(ctx context.Context) (Client, error) {
 	storageClient, err := storage.NewClient(ctx)
 	if err != nil {
@@ -98,7 +87,7 @@ func (c *client) Close() error {
 	return c.client.Close()
 }
 
-func (c *client) Read(gcsFile string) (*File, error) {
+func (c *client) FileReader(gcsFile string) (io.ReadCloser, error) {
 	bucket, filename, err := split(gcsFile)
 	if err != nil {
 		return nil, err
@@ -116,12 +105,7 @@ func (c *client) Read(gcsFile string) (*File, error) {
 		GenerationMatch:     attrs.Generation,
 		MetagenerationMatch: attrs.Metageneration,
 	})
-	file := &File{
-		Updated: attrs.Updated,
-		ctx:     c.ctx,
-		handle:  handle,
-	}
-	return file, nil
+	return handle.NewReader(c.ctx)
 }
 
 func (c *client) FileWriter(gcsFile, contentType, contentEncoding string) (io.WriteCloser, error) {

pkg/gcs/mocks/Client.go

@@ -51,11 +51,7 @@ func (gcs *gcsDriver) Read(uri string) (io.ReadCloser, error) {
 	if err != nil {
 		return nil, err
 	}
-	file, err := gcs.client.Read(fmt.Sprintf("%s/%s", gcs.bucket, object))
-	if err != nil {
-		return nil, err
-	}
-	return file.Reader()
+	return gcs.client.FileReader(fmt.Sprintf("%s/%s", gcs.bucket, object))
 }
 
 var gcsObjectRe = regexp.MustCompile(`^gcs://([\w-]+)/([\w-]+)$`)