From dd413288a205a9aac83bc7a52c0a863bd4fb0e0b Mon Sep 17 00:00:00 2001
From: Freddy <freddygv@users.noreply.github.com>
Date: Tue, 17 Dec 2019 10:28:51 -0700
Subject: [PATCH] Add kv meta to namespaces api module (#6958)

---
 api/namespace.go      |  3 +++
 api/namespace_test.go | 15 ++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/api/namespace.go b/api/namespace.go
index 9e1fead2e..875af105f 100644
--- a/api/namespace.go
+++ b/api/namespace.go
@@ -21,6 +21,9 @@ type Namespace struct {
 	// This is nullable so that we can omit if empty when encoding in JSON
 	ACLs *NamespaceACLConfig `json:"ACLs,omitempty"`
 
+	// Meta is a map that can be used to add kv metadata to the namespace definition
+	Meta map[string]string `json:"Meta,omitempty"`
+
 	// DeletedAt is the time when the Namespace was marked for deletion
 	// This is nullable so that we can omit if empty when encoding in JSON
 	DeletedAt *time.Time `json:"DeletedAt,omitempty"`
diff --git a/api/namespace_test.go b/api/namespace_test.go
index be776a579..aec09a78e 100644
--- a/api/namespace_test.go
+++ b/api/namespace_test.go
@@ -46,10 +46,14 @@ func TestAPI_Namespaces(t *testing.T) {
 	t.Run("Create", func(t *testing.T) {
 		ns, _, err := namespaces.Create(&Namespace{
 			Name: "foo",
+			Meta: map[string]string{
+				"foo": "bar",
+			},
 		}, nil)
 		require.NoError(t, err)
 		require.NotNil(t, ns)
 		require.Equal(t, "foo", ns.Name)
+		require.Len(t, ns.Meta, 1)
 		require.Nil(t, ns.ACLs)
 
 		ns, _, err = namespaces.Create(&Namespace{
@@ -113,14 +117,11 @@ func TestAPI_Namespaces(t *testing.T) {
 		require.NoError(t, err)
 
 		// due to deferred deletion the namespace might still exist
-		// this checks that either it is in fact gone and we get a 404 or
-		// that the namespace is still there but marked for deletion
+		// this checks that we get a nil return or that the obj has
+		// the deletion mark
 		ns, _, err := namespaces.Read("foo", nil)
-		if err != nil {
-			require.Contains(t, err.Error(), "Unexpected response code: 404")
-			require.Nil(t, ns)
-		} else {
-			require.NotNil(t, ns)
+		require.NoError(t, err)
+		if ns != nil {
 			require.NotNil(t, ns.DeletedAt)
 			require.False(t, ns.DeletedAt.IsZero())
 		}