github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(stacks): fix an issue with stack update

pull/1988/head
Anthony Lapenna 2018-06-20 20:55:00 +03:00
parent 48f963398f
commit a5bd2743f3
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/http/handler/stacks/create_compose_stack.go
View File

@ -2,6 +2,7 @@ package stacks
import ( import (
"net/http" "net/http"
"strconv"
"strings" "strings"
"github.com/asaskevich/govalidator" "github.com/asaskevich/govalidator"
@ -55,7 +56,8 @@ func (handler *Handler) createComposeStackFromFileContent(w http.ResponseWriter,
EntryPoint: filesystem.ComposeFileDefaultName, EntryPoint: filesystem.ComposeFileDefaultName,
} }
projectPath, err := handler.FileService.StoreStackFileFromBytes(string(stack.ID), stack.EntryPoint, []byte(payload.StackFileContent)) stackFolder := strconv.Itoa(int(stack.ID))
projectPath, err := handler.FileService.StoreStackFileFromBytes(stackFolder, stack.EntryPoint, []byte(payload.StackFileContent))
if err != nil { if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist Compose file on disk", err} return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist Compose file on disk", err}
} }
@ -220,7 +222,8 @@ func (handler *Handler) createComposeStackFromFileUpload(w http.ResponseWriter,
EntryPoint: filesystem.ComposeFileDefaultName, EntryPoint: filesystem.ComposeFileDefaultName,
} }
projectPath, err := handler.FileService.StoreStackFileFromBytes(string(stack.ID), stack.EntryPoint, []byte(payload.StackFileContent)) stackFolder := strconv.Itoa(int(stack.ID))
projectPath, err := handler.FileService.StoreStackFileFromBytes(stackFolder, stack.EntryPoint, []byte(payload.StackFileContent))
if err != nil { if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist Compose file on disk", err} return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist Compose file on disk", err}
} }

7
api/http/handler/stacks/create_swarm_stack.go
View File

@ -2,6 +2,7 @@ package stacks
import ( import (
"net/http" "net/http"
"strconv"
"strings" "strings"
"github.com/asaskevich/govalidator" "github.com/asaskevich/govalidator"
@ -62,7 +63,8 @@ func (handler *Handler) createSwarmStackFromFileContent(w http.ResponseWriter, r
Env: payload.Env, Env: payload.Env,
} }
projectPath, err := handler.FileService.StoreStackFileFromBytes(string(stack.ID), stack.EntryPoint, []byte(payload.StackFileContent)) stackFolder := strconv.Itoa(int(stack.ID))
projectPath, err := handler.FileService.StoreStackFileFromBytes(stackFolder, stack.EntryPoint, []byte(payload.StackFileContent))
if err != nil { if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist Compose file on disk", err} return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist Compose file on disk", err}
} }
@ -250,7 +252,8 @@ func (handler *Handler) createSwarmStackFromFileUpload(w http.ResponseWriter, r
Env: payload.Env, Env: payload.Env,
} }
projectPath, err := handler.FileService.StoreStackFileFromBytes(string(stack.ID), stack.EntryPoint, []byte(payload.StackFileContent)) stackFolder := strconv.Itoa(int(stack.ID))
projectPath, err := handler.FileService.StoreStackFileFromBytes(stackFolder, stack.EntryPoint, []byte(payload.StackFileContent))
if err != nil { if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist Compose file on disk", err} return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist Compose file on disk", err}
} }

7
api/http/handler/stacks/stack_update.go
View File

@ -2,6 +2,7 @@ package stacks
import ( import (
"net/http" "net/http"
"strconv"
"github.com/asaskevich/govalidator" "github.com/asaskevich/govalidator"
"github.com/portainer/portainer" "github.com/portainer/portainer"
@ -111,7 +112,8 @@ func (handler *Handler) updateComposeStack(r *http.Request, stack *portainer.Sta
return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err}
} }
_, err = handler.FileService.StoreStackFileFromBytes(string(stack.ID), stack.EntryPoint, []byte(payload.StackFileContent)) stackFolder := strconv.Itoa(int(stack.ID))
_, err = handler.FileService.StoreStackFileFromBytes(stackFolder, stack.EntryPoint, []byte(payload.StackFileContent))
if err != nil { if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist updated Compose file on disk", err} return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist updated Compose file on disk", err}
} }
@ -138,7 +140,8 @@ func (handler *Handler) updateSwarmStack(r *http.Request, stack *portainer.Stack
stack.Env = payload.Env stack.Env = payload.Env
_, err = handler.FileService.StoreStackFileFromBytes(string(stack.ID), stack.EntryPoint, []byte(payload.StackFileContent)) stackFolder := strconv.Itoa(int(stack.ID))
_, err = handler.FileService.StoreStackFileFromBytes(stackFolder, stack.EntryPoint, []byte(payload.StackFileContent))
if err != nil { if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist updated Compose file on disk", err} return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist updated Compose file on disk", err}
} }