From 07b1714bdf1bc39d03509914af9650e661b3e232 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Dec 2025 16:52:20 +0100 Subject: [PATCH] cmd: move `awscloudNewUploader` back into upload.go During the merge of the bootc-image-builder code into bib (PR#374) a function accidentially moved from `upload.go` into `bib_main.go`. This was a mistake and this commit moves it back into the right place. Thanks to Thozza for finding this [0] [0] https://github.com/osbuild/image-builder-cli/pull/374#discussion_r2589121410 --- cmd/image-builder/bib_main.go | 2 -- cmd/image-builder/upload.go | 10 +++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/image-builder/bib_main.go b/cmd/image-builder/bib_main.go index da725988..6df44eda 100644 --- a/cmd/image-builder/bib_main.go +++ b/cmd/image-builder/bib_main.go @@ -219,8 +219,6 @@ func bibCmdManifest(cmd *cobra.Command, args []string) error { return nil } -var awscloudNewUploader = awscloud.NewUploader - func handleAWSFlags(cmd *cobra.Command) (cloud.Uploader, error) { imgTypes, _ := cmd.Flags().GetStringArray("type") region, _ := cmd.Flags().GetString("aws-region") diff --git a/cmd/image-builder/upload.go b/cmd/image-builder/upload.go index d79196be..6c4d76f2 100644 --- a/cmd/image-builder/upload.go +++ b/cmd/image-builder/upload.go @@ -31,9 +31,13 @@ var ErrUploadConfigNotProvided = errors.New("missing all upload configuration") // ErrUploadTypeUnsupported is returned when the upload type is not supported var ErrUploadTypeUnsupported = errors.New("unsupported type") -var libvirtNewUploader = libvirt.NewUploader -var openstackNewUploader = openstack.NewUploader -var ibmNewUploader = ibmcloud.NewUploader +// uploader constructors that are mocked in tests +var ( + awscloudNewUploader = awscloud.NewUploader + libvirtNewUploader = libvirt.NewUploader + openstackNewUploader = openstack.NewUploader + ibmNewUploader = ibmcloud.NewUploader +) func uploadImageWithProgress(uploader cloud.Uploader, imagePath string) error { f, err := os.Open(imagePath)