[WIP] Change UpdateTemplate function declaration

handlers.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/justinas/alice"
+    "github.com/fatih/structs"
 )
 
 // NewDefaultRouter sets up a mux.Router with the registry routes
@@ -166,7 +167,7 @@ func (registry Registry) templateUpdate(w http.ResponseWriter, r *http.Request)
 		panic(err)
 	}
 
-	var tmpl Template
+    var tmpl Template
 
 	if err := json.Unmarshal(body, &tmpl); err != nil {
 		w.WriteHeader(http.StatusBadRequest)
@@ -182,7 +183,8 @@ func (registry Registry) templateUpdate(w http.ResponseWriter, r *http.Request)
 
 	tmpl.Name = templateName
 
-	tmpl, err = registry.UpdateTemplate(tmpl)
+	tmpl, err = registry.UpdateTemplate(templateName, structs.Map(tmpl))
+
 	if err != nil {
 		w.WriteHeader(http.StatusNotFound)
 		if err := json.NewEncoder(w).Encode(TemplateNotFoundError); err != nil {

handlers_test.go

@@ -8,7 +8,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/binder-project/binder-registry/mocks"
+    "github.com/binder-project/binder-registry/mocks"
 	"github.com/gorilla/mux"
 )
 

inmemstore.go

@@ -55,23 +55,24 @@ func (store InMemoryStore) ListTemplates() ([]Template, error) {
 }
 
 // UpdateTemplate will allow for updating ImageName and Command
-func (store InMemoryStore) UpdateTemplate(tmpl Template) (Template, error) {
-	updatedTemplate, ok := store.templateMap[tmpl.Name]
+func (store InMemoryStore) UpdateTemplate(name string,
+                    update map[string]interface {}) (Template, error) {
+	updatedTemplate, ok := store.templateMap[name]
 	if !ok {
 		return Template{}, UnavailableTemplateError
 	}
 
 	// For now we allow updates to image name and command
-	if tmpl.ImageName != "" {
-		updatedTemplate.ImageName = tmpl.ImageName
+	if updatedName, ok := update["name"]; ok {
+		updatedTemplate.ImageName = updatedName.(string)
 	}
-	if tmpl.Command != "" {
-		updatedTemplate.Command = tmpl.Command
+	if command, ok := update["command"]; ok {
+		updatedTemplate.Command = command.(string)
 	}
 
 	updatedTemplate.TimeModified = time.Now().UTC()
 
-	store.templateMap[tmpl.Name] = updatedTemplate
+	store.templateMap[name] = updatedTemplate
 
 	return updatedTemplate, nil
 }

inmemstore_test.go

@@ -91,7 +91,7 @@ func TestListTemplates(t *testing.T) {
 
 func TestUpdateTemplate(t *testing.T) {
 	store := NewInMemoryStore()
-	_, err := store.UpdateTemplate(Template{Name: "NotHere", ImageName: "cool/app"})
+	_, err := store.UpdateTemplate("NotHere", make(map[string]interface{}))
 	equals(t, err, UnavailableTemplateError)
 
 	template := Template{
@@ -107,7 +107,8 @@ func TestUpdateTemplate(t *testing.T) {
 	updatedTemplate.ImageName = "nteract/poster"
 	nequals(t, updatedTemplate, registeredTemplate)
 
-	actualTemplate, err := store.UpdateTemplate(updatedTemplate)
+	actualTemplate, err := store.UpdateTemplate("Test1", map[string]interface{}{
+                                                "image-name": "nteract/poster"})
 	ok(t, err)
 
 	// TODO: Mock time

middleware_test.go

@@ -29,7 +29,7 @@ func (s PanicStore) ListTemplates() ([]Template, error) {
 	panic("NO LISTING TEMPLATES FOR YOU")
 }
 
-func (s PanicStore) UpdateTemplate(tmpl Template) (Template, error) {
+func (s PanicStore) UpdateTemplate(name string, update map[string]interface{}) (Template, error) {
 	panic("NO UPDATING TEMPLATES FOR YOU")
 }
 

mongostore.go

@@ -71,7 +71,7 @@ func contains(list []string, item string) bool {
 }
 
 func (store MongoStore) UpdateTemplate(name string,
-                                    update map[string]string) error {
+                                    update map[string]interface {}) error {
     TEMPLATE_KEYS := []string{"name", "image-name", "command", "limits",
                                 "time-created", "time-modified", "redirect-uri",
                                 "container-ip", "bind-port"}

mongostore_test.go

@@ -117,7 +117,7 @@ func TestMongoUpdateTemplate(t *testing.T) {
     _, err := store.RegisterTemplate(tmpl)
 
     if (err == nil) {
-        updates := make(map[string]string)
+        updates := make(map[string]interface{})
         updates["name"] = "Updated!"
         err := store.UpdateTemplate(tmpl.Name, updates)
 

registry_test.go

@@ -71,72 +71,87 @@ func matchedAPIError(tb testing.TB, expected APIErrorResponse, w *httptest.Respo
 	equals(tb, expected.Message, apiError.Message)
 }
 
-/**
-Autogenerated with mockery -name=store
-There's a few changes though. Buyer beware.
-**/
+/*
+
+*/
 type mockStore struct {
-	mock.Mock
-	registerCall map[string]RegisterReceiver
+    mock.Mock
+    registerCall map[string]RegisterReceiver
 }
 
 type RegisterReceiver struct {
-	Input          Template
-	OutputTemplate Template
-	OutputError    error
-	Actual         Template
+    Input           Template
+    OutputTemplate  Template
+    OutputError     error
+    Actual          Template
 }
 
 func (_m *mockStore) GetTemplate(name string) (Template, error) {
-	ret := _m.Called(name)
-
-	var r0 Template
-	if rf, ok := ret.Get(0).(func(string) Template); ok {
-		r0 = rf(name)
-	} else {
-		r0 = ret.Get(0).(Template)
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(string) error); ok {
-		r1 = rf(name)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
+    ret := _m.Called(name)
+
+    var r0 Template
+    if rf, ok := ret.Get(0).(func(string) Template); ok {
+        r0 = rf(name)
+    } else {
+        r0 = ret.Get(0).(Template)
+    }
+
+    var r1 error
+    if rf, ok := ret.Get(1).(func(string) error); ok {
+        r1 = rf(name)
+    } else {
+        r1 = ret.Error(1)
+    }
+
+    return r0, r1
 }
+
 func (_m *mockStore) RegisterTemplate(tmpl Template) (Template, error) {
-	receiver := _m.registerCall[tmpl.Name]
-	receiver.Actual = tmpl
+    receiver := _m.registerCall[tmpl.Name]
+    receiver.Actual = tmpl
 
-	return receiver.OutputTemplate, receiver.OutputError
+    return receiver.OutputTemplate, receiver.OutputError
 }
 
 func (_m *mockStore) ListTemplates() ([]Template, error) {
-	ret := _m.Called()
-
-	var r0 []Template
-	if rf, ok := ret.Get(0).(func() []Template); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]Template)
-		}
-	}
+    ret := _m.Called()
+
+    var r0 []Template
+    if rf, ok := ret.Get(0).(func() []Template); ok {
+        r0 = rf()
+    } else {
+        if ret.Get(0) != nil {
+            r0 = ret.Get(0).([]Template)
+        }
+    }
+
+    var r1 error
+    if rf, ok := ret.Get(1).(func() error); ok {
+        r1 = rf()
+    } else {
+        r1 = ret.Error(1)
+    }
+
+    return r0, r1
+}
 
-	var r1 error
-	if rf, ok := ret.Get(1).(func() error); ok {
-		r1 = rf()
-	} else {
-		r1 = ret.Error(1)
-	}
+func (_m *mockStore) UpdateTemplate(name string, update map[string]interface{}) (Template, error) {
+    ret := _m.Called(name, update)
 
-	return r0, r1
-}
-func (_m *mockStore) UpdateTemplate(tmpl Template) (Template, error) {
-	receiver := _m.registerCall[tmpl.Name]
-	receiver.Actual = tmpl
+    var r0 Template
+    if rf, ok := ret.Get(0).(func(string, map[string]interface{}) Template); ok {
+        r0 = rf(name, update)
+    } else {
+        r0 = ret.Get(0).(Template)
+    }
+
+    var r1 error
+    if rf, ok := ret.Get(1).(func(string, map[string]interface{}) error); ok {
+        r1 = rf(name, update)
+    } else {
+        r1 = ret.Error(1)
+    }
 
-	return receiver.OutputTemplate, receiver.OutputError
+    return r0, r1
 }
+

store.go

@@ -22,7 +22,7 @@ type Store interface {
 	ListTemplates() ([]Template, error)
 
 	// UpdateTemplate will allow for updating ImageName and Command
-	UpdateTemplate(tmpl Template) (Template, error)
+	UpdateTemplate(name string, update map[string]interface {}) (Template, error)
 }
 
 // AuthStore is an interface for connecting to some authentication endpoint,