Minor refactor to update the format method name for go lint (#777)

Author: TristonianJones

cel/env.go

@@ -99,11 +99,11 @@ func FormatType(t *exprpb.Type) string {
 	return checker.FormatCheckedType(t)
 }
 
-// FormatCelType formats a cel.Type value to a string representation.
+// FormatCELType formats a cel.Type value to a string representation.
 //
 // The type formatting is identical to FormatType.
-func FormatCelType(t *Type) string {
-	return checker.FormatCelType(t)
+func FormatCELType(t *Type) string {
+	return checker.FormatCELType(t)
 }
 
 // Env encapsulates the context necessary to perform parsing, type checking, or generation of

cel/env_test.go

@@ -84,7 +84,7 @@ ERROR: <input>:1:2: Syntax error: mismatched input '<EOF>' expecting {'[', '{',
 	}
 }
 
-func TestFormatCelTypeEquivalence(t *testing.T) {
+func TestFormatCELTypeEquivalence(t *testing.T) {
 	values := []*Type{
 		AnyType,
 		MapType(StringType, DynType),
@@ -95,14 +95,14 @@ func TestFormatCelTypeEquivalence(t *testing.T) {
 	for _, v := range values {
 		v := v
 		t.Run(v.String(), func(t *testing.T) {
-			celStr := FormatCelType(v)
+			celStr := FormatCELType(v)
 			et, err := TypeToExprType(v)
 			if err != nil {
 				t.Fatalf("TypeToExprType(%v) failed: %v", v, err)
 			}
 			exprStr := FormatType(et)
 			if celStr != exprStr {
-				t.Errorf("FormatCelType(%v) got %s, wanted %s", v, celStr, exprStr)
+				t.Errorf("FormatCELType(%v) got %s, wanted %s", v, celStr, exprStr)
 			}
 		})
 	}

cel/validator.go

@@ -342,7 +342,7 @@ func isOptionalIndex(i int, optIndices []int32) bool {
 }
 
 func (homogeneousAggregateLiteralValidator) typeMismatch(iss *Issues, id int64, expected, actual *Type) {
-	iss.ReportErrorAtID(id, "expected type '%s' but found '%s'", FormatCelType(expected), FormatCelType(actual))
+	iss.ReportErrorAtID(id, "expected type '%s' but found '%s'", FormatCELType(expected), FormatCELType(actual))
 }
 
 type nestingLimitValidator struct {

checker/errors.go

@@ -31,7 +31,7 @@ type typeErrors struct {
 
 func (e *typeErrors) fieldTypeMismatch(id int64, l common.Location, name string, field, value *types.Type) {
 	e.errs.ReportErrorAtID(id, l, "expected type of field '%s' is '%s' but provided type is '%s'",
-		name, FormatCelType(field), FormatCelType(value))
+		name, FormatCELType(field), FormatCELType(value))
 }
 
 func (e *typeErrors) incompatibleType(id int64, l common.Location, ex *exprpb.Expr, prev, next *types.Type) {
@@ -46,7 +46,7 @@ func (e *typeErrors) noMatchingOverload(id int64, l common.Location, name string
 
 func (e *typeErrors) notAComprehensionRange(id int64, l common.Location, t *types.Type) {
 	e.errs.ReportErrorAtID(id, l, "expression of type '%s' cannot be range of a comprehension (must be list, map, or dynamic)",
-		FormatCelType(t))
+		FormatCELType(t))
 }
 
 func (e *typeErrors) notAnOptionalFieldSelection(id int64, l common.Location, field *exprpb.Expr) {
@@ -67,12 +67,12 @@ func (e *typeErrors) referenceRedefinition(id int64, l common.Location, ex *expr
 }
 
 func (e *typeErrors) typeDoesNotSupportFieldSelection(id int64, l common.Location, t *types.Type) {
-	e.errs.ReportErrorAtID(id, l, "type '%s' does not support field selection", FormatCelType(t))
+	e.errs.ReportErrorAtID(id, l, "type '%s' does not support field selection", FormatCELType(t))
 }
 
 func (e *typeErrors) typeMismatch(id int64, l common.Location, expected, actual *types.Type) {
 	e.errs.ReportErrorAtID(id, l, "expected type '%s' but found '%s'",
-		FormatCelType(expected), FormatCelType(actual))
+		FormatCELType(expected), FormatCELType(actual))
 }
 
 func (e *typeErrors) undefinedField(id int64, l common.Location, field string) {

checker/format.go

@@ -103,10 +103,10 @@ func FormatCheckedType(t *exprpb.Type) string {
 
 type formatter func(any) string
 
-// FormatCelType formats a types.Type value to a string representation.
+// FormatCELType formats a types.Type value to a string representation.
 //
 // The type formatting is identical to FormatCheckedType.
-func FormatCelType(t any) string {
+func FormatCELType(t any) string {
 	dt := t.(*types.Type)
 	switch dt.Kind() {
 	case types.AnyKind:
@@ -135,7 +135,7 @@ func FormatCelType(t any) string {
 	}
 	paramTypeNames := make([]string, 0, len(dt.Parameters()))
 	for _, p := range dt.Parameters() {
-		paramTypeNames = append(paramTypeNames, FormatCelType(p))
+		paramTypeNames = append(paramTypeNames, FormatCELType(p))
 	}
 	return fmt.Sprintf("%s(%s)", dt.TypeName(), strings.Join(paramTypeNames, ", "))
 }
@@ -152,7 +152,7 @@ func formatFunctionExprType(resultType *exprpb.Type, argTypes []*exprpb.Type, is
 }
 
 func formatFunctionDeclType(resultType *types.Type, argTypes []*types.Type, isInstance bool) string {
-	return formatFunctionInternal[*types.Type](resultType, argTypes, isInstance, FormatCelType)
+	return formatFunctionInternal[*types.Type](resultType, argTypes, isInstance, FormatCELType)
 }
 
 func formatFunctionInternal[T any](resultType T, argTypes []T, isInstance bool, format formatter) string {

checker/format_test.go

@@ -51,20 +51,20 @@ func TestFormatType(t *testing.T) {
 			if err != nil {
 				t.Fatalf("types.TypeToExprType(%v) failed: %v", tc, err)
 			}
-			if FormatCelType(tc) != FormatCheckedType(exprType) {
-				t.Errorf("formatCelType(%v) not equal to FormatCheckedType(%v), got %s, wanted %s",
-					tc, exprType, FormatCelType(tc), FormatCheckedType(exprType))
+			if FormatCELType(tc) != FormatCheckedType(exprType) {
+				t.Errorf("FormatCELType(%v) not equal to FormatCheckedType(%v), got %s, wanted %s",
+					tc, exprType, FormatCELType(tc), FormatCheckedType(exprType))
 			}
 		})
 	}
 }
 
 func TestFormatFunctionType(t *testing.T) {
 	// native type representation of function(string, int) -> bool
-	ct := FormatCelType(newFunctionType(types.BoolType, types.StringType, types.IntType))
+	ct := FormatCELType(newFunctionType(types.BoolType, types.StringType, types.IntType))
 	// protobuf-based function type
 	et := FormatCheckedType(decls.NewFunctionType(decls.Bool, decls.String, decls.Int))
 	if ct != et {
-		t.Errorf("formatCelType() not equal to FormatCheckedType(), got %s, wanted %s", ct, et)
+		t.Errorf("FormatCELType() not equal to FormatCheckedType(), got %s, wanted %s", ct, et)
 	}
 }

checker/mapping.go

@@ -29,11 +29,11 @@ func newMapping() *mapping {
 }
 
 func (m *mapping) add(from, to *types.Type) {
-	m.mapping[FormatCelType(from)] = to
+	m.mapping[FormatCELType(from)] = to
 }
 
 func (m *mapping) find(from *types.Type) (*types.Type, bool) {
-	if r, found := m.mapping[FormatCelType(from)]; found {
+	if r, found := m.mapping[FormatCELType(from)]; found {
 		return r, found
 	}
 	return nil, false