Merge pull request #75 from netlify/update_full_instance

Overwrite instance configuration on update.
netlify · Aug 31, 2017 · e6ff3c1 · e6ff3c1
2 parents 06dab68 + 11d9178
commit e6ff3c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/api/instance.go b/api/instance.go
@@ -6,7 +6,6 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi"
-	"github.com/imdario/mergo"
 	"github.com/netlify/gotrue/conf"
 	"github.com/netlify/gotrue/models"
 	"github.com/pborman/uuid"
@@ -93,9 +92,7 @@ func (a *API) UpdateInstance(w http.ResponseWriter, r *http.Request) error {
 	}
 
 	if params.BaseConfig != nil {
-		if err := mergo.MergeWithOverwrite(i.BaseConfig, params.BaseConfig); err != nil {
-			return internalServerError("Error merging instance configurations").WithInternalError(err)
-		}
+		i.BaseConfig = params.BaseConfig
 	}
 
 	if err := a.db.UpdateInstance(i); err != nil {

diff --git a/api/instance_test.go b/api/instance_test.go
@@ -124,6 +124,9 @@ func (ts *InstanceTestSuite) TestUpdate() {
 	var buffer bytes.Buffer
 	require.NoError(ts.T(), json.NewEncoder(&buffer).Encode(map[string]interface{}{
 		"config": &conf.Configuration{
+			JWT: conf.JWTConfiguration{
+				Secret: "testsecret",
+			},
 			SiteURL: "https://test.mysite.com",
 		},
 	}))