provider/digitalocean: fix issue hashicorp#3628 by accepting SSH fing…

…erprints
aybabtme · Oct 25, 2015 · 7594c09 · 7594c09
1 parent 965399c
commit 7594c09
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/builtin/providers/digitalocean/resource_digitalocean_droplet.go b/builtin/providers/digitalocean/resource_digitalocean_droplet.go
@@ -140,14 +140,17 @@ func resourceDigitalOceanDropletCreate(d *schema.ResourceData, meta interface{})
 		opts.SSHKeys = make([]godo.DropletCreateSSHKey, 0, sshKeys)
 		for i := 0; i < sshKeys; i++ {
 			key := fmt.Sprintf("ssh_keys.%d", i)
-			id, err := strconv.Atoi(d.Get(key).(string))
-			if err != nil {
-				return err
+			sshKeyRef := d.Get(key).(string)
+
+			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{
-				ID: id,
-			})
+			opts.SSHKeys = append(opts.SSHKeys, sshKey)
 		}
 	}