Skip to content

fix: prevent deletion of git material used in overridden CI templates #6633

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
Jun 2, 2025
Merged

fix: prevent deletion of git material used in overridden CI templates #6633

Show file tree
Hide file tree
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
18 changes: 18 additions & 0 deletions internal/sql/repository/pipelineConfig/CiTemplateOverrideRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
repository2 "github.com/devtron-labs/devtron/pkg/build/git/gitMaterial/repository"
"github.com/devtron-labs/devtron/pkg/sql"
"github.com/go-pg/pg"
"github.com/go-pg/pg/orm"
"go.uber.org/zap"
)

Expand All @@ -47,6 +48,7 @@ type CiTemplateOverrideRepository interface {
FindByAppId(appId int) ([]*CiTemplateOverride, error)
FindByCiPipelineIds(ciPipelineIds []int) ([]*CiTemplateOverride, error)
FindByCiPipelineId(ciPipelineId int) (*CiTemplateOverride, error)
FindIfTemplateOverrideExistsByCiPipelineIdsAndGitMaterialId(ciPipelineIds []int, gitMaterialId int) (bool, error)
}

type CiTemplateOverrideRepositoryImpl struct {
Expand Down Expand Up @@ -125,3 +127,19 @@ func (repo *CiTemplateOverrideRepositoryImpl) FindByCiPipelineId(ciPipelineId in
}
return ciTemplateOverride, nil
}

func (repo *CiTemplateOverrideRepositoryImpl) FindIfTemplateOverrideExistsByCiPipelineIdsAndGitMaterialId(ciPipelineIds []int, gitMaterialId int) (bool, error) {
count, err := repo.dbConnection.Model((*CiTemplateOverride)(nil)).
Where("ci_pipeline_id in (?)", pg.In(ciPipelineIds)).
WhereGroup(func(q *orm.Query) (*orm.Query, error) {
return q.Where("git_material_id = ?", gitMaterialId).WhereOr("build_context_git_material_id = ?", gitMaterialId), nil
}).
Where("active = ?", true).
Count()
if err != nil {
repo.logger.Errorw("error in checking if template override exists", "ciPipelineIds", ciPipelineIds, "gitMaterialId", gitMaterialId, "err", err)
return false, err
}
return count > 0, nil

}
5 changes: 5 additions & 0 deletions pkg/build/pipeline/CiTemplateReadService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type CiTemplateReadService interface {
GetAppliedDockerConfigForCiPipeline(ciPipelineId, appId int, isOverridden bool) (*types.DockerArtifactStoreBean, error)
GetBaseDockerConfigForCiPipeline(appId int) (*types.DockerArtifactStoreBean, error)
FindByAppIds(appIds []int) (map[int]*bean.CiTemplateBean, error)
CheckIfTemplateOverrideExists(ciPipelineIds []int, gitMaterialId int) (bool, error)
}

type CiTemplateReadServiceImpl struct {
Expand Down Expand Up @@ -181,3 +182,7 @@ func (impl *CiTemplateReadServiceImpl) FindByAppIds(appIds []int) (map[int]*bean
}
return ciTemplateMap, nil
}

func (impl *CiTemplateReadServiceImpl) CheckIfTemplateOverrideExists(ciPipelineIds []int, gitMaterialId int) (bool, error) {
return impl.CiTemplateOverrideRepository.FindIfTemplateOverrideExistsByCiPipelineIdsAndGitMaterialId(ciPipelineIds, gitMaterialId)
}
14 changes: 14 additions & 0 deletions pkg/pipeline/CiMaterialConfigService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,18 @@ import (
"fmt"
"github.com/devtron-labs/devtron/internal/sql/constants"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
util2 "github.com/devtron-labs/devtron/internal/util"
"github.com/devtron-labs/devtron/pkg/bean"
"github.com/devtron-labs/devtron/pkg/build/git/gitMaterial/read"
"github.com/devtron-labs/devtron/pkg/build/git/gitMaterial/repository"
"github.com/devtron-labs/devtron/pkg/build/pipeline"
"github.com/devtron-labs/devtron/pkg/pipeline/history"
"github.com/devtron-labs/devtron/pkg/sql"
"github.com/devtron-labs/devtron/util/sliceUtil"
"github.com/go-pg/pg"
"github.com/juju/errors"
"go.uber.org/zap"
"net/http"
"strings"
"time"
)
Expand Down Expand Up @@ -123,6 +126,17 @@ func (impl *CiMaterialConfigServiceImpl) DeleteMaterial(request *bean.UpdateMate
return fmt.Errorf("cannot delete git material, is being used in docker config")
}
}
pipelineIds := sliceUtil.NewSliceFromFuncExec(pipelines, func(dbPipeline *pipelineConfig.CiPipeline) int {
return dbPipeline.Id
})
exist, err := impl.ciTemplateService.CheckIfTemplateOverrideExists(pipelineIds, request.Material.Id)
if err != nil {
impl.logger.Errorw("error in checking if template override exists", "pipelineIds", pipelineIds, "gitMaterialId", request.Material.Id, "err", err)
return err
}
if exist {
return util2.GetApiErrorAdapter(http.StatusBadRequest, "400", "cannot delete git material, is being used in overridden ci template", "cannot delete git material, is being used in overridden ci template")
}
}
existingMaterial, err := impl.gitMaterialReadService.FindById(request.Material.Id)
if err != nil {
Expand Down
Loading