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

fix(edgestacks): create new stack [EE-2178] (#6311) 

* fix(edgestacks): create new stack [EE-2178]

[EE-2178]

* refactor(edgestacks): id is required on create
pull/6270/head
Chaim Lev-Ari 2022-01-10 11:36:46 +02:00 committed by GitHub
parent 4e77d2d772
commit 87dda810fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/dataservices/edgestack/edgestack.go
View File

@ -67,14 +67,15 @@ func (service *Service) EdgeStack(ID portainer.EdgeStackID) (*portainer.EdgeStac
return &stack, nil return &stack, nil
} }
// CreateEdgeStack assign an ID to a new Edge stack and saves it. // CreateEdgeStack saves an Edge stack object to db.
func (service *Service) Create(edgeStack *portainer.EdgeStack) error { func (service *Service) Create(id portainer.EdgeStackID, edgeStack *portainer.EdgeStack) error {
return service.connection.CreateObject(
edgeStack.ID = id
return service.connection.CreateObjectWithId(
BucketName, BucketName,
func(id uint64) (int, interface{}) { int(edgeStack.ID),
edgeStack.ID = portainer.EdgeStackID(id) edgeStack,
return int(edgeStack.ID), edgeStack
},
) )
} }

2
api/dataservices/interface.go
View File

@ -84,7 +84,7 @@ type (
EdgeStackService interface { EdgeStackService interface {
EdgeStacks() ([]portainer.EdgeStack, error) EdgeStacks() ([]portainer.EdgeStack, error)
EdgeStack(ID portainer.EdgeStackID) (*portainer.EdgeStack, error) EdgeStack(ID portainer.EdgeStackID) (*portainer.EdgeStack, error)
Create(edgeStack *portainer.EdgeStack) error Create(id portainer.EdgeStackID, edgeStack *portainer.EdgeStack) error
UpdateEdgeStack(ID portainer.EdgeStackID, edgeStack *portainer.EdgeStack) error UpdateEdgeStack(ID portainer.EdgeStackID, edgeStack *portainer.EdgeStack) error
DeleteEdgeStack(ID portainer.EdgeStackID) error DeleteEdgeStack(ID portainer.EdgeStackID) error
GetNextIdentifier() int GetNextIdentifier() int

6
api/http/handler/edgestacks/edgestack_create.go
View File

@ -159,7 +159,7 @@ func (handler *Handler) createSwarmStackFromFileContent(r *http.Request) (*porta
return nil, fmt.Errorf("Unable to update endpoint relations: %w", err) return nil, fmt.Errorf("Unable to update endpoint relations: %w", err)
} }
err = handler.DataStore.EdgeStack().Create(stack) err = handler.DataStore.EdgeStack().Create(stack.ID, stack)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -274,7 +274,7 @@ func (handler *Handler) createSwarmStackFromGitRepository(r *http.Request) (*por
return nil, fmt.Errorf("Unable to update endpoint relations: %w", err) return nil, fmt.Errorf("Unable to update endpoint relations: %w", err)
} }
err = handler.DataStore.EdgeStack().Create(stack) err = handler.DataStore.EdgeStack().Create(stack.ID, stack)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -381,7 +381,7 @@ func (handler *Handler) createSwarmStackFromFileUpload(r *http.Request) (*portai
return nil, fmt.Errorf("Unable to update endpoint relations: %w", err) return nil, fmt.Errorf("Unable to update endpoint relations: %w", err)
} }
err = handler.DataStore.EdgeStack().Create(stack) err = handler.DataStore.EdgeStack().Create(stack.ID, stack)
if err != nil { if err != nil {
return nil, err return nil, err
} }