From 597d66b5b38c94b3c587113aa61fae14101f3407 Mon Sep 17 00:00:00 2001 From: Pedro Nasser Date: Thu, 22 Dec 2016 19:27:52 -0200 Subject: [PATCH] fix: using bolt config/header update now overwrites (#456) --- api/datastore/bolt/bolt.go | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/api/datastore/bolt/bolt.go b/api/datastore/bolt/bolt.go index 91fc29fee..3b9373318 100644 --- a/api/datastore/bolt/bolt.go +++ b/api/datastore/bolt/bolt.go @@ -143,12 +143,7 @@ func (ds *BoltDatastore) UpdateApp(ctx context.Context, newapp *models.App) (*mo // Update app fields if newapp.Config != nil { - if app.Config == nil { - app.Config = map[string]string{} - } - for k, v := range newapp.Config { - app.Config[k] = v - } + app.Config = newapp.Config } buf, err := json.Marshal(app) @@ -352,20 +347,10 @@ func (ds *BoltDatastore) UpdateRoute(ctx context.Context, newroute *models.Route route.MaxConcurrency = newroute.MaxConcurrency } if newroute.Headers != nil { - if route.Headers == nil { - route.Headers = map[string][]string{} - } - for k, v := range newroute.Headers { - route.Headers[k] = v - } + route.Headers = newroute.Headers } if newroute.Config != nil { - if route.Config == nil { - route.Config = map[string]string{} - } - for k, v := range newroute.Config { - route.Config[k] = v - } + route.Config = newroute.Config } if err := route.Validate(); err != nil {