fix: Incorrect diagnostics summary count (#823)

* fix: Incorrect diagnostics summary count

pkg/core/diagnostics.go

@@ -1,6 +1,8 @@
 package core
 
 import (
+	"strings"
+
 	"github.com/cloudquery/cloudquery/pkg/plugin"
 	"github.com/cloudquery/cq-provider-sdk/provider/diag"
 	"github.com/spf13/viper"
@@ -31,16 +33,19 @@ func SummarizeDiagnostics(diags diag.Diagnostics) DiagnosticsSummary {
 	}
 	for _, d := range diags {
 		summary.Total++
-		if _, ok := summary.BySeverity[d.Severity().String()]; ok {
-			summary.BySeverity[d.Severity().String()] = 1
+		severity := strings.ToLower(d.Severity().String())
+		dtype := strings.ToLower(d.Type().String())
+
+		if count, ok := summary.BySeverity[severity]; ok {
+			summary.BySeverity[severity] = count + 1
 		} else {
-			summary.BySeverity[d.Severity().String()]++
+			summary.BySeverity[severity] = 1
 		}
 
-		if _, ok := summary.ByType[d.Type().String()]; ok {
-			summary.ByType[d.Type().String()] = 1
+		if count, ok := summary.ByType[dtype]; ok {
+			summary.ByType[dtype] = count + 1
 		} else {
-			summary.ByType[d.Type().String()]++
+			summary.ByType[dtype] = 1
 		}
 	}
 	return summary

pkg/core/diagnostics_test.go

@@ -0,0 +1,46 @@
+package core
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/cloudquery/cq-provider-sdk/provider/diag"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_SummarizeDiagnostics(t *testing.T) {
+	testCases := []struct {
+		Name            string
+		Diags           diag.Diagnostics
+		ExpectedSummary DiagnosticsSummary
+	}{
+		{
+			Name:            "simple",
+			Diags:           diag.FromError(errors.New("1"), diag.USER),
+			ExpectedSummary: DiagnosticsSummary{Total: 1, ByType: map[string]int{"user": 1}, BySeverity: map[string]int{"error": 1}},
+		},
+
+		{
+			Name: "multi-severity",
+			Diags: diag.Diagnostics{}.Add(
+				diag.FromError(errors.New("1"), diag.USER),
+				diag.FromError(errors.New("1"), diag.USER, diag.WithSeverity(diag.WARNING)),
+			),
+			ExpectedSummary: DiagnosticsSummary{Total: 2, ByType: map[string]int{"user": 2}, BySeverity: map[string]int{"error": 1, "warning": 1}},
+		},
+		{
+			Name: "multi-type",
+			Diags: diag.Diagnostics{}.Add(
+				diag.FromError(errors.New("1"), diag.USER),
+				diag.FromError(errors.New("1"), diag.DATABASE),
+				diag.FromError(errors.New("1"), diag.USER, diag.WithSeverity(diag.WARNING)),
+			),
+			ExpectedSummary: DiagnosticsSummary{Total: 3, ByType: map[string]int{"user": 2, "database": 1}, BySeverity: map[string]int{"error": 2, "warning": 1}},
+		},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.Name, func(t *testing.T) {
+			assert.Equal(t, tc.ExpectedSummary, SummarizeDiagnostics(tc.Diags))
+		})
+	}
+}