Merge pull request #273 from zinuzoid/new-label-cmd

feat(label-cmd): add Label cmd

Author: kmala

cmd/apps.go

@@ -134,6 +134,12 @@ func (d *DeisCmd) AppInfo(appID string) error {
 		return err
 	}
 
+	d.Println()
+	// print the app labels
+	if err = d.LabelsList(app.ID); err != nil {
+		return err
+	}
+
 	d.Println()
 
 	return nil

cmd/apps_test.go

@@ -165,6 +165,20 @@ func TestAppsInfo(t *testing.T) {
 }`)
 	})
 
+	server.Mux.HandleFunc("/v2/apps/lorem-ipsum/settings/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		fmt.Fprintf(w, `{
+			"owner": "elrond",
+			"app": "lorem-ipsum",
+			"created": "2014-01-01T00:00:00UTC",
+			"updated": "2014-01-01T00:00:00UTC",
+			"uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
+			"label": {
+				"team": "frontend"
+			}
+		}`)
+	})
+
 	s, err := settings.Load(cmdr.ConfigFile)
 	if err != nil {
 		t.Fatal(err)
@@ -196,6 +210,9 @@ lorem-ipsum-cmd-1911796442-48b58 up (v2)
 === lorem-ipsum Domains
 lorem-ipsum
 
+=== lorem-ipsum Label
+team:            frontend
+
 `, "output")
 }
 

cmd/cmd.go

@@ -52,6 +52,9 @@ type Commander interface {
 	KeysList(int) error
 	KeyRemove(string) error
 	KeyAdd(string, string) error
+	LabelsList(string) error
+	LabelsSet(string, []string) error
+	LabelsUnset(string, []string) error
 	LimitsList(string) error
 	LimitsSet(string, []string, string) error
 	LimitsUnset(string, []string, string) error

cmd/labels.go

@@ -0,0 +1,120 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/deis/controller-sdk-go/api"
+	"github.com/deis/controller-sdk-go/appsettings"
+	"strings"
+)
+
+// LabelsList list app's labels
+func (d *DeisCmd) LabelsList(appID string) error {
+	s, appID, err := load(d.ConfigFile, appID)
+
+	if err != nil {
+		return err
+	}
+
+	appSettings, err := appsettings.List(s.Client, appID)
+	if d.checkAPICompatibility(s.Client, err) != nil {
+		return err
+	}
+
+	d.Printf("=== %s Label\n", appID)
+
+	if appSettings.Label == nil || len(appSettings.Label) == 0 {
+		d.Println("No labels found.")
+	} else {
+		d.Println(appSettings.Label)
+	}
+
+	return nil
+}
+
+// LabelsSet sets labels for app
+func (d *DeisCmd) LabelsSet(appID string, labels []string) error {
+	s, appID, err := load(d.ConfigFile, appID)
+
+	if err != nil {
+		return err
+	}
+
+	labelsMap, err := parseLabels(labels)
+	if err != nil {
+		return err
+	}
+
+	d.Printf("Applying labels on %s... ", appID)
+
+	quit := progress(d.WOut)
+
+	_, err = appsettings.Set(s.Client, appID, api.AppSettings{Label: labelsMap})
+
+	quit <- true
+	<-quit
+
+	if err != nil {
+		return err
+	}
+
+	d.Println("done")
+	return nil
+}
+
+// LabelsUnset removes labels for the app.
+func (d *DeisCmd) LabelsUnset(appID string, labels []string) error {
+	s, appID, err := load(d.ConfigFile, appID)
+
+	if err != nil {
+		return err
+	}
+
+	labelsMap := make(map[string]interface{})
+
+	for _, label := range labels {
+		labelsMap[label] = nil
+	}
+
+	d.Printf("Removing labels on %s... ", appID)
+
+	quit := progress(d.WOut)
+
+	_, err = appsettings.Set(s.Client, appID, api.AppSettings{Label: labelsMap})
+
+	quit <- true
+	<-quit
+
+	if err != nil {
+		return err
+	}
+
+	d.Println("done")
+	return nil
+}
+
+func parseLabels(labels []string) (map[string]interface{}, error) {
+	labelsMap := make(map[string]interface{})
+
+	for _, label := range labels {
+		key, value, err := parseLabel(label)
+
+		if err != nil {
+			return nil, err
+		}
+
+		labelsMap[key] = value
+	}
+
+	return labelsMap, nil
+}
+
+func parseLabel(label string) (string, string, error) {
+	parts := strings.Split(label, "=")
+
+	if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
+		return "", "", fmt.Errorf(`%s is invalid, Must be in format key=value
+Examples: git_repo=https://github.com/deis/workflow team=frontend`, label)
+	}
+
+	return parts[0], parts[1], nil
+}

