Make content-service take bucket name from config

Rather than hardcoding the name of the bucket.

Author: Andrew Farries

components/content-service/cmd/run.go

@@ -57,7 +57,7 @@ var runCmd = &cobra.Command{
 		}
 		api.RegisterIDEPluginServiceServer(srv.GRPC(), idePluginService)
 
-		usageReportService, err := service.NewUsageReportService(cfg.Storage)
+		usageReportService, err := service.NewUsageReportService(cfg.Storage, cfg.UsageReports.BucketName)
 		if err != nil {
 			log.WithError(err).Fatalf("Cannot create usage report service")
 		}

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

@@ -19,16 +19,20 @@ import (
 // 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) {
+	const (
+		fileName   = "some-report-filename"
+		bucketName = "gitpod-usage-reports"
+	)
+
 	ctrl := gomock.NewController(t)
 	s := storagemock.NewMockPresignedAccess(ctrl)
-	const fileName = "some-report-filename"
 
-	s.EXPECT().EnsureExists(gomock.Any(), usageReportBucketName).
+	s.EXPECT().EnsureExists(gomock.Any(), bucketName).
 		Return(nil)
-	s.EXPECT().SignUpload(gomock.Any(), usageReportBucketName, fileName, gomock.Any()).
+	s.EXPECT().SignUpload(gomock.Any(), bucketName, fileName, gomock.Any()).
 		Return(&storage.UploadInfo{URL: "http://example.com/some-path"}, nil)
 
-	svc := &UsageReportService{cfg: config.StorageConfig{}, s: s}
+	svc := &UsageReportService{cfg: config.StorageConfig{}, s: s, bucketName: bucketName}
 	resp, err := svc.UploadURL(context.Background(), &api.UsageReportUploadURLRequest{Name: fileName})
 
 	require.NoError(t, err)

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

@@ -18,25 +18,22 @@ import (
 	"github.com/gitpod-io/gitpod/content-service/pkg/storage"
 )
 
-const (
-	usageReportBucketName = "usage-reports"
-)
-
 // UsageReportService implements UsageReportServiceServer
 type UsageReportService struct {
-	cfg config.StorageConfig
-	s   storage.PresignedAccess
+	cfg        config.StorageConfig
+	s          storage.PresignedAccess
+	bucketName string
 
 	api.UnimplementedUsageReportServiceServer
 }
 
 // NewUsageReportService create a new usagereport service
-func NewUsageReportService(cfg config.StorageConfig) (res *UsageReportService, err error) {
+func NewUsageReportService(cfg config.StorageConfig, bucketName string) (res *UsageReportService, err error) {
 	s, err := storage.NewPresignedAccess(&cfg)
 	if err != nil {
 		return nil, err
 	}
-	return &UsageReportService{cfg: cfg, s: s}, nil
+	return &UsageReportService{cfg: cfg, s: s, bucketName: bucketName}, nil
 }
 
 // UploadURL provides a URL to which clients can upload the content via HTTP PUT.
@@ -45,17 +42,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, usageReportBucketName)
+	err = us.s.EnsureExists(ctx, us.bucketName)
 	if err != nil {
 		return nil, status.Error(codes.NotFound, err.Error())
 	}
 
-	info, err := us.s.SignUpload(ctx, usageReportBucketName, req.Name, &storage.SignedURLOptions{
+	info, err := us.s.SignUpload(ctx, us.bucketName, req.Name, &storage.SignedURLOptions{
 		ContentType: "*/*",
 	})
 	if err != nil {
 		log.WithField("name", req.Name).
-			WithField("bucket", usageReportBucketName).
+			WithField("bucket", us.bucketName).
 			WithError(err).
 			Error("Error getting UsageReport SignUpload URL")
 		return nil, status.Error(codes.Unknown, err.Error())