Merge pull request #6545 from devtron-labs/fix-bulk-edit-api-response

Ash-exp · web-flow · commit a796c8a1d750 · 2025-05-02T16:26:41.000+05:30
fix: rest handler missing return statements
diff --git a/api/appStore/deployment/AppStoreDeploymentRestHandler.go b/api/appStore/deployment/AppStoreDeploymentRestHandler.go
@@ -539,6 +539,7 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateProjectHelmApp(w http.Res
 		if err != nil {
 			handler.Logger.Errorw("error in decoding app id", "err", err)
 			common.WriteJsonResp(w, err, "error in decoding app id", http.StatusBadRequest)
+			return
 		}
 		// this rbac object checks that whether user have permission to change current project.
 		rbacObjectForCurrentProject, rbacObjectForCurrentProject2 := handler.enforcerUtilHelm.GetHelmObjectByClusterIdNamespaceAndAppName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
@@ -555,6 +556,7 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateProjectHelmApp(w http.Res
 		if err != nil {
 			handler.Logger.Errorw("service err, InstalledAppId", "err", err, "InstalledAppId", request.InstalledAppId)
 			common.WriteJsonResp(w, fmt.Errorf("Unable to fetch installed app details"), nil, http.StatusBadRequest)
+			return
 		}
 		if installedApp.IsVirtualEnvironment {
 			rbacObjectForCurrentProject, _ := handler.enforcerUtilHelm.GetAppRBACNameByInstalledAppId(request.InstalledAppId)
@@ -580,8 +582,10 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateProjectHelmApp(w http.Res
 	if err != nil {
 		handler.Logger.Errorw("error in updating project for helm apps", "err", err)
 		common.WriteJsonResp(w, err, "error in updating project", http.StatusBadRequest)
+		return
 	} else {
 		handler.Logger.Errorw("Helm App project update")
 		common.WriteJsonResp(w, nil, "Project Updated", http.StatusOK)
+		return
 	}
 }
diff --git a/api/appStore/deployment/CommonDeploymentRestHandler.go b/api/appStore/deployment/CommonDeploymentRestHandler.go
@@ -268,6 +268,7 @@ func (handler *CommonDeploymentRestHandlerImpl) RollbackApplication(w http.Respo
 	appOfferingMode, installedAppDto, err := handler.getAppOfferingMode(installedAppId, *request.HAppId)
 	if err != nil {
 		common.WriteJsonResp(w, err, "bad request", http.StatusBadRequest)
+		return
 	}
 	installedAppDto.UserId = userId
 	//rbac block starts from here
diff --git a/api/auth/user/UserAuthHandler.go b/api/auth/user/UserAuthHandler.go
@@ -70,6 +70,7 @@ func (handler UserAuthHandlerImpl) LoginHandler(w http.ResponseWriter, r *http.R
 	if err != nil {
 		handler.logger.Errorw("request err, LoginHandler", "err", err, "payload", up)
 		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
 	}
 
 	err = handler.validator.Struct(up)
diff --git a/api/helm-app/HelmAppRestHandler.go b/api/helm-app/HelmAppRestHandler.go
@@ -191,6 +191,7 @@ func (handler *HelmAppRestHandlerImpl) Hibernate(w http.ResponseWriter, r *http.
 		appType, err = strconv.Atoi(appTypeString)
 		if err != nil {
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
 		}
 	}
 
@@ -282,6 +283,7 @@ func (handler *HelmAppRestHandlerImpl) UnHibernate(w http.ResponseWriter, r *htt
 		appType, err = strconv.Atoi(appTypeString)
 		if err != nil {
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
 		}
 	}
 	token := r.Header.Get("token")
diff --git a/api/k8s/application/k8sApplicationRestHandler.go b/api/k8s/application/k8sApplicationRestHandler.go
@@ -729,6 +729,7 @@ func (handler *K8sApplicationRestHandlerImpl) requestValidationAndRBAC(w http.Re
 		if err != nil {
 			handler.logger.Errorw(bean2.AppIdDecodingError, "err", err, "appIdentifier", request.AppIdentifier)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
 		}
 		valid, err := handler.argoApplicationReadService.ValidateArgoResourceRequest(r.Context(), appIdentifier, request.K8sRequest)
 		if err != nil || !valid {
diff --git a/api/restHandler/BatchOperationRestHandler.go b/api/restHandler/BatchOperationRestHandler.go
@@ -94,6 +94,7 @@ func (handler BatchOperationRestHandlerImpl) Operate(w http.ResponseWriter, r *h
 
 		if workflow.Destination.App == nil || len(*workflow.Destination.App) == 0 {
 			common.WriteJsonResp(w, errors.New("app name cannot be empty"), nil, http.StatusBadRequest)
+			return
 		}
 		rbacString := handler.enforcerUtil.GetProjectAdminRBACNameBYAppName(*workflow.Destination.App)
 		if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionCreate, rbacString); !ok {
diff --git a/api/restHandler/BulkUpdateRestHandler.go b/api/restHandler/BulkUpdateRestHandler.go
@@ -181,22 +181,26 @@ func (handler BulkUpdateRestHandlerImpl) GetImpactedAppsName(w http.ResponseWrit
 		ok := handler.CheckAuthForImpactedObjects(deploymentTemplateImpactedApp.AppId, deploymentTemplateImpactedApp.EnvId, appResourceObjects, envResourceObjects, token)
 		if !ok {
 			common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+			return
 		}
 	}
 	for _, configMapImpactedApp := range impactedApps.ConfigMap {
 		ok := handler.CheckAuthForImpactedObjects(configMapImpactedApp.AppId, configMapImpactedApp.EnvId, appResourceObjects, envResourceObjects, token)
 		if !ok {
 			common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+			return
 		}
 	}
 	for _, secretImpactedApp := range impactedApps.Secret {
 		ok := handler.CheckAuthForImpactedObjects(secretImpactedApp.AppId, secretImpactedApp.EnvId, appResourceObjects, envResourceObjects, token)
 		if !ok {
 			common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+			return
 		}
 	}
 	common.WriteJsonResp(w, err, impactedApps, http.StatusOK)
 }
+
 func (handler BulkUpdateRestHandlerImpl) CheckAuthForBulkUpdate(AppId int, EnvId int, AppName string, rbacObjects map[int]string, token string) bool {
 	resourceName := rbacObjects[AppId]
 	if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionUpdate, resourceName); !ok {
@@ -236,18 +240,21 @@ func (handler BulkUpdateRestHandlerImpl) BulkUpdate(w http.ResponseWriter, r *ht
 		ok := handler.CheckAuthForBulkUpdate(deploymentTemplateImpactedApp.AppId, deploymentTemplateImpactedApp.EnvId, deploymentTemplateImpactedApp.AppName, rbacObjects, token)
 		if !ok {
 			common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+			return
 		}
 	}
 	for _, configMapImpactedApp := range impactedApps.ConfigMap {
 		ok := handler.CheckAuthForBulkUpdate(configMapImpactedApp.AppId, configMapImpactedApp.EnvId, configMapImpactedApp.AppName, rbacObjects, token)
 		if !ok {
 			common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+			return
 		}
 	}
 	for _, secretImpactedApp := range impactedApps.Secret {
 		ok := handler.CheckAuthForBulkUpdate(secretImpactedApp.AppId, secretImpactedApp.EnvId, secretImpactedApp.AppName, rbacObjects, token)
 		if !ok {
 			common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+			return
 		}
 	}
 
diff --git a/api/restHandler/GitOpsConfigRestHandler.go b/api/restHandler/GitOpsConfigRestHandler.go
@@ -312,6 +312,7 @@ func (impl GitOpsConfigRestHandlerImpl) GitOpsValidator(w http.ResponseWriter, r
 	if err != nil && !errors.Is(err, moduleErr.ModuleNotFoundError) {
 		impl.logger.Errorw("error in getting argo module", "error", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
 	}
 	detailedErrorGitOpsConfigResponse := impl.gitOpsConfigService.GitOpsValidateDryRun(argoModule.IsInstalled(), &bean)
 	common.WriteJsonResp(w, nil, detailedErrorGitOpsConfigResponse, http.StatusOK)
diff --git a/api/restHandler/ImageScanRestHandler.go b/api/restHandler/ImageScanRestHandler.go
@@ -198,6 +198,7 @@ func (impl ImageScanRestHandlerImpl) FetchExecutionDetail(w http.ResponseWriter,
 		if err != nil {
 			impl.logger.Errorw("request err, FetchExecutionDetail", "err", err, "imageScanDeployInfoIdS", imageScanDeployInfoIdS)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
 		}
 	}
 	artifactIdS := v.Get("artifactId")
@@ -206,6 +207,7 @@ func (impl ImageScanRestHandlerImpl) FetchExecutionDetail(w http.ResponseWriter,
 		if err != nil {
 			impl.logger.Errorw("request err, FetchExecutionDetail", "err", err, "artifactIdS", artifactIdS)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
 		}
 	}
 	appIds := v.Get("appId")
@@ -214,6 +216,7 @@ func (impl ImageScanRestHandlerImpl) FetchExecutionDetail(w http.ResponseWriter,
 		if err != nil {
 			impl.logger.Errorw("request err, FetchExecutionDetail", "err", err, "appIds", appIds)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
 		}
 	}
 	envIds := v.Get("envId")
@@ -222,6 +225,7 @@ func (impl ImageScanRestHandlerImpl) FetchExecutionDetail(w http.ResponseWriter,
 		if err != nil {
 			impl.logger.Errorw("request err, FetchExecutionDetail", "err", err, "envIds", envIds)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
 		}
 	}
 	image := v.Get("image")
@@ -266,6 +270,7 @@ func (impl ImageScanRestHandlerImpl) FetchExecutionDetail(w http.ResponseWriter,
 			}
 		} else {
 			common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+			return
 		}
 		//RBAC
 	} else {
@@ -285,6 +290,7 @@ func (impl ImageScanRestHandlerImpl) FetchMinScanResultByAppIdAndEnvId(w http.Re
 		if err != nil {
 			impl.logger.Errorw("request err, FetchMinScanResultByAppIdAndEnvId", "err", err, "appIds", appIds)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
 		}
 		request.AppId = appId
 	}
@@ -294,6 +300,7 @@ func (impl ImageScanRestHandlerImpl) FetchMinScanResultByAppIdAndEnvId(w http.Re
 		if err != nil {
 			impl.logger.Errorw("request err, FetchMinScanResultByAppIdAndEnvId", "err", err, "envIds", envIds)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
 		}
 		request.EnvId = envId
 	}
diff --git a/api/restHandler/PolicyRestHandler.go b/api/restHandler/PolicyRestHandler.go
@@ -218,6 +218,7 @@ func (impl PolicyRestHandlerImpl) GetPolicy(w http.ResponseWriter, r *http.Reque
 		if err != nil {
 			impl.logger.Errorw("request err, GetPolicy", "err", err, "id", id)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
 		}
 		req.Id = ids
 	}
diff --git a/api/restHandler/ReleaseMetricsRestHandler.go b/api/restHandler/ReleaseMetricsRestHandler.go
@@ -124,6 +124,7 @@ func (impl *ReleaseMetricsRestHandlerImpl) ResetDataForAllAppEnvironment(w http.
 	if err != nil {
 		impl.logger.Errorw("service err, ResetDataForAllAppEnvironment", "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
 	}
 	for _, pipeline := range pipelines {
 		appRbacObject := impl.enforcerUtil.GetAppRBACNameByAppId(pipeline.AppId)
diff --git a/api/restHandler/WebhookEventHandler.go b/api/restHandler/WebhookEventHandler.go
@@ -142,5 +142,6 @@ func (impl WebhookEventHandlerImpl) OnWebhookEvent(w http.ResponseWriter, r *htt
 	if err != nil {
 		impl.logger.Errorw("Error while handling webhook in git-sensor", "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
 	}
 }
diff --git a/api/restHandler/app/appList/AppListingRestHandler.go b/api/restHandler/app/appList/AppListingRestHandler.go
@@ -346,6 +346,7 @@ func (handler AppListingRestHandlerImpl) FetchAppsByEnvironmentV2(w http.Respons
 		if err != nil {
 			handler.logger.Errorw("service err, FetchAppsByEnvironment", "err", err, "payload", fetchAppListingRequest)
 			common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
+			return
 		}
 	}
 
@@ -370,6 +371,7 @@ func (handler AppListingRestHandlerImpl) FetchAppsByEnvironmentV2(w http.Respons
 	if err != nil {
 		handler.logger.Errorw("service err, FetchAppsByEnvironment", "err", err, "payload", fetchAppListingRequest)
 		common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
+		return
 	}
 
 	appContainerResponse := AppView.AppContainerResponse{
diff --git a/api/restHandler/app/pipeline/configure/BuildPipelineRestHandler.go b/api/restHandler/app/pipeline/configure/BuildPipelineRestHandler.go
@@ -876,8 +876,10 @@ func (handler *PipelineConfigRestHandlerImpl) GetCiPipelineMin(w http.ResponseWr
 		if util.IsErrNoRows(err) {
 			err = &util.ApiError{Code: "404", HttpStatusCode: http.StatusNotFound, UserMessage: "no data found"}
 			common.WriteJsonResp(w, err, nil, http.StatusOK)
+			return
 		} else {
 			common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+			return
 		}
 	}
 	common.WriteJsonResp(w, nil, ciPipelines, http.StatusOK)

Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,7 @@ func (handler *CommonDeploymentRestHandlerImpl) RollbackApplication(w http.Respo`
`268`	`268`	`appOfferingMode, installedAppDto, err := handler.getAppOfferingMode(installedAppId, *request.HAppId)`
`269`	`269`	`if err != nil {`
`270`	`270`	`common.WriteJsonResp(w, err, "bad request", http.StatusBadRequest)`
	`271`	`+ return`
`271`	`272`	`}`
`272`	`273`	`installedAppDto.UserId = userId`
`273`	`274`	`//rbac block starts from here`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ func (handler UserAuthHandlerImpl) LoginHandler(w http.ResponseWriter, r *http.R`
`70`	`70`	`if err != nil {`
`71`	`71`	`handler.logger.Errorw("request err, LoginHandler", "err", err, "payload", up)`
`72`	`72`	`common.WriteJsonResp(w, err, nil, http.StatusBadRequest)`
	`73`	`+ return`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`err = handler.validator.Struct(up)`
Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,7 @@ func (handler HelmAppRestHandlerImpl) Hibernate(w http.ResponseWriter, r http.`
`191`	`191`	`appType, err = strconv.Atoi(appTypeString)`
`192`	`192`	`if err != nil {`
`193`	`193`	`common.WriteJsonResp(w, err, nil, http.StatusBadRequest)`
	`194`	`+ return`
`194`	`195`	`}`
`195`	`196`	`}`
`196`	`197`
`@@ -282,6 +283,7 @@ func (handler HelmAppRestHandlerImpl) UnHibernate(w http.ResponseWriter, r htt`
`282`	`283`	`appType, err = strconv.Atoi(appTypeString)`
`283`	`284`	`if err != nil {`
`284`	`285`	`common.WriteJsonResp(w, err, nil, http.StatusBadRequest)`
	`286`	`+ return`
`285`	`287`	`}`
`286`	`288`	`}`
`287`	`289`	`token := r.Header.Get("token")`
Original file line number	Diff line number	Diff line change
`@@ -729,6 +729,7 @@ func (handler *K8sApplicationRestHandlerImpl) requestValidationAndRBAC(w http.Re`
`729`	`729`	`if err != nil {`
`730`	`730`	`handler.logger.Errorw(bean2.AppIdDecodingError, "err", err, "appIdentifier", request.AppIdentifier)`
`731`	`731`	`common.WriteJsonResp(w, err, nil, http.StatusBadRequest)`
	`732`	`+ return`
`732`	`733`	`}`
`733`	`734`	`valid, err := handler.argoApplicationReadService.ValidateArgoResourceRequest(r.Context(), appIdentifier, request.K8sRequest)`
`734`	`735`	`if err != nil \|\| !valid {`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ func (handler BatchOperationRestHandlerImpl) Operate(w http.ResponseWriter, r *h`
`94`	`94`
`95`	`95`	`if workflow.Destination.App == nil \|\| len(*workflow.Destination.App) == 0 {`
`96`	`96`	`common.WriteJsonResp(w, errors.New("app name cannot be empty"), nil, http.StatusBadRequest)`
	`97`	`+ return`
`97`	`98`	`}`
`98`	`99`	`rbacString := handler.enforcerUtil.GetProjectAdminRBACNameBYAppName(*workflow.Destination.App)`
`99`	`100`	`if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionCreate, rbacString); !ok {`
Original file line number	Diff line number	Diff line change
`@@ -181,22 +181,26 @@ func (handler BulkUpdateRestHandlerImpl) GetImpactedAppsName(w http.ResponseWrit`
`181`	`181`	`ok := handler.CheckAuthForImpactedObjects(deploymentTemplateImpactedApp.AppId, deploymentTemplateImpactedApp.EnvId, appResourceObjects, envResourceObjects, token)`
`182`	`182`	`if !ok {`
`183`	`183`	`common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)`
	`184`	`+ return`
`184`	`185`	`}`
`185`	`186`	`}`
`186`	`187`	`for _, configMapImpactedApp := range impactedApps.ConfigMap {`
`187`	`188`	`ok := handler.CheckAuthForImpactedObjects(configMapImpactedApp.AppId, configMapImpactedApp.EnvId, appResourceObjects, envResourceObjects, token)`
`188`	`189`	`if !ok {`
`189`	`190`	`common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)`
	`191`	`+ return`
`190`	`192`	`}`
`191`	`193`	`}`
`192`	`194`	`for _, secretImpactedApp := range impactedApps.Secret {`
`193`	`195`	`ok := handler.CheckAuthForImpactedObjects(secretImpactedApp.AppId, secretImpactedApp.EnvId, appResourceObjects, envResourceObjects, token)`
`194`	`196`	`if !ok {`
`195`	`197`	`common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)`
	`198`	`+ return`
`196`	`199`	`}`
`197`	`200`	`}`
`198`	`201`	`common.WriteJsonResp(w, err, impactedApps, http.StatusOK)`
`199`	`202`	`}`
	`203`	`+`
`200`	`204`	`func (handler BulkUpdateRestHandlerImpl) CheckAuthForBulkUpdate(AppId int, EnvId int, AppName string, rbacObjects map[int]string, token string) bool {`
`201`	`205`	`resourceName := rbacObjects[AppId]`
`202`	`206`	`if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionUpdate, resourceName); !ok {`
`@@ -236,18 +240,21 @@ func (handler BulkUpdateRestHandlerImpl) BulkUpdate(w http.ResponseWriter, r *ht`
`236`	`240`	`ok := handler.CheckAuthForBulkUpdate(deploymentTemplateImpactedApp.AppId, deploymentTemplateImpactedApp.EnvId, deploymentTemplateImpactedApp.AppName, rbacObjects, token)`
`237`	`241`	`if !ok {`
`238`	`242`	`common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)`
	`243`	`+ return`
`239`	`244`	`}`
`240`	`245`	`}`
`241`	`246`	`for _, configMapImpactedApp := range impactedApps.ConfigMap {`
`242`	`247`	`ok := handler.CheckAuthForBulkUpdate(configMapImpactedApp.AppId, configMapImpactedApp.EnvId, configMapImpactedApp.AppName, rbacObjects, token)`
`243`	`248`	`if !ok {`
`244`	`249`	`common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)`
	`250`	`+ return`
`245`	`251`	`}`
`246`	`252`	`}`
`247`	`253`	`for _, secretImpactedApp := range impactedApps.Secret {`
`248`	`254`	`ok := handler.CheckAuthForBulkUpdate(secretImpactedApp.AppId, secretImpactedApp.EnvId, secretImpactedApp.AppName, rbacObjects, token)`
`249`	`255`	`if !ok {`
`250`	`256`	`common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)`
	`257`	`+ return`
`251`	`258`	`}`
`252`	`259`	`}`
`253`	`260`
Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@ func (impl GitOpsConfigRestHandlerImpl) GitOpsValidator(w http.ResponseWriter, r`
`312`	`312`	`if err != nil && !errors.Is(err, moduleErr.ModuleNotFoundError) {`
`313`	`313`	`impl.logger.Errorw("error in getting argo module", "error", err)`
`314`	`314`	`common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)`
	`315`	`+ return`
`315`	`316`	`}`
`316`	`317`	`detailedErrorGitOpsConfigResponse := impl.gitOpsConfigService.GitOpsValidateDryRun(argoModule.IsInstalled(), &bean)`
`317`	`318`	`common.WriteJsonResp(w, nil, detailedErrorGitOpsConfigResponse, http.StatusOK)`
Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,7 @@ func (impl ImageScanRestHandlerImpl) FetchExecutionDetail(w http.ResponseWriter,`
`198`	`198`	`if err != nil {`
`199`	`199`	`impl.logger.Errorw("request err, FetchExecutionDetail", "err", err, "imageScanDeployInfoIdS", imageScanDeployInfoIdS)`
`200`	`200`	`common.WriteJsonResp(w, err, nil, http.StatusBadRequest)`
	`201`	`+ return`
`201`	`202`	`}`
`202`	`203`	`}`
`203`	`204`	`artifactIdS := v.Get("artifactId")`
`@@ -206,6 +207,7 @@ func (impl ImageScanRestHandlerImpl) FetchExecutionDetail(w http.ResponseWriter,`
`206`	`207`	`if err != nil {`
`207`	`208`	`impl.logger.Errorw("request err, FetchExecutionDetail", "err", err, "artifactIdS", artifactIdS)`
`208`	`209`	`common.WriteJsonResp(w, err, nil, http.StatusBadRequest)`
	`210`	`+ return`
`209`	`211`	`}`
`210`	`212`	`}`
`211`	`213`	`appIds := v.Get("appId")`
`@@ -214,6 +216,7 @@ func (impl ImageScanRestHandlerImpl) FetchExecutionDetail(w http.ResponseWriter,`
`214`	`216`	`if err != nil {`
`215`	`217`	`impl.logger.Errorw("request err, FetchExecutionDetail", "err", err, "appIds", appIds)`
`216`	`218`	`common.WriteJsonResp(w, err, nil, http.StatusBadRequest)`
	`219`	`+ return`
`217`	`220`	`}`
`218`	`221`	`}`
`219`	`222`	`envIds := v.Get("envId")`
`@@ -222,6 +225,7 @@ func (impl ImageScanRestHandlerImpl) FetchExecutionDetail(w http.ResponseWriter,`
`222`	`225`	`if err != nil {`
`223`	`226`	`impl.logger.Errorw("request err, FetchExecutionDetail", "err", err, "envIds", envIds)`
`224`	`227`	`common.WriteJsonResp(w, err, nil, http.StatusBadRequest)`
	`228`	`+ return`
`225`	`229`	`}`
`226`	`230`	`}`
`227`	`231`	`image := v.Get("image")`
`@@ -266,6 +270,7 @@ func (impl ImageScanRestHandlerImpl) FetchExecutionDetail(w http.ResponseWriter,`
`266`	`270`	`}`
`267`	`271`	`} else {`
`268`	`272`	`common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)`
	`273`	`+ return`
`269`	`274`	`}`
`270`	`275`	`//RBAC`
`271`	`276`	`} else {`
`@@ -285,6 +290,7 @@ func (impl ImageScanRestHandlerImpl) FetchMinScanResultByAppIdAndEnvId(w http.Re`
`285`	`290`	`if err != nil {`
`286`	`291`	`impl.logger.Errorw("request err, FetchMinScanResultByAppIdAndEnvId", "err", err, "appIds", appIds)`
`287`	`292`	`common.WriteJsonResp(w, err, nil, http.StatusBadRequest)`
	`293`	`+ return`
`288`	`294`	`}`
`289`	`295`	`request.AppId = appId`
`290`	`296`	`}`
`@@ -294,6 +300,7 @@ func (impl ImageScanRestHandlerImpl) FetchMinScanResultByAppIdAndEnvId(w http.Re`
`294`	`300`	`if err != nil {`
`295`	`301`	`impl.logger.Errorw("request err, FetchMinScanResultByAppIdAndEnvId", "err", err, "envIds", envIds)`
`296`	`302`	`common.WriteJsonResp(w, err, nil, http.StatusBadRequest)`
	`303`	`+ return`
`297`	`304`	`}`
`298`	`305`	`request.EnvId = envId`
`299`	`306`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,7 @@ func (impl PolicyRestHandlerImpl) GetPolicy(w http.ResponseWriter, r *http.Reque`
`218`	`218`	`if err != nil {`
`219`	`219`	`impl.logger.Errorw("request err, GetPolicy", "err", err, "id", id)`
`220`	`220`	`common.WriteJsonResp(w, err, nil, http.StatusBadRequest)`
	`221`	`+ return`
`221`	`222`	`}`
`222`	`223`	`req.Id = ids`
`223`	`224`	`}`