Merge pull request #149806 from cockroachdb/blathers/backport-release-25.2-149695

release-25.2: catalog: make DescriptorType unredactable

Author: rafiss

pkg/sql/catalog/descriptor.go

@@ -31,6 +31,11 @@ import (
 // DescriptorType is a symbol representing the (sub)type of a descriptor.
 type DescriptorType string
 
+var _ redact.SafeValue = DescriptorType("")
+
+// SafeValue implements redact.SafeValue.
+func (DescriptorType) SafeValue() {}
+
 const (
 	// Any represents any descriptor.
 	Any DescriptorType = "any"

pkg/testutils/lint/passes/redactcheck/redactcheck.go

@@ -174,6 +174,9 @@ func runAnalyzer(pass *analysis.Pass) (interface{}, error) {
 					"github.com/cockroachdb/cockroach/pkg/server/license": {
 						"LicType": {},
 					},
+					"github.com/cockroachdb/cockroach/pkg/sql/catalog": {
+						"DescriptorType": {},
+					},
 					"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb": {
 						"JobID":         {},
 						"PolicyCommand": {},