fix

Author: prakash100198

api/restHandler/ConfigMapRestHandler.go

@@ -126,7 +126,7 @@ func (handler ConfigMapRestHandlerImpl) CMGlobalAddUpdate(w http.ResponseWriter,
 	//RBAC END
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
 	ctx := r.Context()
-	util.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util.SetSuperAdminInContext(ctx, isSuperAdmin)
 	res, err := handler.draftAwareResourceService.CMGlobalAddUpdate(ctx, &configMapRequest)
 	if err != nil {
 		handler.Logger.Errorw("service err, CMGlobalAddUpdate", "err", err, "payload", configMapRequest)
@@ -172,7 +172,7 @@ func (handler ConfigMapRestHandlerImpl) CMEnvironmentAddUpdate(w http.ResponseWr
 	//RBAC END
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
 	ctx := r.Context()
-	util.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util.SetSuperAdminInContext(ctx, isSuperAdmin)
 	res, err := handler.draftAwareResourceService.CMEnvironmentAddUpdate(ctx, &configMapRequest)
 	if err != nil {
 		handler.Logger.Errorw("service err, CMEnvironmentAddUpdate", "err", err, "payload", configMapRequest)
@@ -371,7 +371,7 @@ func (handler ConfigMapRestHandlerImpl) CSGlobalAddUpdate(w http.ResponseWriter,
 	//RBAC END
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
 	ctx := r.Context()
-	util.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util.SetSuperAdminInContext(ctx, isSuperAdmin)
 	res, err := handler.draftAwareResourceService.CSGlobalAddUpdate(ctx, &configMapRequest)
 	if err != nil {
 		handler.Logger.Errorw("service err, CSGlobalAddUpdate", "err", err, "payload", configMapRequest)
@@ -418,7 +418,7 @@ func (handler ConfigMapRestHandlerImpl) CSEnvironmentAddUpdate(w http.ResponseWr
 	//RBAC END
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
 	ctx := r.Context()
-	util.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util.SetSuperAdminInContext(ctx, isSuperAdmin)
 	res, err := handler.draftAwareResourceService.CSEnvironmentAddUpdate(ctx, &configMapRequest)
 	if err != nil {
 		handler.Logger.Errorw("service err, CSEnvironmentAddUpdate", "err", err, "payload", configMapRequest)
@@ -533,7 +533,7 @@ func (handler ConfigMapRestHandlerImpl) CMGlobalDelete(w http.ResponseWriter, r
 	//RBAC END
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
 	ctx := r.Context()
-	util.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util.SetSuperAdminInContext(ctx, isSuperAdmin)
 	deleteReq := &bean.ConfigDataRequest{
 		Id:     id,
 		AppId:  appId,
@@ -595,7 +595,7 @@ func (handler ConfigMapRestHandlerImpl) CMEnvironmentDelete(w http.ResponseWrite
 	//RBAC END
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
 	ctx := r.Context()
-	util.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util.SetSuperAdminInContext(ctx, isSuperAdmin)
 	deleteReq := &bean.ConfigDataRequest{
 		Id:     id,
 		AppId:  appId,
@@ -643,7 +643,7 @@ func (handler ConfigMapRestHandlerImpl) CSGlobalDelete(w http.ResponseWriter, r
 	//RBAC END
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
 	ctx := r.Context()
-	util.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util.SetSuperAdminInContext(ctx, isSuperAdmin)
 	deleteReq := &bean.ConfigDataRequest{
 		Id:     id,
 		AppId:  appId,
@@ -705,7 +705,7 @@ func (handler ConfigMapRestHandlerImpl) CSEnvironmentDelete(w http.ResponseWrite
 	//RBAC END
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
 	ctx := r.Context()
-	util.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util.SetSuperAdminInContext(ctx, isSuperAdmin)
 	deleteReq := &bean.ConfigDataRequest{
 		Id:     id,
 		AppId:  appId,

api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go

@@ -176,7 +176,7 @@ func (handler *PipelineConfigRestHandlerImpl) ConfigureDeploymentTemplateForApp(
 		}(ctx.Done(), cn.CloseNotify())
 	}
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	util2.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util2.SetSuperAdminInContext(ctx, isSuperAdmin)
 
 	createResp, err := handler.draftAwareResourceService.Create(ctx, templateRequest)
 	if err != nil {
@@ -730,7 +730,7 @@ func (handler *PipelineConfigRestHandlerImpl) EnvConfigOverrideCreate(w http.Res
 		}(ctx.Done(), cn.CloseNotify())
 	}
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	util2.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util2.SetSuperAdminInContext(ctx, isSuperAdmin)
 	createResp, err := handler.draftAwareResourceService.CreateEnvironmentPropertiesAndBaseIfNeeded(ctx, appId, &envConfigProperties)
 	if err != nil {
 		handler.Logger.Errorw("service err, CreateEnvironmentPropertiesAndBaseIfNeeded", "payload", envConfigProperties, "err", err)
@@ -797,7 +797,7 @@ func (handler *PipelineConfigRestHandlerImpl) EnvConfigOverrideUpdate(w http.Res
 	}
 	ctx := r.Context()
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	util2.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util2.SetSuperAdminInContext(ctx, isSuperAdmin)
 	createResp, err := handler.draftAwareResourceService.UpdateEnvironmentProperties(ctx, appId, &envConfigProperties, token)
 	if err != nil {
 		handler.Logger.Errorw("service err, EnvConfigOverrideUpdate", "err", err, "payload", envConfigProperties)
@@ -1389,7 +1389,7 @@ func (handler *PipelineConfigRestHandlerImpl) UpdateAppOverride(w http.ResponseW
 		return
 	}
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	util2.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util2.SetSuperAdminInContext(ctx, isSuperAdmin)
 
 	_, span = otel.Tracer("orchestrator").Start(ctx, "chartService.UpdateAppOverride")
 	createResp, err := handler.draftAwareResourceService.UpdateAppOverride(ctx, &templateRequest, token)
@@ -1529,7 +1529,7 @@ func (handler *PipelineConfigRestHandlerImpl) EnvConfigOverrideReset(w http.Resp
 	}
 	ctx := r.Context()
 	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*")
-	util2.SetSuperAdminInContext(ctx, isSuperAdmin)
+	ctx = util2.SetSuperAdminInContext(ctx, isSuperAdmin)
 	envProperties := &pipelineBean.EnvironmentProperties{
 		Id:            id,
 		EnvironmentId: environmentId,