vvzvlad/portainer
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

feat(sources): add sources and workflows to the backend BE-12919 (#2666)

Browse Source
This commit is contained in:
andres-portainer
2026-05-20 20:42:10 -03:00
committed by GitHub
parent 4cd8c04691
commit 3d09c70e13
71 changed files with 3117 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/http/handler/stacks/stack_update_git_redeploy.go
+67 -27
View File
@@ -19,6 +19,7 @@ import (
"github.com/portainer/portainer/pkg/libhttp/response"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
)
type stackGitRedeployPayload struct {
@@ -73,8 +74,16 @@ func (handler *Handler) stackGitRedeploy(w http.ResponseWriter, r *http.Request)
return httperror.InternalServerError("Unable to find a stack with the specified identifier inside the database", err)
}
if stack.GitConfig == nil {
return httperror.BadRequest("Stack is not created from git", err)
if stack.WorkflowID == 0 {
return httperror.BadRequest("Stack is not created from git", errors.New("stack has no git workflow"))
}
gitConfig, sourceID, err := loadGitConfigFromSource(handler.DataStore, stack.WorkflowID)
if err != nil {
return httperror.InternalServerError("Unable to load git config for stack", err)
}
if gitConfig == nil {
return httperror.BadRequest("Stack is not created from git", errors.New("stack source has no git config"))
}
if stack.Status == portainer.StackStatusDeploying {
@@ -135,7 +144,7 @@ func (handler *Handler) stackGitRedeploy(w http.ResponseWriter, r *http.Request)
}
payload.RepullImageAndRedeploy = payload.RepullImageAndRedeploy || payload.PullImage
stack.GitConfig.ReferenceName = cmp.Or(payload.RepositoryReferenceName, stack.GitConfig.ReferenceName)
gitConfig.ReferenceName = cmp.Or(payload.RepositoryReferenceName, gitConfig.ReferenceName)
if payload.Env != nil {
stack.Env = payload.Env
@@ -161,19 +170,19 @@ func (handler *Handler) stackGitRedeploy(w http.ResponseWriter, r *http.Request)
// When the existing stack is using the custom username/password and the password is not updated,
// the stack should keep using the saved username/password
if repositoryPassword == "" && stack.GitConfig != nil && stack.GitConfig.Authentication != nil {
repositoryPassword = stack.GitConfig.Authentication.Password
if repositoryPassword == "" && gitConfig.Authentication != nil {
repositoryPassword = gitConfig.Authentication.Password
}
repositoryUsername = payload.RepositoryUsername
}
cloneOptions := git.CloneOptions{
ProjectPath: stack.ProjectPath,
URL: stack.GitConfig.URL,
ReferenceName: stack.GitConfig.ReferenceName,
URL: gitConfig.URL,
ReferenceName: gitConfig.ReferenceName,
Username: repositoryUsername,
Password: repositoryPassword,
TLSSkipVerify: stack.GitConfig.TLSSkipVerify,
TLSSkipVerify: gitConfig.TLSSkipVerify,
}
clean, err := git.CloneWithBackup(context.TODO(), handler.GitService, handler.FileService, cloneOptions)
@@ -183,51 +192,82 @@ func (handler *Handler) stackGitRedeploy(w http.ResponseWriter, r *http.Request)
defer clean()
deployGate := newDeployGate()
if err := handler.deployStack(r, stack, payload.RepullImageAndRedeploy, endpoint, deployGate); err != nil {
return err
}
newHash, err := handler.GitService.LatestCommitID(context.TODO(), stack.GitConfig.URL, stack.GitConfig.ReferenceName, repositoryUsername, repositoryPassword, stack.GitConfig.TLSSkipVerify)
newHash, err := handler.GitService.LatestCommitID(context.TODO(), gitConfig.URL, gitConfig.ReferenceName, repositoryUsername, repositoryPassword, gitConfig.TLSSkipVerify)
if err != nil {
return httperror.InternalServerError("Unable get latest commit id", errors.WithMessagef(err, "failed to fetch latest commit id of the stack %v", stack.ID))
}
stack.GitConfig.ConfigHash = newHash
oldConfigHash := gitConfig.ConfigHash
gitConfig.ConfigHash = newHash
user, err := handler.DataStore.User().Read(securityContext.UserID)
if err != nil {
return httperror.BadRequest("Cannot find context user", errors.Wrap(err, "failed to fetch the user"))
}
stack.CurrentDeploymentInfo = &portainer.StackDeploymentInfo{
RepositoryURL: stack.GitConfig.URL,
ReferenceName: stack.GitConfig.ReferenceName,
ConfigFilePath: stack.GitConfig.ConfigFilePath,
RepositoryURL: gitConfig.URL,
ReferenceName: gitConfig.ReferenceName,
ConfigFilePath: gitConfig.ConfigFilePath,
AdditionalFiles: stack.AdditionalFiles,
ConfigHash: stack.GitConfig.ConfigHash,
ConfigHash: newHash,
}
stack.UpdatedBy = user.Username
stack.UpdateDate = time.Now().Unix()
stackutils.PrepareStackStatusForDeployment(stack)
postDeploy := func(ctx context.Context, deployErr error) {
if deployErr == nil {
return
}
if err := handler.DataStore.UpdateTx(func(tx dataservices.DataStoreTx) error {
liveStack, err := tx.Stack().Read(stack.ID)
if err != nil {
return err
}
if liveStack.CurrentDeploymentInfo != nil {
liveStack.CurrentDeploymentInfo.ConfigHash = oldConfigHash
}
if err := tx.Stack().Update(liveStack.ID, liveStack); err != nil {
return err
}
gitConfig.ConfigHash = oldConfigHash
return saveSourceGitConfig(tx, sourceID, gitConfig)
}); err != nil {
log.Error().Err(err).Int("stack_id", int(stack.ID)).Msg("failed to revert config hash after failed redeploy")
}
}
deployGate := newDeployGate()
if err := handler.deployStack(r, stack, payload.RepullImageAndRedeploy, endpoint, deployGate, postDeploy); err != nil {
return err
}
if err := handler.DataStore.UpdateTx(func(tx dataservices.DataStoreTx) error {
return tx.Stack().Update(stack.ID, stack)
if err := tx.Stack().Update(stack.ID, stack); err != nil {
return err
}
if err := saveSourceGitConfig(tx, sourceID, gitConfig); err != nil {
return err
}
return fillStackGitConfig(tx, stack)
}); err != nil {
deployGate.abortDeploy()
return httperror.InternalServerError("Unable to persist the stack changes inside the database", errors.Wrap(err, "failed to update the stack"))
}
deployGate.startDeploy()
if stack.GitConfig != nil && stack.GitConfig.Authentication != nil && stack.GitConfig.Authentication.Password != "" {
// Sanitize password in the http response to minimise possible security leaks
stack.GitConfig.Authentication.Password = ""
}
return response.JSON(w, stack)
}
func (handler *Handler) deployStack(r *http.Request, stack *portainer.Stack, pullImage bool, endpoint *portainer.Endpoint, gate *deployGate) *httperror.HandlerError {
func (handler *Handler) deployStack(r *http.Request, stack *portainer.Stack, pullImage bool, endpoint *portainer.Endpoint, gate *deployGate, postDeploy postDeployFunc) *httperror.HandlerError {
var deploymentConfiger deployments.StackDeploymentConfiger
switch stack.Type {
@@ -286,7 +326,7 @@ func (handler *Handler) deployStack(r *http.Request, stack *portainer.Stack, pul
return httperror.InternalServerError("Unsupported stack", errors.Errorf("unsupported stack type: %v", stack.Type))
}
go stackDeploy(handler.DataStore, stack.ID, deploymentConfiger, gate, nil)
go stackDeploy(handler.DataStore, stack.ID, deploymentConfiger, gate, postDeploy)
return nil
}