tests(config): add test for config commands (#192)

Author: Joshua-Anderson

.dockerignore

@@ -1 +1,2 @@
 Dockerfile
+vendor

cmd/config.go

@@ -29,17 +29,16 @@ func (d DeisCmd) ConfigList(appID string, oneLine bool) error {
 		return err
 	}
 
-	var keys []string
-	for k := range config.Values {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
+	keys := sortKeys(config.Values)
 
 	if oneLine {
-		for _, key := range keys {
-			d.Printf("%s=%s ", key, config.Values[key])
+		for i, key := range keys {
+			sep := " "
+			if i == len(keys)-1 {
+				sep = "\n"
+			}
+			d.Printf("%s=%s%s", key, config.Values[key], sep)
 		}
-		d.Println()
 	} else {
 		d.Printf("=== %s Config\n", appID)
 
@@ -285,9 +284,19 @@ func parseConfig(configVars []string) (map[string]interface{}, error) {
 func formatConfig(configVars map[string]interface{}) string {
 	var formattedConfig string
 
-	for key, value := range configVars {
-		formattedConfig += fmt.Sprintf("%s=%s\n", key, value)
+	keys := sortKeys(configVars)
+	for _, key := range keys {
+		formattedConfig += fmt.Sprintf("%s=%v\n", key, configVars[key])
 	}
 
 	return formattedConfig
 }
+
+func sortKeys(kv map[string]interface{}) []string {
+	var keys []string
+	for k := range kv {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	return keys
+}

cmd/config_test.go

@@ -1,9 +1,14 @@
 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 TestParseConfig(t *testing.T) {
@@ -16,3 +21,186 @@ func TestParseConfig(t *testing.T) {
 	assert.NoErr(t, err)
 	assert.Equal(t, actual, map[string]interface{}{"FOO": "bar"}, "map")
 }
+
+func TestFormatConfig(t *testing.T) {
+	t.Parallel()
+
+	testMap := map[string]interface{}{
+		"TEST":  "testing",
+		"NCC":   1701,
+		"TRUE":  false,
+		"FLOAT": 12.34,
+	}
+
+	testOut := formatConfig(testMap)
+	assert.Equal(t, testOut, `FLOAT=12.34
+NCC=1701
+TEST=testing
+TRUE=false
+`, "output")
+}
+
+func TestSortKeys(t *testing.T) {
+	test := map[string]interface{}{
+		"d": nil,
+		"b": nil,
+		"c": nil,
+		"a": nil,
+	}
+
+	assert.Equal(t, sortKeys(test), []string{"a", "b", "c", "d"}, "map")
+}
+
+func TestConfigList(t *testing.T) {
+	t.Parallel()
+	cf, server, err := testutil.NewTestServerAndClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer server.Close()
+
+	server.Mux.HandleFunc("/v2/apps/foo/config/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		fmt.Fprintf(w, `{
+    "owner": "jkirk",
+    "app": "foo",
+    "values": {
+        "TEST":  "testing",
+        "NCC":   "1701",
+        "TRUE":  "false",
+        "FLOAT": "12.34"
+    },
+    "memory": {},
+    "cpu": {},
+    "tags": {},
+    "registry": {},
+    "created": "2014-01-01T00:00:00UTC",
+    "updated": "2014-01-01T00:00:00UTC",
+    "uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
+}`)
+	})
+
+	var b bytes.Buffer
+	cmdr := DeisCmd{WOut: &b, ConfigFile: cf}
+
+	err = cmdr.ConfigList("foo", false)
+	assert.NoErr(t, err)
+
+	assert.Equal(t, b.String(), `=== foo Config
+FLOAT      12.34
+NCC        1701
+TEST       testing
+TRUE       false
+`, "output")
+	b.Reset()
+
+	err = cmdr.ConfigList("foo", true)
+	assert.NoErr(t, err)
+	assert.Equal(t, b.String(), "FLOAT=12.34 NCC=1701 TEST=testing TRUE=false\n", "output")
+}
+
+func TestConfigSet(t *testing.T) {
+	t.Parallel()
+	cf, server, err := testutil.NewTestServerAndClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer server.Close()
+
+	server.Mux.HandleFunc("/v2/apps/foo/config/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		if r.Method == "POST" {
+			testutil.AssertBody(t, api.Config{
+				Values: map[string]interface{}{
+					"TRUE": "false",
+				},
+			}, r)
+		}
+
+		fmt.Fprintf(w, `{
+	"owner": "jkirk",
+	"app": "foo",
+	"values": {
+			"TEST":  "testing",
+			"NCC":   "1701",
+			"TRUE":  "false",
+			"FLOAT": "12.34"
+	},
+	"memory": {},
+	"cpu": {},
+	"tags": {},
+	"registry": {},
+	"created": "2014-01-01T00:00:00UTC",
+	"updated": "2014-01-01T00:00:00UTC",
+	"uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
+}`)
+	})
+
+	var b bytes.Buffer
+	cmdr := DeisCmd{WOut: &b, ConfigFile: cf}
+
+	err = cmdr.ConfigSet("foo", []string{"TRUE=false"})
+	assert.NoErr(t, err)
+
+	assert.Equal(t, testutil.StripProgress(b.String()), `Creating config... done
+
+=== foo Config
+FLOAT      12.34
+NCC        1701
+TEST       testing
+TRUE       false
+`, "output")
+}
+
+func TestConfigUnset(t *testing.T) {
+	t.Parallel()
+	cf, server, err := testutil.NewTestServerAndClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer server.Close()
+
+	server.Mux.HandleFunc("/v2/apps/foo/config/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		if r.Method == "POST" {
+			testutil.AssertBody(t, api.Config{
+				Values: map[string]interface{}{
+					"FOO": nil,
+				},
+			}, r)
+		}
+
+		fmt.Fprintf(w, `{
+	"owner": "jkirk",
+	"app": "foo",
+	"values": {
+			"TEST":  "testing",
+			"NCC":   "1701",
+			"TRUE":  "false",
+			"FLOAT": "12.34"
+	},
+	"memory": {},
+	"cpu": {},
+	"tags": {},
+	"registry": {},
+	"created": "2014-01-01T00:00:00UTC",
+	"updated": "2014-01-01T00:00:00UTC",
+	"uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
+}`)
+	})
+
+	var b bytes.Buffer
+	cmdr := DeisCmd{WOut: &b, ConfigFile: cf}
+
+	err = cmdr.ConfigUnset("foo", []string{"FOO"})
+	assert.NoErr(t, err)
+
+	assert.Equal(t, testutil.StripProgress(b.String()), `Removing config... done
+
+=== foo Config
+FLOAT      12.34
+NCC        1701
+TEST       testing
+TRUE       false
+`, "output")
+}