Skip to content

cmd: move awscloudNewUploader back into upload.go #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lzap merged 1 commit into from
Dec 10, 2025
Merged

cmd: move awscloudNewUploader back into upload.go #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmd/image-builder/bib_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
10 changes: 7 additions & 3 deletions cmd/image-builder/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading