Don't take bucket name as a request parameter

Author: Andrew Farries

components/content-service-api/go/usage.pb.go

@@ -13,8 +13,6 @@
 import * as jspb from "google-protobuf";
 
 export class UsageReportUploadURLRequest extends jspb.Message {
-    getBucket(): string;
-    setBucket(value: string): UsageReportUploadURLRequest;
     getName(): string;
     setName(value: string): UsageReportUploadURLRequest;
 
@@ -30,7 +28,6 @@ export class UsageReportUploadURLRequest extends jspb.Message {
 
 export namespace UsageReportUploadURLRequest {
     export type AsObject = {
-        bucket: string,
         name: string,
     }
 }

components/content-service-api/typescript/src/usage_pb.d.ts

@@ -97,8 +97,7 @@ proto.contentservice.UsageReportUploadURLRequest.prototype.toObject = function(o
  */
 proto.contentservice.UsageReportUploadURLRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-    bucket: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    name: jspb.Message.getFieldWithDefault(msg, 2, "")
+    name: jspb.Message.getFieldWithDefault(msg, 1, "")
   };
 
   if (includeInstance) {
@@ -136,10 +135,6 @@ proto.contentservice.UsageReportUploadURLRequest.deserializeBinaryFromReader = f
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setBucket(value);
-      break;
-    case 2:
       var value = /** @type {string} */ (reader.readString());
       msg.setName(value);
       break;
@@ -172,47 +167,22 @@ proto.contentservice.UsageReportUploadURLRequest.prototype.serializeBinary = fun
  */
 proto.contentservice.UsageReportUploadURLRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = message.getBucket();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
   f = message.getName();
   if (f.length > 0) {
     writer.writeString(
-      2,
+      1,
       f
     );
   }
 };
 
 
 /**
- * optional string bucket = 1;
- * @return {string}
- */
-proto.contentservice.UsageReportUploadURLRequest.prototype.getBucket = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/**
- * @param {string} value
- * @return {!proto.contentservice.UsageReportUploadURLRequest} returns this
- */
-proto.contentservice.UsageReportUploadURLRequest.prototype.setBucket = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-/**
- * optional string name = 2;
+ * optional string name = 1;
  * @return {string}
  */
 proto.contentservice.UsageReportUploadURLRequest.prototype.getName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
@@ -221,7 +191,7 @@ proto.contentservice.UsageReportUploadURLRequest.prototype.getName = function()
  * @return {!proto.contentservice.UsageReportUploadURLRequest} returns this
  */
 proto.contentservice.UsageReportUploadURLRequest.prototype.setName = function(value) {
-  return jspb.Message.setProto3StringField(this, 2, value);
+  return jspb.Message.setProto3StringField(this, 1, value);
 };
 
 

components/content-service-api/typescript/src/usage_pb.js

@@ -14,8 +14,7 @@ service UsageReportService {
 }
 
 message UsageReportUploadURLRequest {
-  string bucket = 1;
-  string name = 2;
+  string name = 1;
 }
 
 message UsageReportUploadURLResponse {

components/content-service-api/usage.proto

@@ -18,6 +18,10 @@ import (
 	"github.com/gitpod-io/gitpod/content-service/pkg/storage"
 )
 
+const (
+	bucketName = "usage-reports"
+)
+
 // UsageReportService implements UsageReportServiceServer
 type UsageReportService struct {
 	cfg config.StorageConfig
@@ -41,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, req.Bucket)
+	err = us.s.EnsureExists(ctx, bucketName)
 	if err != nil {
 		return nil, status.Error(codes.NotFound, err.Error())
 	}
 
-	info, err := us.s.SignUpload(ctx, req.Bucket, req.Name, &storage.SignedURLOptions{
+	info, err := us.s.SignUpload(ctx, bucketName, req.Name, &storage.SignedURLOptions{
 		ContentType: "*/*",
 	})
 	if err != nil {
 		log.WithField("name", req.Name).
-			WithField("bucket", req.Bucket).
+			WithField("bucket", bucketName).
 			WithError(err).
 			Error("Error getting UsageReport SignUpload URL")
 		if err == storage.ErrNotFound {

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

@@ -4,14 +4,15 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-// generated using github.com/32leaves/bel on 2022-07-19 09:52:23.814133592 +0000 UTC m=+0.009909921
+// generated using github.com/32leaves/bel on 2022-07-21 07:41:48.081573085 +0000 UTC m=+0.009109470
 // DO NOT MODIFY
 
+export interface WorkspaceReadyMessage {
+    source: WorkspaceInitSource;
+}
+
 export enum WorkspaceInitSource {
     WorkspaceInitFromBackup = "from-backup",
     WorkspaceInitFromPrebuild = "from-prebuild",
     WorkspaceInitFromOther = "from-other",
 }
-export interface WorkspaceReadyMessage {
-    source: WorkspaceInitSource
-}