feat(whitelist): Add support for ip whitlising for app

Author: kmala

cmd/cmd.go

@@ -74,6 +74,9 @@ type Commander interface {
 	TagsSet(string, []string) error
 	TagsUnset(string, []string) error
 	UsersList(results int) error
+	WhitelistAdd(string, string) error
+	WhitelistList(string) error
+	WhitelistRemove(string, string) error
 	Println(...interface{}) (int, error)
 	Print(...interface{}) (int, error)
 	Printf(string, ...interface{}) (int, error)

cmd/whitelist.go

@@ -0,0 +1,72 @@
+package cmd
+
+import (
+	"strings"
+
+	"github.com/deis/controller-sdk-go/whitelist"
+)
+
+// WhitelistList lists the addresses whitelisted for app
+func (d DeisCmd) WhitelistList(appID string) error {
+	s, appID, err := load(d.ConfigFile, appID)
+
+	if err != nil {
+		return err
+	}
+
+	whitelist, err := whitelist.List(s.Client, appID)
+	if checkAPICompatibility(s.Client, err, d.WErr) != nil {
+		return err
+	}
+
+	d.Printf("=== %s Whitelisted Addresses", appID)
+
+	for _, ip := range whitelist.Addresses {
+		d.Println(ip)
+	}
+	return nil
+}
+
+// WhitelistAdd adds the addresses to the app's Whitelist.
+func (d DeisCmd) WhitelistAdd(appID, IPs string) error {
+	s, appID, err := load(d.ConfigFile, appID)
+
+	if err != nil {
+		return err
+	}
+
+	d.Printf("Adding %s to %s whitelist...\n", IPs, appID)
+
+	quit := progress(d.WOut)
+	_, err = whitelist.Add(s.Client, appID, strings.Split(IPs, ","))
+	quit <- true
+	<-quit
+	if checkAPICompatibility(s.Client, err, d.WErr) != nil {
+		return err
+	}
+
+	d.Println("done")
+	return nil
+}
+
+// WhitelistRemove deletes the addresses from the app's Whitelist.
+func (d DeisCmd) WhitelistRemove(appID, IPs string) error {
+	s, appID, err := load(d.ConfigFile, appID)
+
+	if err != nil {
+		return err
+	}
+
+	d.Printf("Removing %s from %s whitelist...\n", IPs, appID)
+
+	quit := progress(d.WOut)
+	err = whitelist.Delete(s.Client, appID, strings.Split(IPs, ","))
+	quit <- true
+	<-quit
+	if checkAPICompatibility(s.Client, err, d.WErr) != nil {
+		return err
+	}
+
+	d.Println("done")
+	return nil
+}

cmd/whitelist_test.go

@@ -0,0 +1,83 @@
+package cmd
+
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/arschles/assert"
+	"github.com/deis/controller-sdk-go/api"
+	"github.com/deis/workflow-cli/pkg/testutil"
+)
+
+func TestWhitelistList(t *testing.T) {
+	t.Parallel()
+	cf, server, err := testutil.NewTestServerAndClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer server.Close()
+	var b bytes.Buffer
+	cmdr := DeisCmd{WOut: &b, ConfigFile: cf}
+
+	server.Mux.HandleFunc("/v2/apps/foo/whitelist/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		fmt.Fprintf(w, `{
+    "addresses": ["1.2.3.4", "0.0.0.0/0"]
+}`)
+	})
+
+	err = cmdr.WhitelistList("foo")
+	assert.NoErr(t, err)
+
+	assert.Equal(t, b.String(), "=== foo Whitelisted Addresses1.2.3.4\n0.0.0.0/0\n", "output")
+}
+
+func TestWhitelistAdd(t *testing.T) {
+	t.Parallel()
+	cf, server, err := testutil.NewTestServerAndClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer server.Close()
+	var b bytes.Buffer
+	cmdr := DeisCmd{WOut: &b, ConfigFile: cf}
+
+	server.Mux.HandleFunc("/v2/apps/foo/whitelist/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.AssertBody(t, api.Whitelist{Addresses: []string{"1.2.3.4", "0.0.0.0/0"}}, r)
+		testutil.SetHeaders(w)
+		w.WriteHeader(http.StatusCreated)
+		// Body isn't used by CLI, so it isn't set.
+		w.Write([]byte("{}"))
+	})
+
+	err = cmdr.WhitelistAdd("foo", "1.2.3.4,0.0.0.0/0")
+	assert.NoErr(t, err)
+
+	assert.Equal(t, testutil.StripProgress(b.String()), "Adding 1.2.3.4,0.0.0.0/0 to foo whitelist...\ndone\n", "output")
+}
+
+func TestWhitelistRemove(t *testing.T) {
+	t.Parallel()
+	cf, server, err := testutil.NewTestServerAndClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer server.Close()
+	var b bytes.Buffer
+	cmdr := DeisCmd{WOut: &b, ConfigFile: cf}
+
+	server.Mux.HandleFunc("/v2/apps/foo/whitelist/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.AssertBody(t, api.Whitelist{Addresses: []string{"1.2.3.4"}}, r)
+		testutil.SetHeaders(w)
+		w.WriteHeader(http.StatusCreated)
+		// Body isn't used by CLI, so it isn't set.
+		w.Write([]byte("{}"))
+	})
+
+	err = cmdr.WhitelistRemove("foo", "1.2.3.4")
+	assert.NoErr(t, err)
+
+	assert.Equal(t, testutil.StripProgress(b.String()), "Removing 1.2.3.4 from foo whitelist...\ndone\n", "output")
+}

deis.go

@@ -63,6 +63,7 @@ Subcommands, use 'deis help [subcommand]' to learn more::
   tags          manage tags for application containers
   users         manage users
   version       display client version
+  whitelist     manage whitelisted addresses of an application
 
 Shortcut commands, use 'deis shortcuts' to see all::
 
@@ -143,6 +144,8 @@ Use 'git push deis master' to deploy to an application.
 		err = parser.Users(argv, &cmdr)
 	case "version":
 		err = parser.Version(argv)
+	case "whitelist":
+		err = parser.Whitelist(argv, &cmdr)
 	default:
 		env := os.Environ()
 		extCmd := "deis-" + command

parser/whitelist.go

@@ -0,0 +1,119 @@
+package parser
+
+import (
+	"github.com/deis/workflow-cli/cmd"
+	docopt "github.com/docopt/docopt-go"
+)
+
+// Whitelist displays all relevant commands for `deis whitelist`.
+func Whitelist(argv []string, cmdr cmd.Commander) error {
+	usage := `
+Valid commands for whitelist:
+
+whitelist:add           adds addresses to the application's whitelist
+whitelist:list          list addresses in the application's whitelist
+whitelist:remove        remove addresses from the application's whitelist
+
+Use 'deis help [command]' to learn more.
+`
+
+	switch argv[0] {
+	case "whitelist:add":
+		return whitelistAdd(argv, cmdr)
+	case "whitelist:list":
+		return whitelistList(argv, cmdr)
+	case "whitelist:remove":
+		return whitelistRemove(argv, cmdr)
+	default:
+		if printHelp(argv, usage) {
+			return nil
+		}
+
+		if argv[0] == "whitelist" {
+			argv[0] = "whitelist:list"
+			return whitelistList(argv, cmdr)
+		}
+
+		PrintUsage(cmdr)
+		return nil
+	}
+}
+
+func whitelistAdd(argv []string, cmdr cmd.Commander) error {
+	usage := `
+Adds addresses to an application whitelist.
+
+Usage: deis whitelist:add <addresses> [options]
+
+Arguments:
+  <addresses>
+    comma-delimited list of addresses(using IP or CIDR notation) to be whitelisted for the application, such as '1.2.3.4' or '1.2.3.4,0.0.0.0/0'.
+
+Options:
+  -a --app=<app>
+    the uniquely identifiable name for the application.
+`
+
+	args, err := docopt.Parse(usage, argv, true, "", false, true)
+
+	if err != nil {
+		return err
+	}
+
+	app := safeGetValue(args, "--app")
+	addresses := safeGetValue(args, "<addresses>")
+
+	return cmdr.WhitelistAdd(app, addresses)
+}
+
+func whitelistList(argv []string, cmdr cmd.Commander) error {
+	usage := `
+Lists whitelisted addresses for an application.
+
+Usage: deis whitelist:list [options]
+
+Options:
+  -a --app=<app>
+    the uniquely identifiable name for the application.
+`
+
+	args, err := docopt.Parse(usage, argv, true, "", false, true)
+
+	if err != nil {
+		return err
+	}
+
+	if err != nil {
+		return err
+	}
+	app := safeGetValue(args, "--app")
+
+	return cmdr.WhitelistList(app)
+}
+
+func whitelistRemove(argv []string, cmdr cmd.Commander) error {
+	usage := `
+Removes addresses from an application whitelist.
+
+Usage: deis whitelist:remove <addresses> [options]
+
+Arguments:
+  <addresses>
+    comma-delimited list of addresses(using IP or CIDR notation) to be whitelisted for the application, such as '1.2.3.4' or "1.2.3.4,0.0.0.0/0".
+
+Options:
+  -a --app=<app>
+    the uniquely identifiable name for the application.
+`
+
+	args, err := docopt.Parse(usage, argv, true, "", false, true)
+
+	if err != nil {
+		return err
+	}
+
+	app := safeGetValue(args, "--app")
+	addresses := safeGetValue(args, "<addresses>")
+
+	return cmdr.WhitelistRemove(app, addresses)
+}