Merge v1.2.1-master

Signed-off-by: Emile Vauge <emile@vauge.com>

vendor/github.com/JamesClonk/vultr/lib/applications.go

@@ -0,0 +1,38 @@
+package lib
+
+import (
+	"sort"
+	"strings"
+)
+
+// Application on Vultr
+type Application struct {
+	ID         string  `json:"APPID"`
+	Name       string  `json:"name"`
+	ShortName  string  `json:"short_name"`
+	DeployName string  `json:"deploy_name"`
+	Surcharge  float64 `json:"surcharge"`
+}
+
+type applications []Application
+
+func (s applications) Len() int      { return len(s) }
+func (s applications) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s applications) Less(i, j int) bool {
+	return strings.ToLower(s[i].Name) < strings.ToLower(s[j].Name)
+}
+
+// GetApplications returns a list of all available applications on Vultr
+func (c *Client) GetApplications() ([]Application, error) {
+	var appMap map[string]Application
+	if err := c.get(`app/list`, &appMap); err != nil {
+		return nil, err
+	}
+
+	var appList []Application
+	for _, app := range appMap {
+		appList = append(appList, app)
+	}
+	sort.Sort(applications(appList))
+	return appList, nil
+}

vendor/github.com/JamesClonk/vultr/lib/block_storage.go

@@ -4,7 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
+	"sort"
 	"strconv"
+	"strings"
 )
 
 // BlockStorage on Vultr account
@@ -19,6 +21,25 @@ type BlockStorage struct {
 	AttachedTo string `json:"attached_to_SUBID"`
 }
 
+type blockstorages []BlockStorage
+
+func (b blockstorages) Len() int      { return len(b) }
+func (b blockstorages) Swap(i, j int) { b[i], b[j] = b[j], b[i] }
+func (b blockstorages) Less(i, j int) bool {
+	// sort order: name, size, status
+	if strings.ToLower(b[i].Name) < strings.ToLower(b[j].Name) {
+		return true
+	} else if strings.ToLower(b[i].Name) > strings.ToLower(b[j].Name) {
+		return false
+	}
+	if b[i].SizeGB < b[j].SizeGB {
+		return true
+	} else if b[i].SizeGB > b[j].SizeGB {
+		return false
+	}
+	return b[i].Status < b[j].Status
+}
+
 // UnmarshalJSON implements json.Unmarshaller on BlockStorage.
 // This is needed because the Vultr API is inconsistent in it's JSON responses.
 // Some fields can change type, from JSON number to JSON string and vice-versa.
@@ -87,6 +108,7 @@ func (c *Client) GetBlockStorages() (storages []BlockStorage, err error) {
 	if err := c.get(`block/list`, &storages); err != nil {
 		return nil, err
 	}
+	sort.Sort(blockstorages(storages))
 	return storages, nil
 }
 

vendor/github.com/JamesClonk/vultr/lib/client.go

