iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SSHPrivateKey => SSHPrivateKeyFile

This commit is contained in:
Adrien Delorme 2018-08-23 16:35:07 +02:00
parent c0b52b0aff
commit 51d2aac9f6
25 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/alicloud/ecs/builder.go
View File

@ -98,7 +98,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&stepConfigAlicloudKeyPair{ &stepConfigAlicloudKeyPair{
Debug: b.config.PackerDebug, Debug: b.config.PackerDebug,
KeyPairName: b.config.SSHKeyPairName, KeyPairName: b.config.SSHKeyPairName,
PrivateKeyFile: b.config.Comm.SSHPrivateKey, PrivateKeyFile: b.config.Comm.SSHPrivateKeyFile,
TemporaryKeyPairName: b.config.TemporaryKeyPairName, TemporaryKeyPairName: b.config.TemporaryKeyPairName,
SSHAgentAuth: b.config.Comm.SSHAgentAuth, SSHAgentAuth: b.config.Comm.SSHAgentAuth,
DebugKeyPath: fmt.Sprintf("ecs_%s.pem", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("ecs_%s.pem", b.config.PackerBuildName),
@ -230,7 +230,7 @@ func (b *Builder) isVpcSpecified() bool {
func (b *Builder) isUserDataNeeded() bool { func (b *Builder) isUserDataNeeded() bool {
// Public key setup requires userdata // Public key setup requires userdata
if b.config.RunConfig.Comm.SSHPrivateKey != "" { if b.config.RunConfig.Comm.SSHPrivateKeyFile != "" {
return true return true
} }

2
builder/alicloud/ecs/run_config.go
View File

@ -41,7 +41,7 @@ type RunConfig struct {
func (c *RunConfig) Prepare(ctx *interpolate.Context) []error { func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
if c.SSHKeyPairName == "" && c.TemporaryKeyPairName == "" && if c.SSHKeyPairName == "" && c.TemporaryKeyPairName == "" &&
c.Comm.SSHPrivateKey == "" && c.Comm.SSHPassword == "" && c.Comm.WinRMPassword == "" { c.Comm.SSHPrivateKeyFile == "" && c.Comm.SSHPassword == "" && c.Comm.WinRMPassword == "" {
c.TemporaryKeyPairName = fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID()) c.TemporaryKeyPairName = fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID())
} }

6
builder/amazon/common/run_config.go
View File

@ -68,7 +68,7 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
// temporary_key_pair_name has not been provided and we are not using // temporary_key_pair_name has not been provided and we are not using
// ssh_password. // ssh_password.
if c.SSHKeyPairName == "" && c.TemporaryKeyPairName == "" && if c.SSHKeyPairName == "" && c.TemporaryKeyPairName == "" &&
c.Comm.SSHPrivateKey == "" && c.Comm.SSHPassword == "" { c.Comm.SSHPrivateKeyFile == "" && c.Comm.SSHPassword == "" {
c.TemporaryKeyPairName = fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID()) c.TemporaryKeyPairName = fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID())
} }
@ -94,9 +94,9 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
} }
if c.SSHKeyPairName != "" { if c.SSHKeyPairName != "" {
if c.Comm.Type == "winrm" && c.Comm.WinRMPassword == "" && c.Comm.SSHPrivateKey == "" { if c.Comm.Type == "winrm" && c.Comm.WinRMPassword == "" && c.Comm.SSHPrivateKeyFile == "" {
errs = append(errs, fmt.Errorf("ssh_private_key_file must be provided to retrieve the winrm password when using ssh_keypair_name.")) errs = append(errs, fmt.Errorf("ssh_private_key_file must be provided to retrieve the winrm password when using ssh_keypair_name."))
} else if c.Comm.SSHPrivateKey == "" && !c.Comm.SSHAgentAuth { } else if c.Comm.SSHPrivateKeyFile == "" && !c.Comm.SSHAgentAuth {
errs = append(errs, fmt.Errorf("ssh_private_key_file must be provided or ssh_agent_auth enabled when ssh_keypair_name is specified.")) errs = append(errs, fmt.Errorf("ssh_private_key_file must be provided or ssh_agent_auth enabled when ssh_keypair_name is specified."))
} }
} }

2
builder/amazon/ebs/builder.go
View File

@ -184,7 +184,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
DebugKeyPath: fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName),
KeyPairName: b.config.SSHKeyPairName, KeyPairName: b.config.SSHKeyPairName,
TemporaryKeyPairName: b.config.TemporaryKeyPairName, TemporaryKeyPairName: b.config.TemporaryKeyPairName,
PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKey, PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKeyFile,
}, },
&awscommon.StepSecurityGroup{ &awscommon.StepSecurityGroup{
SecurityGroupIds: b.config.SecurityGroupIds, SecurityGroupIds: b.config.SecurityGroupIds,

2
builder/amazon/ebssurrogate/builder.go
View File

@ -201,7 +201,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
DebugKeyPath: fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName),
KeyPairName: b.config.SSHKeyPairName, KeyPairName: b.config.SSHKeyPairName,
TemporaryKeyPairName: b.config.TemporaryKeyPairName, TemporaryKeyPairName: b.config.TemporaryKeyPairName,
PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKey, PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKeyFile,
}, },
&awscommon.StepSecurityGroup{ &awscommon.StepSecurityGroup{
SecurityGroupIds: b.config.SecurityGroupIds, SecurityGroupIds: b.config.SecurityGroupIds,

2
builder/amazon/ebsvolume/builder.go
View File

@ -176,7 +176,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
DebugKeyPath: fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName),
KeyPairName: b.config.SSHKeyPairName, KeyPairName: b.config.SSHKeyPairName,
TemporaryKeyPairName: b.config.TemporaryKeyPairName, TemporaryKeyPairName: b.config.TemporaryKeyPairName,
PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKey, PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKeyFile,
}, },
&awscommon.StepSecurityGroup{ &awscommon.StepSecurityGroup{
SecurityGroupIds: b.config.SecurityGroupIds, SecurityGroupIds: b.config.SecurityGroupIds,

2
builder/amazon/instance/builder.go
View File

@ -261,7 +261,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
SSHAgentAuth: b.config.Comm.SSHAgentAuth, SSHAgentAuth: b.config.Comm.SSHAgentAuth,
DebugKeyPath: fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName),
KeyPairName: b.config.SSHKeyPairName, KeyPairName: b.config.SSHKeyPairName,
PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKey, PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKeyFile,
TemporaryKeyPairName: b.config.TemporaryKeyPairName, TemporaryKeyPairName: b.config.TemporaryKeyPairName,
}, },
&awscommon.StepSecurityGroup{ &awscommon.StepSecurityGroup{

4
builder/azure/arm/config.go
View File

@ -314,8 +314,8 @@ func setSshValues(c *Config) error {
c.Comm.SSHTimeout = 20 * time.Minute c.Comm.SSHTimeout = 20 * time.Minute
} }
if c.Comm.SSHPrivateKey != "" { if c.Comm.SSHPrivateKeyFile != "" {
privateKeyBytes, err := ioutil.ReadFile(c.Comm.SSHPrivateKey) privateKeyBytes, err := ioutil.ReadFile(c.Comm.SSHPrivateKeyFile)
if err != nil { if err != nil {
return err return err
} }

2
builder/cloudstack/builder.go
View File

@ -67,7 +67,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Debug: b.config.PackerDebug, Debug: b.config.PackerDebug,
DebugKeyPath: fmt.Sprintf("cs_%s.pem", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("cs_%s.pem", b.config.PackerBuildName),
KeyPair: b.config.Keypair, KeyPair: b.config.Keypair,
PrivateKeyFile: b.config.Comm.SSHPrivateKey, PrivateKeyFile: b.config.Comm.SSHPrivateKeyFile,
SSHAgentAuth: b.config.Comm.SSHAgentAuth, SSHAgentAuth: b.config.Comm.SSHAgentAuth,
TemporaryKeyPairName: b.config.TemporaryKeypairName, TemporaryKeyPairName: b.config.TemporaryKeypairName,
}, },

2
builder/cloudstack/config.go
View File

@ -127,7 +127,7 @@ func NewConfig(raws ...interface{}) (*Config, error) {
// then create a temporary one, but only if the temporary_keypair_name has not // then create a temporary one, but only if the temporary_keypair_name has not
// been provided. // been provided.
if c.Keypair == "" && c.TemporaryKeypairName == "" && if c.Keypair == "" && c.TemporaryKeypairName == "" &&
c.Comm.SSHPrivateKey == "" && c.Comm.SSHPassword == "" { c.Comm.SSHPrivateKeyFile == "" && c.Comm.SSHPassword == "" {
c.TemporaryKeypairName = fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID()) c.TemporaryKeypairName = fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID())
} }

2
builder/googlecompute/builder.go
View File

@ -53,7 +53,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&StepCreateSSHKey{ &StepCreateSSHKey{
Debug: b.config.PackerDebug, Debug: b.config.PackerDebug,
DebugKeyPath: fmt.Sprintf("gce_%s.pem", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("gce_%s.pem", b.config.PackerBuildName),
PrivateKeyFile: b.config.Comm.SSHPrivateKey, PrivateKeyFile: b.config.Comm.SSHPrivateKeyFile,
}, },
&StepCreateInstance{ &StepCreateInstance{
Debug: b.config.PackerDebug, Debug: b.config.PackerDebug,

6
builder/null/config.go
View File

@ -43,14 +43,14 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
fmt.Errorf("a Username must be specified, please reference your communicator documentation")) fmt.Errorf("a Username must be specified, please reference your communicator documentation"))
} }
if !c.CommConfig.SSHAgentAuth && c.CommConfig.Password() == "" && c.CommConfig.SSHPrivateKey == "" { if !c.CommConfig.SSHAgentAuth && c.CommConfig.Password() == "" && c.CommConfig.SSHPrivateKeyFile == "" {
errs = packer.MultiErrorAppend(errs, errs = packer.MultiErrorAppend(errs,
fmt.Errorf("one authentication method must be specified, please reference your communicator documentation")) fmt.Errorf("one authentication method must be specified, please reference your communicator documentation"))
} }
if (c.CommConfig.SSHAgentAuth && if (c.CommConfig.SSHAgentAuth &&
(c.CommConfig.SSHPassword != "" || c.CommConfig.SSHPrivateKey != "")) || (c.CommConfig.SSHPassword != "" || c.CommConfig.SSHPrivateKeyFile != "")) ||
(c.CommConfig.SSHPassword != "" && c.CommConfig.SSHPrivateKey != "") { (c.CommConfig.SSHPassword != "" && c.CommConfig.SSHPrivateKeyFile != "") {
errs = packer.MultiErrorAppend(errs, errs = packer.MultiErrorAppend(errs,
fmt.Errorf("only one of ssh_agent_auth, ssh_password, and ssh_private_key_file must be specified")) fmt.Errorf("only one of ssh_agent_auth, ssh_password, and ssh_private_key_file must be specified"))

4
builder/oneandone/step_create_sshkey.go
View File

@ -21,8 +21,8 @@ func (s *StepCreateSSHKey) Run(_ context.Context, state multistep.StateBag) mult
ui := state.Get("ui").(packer.Ui) ui := state.Get("ui").(packer.Ui)
c := state.Get("config").(*Config) c := state.Get("config").(*Config)
if c.Comm.SSHPrivateKey != "" { if c.Comm.SSHPrivateKeyFile != "" {
pemBytes, err := ioutil.ReadFile(c.Comm.SSHPrivateKey) pemBytes, err := ioutil.ReadFile(c.Comm.SSHPrivateKeyFile)
if err != nil { if err != nil {
ui.Error(err.Error()) ui.Error(err.Error())

2
builder/openstack/builder.go
View File

@ -84,7 +84,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
DebugKeyPath: fmt.Sprintf("os_%s.pem", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("os_%s.pem", b.config.PackerBuildName),
KeyPairName: b.config.SSHKeyPairName, KeyPairName: b.config.SSHKeyPairName,
TemporaryKeyPairName: b.config.TemporaryKeyPairName, TemporaryKeyPairName: b.config.TemporaryKeyPairName,
PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKey, PrivateKeyFile: b.config.RunConfig.Comm.SSHPrivateKeyFile,
SSHAgentAuth: b.config.RunConfig.Comm.SSHAgentAuth, SSHAgentAuth: b.config.RunConfig.Comm.SSHAgentAuth,
}, },
&StepSourceImageInfo{ &StepSourceImageInfo{

6
builder/openstack/run_config.go
View File

@ -103,7 +103,7 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
// temporary_key_pair_name has not been provided and we are not using // temporary_key_pair_name has not been provided and we are not using
// ssh_password. // ssh_password.
if c.SSHKeyPairName == "" && c.TemporaryKeyPairName == "" && if c.SSHKeyPairName == "" && c.TemporaryKeyPairName == "" &&
c.Comm.SSHPrivateKey == "" && c.Comm.SSHPassword == "" { c.Comm.SSHPrivateKeyFile == "" && c.Comm.SSHPassword == "" {
c.TemporaryKeyPairName = fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID()) c.TemporaryKeyPairName = fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID())
} }
@ -116,9 +116,9 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
errs := c.Comm.Prepare(ctx) errs := c.Comm.Prepare(ctx)
if c.SSHKeyPairName != "" { if c.SSHKeyPairName != "" {
if c.Comm.Type == "winrm" && c.Comm.WinRMPassword == "" && c.Comm.SSHPrivateKey == "" { if c.Comm.Type == "winrm" && c.Comm.WinRMPassword == "" && c.Comm.SSHPrivateKeyFile == "" {
errs = append(errs, errors.New("A ssh_private_key_file must be provided to retrieve the winrm password when using ssh_keypair_name.")) errs = append(errs, errors.New("A ssh_private_key_file must be provided to retrieve the winrm password when using ssh_keypair_name."))
} else if c.Comm.SSHPrivateKey == "" && !c.Comm.SSHAgentAuth { } else if c.Comm.SSHPrivateKeyFile == "" && !c.Comm.SSHAgentAuth {
errs = append(errs, errors.New("A ssh_private_key_file must be provided or ssh_agent_auth enabled when ssh_keypair_name is specified.")) errs = append(errs, errors.New("A ssh_private_key_file must be provided or ssh_agent_auth enabled when ssh_keypair_name is specified."))
} }
} }

2
builder/oracle/classic/builder.go
View File

@ -65,7 +65,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&ocommon.StepKeyPair{ &ocommon.StepKeyPair{
Debug: b.config.PackerDebug, Debug: b.config.PackerDebug,
DebugKeyPath: fmt.Sprintf("oci_classic_%s.pem", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("oci_classic_%s.pem", b.config.PackerBuildName),
PrivateKeyFile: b.config.Comm.SSHPrivateKey, PrivateKeyFile: b.config.Comm.SSHPrivateKeyFile,
}, },
&stepCreateIPReservation{}, &stepCreateIPReservation{},
&stepAddKeysToAPI{}, &stepAddKeysToAPI{},

2
builder/oracle/oci/builder.go
View File

@ -54,7 +54,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&ocommon.StepKeyPair{ &ocommon.StepKeyPair{
Debug: b.config.PackerDebug, Debug: b.config.PackerDebug,
DebugKeyPath: fmt.Sprintf("oci_%s.pem", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("oci_%s.pem", b.config.PackerBuildName),
PrivateKeyFile: b.config.Comm.SSHPrivateKey, PrivateKeyFile: b.config.Comm.SSHPrivateKeyFile,
}, },
&stepCreateInstance{}, &stepCreateInstance{},
&stepInstanceInfo{}, &stepInstanceInfo{},

8
builder/parallels/common/ssh_config_test.go
View File

@ -33,14 +33,14 @@ func TestSSHConfigPrepare_SSHPrivateKey(t *testing.T) {
var errs []error var errs []error
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = "" c.Comm.SSHPrivateKeyFile = ""
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) > 0 { if len(errs) > 0 {
t.Fatalf("should not have error: %#v", errs) t.Fatalf("should not have error: %#v", errs)
} }
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = "/i/dont/exist" c.Comm.SSHPrivateKeyFile = "/i/dont/exist"
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) == 0 { if len(errs) == 0 {
t.Fatal("should have error") t.Fatal("should have error")
@ -59,7 +59,7 @@ func TestSSHConfigPrepare_SSHPrivateKey(t *testing.T) {
} }
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = tf.Name() c.Comm.SSHPrivateKeyFile = tf.Name()
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) == 0 { if len(errs) == 0 {
t.Fatal("should have error") t.Fatal("should have error")
@ -70,7 +70,7 @@ func TestSSHConfigPrepare_SSHPrivateKey(t *testing.T) {
tf.Truncate(0) tf.Truncate(0)
tf.Write([]byte(testPem)) tf.Write([]byte(testPem))
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = tf.Name() c.Comm.SSHPrivateKeyFile = tf.Name()
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) > 0 { if len(errs) > 0 {
t.Fatalf("should not have error: %#v", errs) t.Fatalf("should not have error: %#v", errs)

2
builder/profitbricks/config.go
View File

@ -53,7 +53,7 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
var errs *packer.MultiError var errs *packer.MultiError
if c.Comm.SSHPassword == "" && c.Comm.SSHPrivateKey == "" { if c.Comm.SSHPassword == "" && c.Comm.SSHPrivateKeyFile == "" {
errs = packer.MultiErrorAppend( errs = packer.MultiErrorAppend(
errs, errors.New("Either ssh private key path or ssh password must be set.")) errs, errors.New("Either ssh private key path or ssh password must be set."))
} }

4
builder/profitbricks/step_create_ssh_key.go
View File

@ -21,8 +21,8 @@ func (s *StepCreateSSHKey) Run(_ context.Context, state multistep.StateBag) mult
ui := state.Get("ui").(packer.Ui) ui := state.Get("ui").(packer.Ui)
c := state.Get("config").(*Config) c := state.Get("config").(*Config)
if c.Comm.SSHPrivateKey != "" { if c.Comm.SSHPrivateKeyFile != "" {
pemBytes, err := ioutil.ReadFile(c.Comm.SSHPrivateKey) pemBytes, err := ioutil.ReadFile(c.Comm.SSHPrivateKeyFile)
if err != nil { if err != nil {
ui.Error(err.Error()) ui.Error(err.Error())

2
builder/scaleway/builder.go
View File

@ -51,7 +51,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&stepCreateSSHKey{ &stepCreateSSHKey{
Debug: b.config.PackerDebug, Debug: b.config.PackerDebug,
DebugKeyPath: fmt.Sprintf("scw_%s.pem", b.config.PackerBuildName), DebugKeyPath: fmt.Sprintf("scw_%s.pem", b.config.PackerBuildName),
PrivateKeyFile: b.config.Comm.SSHPrivateKey, PrivateKeyFile: b.config.Comm.SSHPrivateKeyFile,
}, },
new(stepCreateServer), new(stepCreateServer),
new(stepServerInfo), new(stepServerInfo),

2
builder/triton/builder.go
View File

@ -38,7 +38,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
// If we are using an SSH agent to sign requests, and no private key has been // If we are using an SSH agent to sign requests, and no private key has been
// specified for SSH, use the agent for connecting for provisioning. // specified for SSH, use the agent for connecting for provisioning.
if b.config.AccessConfig.KeyMaterial == "" && b.config.Comm.SSHPrivateKey == "" { if b.config.AccessConfig.KeyMaterial == "" && b.config.Comm.SSHPrivateKeyFile == "" {
b.config.Comm.SSHAgentAuth = true b.config.Comm.SSHAgentAuth = true
} }

8
builder/virtualbox/common/ssh_config_test.go
View File

@ -64,14 +64,14 @@ func TestSSHConfigPrepare_SSHPrivateKey(t *testing.T) {
var errs []error var errs []error
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = "" c.Comm.SSHPrivateKeyFile = ""
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) > 0 { if len(errs) > 0 {
t.Fatalf("should not have error: %#v", errs) t.Fatalf("should not have error: %#v", errs)
} }
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = "/i/dont/exist" c.Comm.SSHPrivateKeyFile = "/i/dont/exist"
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) == 0 { if len(errs) == 0 {
t.Fatal("should have error") t.Fatal("should have error")
@ -90,7 +90,7 @@ func TestSSHConfigPrepare_SSHPrivateKey(t *testing.T) {
} }
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = tf.Name() c.Comm.SSHPrivateKeyFile = tf.Name()
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) == 0 { if len(errs) == 0 {
t.Fatal("should have error") t.Fatal("should have error")
@ -101,7 +101,7 @@ func TestSSHConfigPrepare_SSHPrivateKey(t *testing.T) {
tf.Truncate(0) tf.Truncate(0)
tf.Write([]byte(testPem)) tf.Write([]byte(testPem))
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = tf.Name() c.Comm.SSHPrivateKeyFile = tf.Name()
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) > 0 { if len(errs) > 0 {
t.Fatalf("should not have error: %#v", errs) t.Fatalf("should not have error: %#v", errs)

8
builder/vmware/common/ssh_config_test.go
View File

@ -33,14 +33,14 @@ func TestSSHConfigPrepare_SSHPrivateKey(t *testing.T) {
var errs []error var errs []error
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = "" c.Comm.SSHPrivateKeyFile = ""
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) > 0 { if len(errs) > 0 {
t.Fatalf("should not have error: %#v", errs) t.Fatalf("should not have error: %#v", errs)
} }
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = "/i/dont/exist" c.Comm.SSHPrivateKeyFile = "/i/dont/exist"
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) == 0 { if len(errs) == 0 {
t.Fatal("should have error") t.Fatal("should have error")
@ -59,7 +59,7 @@ func TestSSHConfigPrepare_SSHPrivateKey(t *testing.T) {
} }
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = tf.Name() c.Comm.SSHPrivateKeyFile = tf.Name()
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) == 0 { if len(errs) == 0 {
t.Fatal("should have error") t.Fatal("should have error")
@ -70,7 +70,7 @@ func TestSSHConfigPrepare_SSHPrivateKey(t *testing.T) {
tf.Truncate(0) tf.Truncate(0)
tf.Write([]byte(testPem)) tf.Write([]byte(testPem))
c = testSSHConfig() c = testSSHConfig()
c.Comm.SSHPrivateKey = tf.Name() c.Comm.SSHPrivateKeyFile = tf.Name()
errs = c.Prepare(testConfigTemplate(t)) errs = c.Prepare(testConfigTemplate(t))
if len(errs) > 0 { if len(errs) > 0 {
t.Fatalf("should not have error: %#v", errs) t.Fatalf("should not have error: %#v", errs)

16
helper/communicator/config.go
View File

@ -26,7 +26,7 @@ type Config struct {
SSHPort int `mapstructure:"ssh_port"` SSHPort int `mapstructure:"ssh_port"`
SSHUsername string `mapstructure:"ssh_username"` SSHUsername string `mapstructure:"ssh_username"`
SSHPassword string `mapstructure:"ssh_password"` SSHPassword string `mapstructure:"ssh_password"`
SSHPrivateKey string `mapstructure:"ssh_private_key_file"` SSHPrivateKeyFile string `mapstructure:"ssh_private_key_file"`
SSHPty bool `mapstructure:"ssh_pty"` SSHPty bool `mapstructure:"ssh_pty"`
SSHTimeout time.Duration `mapstructure:"ssh_timeout"` SSHTimeout time.Duration `mapstructure:"ssh_timeout"`
SSHAgentAuth bool `mapstructure:"ssh_agent_auth"` SSHAgentAuth bool `mapstructure:"ssh_agent_auth"`
@ -83,9 +83,9 @@ func (c *Config) SSHConfigFunc() func(multistep.StateBag) (*ssh.ClientConfig, er
} }
var privateKeys [][]byte var privateKeys [][]byte
if c.SSHPrivateKey != "" { if c.SSHPrivateKeyFile != "" {
// key based auth // key based auth
bytes, err := ioutil.ReadFile(c.SSHPrivateKey) bytes, err := ioutil.ReadFile(c.SSHPrivateKeyFile)
if err != nil { if err != nil {
return nil, fmt.Errorf("Error setting up SSH config: %s", err) return nil, fmt.Errorf("Error setting up SSH config: %s", err)
} }
@ -219,8 +219,8 @@ func (c *Config) prepareSSH(ctx *interpolate.Context) []error {
c.SSHBastionPort = 22 c.SSHBastionPort = 22
} }
if c.SSHBastionPrivateKey == "" && c.SSHPrivateKey != "" { if c.SSHBastionPrivateKey == "" && c.SSHPrivateKeyFile != "" {
c.SSHBastionPrivateKey = c.SSHPrivateKey c.SSHBastionPrivateKey = c.SSHPrivateKeyFile
} }
} }
@ -240,11 +240,11 @@ func (c *Config) prepareSSH(ctx *interpolate.Context) []error {
errs = append(errs, errors.New("An ssh_username must be specified\n Note: some builders used to default ssh_username to \"root\".")) errs = append(errs, errors.New("An ssh_username must be specified\n Note: some builders used to default ssh_username to \"root\"."))
} }
if c.SSHPrivateKey != "" { if c.SSHPrivateKeyFile != "" {
if _, err := os.Stat(c.SSHPrivateKey); err != nil { if _, err := os.Stat(c.SSHPrivateKeyFile); err != nil {
errs = append(errs, fmt.Errorf( errs = append(errs, fmt.Errorf(
"ssh_private_key_file is invalid: %s", err)) "ssh_private_key_file is invalid: %s", err))
} else if _, err := SSHFileSigner(c.SSHPrivateKey); err != nil { } else if _, err := SSHFileSigner(c.SSHPrivateKeyFile); err != nil {
errs = append(errs, fmt.Errorf( errs = append(errs, fmt.Errorf(
"ssh_private_key_file is invalid: %s", err)) "ssh_private_key_file is invalid: %s", err))
} }