adding error reporting on failure on client cmd

DataDog · Nov 20, 2024 · de201a2 · de201a2
1 parent e5ae1af
commit de201a2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/cmd/kubehound/dumper.go b/cmd/kubehound/dumper.go
@@ -8,6 +8,7 @@ import (
 	"github.com/DataDog/KubeHound/pkg/cmd"
 	"github.com/DataDog/KubeHound/pkg/config"
 	"github.com/DataDog/KubeHound/pkg/kubehound/core"
+	"github.com/DataDog/KubeHound/pkg/telemetry/events"
 	"github.com/DataDog/KubeHound/pkg/telemetry/log"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -44,6 +45,7 @@ var (
 
 			// Create a temporary directory
 			tmpDir, err := os.MkdirTemp("", "kubehound")
+			defer cmd.ReportError(cobraCmd.Context(), events.DumpFinished, err)
 			if err != nil {
 				return fmt.Errorf("create temporary directory: %w", err)
 			}
@@ -63,7 +65,9 @@ var (
 			}
 			// Running the ingestion on KHaaS
 			if cobraCmd.Flags().Lookup("khaas-server").Value.String() != "" {
-				return core.CoreClientGRPCIngest(cobraCmd.Context(), khCfg.Ingestor, khCfg.Dynamic.ClusterName, khCfg.Dynamic.RunID.String())
+				err = core.CoreClientGRPCIngest(cobraCmd.Context(), khCfg.Ingestor, khCfg.Dynamic.ClusterName, khCfg.Dynamic.RunID.String())
+
+				return err
 			}
 
 			return err
@@ -82,6 +86,7 @@ var (
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
 			// Passing the Kubehound config from viper
 			khCfg, err := cmd.GetConfig()
+			defer cmd.ReportError(cobraCmd.Context(), events.DumpFinished, err)
 			if err != nil {
 				return fmt.Errorf("get config: %w", err)
 			}

diff --git a/cmd/kubehound/ingest.go b/cmd/kubehound/ingest.go
@@ -6,6 +6,7 @@ import (
 	"github.com/DataDog/KubeHound/pkg/cmd"
 	"github.com/DataDog/KubeHound/pkg/config"
 	"github.com/DataDog/KubeHound/pkg/kubehound/core"
+	"github.com/DataDog/KubeHound/pkg/telemetry/events"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -61,6 +62,7 @@ var (
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
 			// Passing the Kubehound config from viper
 			khCfg, err := cmd.GetConfig()
+			defer cmd.ReportError(cobraCmd.Context(), events.IngestorFailed, err)
 			if err != nil {
 				return fmt.Errorf("get config: %w", err)
 			}

diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go
@@ -6,6 +6,7 @@ import (
 
 	"strings"
 
+	"github.com/DataDog/KubeHound/pkg/telemetry/events"
 	"github.com/DataDog/KubeHound/pkg/telemetry/log"
 )
 
@@ -29,3 +30,12 @@ func AskForConfirmation(ctx context.Context) (bool, error) {
 		return AskForConfirmation(ctx)
 	}
 }
+
+func ReportError(ctx context.Context, action events.EventAction, err error) {
+	l := log.Logger(ctx)
+	if err != nil {
+		errMsg := fmt.Errorf("fatal error: %w", err)
+		l.Error("Error occurred", log.ErrorField(errMsg))
+		_ = events.PushEvent(ctx, action, fmt.Sprintf("%s", errMsg))
+	}
+}