fix: [5110]: updated cmd probe source error handling and fixed edit issue for source (#5268)

* fix: [5110]: updated cmd probe source error handling and fixed edit issue for source

Signed-off-by: Amit Kumar Das <[email protected]>

* fix: [5110]: fixed go imports

Signed-off-by: Amit Kumar Das <[email protected]>

* fix: [5110]: fixed go imports

Signed-off-by: Amit Kumar Das <[email protected]>

---------

Signed-off-by: Amit Kumar Das <[email protected]>
Co-authored-by: Pritesh Kiri <[email protected]>
Co-authored-by: Vedant Shrotria <[email protected]>

Author: 3 people

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

@@ -12,21 +12,20 @@ import (
 
 	argoTypes "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
 	"github.com/ghodss/yaml"
-	dbChaosExperiment "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/chaos_experiment"
-	"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/probe/utils"
-	globalUtils "github.com/litmuschaos/litmus/chaoscenter/graphql/server/utils"
-
-	"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_experiment"
+	"github.com/sirupsen/logrus"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
 
 	"github.com/litmuschaos/chaos-operator/api/litmuschaos/v1alpha1"
 	"github.com/litmuschaos/litmus/chaoscenter/graphql/server/graph/model"
 	"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/authorization"
+	"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_experiment"
 	"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb"
+	dbChaosExperiment "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/chaos_experiment"
 	dbChaosExperimentRun "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/chaos_experiment_run"
 	dbSchemaProbe "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/probe"
-	"github.com/sirupsen/logrus"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
+	"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/probe/utils"
+	globalUtils "github.com/litmuschaos/litmus/chaoscenter/graphql/server/utils"
 )
 
 type Service interface {
@@ -112,7 +111,10 @@ func (p *probeService) AddProbe(ctx context.Context, probe model.ProbeRequest, p
 	if probe.Type == model.ProbeTypeHTTPProbe && probe.KubernetesHTTPProperties != nil {
 		utils.AddKubernetesHTTPProbeProperties(newProbe, probe)
 	} else if probe.Type == model.ProbeTypeCmdProbe && probe.KubernetesCMDProperties != nil {
-		utils.AddKubernetesCMDProbeProperties(newProbe, probe)
+		_, err := utils.AddKubernetesCMDProbeProperties(newProbe, probe)
+		if err != nil {
+			return nil, fmt.Errorf("%s: %s", "error adding cmd probe properties", err.Error())
+		}
 	} else if probe.Type == model.ProbeTypePromProbe && probe.PromProperties != nil {
 		utils.AddPROMProbeProperties(newProbe, probe)
 	} else if probe.Type == model.ProbeTypeK8sProbe && probe.K8sProperties != nil {
@@ -178,7 +180,10 @@ func (p *probeService) UpdateProbe(ctx context.Context, request model.ProbeReque
 		case model.ProbeTypeHTTPProbe:
 			utils.AddKubernetesHTTPProbeProperties(newProbe, request)
 		case model.ProbeTypeCmdProbe:
-			utils.AddKubernetesCMDProbeProperties(newProbe, request)
+			_, err := utils.AddKubernetesCMDProbeProperties(newProbe, request)
+			if err != nil {
+				return "", err
+			}
 		case model.ProbeTypePromProbe:
 			utils.AddPROMProbeProperties(newProbe, request)
 		case model.ProbeTypeK8sProbe:

chaoscenter/graphql/server/pkg/probe/utils/utils.go

@@ -71,7 +71,7 @@ func AddKubernetesHTTPProbeProperties(newProbe *dbSchemaProbe.Probe, request mod
 	return newProbe
 }
 
-func AddKubernetesCMDProbeProperties(newProbe *dbSchemaProbe.Probe, request model.ProbeRequest) *dbSchemaProbe.Probe {
+func AddKubernetesCMDProbeProperties(newProbe *dbSchemaProbe.Probe, request model.ProbeRequest) (*dbSchemaProbe.Probe, error) {
 	newProbe.KubernetesCMDProperties = &dbSchemaProbe.KubernetesCMDProbe{
 		// Common Probe Properties
 		ProbeTimeout: request.KubernetesCMDProperties.ProbeTimeout,
@@ -108,8 +108,8 @@ func AddKubernetesCMDProbeProperties(newProbe *dbSchemaProbe.Probe, request mode
 
 		err := json.Unmarshal([]byte(*request.KubernetesCMDProperties.Source), &source)
 		if err != nil {
-			log.Errorf("error unmarshalling soruce: %s", err.Error())
-			return nil
+			log.Errorf("error unmarshalling source: %s", err.Error())
+			return nil, err
 		}
 		if source != nil {
 			newProbe.KubernetesCMDProperties.Source = &v1alpha1.SourceDetails{
@@ -131,7 +131,7 @@ func AddKubernetesCMDProbeProperties(newProbe *dbSchemaProbe.Probe, request mode
 		}
 	}
 
-	return newProbe
+	return newProbe, nil
 }
 
 func AddPROMProbeProperties(newProbe *dbSchemaProbe.Probe, request model.ProbeRequest) *dbSchemaProbe.Probe {

chaoscenter/web/src/views/AddProbeModalWizard/AddProbeModalWizard.tsx

@@ -521,8 +521,8 @@ const TuneDetailsStep: React.FC<
             ...props.formData,
             kubernetesCMDProperties: {
               ...props.formData.kubernetesCMDProperties,
-              source: source.current !== '' ? JSON.stringify(parse(source.current)) : undefined,
-              ...(formikProps.values.kubernetesCMDProperties as CmdProbeInputs)
+              ...(formikProps.values.kubernetesCMDProperties as CmdProbeInputs),
+              source: source.current !== '' ? JSON.stringify(parse(source.current)) : undefined
             } as Probe['kubernetesCMDProperties']
           };