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.

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

Added check to prevent duplicate experiments with same name #4187

Merged
merged 6 commits into from Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 35 additions & 8 deletions chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler.go
Expand Up @@ -105,6 +105,20 @@ func (c *ChaosExperimentHandler) SaveChaosExperiment(ctx context.Context, reques
// Updating the existing experiment
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)
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)
if err != nil {
Expand All @@ -129,19 +143,18 @@ func (c *ChaosExperimentHandler) CreateChaosExperiment(ctx context.Context, requ

var revID = uuid.New().String()

// Check if the workflow_name exists under same project
wfDetails, err := c.chaosExperimentOperator.GetExperiments(bson.D{
{"name", request.ExperimentName},
// Check if the experiment_name exists under same project
filterQuery := bson.D{
{"project_id", projectID},
{"tags", request.Tags},
{"name", request.ExperimentName},
{"is_removed", false},
})
}
experimentCount, err := c.chaosExperimentOperator.CountChaosExperiments(ctx, filterQuery)
if err != nil {
return nil, err
}

if wfDetails != nil || len(wfDetails) > 0 {
return nil, errors.New("experiment name already exists in this project")
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)
Expand Down Expand Up @@ -226,6 +239,20 @@ func (c *ChaosExperimentHandler) UpdateChaosExperiment(ctx context.Context, requ
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)
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 {
return nil, err
Expand Down
Expand Up @@ -124,3 +124,12 @@ func (c *Operator) UpdateChaosExperiments(ctx context.Context, query bson.D, upd

return nil
}

// CountChaosExperiments returns total number of matched documents
func (c *Operator) CountChaosExperiments(ctx context.Context, query bson.D) (int64, error) {
res, err := mongodb.Operator.CountDocuments(ctx, mongodb.ChaosExperimentCollection, query)
if err != nil {
return 0, err
}
return res, nil
}
30 changes: 30 additions & 0 deletions litmus-portal/graphql-server/pkg/chaos-workflow/handler/handler.go
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -64,6 +65,21 @@ func NewChaosWorkflowHandler(

// CreateChaosWorkflow creates a new chaos workflow
func (c *ChaosWorkflowHandler) CreateChaosWorkflow(ctx context.Context, request *model.ChaosWorkFlowRequest, r *store.StateData) (*model.ChaosWorkFlowResponse, error) {

// Check if the experiment_name exists under same project
expDetails, err := c.chaosWorkflowOperator.GetWorkflow(bson.D{
{"name", request.WorkflowName},
{"project_id", request.ProjectID},
{"is_removed", false},
})
if err != nil && err != mongo.ErrNoDocuments {
return nil, err
}
if expDetails.WorkflowID == "" {
log.Errorf("experiment with name %s already exists", request.WorkflowName)
return nil, fmt.Errorf("experiment with name %s already exists", request.WorkflowName)
}

request, wfType, err := c.chaosWorkflowService.ProcessWorkflow(request)
if err != nil {
log.Error("error processing workflow: ", err)
Expand Down Expand Up @@ -198,6 +214,20 @@ func (c *ChaosWorkflowHandler) TerminateChaosWorkflow(ctx context.Context, proje
}

func (c *ChaosWorkflowHandler) UpdateChaosWorkflow(ctx context.Context, request *model.ChaosWorkFlowRequest, r *store.StateData) (*model.ChaosWorkFlowResponse, error) {
// Check if the experiment_name exists under same project
expDetails, err := c.chaosWorkflowOperator.GetWorkflow(bson.D{
{"name", request.WorkflowName},
{"project_id", request.ProjectID},
{"is_removed", false},
})
if err != nil && err != mongo.ErrNoDocuments {
return nil, err
}
if expDetails.WorkflowID == "" {
log.Errorf("experiment with name %s already exists", request.WorkflowName)
return nil, fmt.Errorf("experiment with name %s already exists", request.WorkflowName)
}

request, wfType, err := c.chaosWorkflowService.ProcessWorkflow(request)
if err != nil {
log.Error("error processing workflow update: ", err)
Expand Down