github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2397 from dave-tucker/aws-panic

Browse Source 
aws: Fix panic when there is no console output
This commit is contained in:
Justin Cormack 2017-08-10 21:59:54 +01:00 committed by GitHub
commit a3de645048
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cmd/linuxkit/run_aws.go
View File

@ -170,12 +170,15 @@ func runAWS(args []string) {
log.Fatalf("Error getting output from instance %s: %s", *instanceID, err) log.Fatalf("Error getting output from instance %s: %s", *instanceID, err)
} }
out, err := base64.StdEncoding.DecodeString(*output.Output) if output.Output == nil {
if err != nil { log.Warn("No Console Output found")
log.Fatalf("Error decoding output: %s", err) } else {
out, err := base64.StdEncoding.DecodeString(*output.Output)
if err != nil {
log.Fatalf("Error decoding output: %s", err)
}
fmt.Printf(string(out) + "\n")
} }
fmt.Printf(string(out) + "\n")
log.Infof("Terminating instance %s", *instanceID) log.Infof("Terminating instance %s", *instanceID)
terminateParams := &ec2.TerminateInstancesInput{ terminateParams := &ec2.TerminateInstancesInput{
InstanceIds: []*string{instanceID}, InstanceIds: []*string{instanceID},