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

image-builder: update upload API to match latest images

Browse source 
This commit updates the upload API to match the latest
version in the images library.
This commit is contained in:
Michael Vogt 2025-08-07 09:43:22 +02:00 • committed by Achilleas Koutsou
parent eef98870f4
commit 6169260dcd
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,7 @@ func uploaderFor(cmd *cobra.Command, typeOrCloud string, targetArch string, boot
} }
func uploaderForCmdAWS(cmd *cobra.Command, targetArch string, bootMode *platform.BootMode) (cloud.Uploader, error) { func uploaderForCmdAWS(cmd *cobra.Command, targetArchStr string, bootMode *platform.BootMode) (cloud.Uploader, error) {
amiName, err := cmd.Flags().GetString("aws-ami-name") amiName, err := cmd.Flags().GetString("aws-ami-name")
if err != nil { if err != nil {
return nil, err return nil, err
@ -98,6 +98,10 @@ func uploaderForCmdAWS(cmd *cobra.Command, targetArch string, bootMode *platform
bootModeHybrid := platform.BOOT_HYBRID bootModeHybrid := platform.BOOT_HYBRID
bootMode = &bootModeHybrid bootMode = &bootModeHybrid
} }
targetArch, err := arch.FromString(targetArchStr)
if err != nil {
return nil, err
}
var missing []string var missing []string
requiredArgs := []string{"aws-ami-name", "aws-bucket", "aws-region"} requiredArgs := []string{"aws-ami-name", "aws-bucket", "aws-region"}

6
cmd/image-builder/upload_test.go
View file

@ -102,7 +102,9 @@ func TestUploadWithAWSMock(t *testing.T) {
assert.Equal(t, bucketName, "aws-bucket-2") assert.Equal(t, bucketName, "aws-bucket-2")
assert.Equal(t, amiName, "aws-ami-3") assert.Equal(t, amiName, "aws-ami-3")
expectedBootMode := platform.BOOT_HYBRID expectedBootMode := platform.BOOT_HYBRID
assert.Equal(t, &awscloud.UploaderOptions{TargetArch: tc.expectedUploadArch, BootMode: &expectedBootMode}, uploadOpts) targetArch, err := arch.FromString(tc.expectedUploadArch)
assert.NoError(t, err)
assert.Equal(t, &awscloud.UploaderOptions{TargetArch: targetArch, BootMode: &expectedBootMode}, uploadOpts)
assert.Equal(t, 0, fa.checkCalls) assert.Equal(t, 0, fa.checkCalls)
assert.Equal(t, 1, fa.uploadAndRegisterCalls) assert.Equal(t, 1, fa.uploadAndRegisterCalls)
@ -199,7 +201,7 @@ func TestBuildAndUploadWithAWSMock(t *testing.T) {
assert.Equal(t, bucketName, "aws-bucket-2") assert.Equal(t, bucketName, "aws-bucket-2")
assert.Equal(t, amiName, "aws-ami-3") assert.Equal(t, amiName, "aws-ami-3")
expectedBootMode := platform.BOOT_HYBRID expectedBootMode := platform.BOOT_HYBRID
assert.Equal(t, &awscloud.UploaderOptions{BootMode: &expectedBootMode, TargetArch: arch.Current().String()}, uploadOpts) assert.Equal(t, &awscloud.UploaderOptions{BootMode: &expectedBootMode, TargetArch: arch.Current()}, uploadOpts)
assert.Equal(t, 1, fa.checkCalls) assert.Equal(t, 1, fa.checkCalls)
assert.Equal(t, 1, fa.uploadAndRegisterCalls) assert.Equal(t, 1, fa.uploadAndRegisterCalls)
assert.Equal(t, "fake-img-raw\n", fa.uploadAndRegisterRead.String()) assert.Equal(t, "fake-img-raw\n", fa.uploadAndRegisterRead.String())