Merge pull request #291 from flanksource/fix/empty-config-change-summary

fix: config change summary from patch

db/update.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/aws/smithy-go/ptr"
@@ -316,13 +317,19 @@ func generateConfigChange(newConf, prev models.ConfigItem) (*dutyModels.ConfigCh
 		return nil, fmt.Errorf("failed to create merge patch: %w", err)
 	}
 
+	var patchJSON map[string]any
+	if err := json.Unmarshal(patch, &patchJSON); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal patch: %w", err)
+	}
+
 	return &dutyModels.ConfigChange{
 		ConfigID:         newConf.ID,
 		ChangeType:       "diff",
 		ExternalChangeId: utils.Sha256Hex(string(patch)),
 		ID:               ulid.MustNew().AsUUID(),
 		Diff:             diff,
 		Patches:          string(patch),
+		Summary:          strings.Join(utils.ExtractLeafNodesAndCommonParents(patchJSON), ", "),
 	}, nil
 }
 

scrapers/runscrapers.go

@@ -74,12 +74,18 @@ func summarizeChanges(changes []v1.ChangeResult) []v1.ChangeResult {
 			continue
 		}
 
-		paths := utils.ExtractLeafNodesAndCommonParents(change.AsMap())
+		var patch map[string]any
+		if err := json.Unmarshal([]byte(change.Patches), &patch); err != nil {
+			logger.Errorf("failed to unmarshal patches as map[string]any: %v %v", change.Patches, err)
+			continue
+		}
+
+		paths := utils.ExtractLeafNodesAndCommonParents(patch)
 		if len(paths) == 0 {
 			continue
 		}
 
-		changes[i].Summary += strings.Join(paths, ",")
+		changes[i].Summary += strings.Join(paths, ", ")
 	}
 
 	return changes