Skip to content

Fix: Configmap and Secret Duplicate Key issue #2120

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 6 commits into from
Aug 3, 2022
Merged

Fix: Configmap and Secret Duplicate Key issue #2120

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
74f61d4
override confimap and secret if app id and environment id provided in…
vikramdevtron Aug 1, 2022
44d44c3
Merge branch 'main' into hotfix-2024
vikramdevtron Aug 1, 2022
b6e3d2f
Merge branch 'main' into hotfix-2024
vikramdevtron Aug 3, 2022
845c70b
cs and cm environment override update fix
vikramdevtron Aug 3, 2022
4e49d70
configmap update fix for environment override
vikramdevtron Aug 3, 2022
b8b2df8
Merge branch 'main' into hotfix-2024
vikramdevtron Aug 3, 2022
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
28 changes: 18 additions & 10 deletions pkg/pipeline/ConfigMapService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,14 @@ func (impl ConfigMapServiceImpl) CMEnvironmentAddUpdate(configMapRequest *Config
var model *chartConfig.ConfigMapEnvModel
if configMapRequest.Id > 0 {
model, err = impl.configMapRepository.GetByIdEnvLevel(configMapRequest.Id)
if err != nil {
impl.logger.Errorw("error while fetching from db", "error", err)
return nil, err
}
} else if configMapRequest.AppId > 0 && configMapRequest.EnvironmentId > 0 {
model, err = impl.configMapRepository.GetByAppIdAndEnvIdEnvLevel(configMapRequest.AppId, configMapRequest.EnvironmentId)
}
if err != nil && err != pg.ErrNoRows {
impl.logger.Errorw("error while fetching from db", "error", err)
return nil, err
}
if err == nil && model.Id > 0 {
configsList := &ConfigsList{}
found := false
var configs []*ConfigData
Expand Down Expand Up @@ -383,7 +387,7 @@ func (impl ConfigMapServiceImpl) CMEnvironmentAddUpdate(configMapRequest *Config
}
configMapRequest.Id = configMap.Id

} else {
} else if err == pg.ErrNoRows {
//creating config map record for first time
configsList := &ConfigsList{
ConfigData: configMapRequest.ConfigData,
Expand Down Expand Up @@ -695,10 +699,14 @@ func (impl ConfigMapServiceImpl) CSEnvironmentAddUpdate(configMapRequest *Config
var model *chartConfig.ConfigMapEnvModel
if configMapRequest.Id > 0 {
model, err = impl.configMapRepository.GetByIdEnvLevel(configMapRequest.Id)
if err != nil {
impl.logger.Errorw("error while fetching from db", "error", err)
return nil, err
}
} else if configMapRequest.AppId > 0 && configMapRequest.EnvironmentId > 0 {
model, err = impl.configMapRepository.GetByAppIdAndEnvIdEnvLevel(configMapRequest.AppId, configMapRequest.EnvironmentId)
}
if err != nil && err != pg.ErrNoRows {
impl.logger.Errorw("error while fetching from db", "error", err)
return nil, err
}
if err == nil && model.Id > 0 {
configsList := &SecretsList{}
found := false
var configs []*ConfigData
Expand Down Expand Up @@ -743,7 +751,7 @@ func (impl ConfigMapServiceImpl) CSEnvironmentAddUpdate(configMapRequest *Config
}
configMapRequest.Id = configMap.Id

} else {
} else if err == pg.ErrNoRows {
//creating config map record for first time
secretsList := &SecretsList{
ConfigData: configMapRequest.ConfigData,
Expand Down