Skip to content

Commit 54579b1

Browse files
jemlognamkyu1999amitytSaranya-jena
authored
refactor: update code syntax in backend server (#4944)
* refactor: update codes in backend server Signed-off-by: Jemin <[email protected]> * refactor: add space Signed-off-by: Jemin <[email protected]> * refactor: add space Signed-off-by: Jemin <[email protected]> --------- Signed-off-by: Jemin <[email protected]> Co-authored-by: Namkyu Park <[email protected]> Co-authored-by: Amit Kumar Das <[email protected]> Co-authored-by: Saranya Jena <[email protected]>
1 parent ed83302 commit 54579b1

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,7 @@ func (c *ChaosExperimentHandler) StopExperimentRuns(ctx context.Context, project
15161516
if len(experimentRunsID) == 0 && experiment.CronSyntax == "" {
15171517
return false, fmt.Errorf("no running or timeout experiments found")
15181518
}
1519-
} else if experimentRunID != nil && *experimentRunID != "" {
1519+
} else if *experimentRunID != "" {
15201520
experimentRunsID = []string{*experimentRunID}
15211521
}
15221522

chaoscenter/graphql/server/pkg/environment/handler/handler.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func (e *EnvironmentService) ListEnvironments(projectID string, request *model.L
228228
}
229229

230230
// Filtering based on given parameters
231-
if request.Filter != nil {
231+
if request != nil && request.Filter != nil {
232232
// Filtering based on chaos_infra name
233233
if request.Filter.Name != nil && *request.Filter.Name != "" {
234234
matchInfraNameStage := bson.D{
@@ -280,7 +280,7 @@ func (e *EnvironmentService) ListEnvironments(projectID string, request *model.L
280280
var sortStage bson.D
281281

282282
switch {
283-
case request.Sort != nil && request.Sort.Field == model.EnvironmentSortingFieldTime:
283+
case request != nil && request.Sort != nil && request.Sort.Field == model.EnvironmentSortingFieldTime:
284284
// Sorting based on created time
285285
if request.Sort.Ascending != nil && *request.Sort.Ascending {
286286
sortStage = bson.D{
@@ -295,7 +295,7 @@ func (e *EnvironmentService) ListEnvironments(projectID string, request *model.L
295295
}},
296296
}
297297
}
298-
case request.Sort != nil && request.Sort.Field == model.EnvironmentSortingFieldName:
298+
case request != nil && request.Sort != nil && request.Sort.Field == model.EnvironmentSortingFieldName:
299299
// Sorting based on ExperimentName time
300300
if request.Sort.Ascending != nil && *request.Sort.Ascending {
301301
sortStage = bson.D{
@@ -324,7 +324,7 @@ func (e *EnvironmentService) ListEnvironments(projectID string, request *model.L
324324
sortStage,
325325
}
326326

327-
if request.Pagination != nil {
327+
if request != nil && request.Pagination != nil {
328328
paginationSkipStage := bson.D{
329329
{"$skip", request.Pagination.Page * request.Pagination.Limit},
330330
}
@@ -353,6 +353,7 @@ func (e *EnvironmentService) ListEnvironments(projectID string, request *model.L
353353
pipeline = append(pipeline, facetStage)
354354

355355
cursor, err := e.EnvironmentOperator.GetAggregateEnvironments(pipeline)
356+
356357
if err != nil {
357358
return nil, err
358359
}
@@ -368,6 +369,7 @@ func (e *EnvironmentService) ListEnvironments(projectID string, request *model.L
368369
Environments: envs,
369370
}, errors.New("error decoding environment cursor: " + err.Error())
370371
}
372+
371373
if len(aggregatedEnvironments) == 0 {
372374
return &model.ListEnvironmentResponse{
373375
TotalNoOfEnvironments: 0,

chaoscenter/graphql/server/pkg/gitops/service.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -621,12 +621,11 @@ func (g *gitOpsService) updateExperiment(ctx context.Context, data, wfID, file s
621621
}
622622

623623
revID := ""
624-
updateRevision := false
625624
input, wfType, err := g.chaosExperimentService.ProcessExperiment(ctx, &experimentData, config.ProjectID, revID)
626625
if err != nil {
627626
return err
628627
}
629-
return g.chaosExperimentService.ProcessExperimentUpdate(input, "git-ops", wfType, revID, updateRevision, config.ProjectID, dataStore.Store)
628+
return g.chaosExperimentService.ProcessExperimentUpdate(input, "git-ops", wfType, revID, false, config.ProjectID, dataStore.Store)
630629
}
631630

632631
// deleteExperiment helps in deleting experiment from DB during the SyncDBToGit operation

0 commit comments

Comments
 (0)