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

Add basic logging to AWS upload process

Browse source 
The AWS upload process takes time and has multiple steps that can fail
or take an extended time to run.

Add some basic logging to various parts of the AWS upload process to
assist with troubleshooting in CI and production.

Signed-off-by: Major Hayden <major@redhat.com>
This commit is contained in:
Major Hayden 2020-06-03 12:10:58 -05:00 • committed by Ondřej Budai
parent 65bc635c30
commit 1c9ded8e53
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package awsupload
import (
"log"
"os"
"time"
@ -45,6 +46,7 @@ func (a *AWS) Upload(filename, bucket, key string) (*s3manager.UploadOutput, err
return nil, err
}
log.Printf("[AWS] Uploading image to S3: %s/%s", bucket, key)
return a.uploader.Upload(
&s3manager.UploadInput{
Bucket: aws.String(bucket),
@ -107,6 +109,7 @@ func WaitUntilImportSnapshotTaskCompletedWithContext(c *ec2.EC2, ctx aws.Context
}
func (a *AWS) Register(name, bucket, key string) (*string, error) {
log.Printf("[AWS] Importing snapshot from image: %s/%s", bucket, key)
importTaskOutput, err := a.importer.ImportSnapshot(
&ec2.ImportSnapshotInput{
DiskContainer: &ec2.SnapshotDiskContainer{
@ -121,6 +124,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)
err = WaitUntilImportSnapshotTaskCompleted(
a.importer,
&ec2.DescribeImportSnapshotTasksInput{
@ -134,6 +138,7 @@ func (a *AWS) Register(name, bucket, key string) (*string, error) {
}
// we no longer need the object in s3, let's just delete it
log.Printf("[AWS] Deleting image from S3: %s/%s", bucket, key)
_, err = a.s3.DeleteObject(&s3.DeleteObjectInput{
Bucket: aws.String(bucket),
Key: aws.String(key),
@ -155,6 +160,7 @@ func (a *AWS) Register(name, bucket, key string) (*string, error) {
snapshotId := importOutput.ImportSnapshotTasks[0].SnapshotTaskDetail.SnapshotId
log.Printf("[AWS] Registering AMI from imported snapshot: %v", snapshotId)
registerOutput, err := a.importer.RegisterImage(
&ec2.RegisterImageInput{
Architecture: aws.String("x86_64"),
@ -176,5 +182,6 @@ func (a *AWS) Register(name, bucket, key string) (*string, error) {
return nil, err
}
log.Printf("[AWS] 🎉 AMI registered: %v", registerOutput.ImageId)
return registerOutput.ImageId, nil
}