Updated the distributor bundle path template

internal/adapters/distributor/client.go

@@ -28,11 +28,15 @@ type UploadRequest struct {
 	PipelineID     string
 	BundleID       string
 	IdempotencyKey string
-	SourcePath     string
-	BundlePath     string
+	Files          []UploadFile
 	CreatedAt      time.Time
 }
 
+type UploadFile struct {
+	SourcePath string
+	BundlePath string
+}
+
 type UploadResult struct {
 	RunID        string
 	Status       string
@@ -81,8 +85,7 @@ type uploadFilesOptions struct {
 	PipelineID     string
 	BundleID       string
 	IdempotencyKey string
-	SourcePath     string
-	BundlePath     string
+	Files          []UploadFile
 	CreatedAt      time.Time
 }
 
@@ -139,11 +142,16 @@ func (c *Client) Upload(ctx context.Context, req UploadRequest) (UploadResult, e
 	if req.IdempotencyKey == "" {
 		return UploadResult{}, fmt.Errorf("distributor idempotency key is required for bundle %q", req.BundleID)
 	}
-	if req.SourcePath == "" {
-		return UploadResult{}, fmt.Errorf("distributor source path is required for bundle %q", req.BundleID)
+	if len(req.Files) == 0 {
+		return UploadResult{}, fmt.Errorf("distributor upload files are required for bundle %q", req.BundleID)
 	}
-	if req.BundlePath == "" {
-		return UploadResult{}, fmt.Errorf("distributor bundle path is required for bundle %q", req.BundleID)
+	for i, file := range req.Files {
+		if file.SourcePath == "" {
+			return UploadResult{}, fmt.Errorf("distributor source path is required for bundle %q file %d", req.BundleID, i)
+		}
+		if file.BundlePath == "" {
+			return UploadResult{}, fmt.Errorf("distributor bundle path is required for bundle %q file %d", req.BundleID, i)
+		}
 	}
 	if c.newUploadClient == nil {
 		return UploadResult{}, fmt.Errorf("distributor upload client factory is required for endpoint %q", c.Endpoint)
@@ -173,8 +181,7 @@ func (c *Client) Upload(ctx context.Context, req UploadRequest) (UploadResult, e
 		PipelineID:     req.PipelineID,
 		BundleID:       req.BundleID,
 		IdempotencyKey: req.IdempotencyKey,
-		SourcePath:     req.SourcePath,
-		BundlePath:     req.BundlePath,
+		Files:          append([]UploadFile(nil), req.Files...),
 		CreatedAt:      req.CreatedAt,
 	})
 	if err != nil {
@@ -183,8 +190,8 @@ func (c *Client) Upload(ctx context.Context, req UploadRequest) (UploadResult, e
 			PipelineID:     req.PipelineID,
 			BundleID:       req.BundleID,
 			IdempotencyKey: req.IdempotencyKey,
-			SourcePath:     req.SourcePath,
-			BundlePath:     req.BundlePath,
+			SourcePaths:    uploadSourcePaths(req.Files),
+			BundlePaths:    uploadBundlePaths(req.Files),
 			Token:          token,
 		})
 	}
@@ -271,14 +278,19 @@ func newDistributorUploadClient(endpoint, token string, timeout time.Duration) (
 }
 
 func (c distributorUploadClient) UploadFiles(ctx context.Context, opts uploadFilesOptions) (uploadFilesResult, error) {
+	files := make([]distributorbundle.BundleFile, 0, len(opts.Files))
+	for _, file := range opts.Files {
+		files = append(files, distributorbundle.BundleFile{
+			SourcePath: file.SourcePath,
+			Path:       file.BundlePath,
+		})
+	}
 	result, err := c.client.UploadFiles(ctx, distributorupload.UploadFilesOptions{
 		PipelineID:     opts.PipelineID,
 		ID:             opts.BundleID,
 		Created:        opts.CreatedAt,
 		IdempotencyKey: opts.IdempotencyKey,
-		Files: []distributorbundle.BundleFile{
-			{SourcePath: opts.SourcePath, Path: opts.BundlePath},
-		},
+		Files:          files,
 	})
 	if err != nil {
 		return uploadFilesResult{}, err
@@ -311,8 +323,8 @@ type uploadErrorContext struct {
 	PipelineID     string
 	BundleID       string
 	IdempotencyKey string
-	SourcePath     string
-	BundlePath     string
+	SourcePaths    []string
+	BundlePaths    []string
 	Token          string
 }
 
@@ -322,10 +334,26 @@ func wrapUploadError(err error, ctx uploadErrorContext) error {
 	err = redactToken(err, ctx.Token)
 	if isConflict {
 		return &IdempotencyConflictError{
-			Err: fmt.Errorf("upload distributor bundle %q to pipeline %q at endpoint %q with idempotency key %q from source %q as bundle path %q: idempotency conflict: %w", ctx.BundleID, ctx.PipelineID, ctx.Endpoint, ctx.IdempotencyKey, ctx.SourcePath, ctx.BundlePath, err),
+			Err: fmt.Errorf("upload distributor bundle %q to pipeline %q at endpoint %q with idempotency key %q from sources %q as bundle paths %q: idempotency conflict: %w", ctx.BundleID, ctx.PipelineID, ctx.Endpoint, ctx.IdempotencyKey, ctx.SourcePaths, ctx.BundlePaths, err),
 		}
 	}
-	return fmt.Errorf("upload distributor bundle %q to pipeline %q at endpoint %q with idempotency key %q from source %q as bundle path %q: %w", ctx.BundleID, ctx.PipelineID, ctx.Endpoint, ctx.IdempotencyKey, ctx.SourcePath, ctx.BundlePath, err)
+	return fmt.Errorf("upload distributor bundle %q to pipeline %q at endpoint %q with idempotency key %q from sources %q as bundle paths %q: %w", ctx.BundleID, ctx.PipelineID, ctx.Endpoint, ctx.IdempotencyKey, ctx.SourcePaths, ctx.BundlePaths, err)
+}
+
+func uploadSourcePaths(files []UploadFile) []string {
+	paths := make([]string, 0, len(files))
+	for _, file := range files {
+		paths = append(paths, file.SourcePath)
+	}
+	return paths
+}
+
+func uploadBundlePaths(files []UploadFile) []string {
+	paths := make([]string, 0, len(files))
+	for _, file := range files {
+		paths = append(paths, file.BundlePath)
+	}
+	return paths
 }
 
 func redactToken(err error, token string) error {