Skip to content

fix: cd metrics nil ptr fix #3099

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 4 commits into from
Mar 9, 2023
Merged

fix: cd metrics nil ptr fix #3099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bd837b
added superadmin check before enforcing in batch
gireesh-naidu Mar 9, 2023
06033c2
Revert "added superadmin check before enforcing in batch"
gireesh-naidu Mar 9, 2023
67fe6c8
added cdworkflow data in runner to use in cdMetrics
gireesh-naidu Mar 9, 2023
68affb8
super admin check added before enforcing rbac in batch
gireesh-naidu Mar 9, 2023
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
16 changes: 16 additions & 0 deletions api/cluster/EnvironmentRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,22 @@ func (impl EnvironmentRestHandlerImpl) GetAll(w http.ResponseWriter, r *http.Req
return
}

userId, err := impl.userService.GetLoggedInUser(r)
if userId == 0 || err != nil {
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
return
}
isSuperAdmin, err := impl.userService.IsSuperAdmin(int(userId))
if err != nil {
impl.logger.Errorw("request err, GetAll", "err", err, "userId", userId)
common.WriteJsonResp(w, err, "Failed to check is super admin", http.StatusInternalServerError)
return
}
if isSuperAdmin {
common.WriteJsonResp(w, err, environments, http.StatusOK)
return
}

token := r.Header.Get("token")
emailId, err := impl.userService.GetEmailFromToken(token)
if err != nil {
Expand Down
10 changes: 9 additions & 1 deletion pkg/pipeline/WorkflowDagExecutor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,9 @@ func (impl *WorkflowDagExecutorImpl) TriggerDeployment(cdWf *pipelineConfig.CdWo
if err != nil {
return err
}

runner.CdWorkflow = &pipelineConfig.CdWorkflow{
Pipeline: pipeline,
}
// creating cd pipeline status timeline for deployment initialisation
timeline := &pipelineConfig.PipelineStatusTimeline{
CdWorkflowRunnerId: runner.Id,
Expand Down Expand Up @@ -1380,6 +1382,9 @@ func (impl *WorkflowDagExecutorImpl) ManualCdTrigger(overrideRequest *bean.Value
impl.logger.Errorw("err", "err", err)
return 0, err
}
runner.CdWorkflow = &pipelineConfig.CdWorkflow{
Pipeline: cdPipeline,
}
overrideRequest.CdWorkflowId = cdWorkflowId
// creating cd pipeline status timeline for deployment initialisation
timeline := &pipelineConfig.PipelineStatusTimeline{
Expand Down Expand Up @@ -1452,6 +1457,9 @@ func (impl *WorkflowDagExecutorImpl) ManualCdTrigger(overrideRequest *bean.Value
impl.logger.Errorw("err", "err", err)
return 0, err
}
runner.CdWorkflow = &pipelineConfig.CdWorkflow{
Pipeline: cdPipeline,
}
cdMetrics := util4.CDMetrics{
AppName: runner.CdWorkflow.Pipeline.DeploymentAppName,
Status: runner.Status,
Expand Down