ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3633 from aybabtme/provider/digitalocean-fix-issue-3628 

provider/digitalocean: fix issue #3628 by accepting SSH fingerprints
This commit is contained in:
Paul Hinze 2015-10-29 15:44:51 -05:00
parent 76c488dc24 7594c09623
commit 845e1726dd
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/providers/digitalocean/resource_digitalocean_droplet.go
View File

@ -140,14 +140,17 @@ func resourceDigitalOceanDropletCreate(d *schema.ResourceData, meta interface{})
opts.SSHKeys = make([]godo.DropletCreateSSHKey, 0, sshKeys) opts.SSHKeys = make([]godo.DropletCreateSSHKey, 0, sshKeys)
for i := 0; i < sshKeys; i++ { for i := 0; i < sshKeys; i++ {
key := fmt.Sprintf("ssh_keys.%d", i) key := fmt.Sprintf("ssh_keys.%d", i)
id, err := strconv.Atoi(d.Get(key).(string)) sshKeyRef := d.Get(key).(string)
if err != nil {
return err var sshKey godo.DropletCreateSSHKey
// sshKeyRef can be either an ID or a fingerprint
if id, err := strconv.Atoi(sshKeyRef); err == nil {
sshKey.ID = id
} else {
sshKey.Fingerprint = sshKeyRef
} }
opts.SSHKeys = append(opts.SSHKeys, godo.DropletCreateSSHKey{ opts.SSHKeys = append(opts.SSHKeys, sshKey)
ID: id,
})
} }
} }