Skip to content

Commit

Permalink
chore: remove todo storage client grpc flag (googleapis#10161)
Browse files Browse the repository at this point in the history
You already pushed this into main so this TODO shouldn't be here.
  • Loading branch information
bgdnvk committed May 17, 2024
1 parent 5238dbc commit 67d42ba
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions storage/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,6 @@ type Client struct {

// tc is the transport-agnostic client implemented with either gRPC or HTTP.
tc storageClient
// useGRPC flags whether the client uses gRPC. This is needed while the
// integration piece is only partially complete.
// TODO: remove before merging to main.
useGRPC bool
}

// NewClient creates a new Google Cloud Storage client using the HTTP transport.
Expand Down Expand Up @@ -237,7 +233,7 @@ func NewGRPCClient(ctx context.Context, opts ...option.ClientOption) (*Client, e
return nil, err
}

return &Client{tc: tc, useGRPC: true}, nil
return &Client{tc: tc}, nil
}

// Close closes the Client.
Expand Down Expand Up @@ -975,7 +971,8 @@ func (o *ObjectHandle) Update(ctx context.Context, uattrs ObjectAttrsToUpdate) (
gen: o.gen,
encryptionKey: o.encryptionKey,
conds: o.conds,
overrideRetention: o.overrideRetention}, opts...)
overrideRetention: o.overrideRetention,
}, opts...)
}

// BucketName returns the name of the bucket.
Expand Down Expand Up @@ -2356,7 +2353,6 @@ func toProtoChecksums(sendCRC32C bool, attrs *ObjectAttrs) *storagepb.ObjectChec
func (c *Client) ServiceAccount(ctx context.Context, projectID string) (string, error) {
o := makeStorageOpts(true, c.retry, "")
return c.tc.GetServiceAccount(ctx, projectID, o...)

}

// bucketResourceName formats the given project ID and bucketResourceName ID
Expand Down

0 comments on commit 67d42ba

Please sign in to comment.