Skip to content
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

Jump to bottom

fix: cm cs handling for inheriting type in get sample workflow api (core app routers) #4189

Merged
merged 1 commit into from
Nov 1, 2023
Merged

fix: cm cs handling for inheriting type in get sample workflow api (core app routers) #4189

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
7 changes: 4 additions & 3 deletions api/restHandler/CoreAppRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,10 @@ func (handler CoreAppRestHandlerImpl) buildAppConfigMaps(appId int, envId int, c

//set data
data := configMap.Data
if configMap.Data == nil {
//it means env cm is inheriting from base cm
data = configMap.DefaultData
}
var dataObj map[string]interface{}
if data != nil {
err := json.Unmarshal([]byte(data), &dataObj)
Expand Down Expand Up @@ -973,9 +977,6 @@ func (handler CoreAppRestHandlerImpl) buildAppEnvironmentSecrets(appId int, envI
handler.logger.Errorw("service err, CSEnvironmentFetchForEdit in GetAppAllDetail", "err", err, "appId", appId, "envId", envId)
return nil, err, http.StatusInternalServerError
}
if secretConfig.Data == nil {
secretDataWithData.ConfigData[0].Data = secretConfig.Data
}
secretDataWithData.ConfigData[0].DefaultData = secretConfig.DefaultData

secretRes, err, statusCode := handler.buildAppSecrets(appId, envId, secretDataWithData)
Expand Down
Loading