Skip to content

fix: git material url sanitised #4742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 7, 2024
Merged

fix: git material url sanitised #4742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5927474
fix: git material url sanitised
Ash-exp Mar 4, 2024
27cf93a
Merge remote-tracking branch 'origin/main' into fix-material-url-sani…
Ash-exp Mar 5, 2024
ca80c0a
renamed method
Ash-exp Mar 5, 2024
5af4ee9
Merge remote-tracking branch 'origin/main' into fix-material-url-sani…
ShashwatDadhich Mar 6, 2024
0059e72
Merge remote-tracking branch 'origin/main' into fix-material-url-sani…
Ash-exp Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkg/bean/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
bean3 "github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps/bean"
"github.com/devtron-labs/devtron/pkg/pipeline/bean"
"github.com/devtron-labs/devtron/pkg/pipeline/repository"
"strings"
"time"
)

Expand Down Expand Up @@ -81,6 +82,13 @@ type GitMaterial struct {
FilterPattern []string `json:"filterPattern"`
}

// UpdateSanitisedGitRepoUrl will remove all trailing slashes from git repository url
func (m *GitMaterial) UpdateSanitisedGitRepoUrl() {
for strings.HasSuffix(m.Url, "/") {
m.Url = strings.TrimSuffix(m.Url, "/")
}
}

type CiMaterial struct {
Source *SourceTypeConfig `json:"source,omitempty" validate:"dive,required"` //branch for ci
Path string `json:"path,omitempty"` // defaults to root of git repo
Expand Down
2 changes: 2 additions & 0 deletions pkg/pipeline/CiCdPipelineOrchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1291,6 +1291,7 @@ func (impl CiCdPipelineOrchestratorImpl) CreateMaterials(createMaterialRequest *
}
var materials []*bean.GitMaterial
for _, inputMaterial := range createMaterialRequest.Material {
inputMaterial.UpdateSanitisedGitRepoUrl()
m, err := impl.createMaterial(inputMaterial, createMaterialRequest.AppId, createMaterialRequest.UserId)
inputMaterial.Id = m.Id
if err != nil {
Expand Down Expand Up @@ -1481,6 +1482,7 @@ func (impl CiCdPipelineOrchestratorImpl) updateMaterial(updateMaterialDTO *bean.
impl.logger.Errorw("validation err", "err", err)
return nil, validationErr
}
updateMaterialDTO.Material.UpdateSanitisedGitRepoUrl()
currentMaterial.Url = updateMaterialDTO.Material.Url
basePath := path.Base(updateMaterialDTO.Material.Url)
basePath = strings.TrimSuffix(basePath, ".git")
Expand Down