Skip to content

FEATURE: azure repo support #454

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 1 commit into from
May 20, 2021
Merged

FEATURE: azure repo support #454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions pkg/pipeline/DbPipelineOrchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ import (
"github.com/devtron-labs/devtron/pkg/bean"
"github.com/go-pg/pg"
"go.uber.org/zap"
"net/url"
"path"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -891,7 +893,14 @@ func (impl DbPipelineOrchestratorImpl) updateMaterial(updateMaterialDTO *bean.Up
return nil, validationErr
}
currentMaterial.Url = updateMaterialDTO.Material.Url
currentMaterial.Name = strconv.Itoa(updateMaterialDTO.Material.GitProviderId) + "-" + updateMaterialDTO.Material.Url[strings.LastIndex(updateMaterialDTO.Material.Url, "/")+1:strings.LastIndex(updateMaterialDTO.Material.Url, ".git")]
materialUrl, err := url.Parse(updateMaterialDTO.Material.Url)
if err != nil {
return nil, err
}
basePath := path.Base(materialUrl.Path)
basePath = strings.TrimSuffix(basePath, ".git")

currentMaterial.Name = strconv.Itoa(updateMaterialDTO.Material.GitProviderId) + "-" + basePath
currentMaterial.GitProviderId = updateMaterialDTO.Material.GitProviderId
currentMaterial.CheckoutPath = updateMaterialDTO.Material.CheckoutPath
currentMaterial.AuditLog = models.AuditLog{UpdatedBy: updateMaterialDTO.UserId, CreatedBy: currentMaterial.CreatedBy, UpdatedOn: time.Now(), CreatedOn: currentMaterial.CreatedOn}
Expand All @@ -905,16 +914,22 @@ func (impl DbPipelineOrchestratorImpl) updateMaterial(updateMaterialDTO *bean.Up
}

func (impl DbPipelineOrchestratorImpl) createMaterial(inputMaterial *bean.GitMaterial, appId int, userId int32) (*pipelineConfig.GitMaterial, error) {
materialUrl, err := url.Parse(inputMaterial.Url)
if err != nil {
return nil, err
}
basePath := path.Base(materialUrl.Path)
basePath = strings.TrimSuffix(basePath, ".git")
material := &pipelineConfig.GitMaterial{
Url: inputMaterial.Url,
AppId: appId,
Name: strconv.Itoa(inputMaterial.GitProviderId) + "-" + inputMaterial.Url[strings.LastIndex(inputMaterial.Url, "/")+1:strings.LastIndex(inputMaterial.Url, ".git")],
Name: strconv.Itoa(inputMaterial.GitProviderId) + "-" + basePath,
GitProviderId: inputMaterial.GitProviderId,
Active: true,
CheckoutPath: inputMaterial.CheckoutPath,
AuditLog: models.AuditLog{UpdatedBy: userId, CreatedBy: userId, UpdatedOn: time.Now(), CreatedOn: time.Now()},
}
err := impl.materialRepository.SaveMaterial(material)
err = impl.materialRepository.SaveMaterial(material)
if err != nil {
impl.logger.Errorw("error in saving material", "material", material, "err", err)
return nil, err
Expand Down