v1.1.1

Author: tomsteele

do.go

@@ -8,7 +8,7 @@ import (
 )
 
 func doRegions(client *godo.Client) ([]string, error) {
-	slugs := []string{}
+	var slugs []string
 	regions, _, err := client.Regions.List(&godo.ListOptions{})
 	if err != nil {
 		return slugs, err
@@ -20,13 +20,11 @@ func doRegions(client *godo.Client) ([]string, error) {
 }
 
 func newDropLetMultiCreateRequest(prefix, region, keyID string, count int) *godo.DropletMultiCreateRequest {
-
-	names := []string{}
+	var names []string
 	for i := 0; i < count; i++ {
 		name, _ := randutil.AlphaString(8)
 		names = append(names, fmt.Sprintf("%s-%s", prefix, name))
 	}
-
 	return &godo.DropletMultiCreateRequest{
 		Names:  names,
 		Region: region,

machine.go

@@ -31,10 +31,7 @@ func (m *Machine) GetIPs(client *godo.Client) error {
 		return err
 	}
 	m.IPv4, err = droplet.PublicIPv4()
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // StartSSHProxy starts a socks proxy on 127.0.0.1 or the desired port.
@@ -65,7 +62,7 @@ func (m *Machine) GetIP() string {
 }
 
 func dropletsToMachines(droplets []godo.Droplet) []Machine {
-	m := []Machine{}
+	var m []Machine
 	for _, d := range droplets {
 		m = append(m, Machine{
 			ID:   d.ID,

main.go

@@ -26,7 +26,7 @@ var (
 	force       = flag.Bool("force", false, "Bypass built-in protections that prevent you from deploying more than 50 droplets")
 	startPort   = flag.Int("start-tcp", 55555, "TCP port to start first proxy on and increment from")
 	showversion = flag.Bool("v", false, "Print version and exit")
-	version     = "1.1.0"
+	version     = "1.1.1"
 )
 
 func main() {
@@ -57,7 +57,8 @@ func main() {
 	if err != nil {
 		log.Fatalf("%s\n", err.Error())
 	}
-	droplets := []godo.Droplet{}
+
+	var droplets []godo.Droplet
 
 	for region, c := range regionCountMap {
 		log.Printf("Creating %d droplets to region %s", c, region)
@@ -77,18 +78,18 @@ func main() {
 	for i := range machines {
 		m := &machines[i]
 		if err := m.GetIPs(client); err != nil {
-			log.Println("There was an error getting the IPv4 address of droplet name: %s\nError: %s\n", m.Name, err.Error())
+			log.Printf("There was an error getting the IPv4 address of droplet name: %s\nError: %s\n", m.Name, err.Error())
 		}
 		if m.IsReady() {
 			if err := m.StartSSHProxy(strconv.Itoa(*startPort), *sshLocation); err != nil {
-				log.Println("Could not start SSH proxy on droplet name: %s\nError: %s\n", m.Name, err.Error())
+				log.Printf("Could not start SSH proxy on droplet name: %s\nError: %s\n", m.Name, err.Error())
 			} else {
-				log.Println("SSH proxy started on port %d on droplet name: %s IP: %s\n", *startPort, m.Name, m.IPv4)
+				log.Printf("SSH proxy started on port %d on droplet name: %s IP: %s\n", *startPort, m.Name, m.IPv4)
 				go m.PrintStdError()
 			}
 			*startPort++
 		} else {
-			log.Println("Droplet name: %s is not ready yet. Skipping...\n", m.Name)
+			log.Printf("Droplet name: %s is not ready yet. Skipping...\n", m.Name)
 		}
 	}
 
@@ -105,9 +106,9 @@ func main() {
 	<-c
 	for _, m := range machines {
 		if err := m.Destroy(client); err != nil {
-			log.Println("Could not delete droplet name: %s\n", m.Name)
+			log.Printf("Could not delete droplet name: %s\n", m.Name)
 		} else {
-			log.Println("Deleted droplet name: %s", m.Name)
+			log.Printf("Deleted droplet name: %s\n", m.Name)
 		}
 	}
 }