Skip to content

Fix for source type be #3259

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
kartik-579 merged 17 commits into from
May 3, 2023
Merged

Fix for source type be #3259

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
797d435
git material source type editable
Aravind-2023 Feb 21, 2023
61b124e
after handling linked-ci
Aravind-2023 Feb 22, 2023
7c2eb74
after reverting changes for version.gp
Aravind-2023 Mar 14, 2023
96b700b
Merge branch 'main' into ci-material-source-editable
Aravind-2023 Mar 15, 2023
be5727e
after changing cimaterial access in ciHandler
Aravind-2023 Mar 15, 2023
f608a42
after changing cimaterial access in ciHandler
Aravind-2023 Mar 15, 2023
ab0fe05
after changing cimaterial access in ciHandler
Aravind-2023 Mar 15, 2023
0b98ac4
after fixing in build and deploy
Aravind-2023 Mar 16, 2023
0cf7af6
after removing commented code
Aravind-2023 Mar 22, 2023
dd1293b
"fix in source type"
Aravind-2023 Apr 10, 2023
7cbc483
"removed commented code"
Aravind-2023 Apr 10, 2023
b9c8988
resolve conflicts from main, took main merge
Aravind-2023 Apr 10, 2023
6528d82
"using new update function"
Aravind-2023 Apr 10, 2023
8acae23
"changing update function"
Aravind-2023 Apr 12, 2023
2b5ad62
merging main in the branch
Aravind-2023 Apr 20, 2023
2db9312
Merge branch 'main' into fix_for_source_type_be
Aravind-2023 May 2, 2023
45d4905
adding not null function
Aravind-2023 May 3, 2023
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: 11 additions & 10 deletions internal/sql/repository/pipelineConfig/CiPipelineMaterial.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ type CiPipelineMaterial struct {
type CiPipelineMaterialRepository interface {
Save(tx *pg.Tx, pipeline ...*CiPipelineMaterial) error
Update(tx *pg.Tx, material ...*CiPipelineMaterial) error
UpdateForSwitch(tx *pg.Tx, material ...*CiPipelineMaterial) error
FindByCiPipelineIdsIn(ids []int) ([]*CiPipelineMaterial, error)
GetById(id int) (*CiPipelineMaterial, error)
GetByPipelineId(id int) ([]*CiPipelineMaterial, error)
Expand Down Expand Up @@ -112,17 +113,17 @@ func (impl CiPipelineMaterialRepositoryImpl) Save(tx *pg.Tx, material ...*CiPipe
return err
}

func (impl CiPipelineMaterialRepositoryImpl) Update(tx *pg.Tx, materials ...*CiPipelineMaterial) error {
/*err := tx.RunInTransaction(func(tx *pg.Tx) error {
for _, material := range materials {
r, err := tx.Model(material).WherePK().UpdateNotNull()
if err != nil {
return err
}
impl.logger.Infof("total rows saved %d", r.RowsAffected())
func (impl CiPipelineMaterialRepositoryImpl) UpdateForSwitch(tx *pg.Tx, materials ...*CiPipelineMaterial) error {
for _, material := range materials {
err := tx.Update(material)
if err != nil {
return err
}
return nil
})*/
}

return nil
}
func (impl CiPipelineMaterialRepositoryImpl) Update(tx *pg.Tx, materials ...*CiPipelineMaterial) error {
for _, material := range materials {
_, err := tx.Model(material).WherePK().UpdateNotNull()
if err != nil {
Expand Down
9 changes: 4 additions & 5 deletions pkg/pipeline/CiCdPipelineOrchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
repository5 "github.com/devtron-labs/devtron/pkg/pipeline/repository"
"github.com/devtron-labs/devtron/pkg/sql"
"github.com/devtron-labs/devtron/pkg/user"
util2 "github.com/devtron-labs/devtron/util"
bean3 "github.com/devtron-labs/devtron/pkg/user/bean"
util2 "github.com/devtron-labs/devtron/util"
"path"
"regexp"
"strconv"
Expand Down Expand Up @@ -249,9 +249,8 @@ func (impl CiCdPipelineOrchestratorImpl) PatchMaterialValue(createRequest *bean.
} else {
pipelineMaterial.CiPipelineId = createRequest.Id
pipelineMaterial.CreatedBy = userId
materialsUpdate = append(materialsUpdate, pipelineMaterial)
pipelineMaterial.CreatedOn = createOnTimeMap[material.GitMaterialId]
pipelineMaterial.CreatedBy = createByMap[material.GitMaterialId]
materialsUpdate = append(materialsUpdate, pipelineMaterial)
}
}
if len(materialsAdd) > 0 {
Expand All @@ -261,7 +260,7 @@ func (impl CiCdPipelineOrchestratorImpl) PatchMaterialValue(createRequest *bean.
}
}
if len(materialsUpdate) > 0 {
err = impl.ciPipelineMaterialRepository.Update(tx, materialsUpdate...)
err = impl.ciPipelineMaterialRepository.UpdateForSwitch(tx, materialsUpdate...)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -415,7 +414,7 @@ func (impl CiCdPipelineOrchestratorImpl) PatchMaterialValue(createRequest *bean.
return nil, fmt.Errorf("error while updating linked pipeline")
}
}
err = impl.ciPipelineMaterialRepository.Update(tx, linkedMaterials...)
err = impl.ciPipelineMaterialRepository.UpdateForSwitch(tx, linkedMaterials...)
if err != nil {
return nil, err
}
Expand Down