Merge pull request #3859 from Joshua-Anderson/config-testing

test(deisctl): add tests to config package

Author: Matthew Fisher

deisctl/config/api.go

@@ -3,5 +3,6 @@ package config
 // Client interface used for configuration
 type Client interface {
 	Get(string) (string, error)
-	Set(string) (string, error)
+	Set(string, string) (string, error)
+	Delete(string) error
 }

deisctl/config/config.go

@@ -3,7 +3,9 @@ package config
 import (
 	"encoding/base64"
 	"fmt"
+	"io"
 	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/deis/deis/deisctl/utils"
@@ -20,7 +22,12 @@ var b64Keys = []string{"/deis/platform/sshPrivateKey"}
 
 // Config runs the config subcommand
 func Config(target string, action string, key []string) error {
-	return doConfig(target, action, key)
+	client, err := getEtcdClient()
+	if err != nil {
+		return err
+	}
+
+	return doConfig(target, action, key, client, os.Stdout)
 }
 
 // CheckConfig looks for a value at a keyspace path
@@ -40,15 +47,12 @@ func CheckConfig(root string, k string) error {
 	return nil
 }
 
-func doConfig(target string, action string, key []string) error {
-	client, err := getEtcdClient()
-	if err != nil {
-		return err
-	}
-
+func doConfig(target string, action string, key []string, client Client, w io.Writer) error {
 	rootPath := "/deis/" + target + "/"
 
 	var vals []string
+	var err error
+
 	if action == "set" {
 		vals, err = doConfigSet(client, rootPath, key)
 	} else if action == "rm" {
@@ -62,12 +66,12 @@ func doConfig(target string, action string, key []string) error {
 
 	// print results
 	for _, v := range vals {
-		fmt.Printf("%v\n", v)
+		fmt.Fprintf(w, "%v\n", v)
 	}
 	return nil
 }
 
-func doConfigSet(client *etcdClient, root string, kvs []string) ([]string, error) {
+func doConfigSet(client Client, root string, kvs []string) ([]string, error) {
 	var result []string
 
 	for _, kv := range kvs {
@@ -94,7 +98,7 @@ func doConfigSet(client *etcdClient, root string, kvs []string) ([]string, error
 	return result, nil
 }
 
-func doConfigGet(client *etcdClient, root string, keys []string) ([]string, error) {
+func doConfigGet(client Client, root string, keys []string) ([]string, error) {
 	var result []string
 	for _, k := range keys {
 		val, err := client.Get(root + k)
@@ -106,7 +110,7 @@ func doConfigGet(client *etcdClient, root string, keys []string) ([]string, erro
 	return result, nil
 }
 
-func doConfigRm(client *etcdClient, root string, keys []string) ([]string, error) {
+func doConfigRm(client Client, root string, keys []string) ([]string, error) {
 	var result []string
 	for _, k := range keys {
 		err := client.Delete(root + k)

deisctl/config/config_test.go

@@ -1,12 +1,115 @@
 package config
 
 import (
+	"bytes"
 	"encoding/base64"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"testing"
 )
 
+type KVPair struct {
+	key   string
+	value string
+}
+
+type MockStore []KVPair
+
+type mockClient struct {
+	expected MockStore
+}
+
+func (m mockClient) Get(key string) (value string, err error) {
+	for _, expect := range m.expected {
+		if expect.key == key {
+			return expect.value, nil
+		}
+	}
+	return "", fmt.Errorf("%s does not exist", m.expected)
+}
+
+func (m mockClient) Set(key, value string) (returnedValue string, err error) {
+	for _, expect := range m.expected {
+		if expect.key == key {
+			return value, nil
+		}
+	}
+	return "", fmt.Errorf("%s does not exist", m.expected)
+}
+
+func (m mockClient) Delete(key string) (err error) {
+	for _, expect := range m.expected {
+		if expect.key == key {
+			return nil
+		}
+	}
+	return fmt.Errorf("%s does not exist", m.expected)
+}
+
+func TestGetConfig(t *testing.T) {
+
+	testMock := mockClient{expected: MockStore{{key: "/deis/controller/testing", value: "foo"}, {key: "/deis/controller/port", value: "8000"}}}
+	testWriter := bytes.Buffer{}
+
+	err := doConfig("controller", "get", []string{"testing", "port"}, testMock, &testWriter)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expected := "foo\n8000\n"
+	output := testWriter.String()
+	if output != expected {
+		t.Error(fmt.Errorf("Expected: '%s', Got:'%s'", expected, output))
+	}
+}
+
+func TestGetConfigError(t *testing.T) {
+	testMock := mockClient{expected: MockStore{{key: "/deis/controller/testing", value: "foo"}}}
+	testWriter := bytes.Buffer{}
+
+	err := doConfig("controller", "get", []string{"port"}, testMock, &testWriter)
+
+	if err == nil {
+		t.Fatal("Error Expected")
+	}
+}
+
+func TestSetConfig(t *testing.T) {
+	testMock := mockClient{expected: MockStore{{key: "/deis/controller/testing", value: "foo"}, {key: "/deis/controller/port", value: "8000"}}}
+	testWriter := bytes.Buffer{}
+
+	err := doConfig("controller", "set", []string{"testing=bar", "port=1000"}, testMock, &testWriter)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expected := "bar\n1000\n"
+	output := testWriter.String()
+	if output != expected {
+		t.Error(fmt.Errorf("Expected: '%s', Got:'%s'", expected, output))
+	}
+}
+
+func TestDeleteConfig(t *testing.T) {
+	testMock := mockClient{expected: MockStore{{key: "/deis/controller/testing", value: "foo"}, {key: "/deis/controller/port", value: "8000"}}}
+	testWriter := bytes.Buffer{}
+
+	err := doConfig("controller", "rm", []string{"testing", "port"}, testMock, &testWriter)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expected := "testing\nport\n"
+	output := testWriter.String()
+	if output != expected {
+		t.Error(fmt.Errorf("Expected: '%s', Got:'%s'", expected, output))
+	}
+}
+
 // TestConfigSSHPrivateKey ensures private keys are base64 encoded from file path
 func TestConfigSSHPrivateKey(t *testing.T) {