@@ -18,7 +18,7 @@ import (
 
 const (
 	// Version of this libary
-	Version = "1.12.0"
+	Version = "1.13.0"
 
 	// APIVersion of Vultr
 	APIVersion = "v1"

vendor/github.com/JamesClonk/vultr/lib/dns.go

@@ -3,6 +3,8 @@ package lib
 import (
 	"fmt"
 	"net/url"
+	"sort"
+	"strings"
 )
 
 // DNSDomain represents a DNS domain on Vultr
@@ -11,6 +13,14 @@ type DNSDomain struct {
 	Created string `json:"date_created"`
 }
 
+type dnsdomains []DNSDomain
+
+func (d dnsdomains) Len() int      { return len(d) }
+func (d dnsdomains) Swap(i, j int) { d[i], d[j] = d[j], d[i] }
+func (d dnsdomains) Less(i, j int) bool {
+	return strings.ToLower(d[i].Domain) < strings.ToLower(d[j].Domain)
+}
+
 // DNSRecord represents a DNS record on Vultr
 type DNSRecord struct {
 	RecordID int    `json:"RECORDID"`
@@ -21,20 +31,41 @@ type DNSRecord struct {
 	TTL      int    `json:"ttl"`
 }
 
+type dnsrecords []DNSRecord
+
+func (d dnsrecords) Len() int      { return len(d) }
+func (d dnsrecords) Swap(i, j int) { d[i], d[j] = d[j], d[i] }
+func (d dnsrecords) Less(i, j int) bool {
+	// sort order: type, data, name
+	if d[i].Type < d[j].Type {
+		return true
+	} else if d[i].Type > d[j].Type {
+		return false
+	}
+	if d[i].Data < d[j].Data {
+		return true
+	} else if d[i].Data > d[j].Data {
+		return false
+	}
+	return strings.ToLower(d[i].Name) < strings.ToLower(d[j].Name)
+}
+
 // GetDNSDomains returns a list of available domains on Vultr account
-func (c *Client) GetDNSDomains() (dnsdomains []DNSDomain, err error) {
-	if err := c.get(`dns/list`, &dnsdomains); err != nil {
+func (c *Client) GetDNSDomains() (domains []DNSDomain, err error) {
+	if err := c.get(`dns/list`, &domains); err != nil {
 		return nil, err
 	}
-	return dnsdomains, nil
+	sort.Sort(dnsdomains(domains))
+	return domains, nil
 }
 
 // GetDNSRecords returns a list of all DNS records of a particular domain
-func (c *Client) GetDNSRecords(domain string) (dnsrecords []DNSRecord, err error) {
-	if err := c.get(`dns/records?domain=`+domain, &dnsrecords); err != nil {
+func (c *Client) GetDNSRecords(domain string) (records []DNSRecord, err error) {
+	if err := c.get(`dns/records?domain=`+domain, &records); err != nil {
 		return nil, err
 	}
-	return dnsrecords, nil
+	sort.Sort(dnsrecords(records))
+	return records, nil
 }
 
 // CreateDNSDomain creates a new DNS domain name on Vultr

vendor/github.com/JamesClonk/vultr/lib/ip.go

@@ -1,6 +1,9 @@
 package lib
 
-import "net/url"
+import (
+	"net/url"
+	"sort"
+)
 
 // IPv4 information of a virtual machine
 type IPv4 struct {
@@ -11,6 +14,20 @@ type IPv4 struct {
 	ReverseDNS string `json:"reverse"`
 }
 
+type ipv4s []IPv4
+
+func (s ipv4s) Len() int      { return len(s) }
+func (s ipv4s) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s ipv4s) Less(i, j int) bool {
+	// sort order: type, ip
+	if s[i].Type < s[j].Type {
+		return true
+	} else if s[i].Type > s[j].Type {
+		return false
+	}
+	return s[i].IP < s[j].IP
+}
+
 // IPv6 information of a virtual machine
 type IPv6 struct {
 	IP          string `json:"ip"`
@@ -19,12 +36,32 @@ type IPv6 struct {
 	Type        string `json:"type"`
 }
 
+type ipv6s []IPv6
+
+func (s ipv6s) Len() int      { return len(s) }
+func (s ipv6s) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s ipv6s) Less(i, j int) bool {
+	// sort order: type, ip
+	if s[i].Type < s[j].Type {
+		return true
+	} else if s[i].Type > s[j].Type {
+		return false
+	}
+	return s[i].IP < s[j].IP
+}
+
 // ReverseDNSIPv6 information of a virtual machine
 type ReverseDNSIPv6 struct {
 	IP         string `json:"ip"`
 	ReverseDNS string `json:"reverse"`
 }
 
+type reverseDNSIPv6s []ReverseDNSIPv6
+
+func (s reverseDNSIPv6s) Len() int           { return len(s) }
+func (s reverseDNSIPv6s) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s reverseDNSIPv6s) Less(i, j int) bool { return s[i].IP < s[j].IP }
+
 // ListIPv4 lists the IPv4 information of a virtual machine
 func (c *Client) ListIPv4(id string) (list []IPv4, err error) {
 	var ipMap map[string][]IPv4
@@ -37,6 +74,7 @@ func (c *Client) ListIPv4(id string) (list []IPv4, err error) {
 			list = append(list, ip)
 		}
 	}
+	sort.Sort(ipv4s(list))
 	return list, nil
 }
 
@@ -52,6 +90,7 @@ func (c *Client) ListIPv6(id string) (list []IPv6, err error) {
 			list = append(list, ip)
 		}
 	}
+	sort.Sort(ipv6s(list))
 	return list, nil
 }
 
@@ -67,6 +106,7 @@ func (c *Client) ListIPv6ReverseDNS(id string) (list []ReverseDNSIPv6, err error
 			list = append(list, ip)
 		}
 	}
+	sort.Sort(reverseDNSIPv6s(list))
 	return list, nil
 }
 

vendor/github.com/JamesClonk/vultr/lib/iso.go

@@ -1,5 +1,10 @@
 package lib
 
+import (
+	"sort"
+	"strings"
+)
+
 // ISO image on Vultr
 type ISO struct {
 	ID       int    `json:"ISOID"`
@@ -9,6 +14,20 @@ type ISO struct {
 	MD5sum   string `json:"md5sum"`
 }
 
+type isos []ISO
+
+func (s isos) Len() int      { return len(s) }
+func (s isos) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s isos) Less(i, j int) bool {
+	// sort order: filename, created
+	if strings.ToLower(s[i].Filename) < strings.ToLower(s[j].Filename) {
+		return true
+	} else if strings.ToLower(s[i].Filename) > strings.ToLower(s[j].Filename) {
+		return false
+	}
+	return s[i].Created < s[j].Created
+}
+
 // GetISO returns a list of all ISO images on Vultr account
 func (c *Client) GetISO() ([]ISO, error) {
 	var isoMap map[string]ISO
@@ -20,5 +39,6 @@ func (c *Client) GetISO() ([]ISO, error) {
 	for _, iso := range isoMap {
 		isoList = append(isoList, iso)
 	}
+	sort.Sort(isos(isoList))
 	return isoList, nil
 }

vendor/github.com/JamesClonk/vultr/lib/os.go

@@ -1,5 +1,10 @@
 package lib
 
+import (
+	"sort"
+	"strings"
+)
+
 // OS image on Vultr
 type OS struct {
 	ID        int    `json:"OSID"`
@@ -10,6 +15,12 @@ type OS struct {
 	Surcharge string `json:"surcharge"`
 }
 
+type oses []OS
+
+func (s oses) Len() int           { return len(s) }
+func (s oses) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s oses) Less(i, j int) bool { return strings.ToLower(s[i].Name) < strings.ToLower(s[j].Name) }
+
 // GetOS returns a list of all available operating systems on Vultr
 func (c *Client) GetOS() ([]OS, error) {
 	var osMap map[string]OS
@@ -21,5 +32,6 @@ func (c *Client) GetOS() ([]OS, error) {
 	for _, os := range osMap {
 		osList = append(osList, os)
 	}
+	sort.Sort(oses(osList))
 	return osList, nil
 }

vendor/github.com/JamesClonk/vultr/lib/plans.go

@@ -1,6 +1,11 @@
 package lib
 
-import "fmt"
+import (
+	"fmt"
+	"sort"
+	"strconv"
+	"strings"
+)
 
 // Plan on Vultr
 type Plan struct {
@@ -14,6 +19,40 @@ type Plan struct {
 	Regions   []int  `json:"available_locations"`
 }
 
+type plans []Plan
+
+func (p plans) Len() int      { return len(p) }
+func (p plans) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
+func (p plans) Less(i, j int) bool {
+	pa, _ := strconv.ParseFloat(strings.TrimSpace(p[i].Price), 64)
+	pb, _ := strconv.ParseFloat(strings.TrimSpace(p[j].Price), 64)
+	ra, _ := strconv.ParseInt(strings.TrimSpace(p[i].RAM), 10, 64)
+	rb, _ := strconv.ParseInt(strings.TrimSpace(p[j].RAM), 10, 64)
+	da, _ := strconv.ParseInt(strings.TrimSpace(p[i].Disk), 10, 64)
+	db, _ := strconv.ParseInt(strings.TrimSpace(p[j].Disk), 10, 64)
+
+	// sort order: price, vcpu, ram, disk
+	if pa < pb {
+		return true
+	} else if pa > pb {
+		return false
+	}
+
+	if p[i].VCpus < p[j].VCpus {
+		return true
+	} else if p[i].VCpus > p[j].VCpus {
+		return false
+	}
+
+	if ra < rb {
+		return true
+	} else if ra > rb {
+		return false
+	}
+
+	return da < db
+}
+
 // GetPlans returns a list of all available plans on Vultr account
 func (c *Client) GetPlans() ([]Plan, error) {
 	var planMap map[string]Plan
@@ -21,11 +60,13 @@ func (c *Client) GetPlans() ([]Plan, error) {
 		return nil, err
 	}
 
-	var planList []Plan
+	var p plans
 	for _, plan := range planMap {
-		planList = append(planList, plan)
+		p = append(p, plan)
 	}
-	return planList, nil
+
+	sort.Sort(plans(p))
+	return p, nil
 }
 
 // GetAvailablePlansForRegion returns available plans for specified region

vendor/github.com/JamesClonk/vultr/lib/regions.go

@@ -1,5 +1,7 @@
 package lib
 
+import "sort"
+
 // Region on Vultr
 type Region struct {
 	ID           int    `json:"DCID,string"`
@@ -12,6 +14,20 @@ type Region struct {
 	Code         string `json:"regioncode"`
 }
 
+type regions []Region
+
+func (s regions) Len() int      { return len(s) }
+func (s regions) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s regions) Less(i, j int) bool {
+	// sort order: continent, name
+	if s[i].Continent < s[j].Continent {
+		return true
+	} else if s[i].Continent > s[j].Continent {
+		return false
+	}
+	return s[i].Name < s[j].Name
+}
+
 // GetRegions returns a list of all available Vultr regions
 func (c *Client) GetRegions() ([]Region, error) {
 	var regionMap map[string]Region
@@ -23,5 +39,6 @@ func (c *Client) GetRegions() ([]Region, error) {
 	for _, os := range regionMap {
 		regionList = append(regionList, os)
 	}
+	sort.Sort(regions(regionList))
 	return regionList, nil
 }

vendor/github.com/JamesClonk/vultr/lib/reservedip.go

@@ -4,7 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
+	"sort"
 	"strconv"
+	"strings"
 )
 
 // IP on Vultr
@@ -18,6 +20,25 @@ type IP struct {
 	AttachedTo string `json:"attached_SUBID,string"`
 }
 
+type ips []IP
+
+func (s ips) Len() int      { return len(s) }
+func (s ips) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s ips) Less(i, j int) bool {
+	// sort order: label, iptype, subnet
+	if strings.ToLower(s[i].Label) < strings.ToLower(s[j].Label) {
+		return true
+	} else if strings.ToLower(s[i].Label) > strings.ToLower(s[j].Label) {
+		return false
+	}
+	if s[i].IPType < s[j].IPType {
+		return true
+	} else if s[i].IPType > s[j].IPType {
+		return false
+	}
+	return s[i].Subnet < s[j].Subnet
+}
+
 // UnmarshalJSON implements json.Unmarshaller on IP.
 // This is needed because the Vultr API is inconsistent in it's JSON responses.
 // Some fields can change type, from JSON number to JSON string and vice-versa.
@@ -89,11 +110,12 @@ func (c *Client) ListReservedIP() ([]IP, error) {
 		return nil, err
 	}
 
-	ips := make([]IP, 0)
+	ipList := make([]IP, 0)
 	for _, ip := range ipMap {
-		ips = append(ips, ip)
+		ipList = append(ipList, ip)
 	}
-	return ips, nil
+	sort.Sort(ips(ipList))
+	return ipList, nil
 }
 
 // GetReservedIP returns reserved IP with given ID

vendor/github.com/JamesClonk/vultr/lib/scripts.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
+	"sort"
+	"strings"
 )
 
 // StartupScript on Vultr account
@@ -14,6 +16,14 @@ type StartupScript struct {
 	Content string `json:"script"`
 }
 
+type startupscripts []StartupScript
+
+func (s startupscripts) Len() int      { return len(s) }
+func (s startupscripts) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s startupscripts) Less(i, j int) bool {
+	return strings.ToLower(s[i].Name) < strings.ToLower(s[j].Name)
+}
+
 // UnmarshalJSON implements json.Unmarshaller on StartupScript.
 // Necessary because the SCRIPTID field has inconsistent types.
 func (s *StartupScript) UnmarshalJSON(data []byte) (err error) {
@@ -47,6 +57,7 @@ func (c *Client) GetStartupScripts() (scripts []StartupScript, err error) {
 		}
 		scripts = append(scripts, script)
 	}
