@@ -27,7 +27,6 @@ import (
2727 "github.com/devtron-labs/devtron/pkg/build/pipeline"
2828 "github.com/devtron-labs/devtron/pkg/pipeline/history"
2929 "github.com/devtron-labs/devtron/pkg/sql"
30- "github.com/devtron-labs/devtron/util/sliceUtil"
3130 "github.com/go-pg/pg"
3231 "github.com/juju/errors"
3332 "go.uber.org/zap"
@@ -126,12 +125,15 @@ func (impl *CiMaterialConfigServiceImpl) DeleteMaterial(request *bean.UpdateMate
126125 return fmt .Errorf ("cannot delete git material, is being used in docker config" )
127126 }
128127 }
129- pipelineIds := sliceUtil .NewSliceFromFuncExec (pipelines , func (dbPipeline * pipelineConfig.CiPipeline ) int {
130- return dbPipeline .Id
131- })
132- exist , err := impl .ciTemplateService .CheckIfTemplateOverrideExists (pipelineIds , request .Material .Id )
128+ overriddenPipelineIds := make ([]int , 0 , len (pipelines ))
129+ for _ , dbPipeline := range pipelines {
130+ if dbPipeline .IsDockerConfigOverridden {
131+ overriddenPipelineIds = append (overriddenPipelineIds , dbPipeline .Id )
132+ }
133+ }
134+ exist , err := impl .ciTemplateService .CheckIfTemplateOverrideExists (overriddenPipelineIds , request .Material .Id )
133135 if err != nil {
134- impl .logger .Errorw ("error in checking if template override exists" , "pipelineIds" , pipelineIds , "gitMaterialId" , request .Material .Id , "err" , err )
136+ impl .logger .Errorw ("error in checking if template override exists" , "pipelineIds" , overriddenPipelineIds , "gitMaterialId" , request .Material .Id , "err" , err )
135137 return err
136138 }
137139 if exist {
0 commit comments