Refactor: Use shared UploadPrefix constant across cloud drivers

src/pkg/cli/client/byoc/aws/byoc.go

@@ -238,7 +238,7 @@ func (b *ByocAws) deploy(ctx context.Context, req *client.DeployRequest, cmd str
 		payloadString = base64.StdEncoding.EncodeToString(data)
 		// TODO: consider making this a proper Data URL: "data:application/protobuf;base64,abcd…"
 	} else {
-		payloadUrl, err := b.driver.CreateUploadURL(ctx, etag)
+		payloadUrl, err := b.driver.CreateUploadURL(ctx, byoc.UploadPrefix, etag)
 		if err != nil {
 			return nil, err
 		}
@@ -670,7 +670,7 @@ func (b *ByocAws) CreateUploadURL(ctx context.Context, req *defangv1.UploadURLRe
 		return nil, err
 	}
 
-	url, err := b.driver.CreateUploadURL(ctx, req.Digest)
+	url, err := b.driver.CreateUploadURL(ctx, byoc.UploadPrefix, req.Digest)
 	if err != nil {
 		return nil, err
 	}

src/pkg/cli/client/byoc/common.go

@@ -14,6 +14,7 @@ import (
 
 const (
 	CdTaskPrefix = "defang-cd" // WARNING: renaming this practically deletes the Pulumi state
+	UploadPrefix = "uploads/"
 )
 
 var (

src/pkg/cli/client/byoc/do/byoc.go

@@ -162,7 +162,7 @@ func (b *ByocDo) deploy(ctx context.Context, req *client.DeployRequest, cmd stri
 		return nil, err
 	}
 
-	payloadUrl, err := b.driver.CreateUploadURL(ctx, etag)
+	payloadUrl, err := b.driver.CreateUploadURL(ctx, byoc.UploadPrefix, etag)
 	if err != nil {
 		return nil, err
 	}
@@ -281,7 +281,7 @@ func (b *ByocDo) CreateUploadURL(ctx context.Context, req *defangv1.UploadURLReq
 		return nil, err
 	}
 
-	url, err := b.driver.CreateUploadURL(ctx, req.Digest)
+	url, err := b.driver.CreateUploadURL(ctx, byoc.UploadPrefix, req.Digest)
 
 	if err != nil {
 		return nil, err

src/pkg/cli/client/byoc/gcp/byoc.go

@@ -41,7 +41,6 @@ var _ client.Provider = (*ByocGcp)(nil)
 const (
 	DefangCDProjectName            = "defang-cd"
 	DefangUploadServiceAccountName = "defang-upload"
-	UploadPrefix                   = "uploads/"
 )
 
 var (
@@ -484,7 +483,7 @@ func (b *ByocGcp) CreateUploadURL(ctx context.Context, req *defangv1.UploadURLRe
 		return nil, err
 	}
 
-	url, err := b.driver.CreateUploadURL(ctx, b.bucket, path.Join(UploadPrefix, req.Digest), b.uploadServiceAccount)
+	url, err := b.driver.CreateUploadURL(ctx, b.bucket, path.Join(byoc.UploadPrefix, req.Digest), b.uploadServiceAccount)
 	if err != nil {
 		if strings.Contains(err.Error(), "Permission 'iam.serviceAccounts.signBlob' denied on resource") {
 			return nil, errors.New("current user does not have 'iam.serviceAccounts.signBlob' permission. If it has been recently added, please wait a few minutes then try again")
@@ -538,7 +537,7 @@ func (b *ByocGcp) deploy(ctx context.Context, req *client.DeployRequest, command
 	if len(data) < 1000 {
 		payload = base64.StdEncoding.EncodeToString(data)
 	} else {
-		payloadUrl, err := b.driver.CreateUploadURL(ctx, b.bucket, path.Join(UploadPrefix, etag), b.uploadServiceAccount)
+		payloadUrl, err := b.driver.CreateUploadURL(ctx, b.bucket, path.Join(byoc.UploadPrefix, etag), b.uploadServiceAccount)
 		if err != nil {
 			return nil, err
 		}

src/pkg/clouds/aws/ecs/upload.go

@@ -13,30 +13,28 @@ import (
 // From https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html
 var s3InvalidCharsRegexp = regexp.MustCompile(`[^a-zA-Z0-9!_.*'()-]`)
 
-const prefix = "uploads/"
-
-func (a *AwsEcs) CreateUploadURL(ctx context.Context, name string) (string, error) {
+func (a *AwsEcs) CreateUploadURL(ctx context.Context, prefix string, filename string) (string, error) {
 	cfg, err := a.LoadConfig(ctx)
 	if err != nil {
 		return "", err
 	}
 
-	if name == "" {
-		name = uuid.NewString()
+	if filename == "" {
+		filename = uuid.NewString()
 	} else {
-		if len(name) > 64 {
+		if len(filename) > 64 {
 			return "", errors.New("name must be less than 64 characters")
 		}
 		// Sanitize the digest so it's safe to use as a file name
-		name = s3InvalidCharsRegexp.ReplaceAllString(name, "_")
+		filename = s3InvalidCharsRegexp.ReplaceAllString(filename, "_")
 		// name = path.Join(buildsPath, tenantName.String(), digest); TODO: avoid collisions between tenants
 	}
 
 	s3Client := s3.NewFromConfig(cfg)
 	// Use S3 SDK to create a presigned URL for uploading a file.
 	req, err := s3.NewPresignClient(s3Client).PresignPutObject(ctx, &s3.PutObjectInput{
 		Bucket: &a.BucketName,
-		Key:    ptr.String(prefix + name),
+		Key:    ptr.String(prefix + filename),
 	})
 	if err != nil {
 		return "", err

src/pkg/clouds/do/appPlatform/setup.go

@@ -233,22 +233,20 @@ func NewClient(ctx context.Context) *godo.Client {
 
 var s3InvalidCharsRegexp = regexp.MustCompile(`[^a-zA-Z0-9!_.*'()-]`)
 
-func (d DoApp) CreateUploadURL(ctx context.Context, name string) (string, error) {
+func (d DoApp) CreateUploadURL(ctx context.Context, prefix string, filename string) (string, error) {
 	s3Client, err := d.CreateS3Client()
 	if err != nil {
 		return "", err
 	}
 
-	prefix := "uploads/"
-
-	if name == "" {
-		name = uuid.NewString()
+	if filename == "" {
+		filename = uuid.NewString()
 	} else {
-		if len(name) > 64 {
+		if len(filename) > 64 {
 			return "", errors.New("name must be less than 64 characters")
 		}
 		// Sanitize the digest so it's safe to use as a file name
-		name = s3InvalidCharsRegexp.ReplaceAllString(name, "_")
+		filename = s3InvalidCharsRegexp.ReplaceAllString(filename, "_")
 		// name = path.Join(buildsPath, tenantName.String(), digest); TODO: avoid collisions between tenants
 	}
 
@@ -257,7 +255,7 @@ func (d DoApp) CreateUploadURL(ctx context.Context, name string) (string, error)
 	// so should we just stick to the S3 SDK for all S3 operations, instead of using presigned URLs?
 	req, err := s3.NewPresignClient(s3Client).PresignPutObject(ctx, &s3.PutObjectInput{
 		Bucket: &d.BucketName,
-		Key:    ptr.String(prefix + name),
+		Key:    ptr.String(prefix + filename),
 	})
 
 	if err != nil {

src/pkg/clouds/driver.go

@@ -50,7 +50,7 @@ type Driver interface {
 	PutSecret(ctx context.Context, name, value string) error
 	// DeleteSecrets(ctx context.Context, names ...string) error
 	ListSecrets(ctx context.Context) ([]string, error) // no values
-	CreateUploadURL(ctx context.Context, name string) (string, error)
+	CreateUploadURL(ctx context.Context, prefix string, name string) (string, error)
 }
 
 type TaskInfo struct {

src/pkg/crun/docker/common.go

@@ -39,6 +39,6 @@ func (Docker) ListSecrets(ctx context.Context) ([]string, error) {
 	return nil, errors.New("docker does not support secrets")
 }
 
-func (Docker) CreateUploadURL(ctx context.Context, name string) (string, error) {
+func (Docker) CreateUploadURL(ctx context.Context, prefix, name string) (string, error) {
 	return "", errors.New("docker does not support uploads")
 }

src/pkg/crun/local/local.go

@@ -113,6 +113,6 @@ func (l *Local) ListSecrets(ctx context.Context) ([]string, error) {
 	return nil, client.ErrNotImplemented("not implemented for local driver")
 }
 
-func (l *Local) CreateUploadURL(ctx context.Context, name string) (string, error) {
+func (l *Local) CreateUploadURL(ctx context.Context, prefix, name string) (string, error) {
 	return "", client.ErrNotImplemented("not implemented for local driver")
 }