cmd/labels_test.go

@@ -0,0 +1,113 @@
+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"
+	"strings"
+)
+
+func TestLabelsList(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/rivendell/settings/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		fmt.Fprintf(w, `{
+			"owner": "jim",
+			"app": "rivendell",
+		    "label": {"git_repo": "https://github.com/deis/controller-sdk-go", "team" : "deis"},
+			"created": "2014-01-01T00:00:00UTC",
+			"updated": "2014-01-01T00:00:00UTC",
+			"uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
+		}`)
+	})
+
+	err = cmdr.LabelsList("rivendell")
+	assert.NoErr(t, err)
+	assert.Equal(t, strings.TrimSpace(b.String()), `=== rivendell Label
+git_repo:        https://github.com/deis/controller-sdk-go
+team:            deis`, "output")
+
+	server.Mux.HandleFunc("/v2/apps/mordor/settings/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		fmt.Fprintf(w, `{
+			"owner": "priw",
+			"app": "mordor",
+			"created": "2014-01-01T00:00:00UTC",
+			"updated": "2014-01-01T00:00:00UTC",
+			"uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
+		}`)
+	})
+	b.Reset()
+
+	err = cmdr.LabelsList("mordor")
+	assert.NoErr(t, err)
+	assert.Equal(t, b.String(), "=== mordor Label\nNo labels found.\n", "output")
+}
+
+func TestListsSet(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/lothlorien/settings/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		data := map[string]interface{}{
+			"git_repo": "https://github.com/deis/controller-sdk-go",
+			"team":     "deis",
+		}
+		testutil.AssertBody(t, api.AppSettings{Label: data}, r)
+		fmt.Fprintf(w, "{}")
+	})
+
+	err = cmdr.LabelsSet("lothlorien", []string{
+		"team=deis",
+		"git_repo=https://github.com/deis/controller-sdk-go",
+	})
+	assert.NoErr(t, err)
+	assert.Equal(t, testutil.StripProgress(b.String()), "Applying labels on lothlorien... done\n", "output")
+}
+
+func TestListsUnset(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/bree/settings/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		testutil.AssertBody(t, api.AppSettings{Label: map[string]interface{}{
+			"team":     nil,
+			"git_repo": nil,
+		}}, r)
+		fmt.Fprintf(w, "{}")
+	})
+
+	err = cmdr.LabelsUnset("bree", []string{
+		"team",
+		"git_repo",
+	})
+	assert.NoErr(t, err)
+	assert.Equal(t, testutil.StripProgress(b.String()), "Removing labels on bree... done\n", "output")
+}

deis.go

@@ -56,6 +56,7 @@ Subcommands, use 'deis help [subcommand]' to learn more::
   git           manage git for applications
   healthchecks  manage healthchecks for applications
   keys          manage ssh keys used for 'git push' deployments
+  labels        manage labels of application
   limits        manage resource limits for your application
   perms         manage permissions for applications
   ps            manage processes inside an app container
@@ -128,6 +129,8 @@ Use 'git push deis master' to deploy to an application.
 		return 0
 	case "keys":
 		err = parser.Keys(argv, &cmdr)
+	case "labels":
+		err = parser.Labels(argv, &cmdr)
 	case "limits":
 		err = parser.Limits(argv, &cmdr)
 	case "perms":

glide.lock

@@ -16,4 +16,4 @@ import:
 - package: github.com/olekukonko/tablewriter
 - package: github.com/arschles/assert
 - package: github.com/deis/controller-sdk-go
-  version: bb310847bd314e0f170e807db61acdc33246e0c0
+  version: 685c7f75bc1c4b57899a7cde55d945aa16129513