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

awsupload: fix printing of IDs

Browse source 
The AWS API always uses pointers to strings everywhere, rather than
plain strings. The log messages got this wrong and printed the pointers
rather than dereferencing them.

Don't require users to do a memory dump to get at the AMIs, but instead
print the actual strings. Also change to %s from %v to let the linter
warn us in the future. %s accepts only strings, whereas %v prints
whatever you throw at it.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-06-04 00:36:06 +02:00 • committed by Ondřej Budai
parent a8f6281da2
commit 27e2d17911
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/upload/awsupload/awsupload.go
View file

@ -129,7 +129,7 @@ func (a *AWS) Register(name, bucket, key string) (*string, error) {
return nil, err
}
log.Printf("[AWS] Waiting for snapshot to finish importing: %v", importTaskOutput.ImportTaskId)
log.Printf("[AWS] Waiting for snapshot to finish importing: %s", *importTaskOutput.ImportTaskId)
err = WaitUntilImportSnapshotTaskCompleted(
a.importer,
&ec2.DescribeImportSnapshotTasksInput{
@ -163,9 +163,8 @@ func (a *AWS) Register(name, bucket, key string) (*string, error) {
return nil, err
}
snapshotId := importOutput.ImportSnapshotTasks[0].SnapshotTaskDetail.SnapshotId
log.Printf("[AWS] Registering AMI from imported snapshot: %v", snapshotId)
snapshotID := importOutput.ImportSnapshotTasks[0].SnapshotTaskDetail.SnapshotId
log.Printf("[AWS] Registering AMI from imported snapshot: %s", *snapshotID)
registerOutput, err := a.importer.RegisterImage(
&ec2.RegisterImageInput{
Architecture: aws.String("x86_64"),
@ -177,7 +176,7 @@ func (a *AWS) Register(name, bucket, key string) (*string, error) {
{
DeviceName: aws.String("/dev/sda1"),
Ebs: &ec2.EbsBlockDevice{
SnapshotId: snapshotId,
SnapshotId: snapshotID,
},
},
},
@ -187,6 +186,6 @@ func (a *AWS) Register(name, bucket, key string) (*string, error) {
return nil, err
}
log.Printf("[AWS] 🎉 AMI registered: %v", registerOutput.ImageId)
log.Printf("[AWS] 🎉 AMI registered: %s", *registerOutput.ImageId)
return registerOutput.ImageId, nil
}