+	sort.Sort(startupscripts(scripts))
 	return scripts, nil
 }
 

vendor/github.com/JamesClonk/vultr/lib/servers.go

@@ -5,7 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
+	"sort"
 	"strconv"
+	"strings"
 )
 
 // Server (virtual machine) on Vultr account
@@ -36,6 +38,8 @@ type Server struct {
 	KVMUrl           string      `json:"kvm_url"`
 	AutoBackups      string      `json:"auto_backups"`
 	Tag              string      `json:"tag"`
+	OSID             string      `json:"OSID"`
+	AppID            string      `json:"APPID"`
 }
 
 // ServerOptions are optional parameters to be used during server creation
@@ -52,6 +56,21 @@ type ServerOptions struct {
 	DontNotifyOnActivate bool
 	Hostname             string
 	Tag                  string
+	AppID                string
+}
+
+type servers []Server
+
+func (s servers) Len() int      { return len(s) }
+func (s servers) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s servers) Less(i, j int) bool {
+	// sort order: name, ip
+	if strings.ToLower(s[i].Name) < strings.ToLower(s[j].Name) {
+		return true
+	} else if strings.ToLower(s[i].Name) > strings.ToLower(s[j].Name) {
+		return false
+	}
+	return s[i].MainIP < s[j].MainIP
 }
 
 // V6Network represents a IPv6 network of a Vultr server
