Merge pull request #2 from bryanl/ssh-support

Allow a user to ssh to drop given name or id
bryanl · Jun 17, 2015 · cd6c8b9 · cd6c8b9
2 parents 6ec10a8 + da433d7
commit cd6c8b9
Show file tree

Hide file tree

Showing 29 changed files with 493 additions and 142 deletions.
diff --git a/account.go b/account.go
@@ -9,7 +9,7 @@ import (
 )
 
 func AccountGet(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	err := accountGet(client, c.App.Writer)
 	if err != nil {
 		log.WithField("err", err).Fatal("could not display account")

diff --git a/account_test.go b/account_test.go
@@ -31,7 +31,7 @@ func TestAccountAction(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 
 	WithinTest(cs, nil, func(c *cli.Context) {
 		AccountGet(c)

diff --git a/actions.go b/actions.go
@@ -10,7 +10,7 @@ import (
 )
 
 func ActionList(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	opts := LoadOpts(c)
 	err := actionsList(client, opts, c.App.Writer)
 	if err != nil {
@@ -19,7 +19,7 @@ func ActionList(c *cli.Context) {
 }
 
 func ActionGet(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	id := c.Int("action-id")
 
 	if id < 1 {

diff --git a/actions_test.go b/actions_test.go
@@ -32,7 +32,7 @@ func TestActionList(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 
 	WithinTest(cs, nil, func(c *cli.Context) {
 		ActionList(c)
@@ -54,7 +54,7 @@ func TestActionGet(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 	fs := flag.NewFlagSet("flag set", 0)
 	fs.Int("action-id", testAction.ID, "action-id")
 

diff --git a/cmd/docli/main.go b/cmd/docli/main.go
@@ -21,7 +21,7 @@ func (t *tokenSource) Token() (*oauth2.Token, error) {
 
 func init() {
 	logrus.SetOutput(os.Stderr)
-	logrus.SetLevel(logrus.WarnLevel)
+	logrus.SetLevel(logrus.InfoLevel)
 
 	docli.Bail = func(err error, msg string) {
 		logrus.WithField("err", err).Fatal(msg)
@@ -46,9 +46,10 @@ func main() {
 		dropletActionCommands(),
 		imageActionCommands(),
 		imageCommands(),
+		sshKeyCommands(),
 		regionCommands(),
 		sizeCommands(),
-		sshKeyCommands(),
+		sshCommands(),
 	}
 
 	app.RunAndExitOnError()

diff --git a/cmd/docli/ssh_commands.go b/cmd/docli/ssh_commands.go
@@ -0,0 +1,24 @@
+package main
+
+import (
+	"github.com/bryanl/docli"
+	"github.com/codegangsta/cli"
+)
+
+func sshCommands() cli.Command {
+	return cli.Command{
+		Name:  "ssh",
+		Usage: "SSH to droplet. Provide name or id",
+		Flags: []cli.Flag{
+			cli.StringFlag{
+				Name:  docli.ArgDropletName,
+				Usage: "droplet name",
+			},
+			cli.IntFlag{
+				Name:  docli.ArgDropletID,
+				Usage: "droplet id",
+			},
+		},
+		Action: docli.SSH,
+	}
+}
diff --git a/docli_test.go b/docli_test.go
@@ -3,9 +3,27 @@ package docli
 import (
 	"os"
 	"testing"
+
+	"github.com/digitalocean/godo"
 )
 
-var lastBailOut bailOut
+var (
+	testDroplet = godo.Droplet{
+		ID:   1,
+		Name: "a-droplet",
+		Networks: &godo.Networks{
+			V4: []godo.NetworkV4{
+				{IPAddress: "8.8.8.8", Type: "public"},
+				{IPAddress: "172.16.1.2", Type: "private"},
+			},
+		},
+	}
+	testDropletList = []godo.Droplet{testDroplet}
+	testKernel      = godo.Kernel{ID: 1}
+	testKernelList  = []godo.Kernel{testKernel}
+
+	lastBailOut bailOut
+)
 
 type bailOut struct {
 	err error

diff --git a/domainrecs.go b/domainrecs.go
@@ -7,7 +7,7 @@ import (
 )
 
 func RecordCreate(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	domainName := c.String("domain-name")
 
 	drcr := &godo.DomainRecordEditRequest{
@@ -28,7 +28,7 @@ func RecordCreate(c *cli.Context) {
 }
 
 func RecordDelete(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	domainName := c.String("domain-name")
 	recordID := c.Int("record-id")
 
@@ -40,7 +40,7 @@ func RecordDelete(c *cli.Context) {
 
 // List records for a domain.
 func RecordList(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	opts := LoadOpts(c)
 	name := c.String("domain-name")
 
@@ -73,7 +73,7 @@ func RecordList(c *cli.Context) {
 
 // Retrieve a domain record.
 func RecordGet(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	domainName := c.String("domain-name")
 	recordID := c.Int("record-id")
 
@@ -86,7 +86,7 @@ func RecordGet(c *cli.Context) {
 }
 
 func RecordUpdate(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	domainName := c.String("domain-name")
 	recordID := c.Int("record-id")
 

diff --git a/domainrecs_test.go b/domainrecs_test.go
@@ -26,7 +26,7 @@ func TestRecordsList(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 	fs := flag.NewFlagSet("flag set", 0)
 	fs.String("domain-name", "example.com", "domain-name")
 
@@ -53,7 +53,7 @@ func TestRecordsGet(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 	fs := flag.NewFlagSet("flag set", 0)
 	fs.String("domain-name", "example.com", "domain-name")
 	fs.Int("record-id", testRecord.ID, "record-id")
@@ -84,7 +84,7 @@ func TestRecordsCreate(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 	fs := flag.NewFlagSet("flag set", 0)
 	fs.String("domain-name", "example.com", "domain-name")
 	fs.String("record-type", "A", "record-type")
@@ -120,7 +120,7 @@ func TestRecordsUpdate(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 	fs := flag.NewFlagSet("flag set", 0)
 	fs.String("domain-name", "example.com", "domain-name")
 	fs.Int("record-id", 1, "record-id")
@@ -148,7 +148,7 @@ func TestRecordsDelete(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 	fs := flag.NewFlagSet("flag set", 0)
 	fs.String("domain-name", "example.com", "domain-name")
 	fs.Int("record-id", 1, "record-id")

diff --git a/domains.go b/domains.go
@@ -7,7 +7,7 @@ import (
 )
 
 func DomainCreate(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	req := &godo.DomainCreateRequest{
 		Name:      c.String("domain-name"),
 		IPAddress: c.String("ip-address"),
@@ -21,7 +21,7 @@ func DomainCreate(c *cli.Context) {
 }
 
 func DomainDelete(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	name := c.String("domain-name")
 	_, err := client.Domains.Delete(name)
 	if err != nil {
@@ -31,7 +31,7 @@ func DomainDelete(c *cli.Context) {
 
 // List lists all domains.
 func DomainList(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	opts := LoadOpts(c)
 
 	f := func(opt *godo.ListOptions) ([]interface{}, *godo.Response, error) {
@@ -62,7 +62,7 @@ func DomainList(c *cli.Context) {
 }
 
 func DomainGet(c *cli.Context) {
-	client := NewClient(c, DefaultClientSource)
+	client := NewClient(c, DefaultConfig)
 	id := c.String("domain-name")
 	a, _, err := client.Domains.Get(id)
 	if err != nil {

diff --git a/domains_test.go b/domains_test.go
@@ -31,7 +31,7 @@ func TestDomainsList(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 
 	WithinTest(cs, nil, func(c *cli.Context) {
 		DomainList(c)
@@ -53,7 +53,7 @@ func TestDomainsGet(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 	fs := flag.NewFlagSet("flag set", 0)
 	fs.String("domain-name", testDomain.Name, "domain-id")
 
@@ -78,7 +78,7 @@ func TestDomainsCreate(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 	fs := flag.NewFlagSet("flag set", 0)
 	fs.String("domain-name", testDomain.Name, "domain-name")
 	fs.String("ip-address", "127.0.0.1", "ip- address")
@@ -100,7 +100,7 @@ func TestDomainsDelete(t *testing.T) {
 		},
 	}
 
-	cs := &TestClientSource{client}
+	cs := NewTestConfig(client)
 	fs := flag.NewFlagSet("flag set", 0)
 	fs.String("domain-name", testDomain.Name, "domain-name")