go fmt

builder/amazonebs/builder.go

@@ -16,11 +16,18 @@ import (
 )
 
 type config struct {
+	// Access information
 	AccessKey string `mapstructure:"access_key"`
-	AMIName   string `mapstructure:"ami_name"`
-	Region    string
 	SecretKey string `mapstructure:"secret_key"`
+
+	// Information for the source AMI
+	Region      string
 	SourceAmi   string `mapstructure:"source_ami"`
+	SSHUsername string `mapstructure:"ssh_username"`
+	SSHKeyPath  string `mapstructure:"ssh_private_key_path"`
+
+	// Configuration of the resulting AMI
+	AMIName string `mapstructure:"ami_name"`
 }
 
 type Builder struct {

communicator/ssh/communicator_test.go

@@ -3,8 +3,8 @@ package ssh
 import (
 	"bytes"
 	"code.google.com/p/go.crypto/ssh"
-	"github.com/mitchellh/packer/packer"
 	"fmt"
+	"github.com/mitchellh/packer/packer"
 	"net"
 	"strings"
 	"testing"