Add UploadFile method to contentservice client

Make the `GetSignedUploadUrl` method unexported and remove it from the
interface.

Author: Andrew Farries

components/usage/pkg/contentservice/client.go

@@ -7,14 +7,18 @@ package contentservice
 import (
 	"context"
 	"fmt"
+	"net/http"
+	"os"
+	"path/filepath"
 
+	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/content-service/api"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
 
 type Interface interface {
-	GetSignedUploadUrl(ctx context.Context) (string, error)
+	UploadFile(ctx context.Context, filePath string) error
 }
 
 type Client struct {
@@ -25,7 +29,42 @@ func New(url string) *Client {
 	return &Client{url: url}
 }
 
-func (c *Client) GetSignedUploadUrl(ctx context.Context) (string, error) {
+func (c *Client) UploadFile(ctx context.Context, filePath string) error {
+	url, err := c.getSignedUploadUrl(ctx, filepath.Base(filePath))
+	if err != nil {
+		return fmt.Errorf("failed to obtain signed upload URL: %w", err)
+	}
+
+	file, err := os.Open(filePath)
+	if err != nil {
+		return fmt.Errorf("failed to open file: %w", err)
+	}
+
+	req, err := http.NewRequest(http.MethodPut, url, file)
+	if err != nil {
+		return fmt.Errorf("failed to construct http request: %w", err)
+	}
+
+	fileInfo, err := os.Stat(filePath)
+	if err != nil {
+		return fmt.Errorf("failed to stat file: %w", err)
+	}
+
+	log.Infof("Uploading %q to cloud storage...", filePath)
+	req.ContentLength = fileInfo.Size()
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("failed to make http request: %w", err)
+	}
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("unexpected http response code: %s", resp.Status)
+	}
+	log.Info("Upload complete")
+
+	return nil
+}
+
+func (c *Client) getSignedUploadUrl(ctx context.Context, key string) (string, error) {
 	conn, err := grpc.Dial(c.url, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		return "", fmt.Errorf("failed to dial content-service gRPC server: %w", err)
@@ -34,9 +73,9 @@ func (c *Client) GetSignedUploadUrl(ctx context.Context) (string, error) {
 
 	uc := api.NewUsageReportServiceClient(conn)
 
-	resp, err := uc.UploadURL(ctx, &api.UsageReportUploadURLRequest{Name: "some-name"})
+	resp, err := uc.UploadURL(ctx, &api.UsageReportUploadURLRequest{Name: key})
 	if err != nil {
-		return "", fmt.Errorf("failed to obtain signed upload URL: %w", err)
+		return "", fmt.Errorf("failed RPC to content service: %w", err)
 	}
 
 	return resp.Url, nil

components/usage/pkg/contentservice/noop.go

@@ -8,4 +8,4 @@ import "context"
 
 type NoOpClient struct{}
 
-func (c *NoOpClient) GetSignedUploadUrl(ctx context.Context) (string, error) { return "", nil }
+func (c *NoOpClient) UploadFile(ctx context.Context, filePath string) error { return nil }