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

builder/hcloud: handle dropped ssh errors

This commit is contained in:
Lars Lehtonen 2019-11-07 17:43:54 -08:00 committed by Adrien Delorme
parent db4f242a24
commit 643fce7b8a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builder/hcloud/step_create_sshkey.go
View File

@ -32,7 +32,11 @@ func (s *stepCreateSSHKey) Run(ctx context.Context, state multistep.StateBag) mu
ui.Say("Creating temporary ssh key for server...") ui.Say("Creating temporary ssh key for server...")
priv, err := rsa.GenerateKey(rand.Reader, 2014) priv, err := rsa.GenerateKey(rand.Reader, 2014)
if err != nil {
state.Put("error", fmt.Errorf("Error generating RSA key: %s", err))
ui.Error(err.Error())
return multistep.ActionHalt
}
// ASN.1 DER encoded form // ASN.1 DER encoded form
privDER := x509.MarshalPKCS1PrivateKey(priv) privDER := x509.MarshalPKCS1PrivateKey(priv)
privBLK := pem.Block{ privBLK := pem.Block{
@ -45,8 +49,13 @@ func (s *stepCreateSSHKey) Run(ctx context.Context, state multistep.StateBag) mu
c.Comm.SSHPrivateKey = pem.EncodeToMemory(&privBLK) c.Comm.SSHPrivateKey = pem.EncodeToMemory(&privBLK)
// Marshal the public key into SSH compatible format // Marshal the public key into SSH compatible format
// TODO properly handle the public key error pub, err := ssh.NewPublicKey(&priv.PublicKey)
pub, _ := ssh.NewPublicKey(&priv.PublicKey) if err != nil {
state.Put("error", fmt.Errorf("Error generating public key: %s", err))
ui.Error(err.Error())
return multistep.ActionHalt
}
pubSSHFormat := string(ssh.MarshalAuthorizedKey(pub)) pubSSHFormat := string(ssh.MarshalAuthorizedKey(pub))
// The name of the public key on the Hetzner Cloud // The name of the public key on the Hetzner Cloud