Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

chore(code): clean up the code EE-5719 (#9183)

Browse source
This commit is contained in:
andres-portainer 2023-07-10 23:26:54 -03:00 • committed by GitHub
parent 979af5301e
commit 64b227b2e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 93 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/http/handler/customtemplates/customtemplate_git_fetch.go
View file

@ -11,6 +11,7 @@ import (
"github.com/portainer/libhttp/response"
portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/stacks/stackutils"
"github.com/rs/zerolog/log"
)
@ -68,10 +69,12 @@ func (handler *Handler) customTemplateGitFetch(w http.ResponseWriter, r *http.Re
})
if err != nil {
log.Warn().Err(err).Msg("failed to download git repository")
rbErr := rollbackCustomTemplate(backupPath, customTemplate.ProjectPath)
if err != nil {
rbErr := rollbackCustomTemplate(backupPath, customTemplate.ProjectPath)
return httperror.InternalServerError("Failed to rollback the custom template folder", rbErr)
}
return httperror.InternalServerError("Failed to download git repository", err)
}
@ -104,11 +107,7 @@ func backupCustomTemplate(projectPath string) (string, error) {
return "", err
}
err = os.Mkdir(projectPath, stat.Mode())
if err != nil {
return backupPath, err
}
return backupPath, nil
return backupPath, os.Mkdir(projectPath, stat.Mode())
}
func rollbackCustomTemplate(backupPath, projectPath string) error {
@ -116,6 +115,7 @@ func rollbackCustomTemplate(backupPath, projectPath string) error {
if err != nil {
return err
}
return os.Rename(backupPath, projectPath)
}

7
api/http/handler/customtemplates/customtemplate_git_fetch_test.go
View file

@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/assert"
)
var testFileContent string = "abcdefg"
var testFileContent = "abcdefg"
type TestGitService struct {
portainer.GitService
@ -32,6 +32,7 @@ type TestGitService struct {
func (g *TestGitService) CloneRepository(destination string, repositoryURL, referenceName string, username, password string, tlsSkipVerify bool) error {
time.Sleep(100 * time.Millisecond)
return createTestFile(g.targetFilePath)
}
@ -53,7 +54,9 @@ func createTestFile(targetPath string) error {
return err
}
defer f.Close()
_, err = f.WriteString(testFileContent)
return err
}
@ -152,7 +155,7 @@ func Test_customTemplateGitFetch(t *testing.T) {
wg.Add(10)
for i := 0; i < 10; i++ {
go func(j int) {
if j%1 == 0 {
if j%2 == 0 {
singleAPIRequest(h, jwt1, is, "abcdefg")
} else {
singleAPIRequest(h, jwt2, is, "abcdefg")