Skip to content

Commit e8c77be

Browse files
prkhrkatprkhrkat
authored
Merge branch 'develop' into api-specs-post
2 parents 88c5a4b + 49080ab commit e8c77be

File tree

4 files changed

+47
-16
lines changed

4 files changed

+47
-16
lines changed

‎api/appStore/deployment/AppStoreDeploymentRestHandler.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,10 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateInstalledApp(w http.Respo
415415
handler.Logger.Debugw("request payload, UpdateInstalledApp", "payload", request)
416416
installedApp, err := handler.appStoreDeploymentDBService.GetInstalledApp(request.InstalledAppId)
417417
if err != nil {
418+
if util.IsErrNoRows(err) {
419+
common.HandleResourceNotFound(w, r, "installedApp", strconv.Itoa(request.InstalledAppVersionId))
420+
return
421+
}
418422
handler.Logger.Errorw("service err, UpdateInstalledApp", "err", err, "payload", request)
419423
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
420424
return
@@ -461,6 +465,8 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateInstalledApp(w http.Respo
461465
if err != nil {
462466
if strings.Contains(err.Error(), "application spec is invalid") {
463467
err = &util.ApiError{Code: "400", HttpStatusCode: 400, UserMessage: "application spec is invalid, please check provided chart values"}
468+
} else if util.IsErrNoRows(err) {
469+
handler.Logger.Errorw("installed app not found", "err", err, "payload", request)
464470
}
465471
handler.Logger.Errorw("service err, UpdateInstalledApp", "err", err, "payload", request)
466472
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

‎api/restHandler/ConfigMapRestHandler.go‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,11 @@ func (handler ConfigMapRestHandlerImpl) CMGlobalDelete(w http.ResponseWriter, r
520520
return
521521
}
522522
name := vars["name"]
523-
handler.Logger.Errorw("request payload, CMGlobalDelete", "appId", appId, "id", id, "name", name)
523+
if name == "" || len(name) == 0 {
524+
// handler.Logger.Errorw("request payload, CMGlobalDelete", "appId", appId, "id", id, "name", name)
525+
common.WriteMissingRequiredFieldError(w, "name")
526+
return
527+
}
524528

525529
//RBAC START
526530
token := r.Header.Get("token")
@@ -574,7 +578,11 @@ func (handler ConfigMapRestHandlerImpl) CMEnvironmentDelete(w http.ResponseWrite
574578
return
575579
}
576580
name := vars["name"]
577-
handler.Logger.Errorw("request payload, CMEnvironmentDelete", "appId", appId, "envId", envId, "id", id, "name", name)
581+
if name == "" || len(name) == 0 {
582+
// handler.Logger.Errorw("request payload, CMGlobalDelete", "appId", appId, "id", id, "name", name)
583+
common.WriteMissingRequiredFieldError(w, "name")
584+
return
585+
}
578586

579587
//RBAC START
580588
token := r.Header.Get("token")
@@ -630,7 +638,11 @@ func (handler ConfigMapRestHandlerImpl) CSGlobalDelete(w http.ResponseWriter, r
630638
return
631639
}
632640
name := vars["name"]
633-
handler.Logger.Errorw("request payload, CSGlobalDelete", "appId", appId, "id", id, "name", name)
641+
if name == "" || len(name) == 0 {
642+
// handler.Logger.Errorw("request payload, CMGlobalDelete", "appId", appId, "id", id, "name", name)
643+
common.WriteMissingRequiredFieldError(w, "name")
644+
return
645+
}
634646

635647
//RBAC START
636648
token := r.Header.Get("token")
@@ -684,7 +696,11 @@ func (handler ConfigMapRestHandlerImpl) CSEnvironmentDelete(w http.ResponseWrite
684696
return
685697
}
686698
name := vars["name"]
687-
handler.Logger.Errorw("request payload, CSEnvironmentDelete", "appId", appId, "envId", envId, "id", id, "name", name)
699+
if name == "" || len(name) == 0 {
700+
// handler.Logger.Errorw("request payload, CMGlobalDelete", "appId", appId, "id", id, "name", name)
701+
common.WriteMissingRequiredFieldError(w, "name")
702+
return
703+
}
688704

689705
//RBAC START
690706
token := r.Header.Get("token")

‎api/restHandler/app/pipeline/AutoCompleteRestHandler.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,7 @@ func (handler DevtronAppAutoCompleteRestHandlerImpl) GetAppListForAutocomplete(w
140140
if err != nil {
141141
// Error already written by ExtractIntPathParamWithContext
142142
return
143-
}
144-
if err != nil {
145-
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
146-
return
143+
147144
} else {
148145
apps, err = handler.devtronAppConfigService.FindAppsByTeamId(teamIdInt)
149146
if err != nil {

‎pkg/pipeline/ConfigMapService.go‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -993,8 +993,10 @@ func (impl ConfigMapServiceImpl) CMGlobalDelete(name string, id int, userId int3
993993
return false, err
994994
}
995995
} else {
996-
impl.logger.Debugw("no config map found for delete with this name", "name", name)
997-
996+
// impl.logger.Debugw("no config map found for delete with this name", "name", name)
997+
// this should return false as no config map found
998+
impl.logger.Errorw("config map does not exist", "name", name, "id", id)
999+
return false, err
9981000
}
9991001

10001002
return true, nil
@@ -1049,7 +1051,10 @@ func (impl ConfigMapServiceImpl) CMEnvironmentDelete(name string, id int, userId
10491051
return false, err
10501052
}
10511053
} else {
1052-
impl.logger.Debugw("no config map found for delete with this name", "name", name)
1054+
// impl.logger.Debugw("no config map found for delete with this name", "name", name)
1055+
// this should return false as no config map found
1056+
impl.logger.Errorw("config map does not exist", "name", name, "id", id)
1057+
return false, err
10531058
}
10541059
return true, nil
10551060
}
@@ -1103,8 +1108,10 @@ func (impl ConfigMapServiceImpl) CSGlobalDelete(name string, id int, userId int3
11031108
return false, err
11041109
}
11051110
} else {
1106-
impl.logger.Debugw("no config map found for delete with this name", "name", name)
1107-
1111+
// impl.logger.Debugw("no config map found for delete with this name", "name", name)
1112+
// this should return false as no config map found
1113+
impl.logger.Errorw("cs does not exist", "name", name, "id", id)
1114+
return false, err
11081115
}
11091116

11101117
return true, nil
@@ -1158,7 +1165,10 @@ func (impl ConfigMapServiceImpl) CSEnvironmentDelete(name string, id int, userId
11581165
return false, err
11591166
}
11601167
} else {
1161-
impl.logger.Debugw("no config map found for delete with this name", "name", name)
1168+
// impl.logger.Debugw("no config map found for delete with this name", "name", name)
1169+
// this should return false as no config map found
1170+
impl.logger.Errorw("cs does not exist", "name", name, "id", id)
1171+
return false, err
11621172
}
11631173

11641174
return true, nil
@@ -1209,8 +1219,10 @@ func (impl ConfigMapServiceImpl) CMGlobalDeleteByAppId(name string, appId int, u
12091219
return false, err
12101220
}
12111221
} else {
1212-
impl.logger.Debugw("no config map found for delete with this name", "name", name)
1213-
1222+
// impl.logger.Debugw("no config map found for delete with this name", "name", name)
1223+
// this should return false as no config map found
1224+
impl.logger.Errorw("cnfog map does not exist", "name", name)
1225+
return false, err
12141226
}
12151227

12161228
return true, nil

0 commit comments

Comments
 (0)