@@ -140,6 +159,18 @@ func (s *Server) UnmarshalJSON(data []byte) (err error) {
 	}
 	s.AllowedBandwidth = ab
 
+	value = fmt.Sprintf("%v", fields["OSID"])
+	if value == "<nil>" {
+		value = ""
+	}
+	s.OSID = value
+
+	value = fmt.Sprintf("%v", fields["APPID"])
+	if value == "<nil>" {
+		value = ""
+	}
+	s.AppID = value
+
 	s.ID = fmt.Sprintf("%v", fields["SUBID"])
 	s.Name = fmt.Sprintf("%v", fields["label"])
 	s.OS = fmt.Sprintf("%v", fields["os"])
@@ -180,29 +211,31 @@ func (s *Server) UnmarshalJSON(data []byte) (err error) {
 }
 
 // GetServers returns a list of current virtual machines on Vultr account
-func (c *Client) GetServers() (servers []Server, err error) {
+func (c *Client) GetServers() (serverList []Server, err error) {
 	var serverMap map[string]Server
 	if err := c.get(`server/list`, &serverMap); err != nil {
 		return nil, err
 	}
 
 	for _, server := range serverMap {
-		servers = append(servers, server)
+		serverList = append(serverList, server)
 	}
-	return servers, nil
+	sort.Sort(servers(serverList))
+	return serverList, nil
 }
 
 // GetServersByTag returns a list of all virtual machines matching by tag
-func (c *Client) GetServersByTag(tag string) (servers []Server, err error) {
+func (c *Client) GetServersByTag(tag string) (serverList []Server, err error) {
 	var serverMap map[string]Server
 	if err := c.get(`server/list?tag=`+tag, &serverMap); err != nil {
 		return nil, err
 	}
 
 	for _, server := range serverMap {
-		servers = append(servers, server)
+		serverList = append(serverList, server)
 	}
-	return servers, nil
+	sort.Sort(servers(serverList))
+	return serverList, nil
 }
 
 // GetServer returns the virtual machine with the given ID
@@ -274,6 +307,10 @@ func (c *Client) CreateServer(name string, regionID, planID, osID int, options *
 		if options.Tag != "" {
 			values.Add("tag", options.Tag)
 		}
+
+		if options.AppID != "" {
+			values.Add("APPID", options.AppID)
+		}
 	}
 
 	var server Server
@@ -371,6 +408,7 @@ func (c *Client) ListOSforServer(id string) (os []OS, err error) {
 	for _, o := range osMap {
 		os = append(os, o)
 	}
+	sort.Sort(oses(os))
 	return os, nil
 }
 
@@ -446,3 +484,30 @@ func (c *Client) BandwidthOfServer(id string) (bandwidth []map[string]string, er
 
 	return bandwidth, nil
 }
+
+// ChangeApplicationofServer changes the virtual machine to a different application
+func (c *Client) ChangeApplicationofServer(id string, appID string) error {
+	values := url.Values{
+		"SUBID": {id},
+		"APPID": {appID},
+	}
+
+	if err := c.post(`server/app_change`, values, nil); err != nil {
+		return err
+	}
+	return nil
+}
+
+// ListApplicationsforServer lists all available operating systems to which an existing virtual machine can be changed
+func (c *Client) ListApplicationsforServer(id string) (apps []Application, err error) {
+	var appMap map[string]Application
+	if err := c.get(`server/app_change_list?SUBID=`+id, &appMap); err != nil {
+		return nil, err
+	}
+
+	for _, app := range appMap {
+		apps = append(apps, app)
+	}
+	sort.Sort(applications(apps))
+	return apps, nil
+}

vendor/github.com/JamesClonk/vultr/lib/snapshots.go

@@ -1,6 +1,10 @@
 package lib
 
-import "net/url"
+import (
+	"net/url"
+	"sort"
+	"strings"
+)
 
 // Snapshot of a virtual machine on Vultr account
 type Snapshot struct {
@@ -11,17 +15,32 @@ type Snapshot struct {
 	Created     string `json:"date_created"`
 }
 
+type snapshots []Snapshot
+
+func (s snapshots) Len() int      { return len(s) }
+func (s snapshots) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s snapshots) Less(i, j int) bool {
+	// sort order: description, created
+	if strings.ToLower(s[i].Description) < strings.ToLower(s[j].Description) {
+		return true
+	} else if strings.ToLower(s[i].Description) > strings.ToLower(s[j].Description) {
+		return false
+	}
+	return s[i].Created < s[j].Created
+}
+
 // GetSnapshots retrieves a list of all snapshots on Vultr account
-func (c *Client) GetSnapshots() (snapshots []Snapshot, err error) {
+func (c *Client) GetSnapshots() (snapshotList []Snapshot, err error) {
 	var snapshotMap map[string]Snapshot
 	if err := c.get(`snapshot/list`, &snapshotMap); err != nil {
 		return nil, err
 	}
 
 	for _, snapshot := range snapshotMap {
-		snapshots = append(snapshots, snapshot)
+		snapshotList = append(snapshotList, snapshot)
 	}
-	return snapshots, nil
+	sort.Sort(snapshots(snapshotList))
+	return snapshotList, nil
 }
 
 // CreateSnapshot creates a new virtual machine snapshot

vendor/github.com/JamesClonk/vultr/lib/sshkeys.go

@@ -1,6 +1,10 @@
 package lib
 
-import "net/url"
+import (
+	"net/url"
+	"sort"
+	"strings"
+)
 
 // SSHKey on Vultr account
 type SSHKey struct {
@@ -10,6 +14,12 @@ type SSHKey struct {
 	Created string `json:"date_created"`
 }
 
+type sshkeys []SSHKey
+
+func (s sshkeys) Len() int           { return len(s) }
+func (s sshkeys) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s sshkeys) Less(i, j int) bool { return strings.ToLower(s[i].Name) < strings.ToLower(s[j].Name) }
+
 // GetSSHKeys returns a list of SSHKeys from Vultr account
 func (c *Client) GetSSHKeys() (keys []SSHKey, err error) {
 	var keyMap map[string]SSHKey
@@ -20,6 +30,7 @@ func (c *Client) GetSSHKeys() (keys []SSHKey, err error) {
 	for _, key := range keyMap {
 		keys = append(keys, key)
 	}
+	sort.Sort(sshkeys(keys))
 	return keys, nil
 }