particle-os/debian-forge-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upload: warn the user if no --arch flag is passed on upload

Browse source 
This mitigates the issue that a `image-builder upload` command
currently does not know the target architecture of the image
it uploads.
This commit is contained in:
Michael Vogt 2025-06-03 12:35:40 +02:00 • committed by Achilleas Koutsou
parent 2c017fc630
commit 03613a3fb3
3 changed files with 34 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cmd/image-builder/upload.go
View file

@ -11,6 +11,7 @@ import (
"github.com/spf13/cobra"
"github.com/osbuild/image-builder-cli/pkg/progress"
"github.com/osbuild/images/pkg/arch"
"github.com/osbuild/images/pkg/cloud"
"github.com/osbuild/images/pkg/cloud/awscloud"
"github.com/osbuild/images/pkg/platform"
@ -62,17 +63,17 @@ func uploaderCheckWithProgress(pbar progress.ProgressBar, uploader cloud.Uploade
return uploader.Check(pw)
}
func uploaderFor(cmd *cobra.Command, typeOrCloud string, bootMode *platform.BootMode) (cloud.Uploader, error) {
func uploaderFor(cmd *cobra.Command, typeOrCloud string, targetArch string, bootMode *platform.BootMode) (cloud.Uploader, error) {
switch typeOrCloud {
case "ami", "aws":
return uploaderForCmdAWS(cmd, bootMode)
return uploaderForCmdAWS(cmd, targetArch, bootMode)
default:
return nil, fmt.Errorf("%w: %q", ErrUploadTypeUnsupported, typeOrCloud)
}
}
func uploaderForCmdAWS(cmd *cobra.Command, bootMode *platform.BootMode) (cloud.Uploader, error) {
func uploaderForCmdAWS(cmd *cobra.Command, targetArch string, bootMode *platform.BootMode) (cloud.Uploader, error) {
amiName, err := cmd.Flags().GetString("aws-ami-name")
if err != nil {
return nil, err
@ -85,10 +86,6 @@ func uploaderForCmdAWS(cmd *cobra.Command, bootMode *platform.BootMode) (cloud.U
if err != nil {
return nil, err
}
targetArch, err := cmd.Flags().GetString("arch")
if err != nil {
return nil, err
}
if bootMode == nil {
// If unset, default to BOOT_HYBIRD which translated
// to "uefi-prefered" when registering the image.
@ -127,6 +124,8 @@ func uploaderForCmdAWS(cmd *cobra.Command, bootMode *platform.BootMode) (cloud.U
}
func cmdUpload(cmd *cobra.Command, args []string) error {
imagePath := args[0]
uploadTo, err := cmd.Flags().GetString("to")
if err != nil {
return err
@ -135,8 +134,18 @@ func cmdUpload(cmd *cobra.Command, args []string) error {
return fmt.Errorf("missing --to parameter, try --to=aws")
}
imagePath := args[0]
uploader, err := uploaderFor(cmd, uploadTo, nil)
targetArch, err := cmd.Flags().GetString("arch")
if err != nil {
return err
}
if targetArch == "" {
// we could try to inspect the image here and get a
// better guess
targetArch = arch.Current().String()
fmt.Fprintf(osStderr, "WARNING: no upload architecture specified, using %q (use --arch to override)\n", targetArch)
}
uploader, err := uploaderFor(cmd, uploadTo, targetArch, nil)
if err != nil {
return err
}