bib: fix AWS upload with empty target-arch

This commit fixes the issue that with an unset --target-arch
the code will try to convert an empty string to an arch.Arch
which then fails. This is a regression from
#1017
that was not caught.

Closes: #1029

Author: mvo5

bib/cmd/bootc-image-builder/main.go

@@ -386,9 +386,13 @@ func handleAWSFlags(cmd *cobra.Command) (cloud.Uploader, error) {
 	}
 
 	// check as many permission prerequisites as possible before starting
-	targetArch, err := arch.FromString(targetArchStr)
-	if err != nil {
-		return nil, err
+	targetArch := arch.Current()
+	if targetArchStr != "" {
+		var err error
+		targetArch, err = arch.FromString(targetArchStr)
+		if err != nil {
+			return nil, err
+		}
 	}
 	uploaderOpts := &awscloud.UploaderOptions{
 		TargetArch: targetArch,

bib/cmd/upload/main.go

@@ -33,8 +33,12 @@ func uploadAMI(cmd *cobra.Command, args []string) {
 	targetArchStr, err := flags.GetString("target-arch")
 	check(err)
 
-	targetArch, err := arch.FromString(targetArchStr)
-	check(err)
+	targetArch := arch.Current()
+	if targetArchStr != "" {
+		var err error
+		targetArch, err = arch.FromString(targetArchStr)
+		check(err)
+	}
 	opts := &awscloud.UploaderOptions{
 		TargetArch: targetArch,
 	}