fix: Diagnostics sorting, builtin Redacted() method

provider/diag/diagnostics.go

@@ -144,8 +144,34 @@ func (diags Diagnostics) CountBySeverity(sev Severity) uint64 {
 	return count
 }
 
+func (diags Diagnostics) Redacted() Diagnostics {
+	res := make(Diagnostics, len(diags))
+	for i := range diags {
+		if rd, ok := diags[i].(Redactable); ok {
+			if r := rd.Redacted(); r != nil {
+				res[i] = r
+				continue
+			}
+		}
+
+		res[i] = diags[i]
+	}
+	return res
+}
+
 func (diags Diagnostics) Len() int      { return len(diags) }
 func (diags Diagnostics) Swap(i, j int) { diags[i], diags[j] = diags[j], diags[i] }
 func (diags Diagnostics) Less(i, j int) bool {
-	return diags[i].Severity() > diags[j].Severity() && diags[i].Type() > diags[j].Type()
+	if diags[i].Severity() > diags[j].Severity() {
+		return true
+	} else if diags[i].Severity() < diags[j].Severity() {
+		return false
+	}
+
+	if diags[i].Type() > diags[j].Type() {
+		return true
+	} else if diags[i].Type() < diags[j].Type() {
+		return false
+	}
+	return diags[i].Description().Resource < diags[j].Description().Resource
 }

provider/diag/diagnostics_test.go

@@ -2,6 +2,7 @@ package diag
 
 import (
 	"errors"
+	"sort"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -202,3 +203,38 @@ func TestDiagnostics_SquashRedactable(t *testing.T) {
 	}, FlattenDiags(Diagnostics{r}, false))
 
 }
+
+func TestDiagnostics_Sort(t *testing.T) {
+	resErrA := NewBaseError(errors.New("error test"), RESOLVING, WithResourceName("a"), WithSummary("some summary"))
+	resErrB := NewBaseError(errors.New("error test"), RESOLVING, WithResourceName("b"), WithSummary("some summary"))
+
+	thrErrA := NewBaseError(errors.New("error test"), THROTTLE, WithResourceName("a"), WithSummary("some summary"))
+	accErrA := NewBaseError(errors.New("error test"), ACCESS, WithResourceName("a"), WithSummary("some summary"))
+
+	cases := []struct {
+		diagsInWrongOrder Diagnostics
+		expectedOrder     []int
+	}{
+		{
+			Diagnostics{resErrB, resErrA},
+			[]int{1, 0},
+		},
+		{
+			Diagnostics{accErrA, resErrB, thrErrA, resErrA},
+			[]int{2, 0, 3, 1},
+		},
+	}
+	for caseNo, tc := range cases {
+		assert.Equal(t, len(tc.diagsInWrongOrder), len(tc.expectedOrder), "bad test")
+		if t.Failed() {
+			t.FailNow()
+		}
+
+		sorted := make(Diagnostics, len(tc.diagsInWrongOrder))
+		copy(sorted, tc.diagsInWrongOrder)
+		sort.Sort(sorted)
+		for i := range sorted {
+			assert.Equalf(t, sorted[i], tc.diagsInWrongOrder[tc.expectedOrder[i]], "Case #%d item %d", caseNo+1, i)
+		}
+	}
+}