Skip to content
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

Jump to bottom

added check to prevent dupicate experiment name #4208

Merged
merged 2 commits into from
Oct 4, 2023
Merged

added check to prevent dupicate experiment name #4208

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1485631
added check to prevent dupicate experiment name
SarthakJain26 Oct 4, 2023
4e6781a
Merge branch 'master' into dup-exp-name-fix
Saranya-jena Oct 4, 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
53 changes: 26 additions & 27 deletions chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,10 @@ func (c *ChaosExperimentHandler) SaveChaosExperiment(ctx context.Context, reques
if wfDetails.ExperimentID == request.ID {
logrus.WithFields(logFields).Info("request received to update k8s chaos experiment")
if wfDetails.Name != request.Name {
filterQuery := bson.D{
{"project_id", request.ID},
{"name", request.Name},
{"is_removed", false},
}
experimentCount, err := c.chaosExperimentOperator.CountChaosExperiments(ctx, filterQuery)
err = c.validateDuplicateExperimentName(ctx, request.ID, request.Name)
if err != nil {
return "", err
}
if experimentCount > 0 {
return "", errors.New("experiment name should be unique, duplicate experiment found with name: " + request.Name)
}
}

err = c.chaosExperimentService.ProcessExperimentUpdate(newRequest, username, wfType, revID, false, projectID, nil)
Expand All @@ -128,6 +120,11 @@ func (c *ChaosExperimentHandler) SaveChaosExperiment(ctx context.Context, reques
return "experiment updated successfully", nil
}

err = c.validateDuplicateExperimentName(ctx, request.ID, request.Name)
if err != nil {
return "", err
}

// Saving chaos experiment in the DB
logrus.WithFields(logFields).Info("request received to save k8s chaos experiment")

Expand All @@ -144,18 +141,10 @@ func (c *ChaosExperimentHandler) CreateChaosExperiment(ctx context.Context, requ
var revID = uuid.New().String()

// Check if the experiment_name exists under same project
filterQuery := bson.D{
{"project_id", projectID},
{"name", request.ExperimentName},
{"is_removed", false},
}
experimentCount, err := c.chaosExperimentOperator.CountChaosExperiments(ctx, filterQuery)
err := c.validateDuplicateExperimentName(ctx, projectID, request.ExperimentName)
if err != nil {
return nil, err
}
if experimentCount > 0 {
return nil, errors.New("experiment name should be unique, duplicate experiment found with name: " + request.ExperimentName)
}

newRequest, wfType, err := c.chaosExperimentService.ProcessExperiment(request, projectID, revID)
if err != nil {
Expand Down Expand Up @@ -240,18 +229,10 @@ func (c *ChaosExperimentHandler) UpdateChaosExperiment(ctx context.Context, requ
)

// Check if the experiment_name exists under same project
filterQuery := bson.D{
{"project_id", projectID},
{"name", request.ExperimentName},
{"is_removed", false},
}
experimentCount, err := c.chaosExperimentOperator.CountChaosExperiments(ctx, filterQuery)
err := c.validateDuplicateExperimentName(ctx, projectID, request.ExperimentName)
if err != nil {
return nil, err
}
if experimentCount > 0 {
return nil, errors.New("experiment name should be unique, duplicate experiment found with name: " + request.ExperimentName)
}

newRequest, wfType, err := c.chaosExperimentService.ProcessExperiment(request, projectID, revID)
if err != nil {
Expand Down Expand Up @@ -1317,3 +1298,21 @@ func (c *ChaosExperimentHandler) GetProbesInExperimentRun(ctx context.Context, p

return probeDetails, nil
}

// validateDuplicateExperimentName validates if the name of experiment is duplicate
func (c *ChaosExperimentHandler) validateDuplicateExperimentName(ctx context.Context, projectID, name string) error {
filterQuery := bson.D{
{"project_id", projectID},
{"name", name},
{"is_removed", false},
}
experimentCount, err := c.chaosExperimentOperator.CountChaosExperiments(ctx, filterQuery)
if err != nil {
return err
}
if experimentCount > 0 {
return errors.New("experiment name should be unique, duplicate experiment found with name: " + name)
}

return nil
}
Loading