Add a test for the UsageReportService

Test that usageReportService.UploadURL interacts with PresignedAccess
correctly to produce an upload URL for the correct bucket and filename.

Author: Andrew Farries

components/content-service/pkg/service/usage-report-service_test.go

@@ -0,0 +1,36 @@
+// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License-AGPL.txt in the project root for license information.
+
+package service
+
+import (
+	"context"
+	"testing"
+
+	"github.com/gitpod-io/gitpod/content-service/api"
+	"github.com/gitpod-io/gitpod/content-service/api/config"
+	"github.com/gitpod-io/gitpod/content-service/pkg/storage"
+	storagemock "github.com/gitpod-io/gitpod/content-service/pkg/storage/mock"
+	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/require"
+)
+
+// TestUploadURL tests that usageReportService.UploadURL interacts with PresignedAccess
+// correctly to produce an upload URL for the correct bucket and filename.
+func TestUploadURL(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	s := storagemock.NewMockPresignedAccess(ctrl)
+	const fileName = "some-report-filename"
+
+	s.EXPECT().EnsureExists(gomock.Any(), usageReportBucketName).
+		Return(nil)
+	s.EXPECT().SignUpload(gomock.Any(), usageReportBucketName, fileName, gomock.Any()).
+		Return(&storage.UploadInfo{URL: "http://example.com/some-path"}, nil)
+
+	svc := &UsageReportService{cfg: config.StorageConfig{}, s: s}
+	resp, err := svc.UploadURL(context.Background(), &api.UsageReportUploadURLRequest{Name: fileName})
+
+	require.NoError(t, err)
+	require.Equal(t, "http://example.com/some-path", resp.Url)
+}

components/content-service/pkg/service/usagereport-service.go

@@ -19,7 +19,7 @@ import (
 )
 
 const (
-	bucketName = "usage-reports"
+	usageReportBucketName = "usage-reports"
 )
 
 // UsageReportService implements UsageReportServiceServer
@@ -45,17 +45,17 @@ func (us *UsageReportService) UploadURL(ctx context.Context, req *api.UsageRepor
 	span.SetTag("name", req.Name)
 	defer tracing.FinishSpan(span, &err)
 
-	err = us.s.EnsureExists(ctx, bucketName)
+	err = us.s.EnsureExists(ctx, usageReportBucketName)
 	if err != nil {
 		return nil, status.Error(codes.NotFound, err.Error())
 	}
 
-	info, err := us.s.SignUpload(ctx, bucketName, req.Name, &storage.SignedURLOptions{
+	info, err := us.s.SignUpload(ctx, usageReportBucketName, req.Name, &storage.SignedURLOptions{
 		ContentType: "*/*",
 	})
 	if err != nil {
 		log.WithField("name", req.Name).
-			WithField("bucket", bucketName).
+			WithField("bucket", usageReportBucketName).
 			WithError(err).
 			Error("Error getting UsageReport SignUpload URL")
 		if err == storage.ErrNotFound {