target: pass the image filename in each target

Rather than having to assume that we only ever produce one
artifact, have each upload target contain the filename it expects
to upload from the osbuild output.

An image file is always explicitly named in the manifest, and we
leave it up to each distro to decide how this is done, but the
convention is to use the same image filename as used when
downloading the image through weldr.

Now make this policy explicit, by quering the distro for the image
name and inserting it into each upload target.

Signed-off-by: Tom Gundersen <teg@jklm.no>

internal/jobqueue/job.go

@@ -97,23 +97,7 @@ func (job *Job) Run(uploader LocalTargetUploader) (*common.ComposeResult, error)
 	for _, t := range job.Targets {
 		switch options := t.Options.(type) {
 		case *target.LocalTargetOptions:
-			outputDir := path.Join(tmpStore, "refs", result.OutputID)
+			f, err := os.Open(path.Join(tmpStore, "refs", result.OutputID, options.Filename))
-
-			files, err := ioutil.ReadDir(outputDir)
-			if err != nil {
-				r = append(r, err)
-				continue
-			}
-
-			// TODO osbuild pipelines can have multiple outputs. All the pipelines we
-			// are currently generating have exactly one, but we should support
-			// uploading all results in the future.
-			if len(files) != 1 {
-				r = append(r, fmt.Errorf("expected exactly one resulting image file"))
-				continue
-			}
-
-			f, err := os.Open(path.Join(outputDir, files[0].Name()))
 			if err != nil {
 				r = append(r, err)
 				continue
@@ -137,7 +121,7 @@ func (job *Job) Run(uploader LocalTargetUploader) (*common.ComposeResult, error)
 				options.Key = job.ID.String()
 			}
 
-			_, err = a.Upload(tmpStore+"/refs/"+result.OutputID+"/image.raw.xz", options.Bucket, options.Key)
+			_, err = a.Upload(path.Join(tmpStore, "refs", result.OutputID, options.Filename), options.Bucket, options.Key)
 			if err != nil {
 				r = append(r, err)
 				continue

internal/store/store.go

@@ -595,8 +595,15 @@ func (s *Store) PushCompose(distro distro.Distro, composeID uuid.UUID, bp *bluep
 			return fmt.Errorf("cannot create output directory for job %v: %#v", composeID, err)
 		}
 
+		filename, _, err := distro.FilenameFromType(composeType)
+		if err != nil {
+			return fmt.Errorf("cannot query filename from image type %s: %#v", composeType, err)
+		}
+
 		targets = append(targets, target.NewLocalTarget(
-			&target.LocalTargetOptions{},
+			&target.LocalTargetOptions{
+				Filename: filename,
+			},
 		))
 	}
 

internal/target/aws_target.go

@@ -1,6 +1,7 @@
 package target
 
 type AWSTargetOptions struct {
+	Filename        string `json:"filename"`
 	Region          string `json:"region"`
 	AccessKeyID     string `json:"accessKeyID"`
 	SecretAccessKey string `json:"secretAccessKey"`

internal/target/azure_target.go

@@ -1,6 +1,7 @@
 package target
 
 type AzureTargetOptions struct {
+	Filename  string `json:"filename"`
 	Account   string `json:"account"`
 	AccessKey string `json:"accessKey"`
 	Container string `json:"container"`

internal/target/local_target.go

@@ -1,6 +1,7 @@
 package target
 
 type LocalTargetOptions struct {
+	Filename string `json:"filename"`
 }
 
 func (LocalTargetOptions) isTargetOptions() {}

internal/weldr/api.go

@@ -1396,7 +1396,7 @@ func (api *API) composeHandler(writer http.ResponseWriter, request *http.Request
 
 	var uploadTarget *target.Target
 	if isRequestVersionAtLeast(params, 1) && cr.Upload != nil {
-		uploadTarget, err = uploadRequestToTarget(*cr.Upload)
+		uploadTarget, err = uploadRequestToTarget(*cr.Upload, api.distro, cr.ComposeType)
 		if err != nil {
 			errors := responseError{
 				ID:  "UploadError",

internal/weldr/api_test.go

@@ -495,6 +495,7 @@ func TestCompose(t *testing.T) {
 						Status:    common.IBWaiting,
 						ImageName: "test_upload",
 						Options: &target.AWSTargetOptions{
+							Filename:        "test.img",
 							Region:          "frankfurt",
 							AccessKeyID:     "accesskey",
 							SecretAccessKey: "secretkey",

internal/weldr/upload.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/osbuild/osbuild-composer/internal/common"
+	"github.com/osbuild/osbuild-composer/internal/distro"
 
 	"github.com/google/uuid"
 	"github.com/osbuild/osbuild-composer/internal/target"
@@ -117,9 +118,14 @@ func targetsToUploadResponses(targets []*target.Target) []uploadResponse {
 	return uploads
 }
 
-func uploadRequestToTarget(u uploadRequest) (*target.Target, error) {
+func uploadRequestToTarget(u uploadRequest, d distro.Distro, imageType string) (*target.Target, error) {
 	var t target.Target
 
+	filename, _, err := d.FilenameFromType(imageType)
+	if err != nil {
+		return nil, err
+	}
+
 	t.Uuid = uuid.New()
 	t.ImageName = u.ImageName
 	t.Status = common.IBWaiting
@@ -129,6 +135,7 @@ func uploadRequestToTarget(u uploadRequest) (*target.Target, error) {
 	case *awsUploadSettings:
 		t.Name = "org.osbuild.aws"
 		t.Options = &target.AWSTargetOptions{
+			Filename:        filename,
 			Region:          options.Region,
 			AccessKeyID:     options.AccessKeyID,
 			SecretAccessKey: options.SecretAccessKey,
@@ -138,6 +145,7 @@ func uploadRequestToTarget(u uploadRequest) (*target.Target, error) {
 	case *azureUploadSettings:
 		t.Name = "org.osbuild.azure"
 		t.Options = &target.AzureTargetOptions{
+			Filename:  filename,
 			Account:   options.Account,
 			AccessKey: options.AccessKey,
 			Container: options.Container,