Skip to content

fixing enum compare to be case insensitive for FFEnumParseString #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterbroadhurst merged 2 commits into from
Jun 10, 2026
+30 −4
Merged

fixing enum compare to be case insensitive for FFEnumParseString #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dfedc8
fixing enum compare to be case insensitive
Chengxuan Jun 5, 2026
d28788b
address review comments
Chengxuan Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions pkg/fftypes/enum.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,23 @@ import (

type FFEnum string

var enumValues = map[string][]interface{}{}
var enumValues = map[string][]string{}

func FFEnumValue(t string, val string) FFEnum {
t = strings.ToLower(t)
enumValues[t] = append(enumValues[t], val)
return FFEnum(val)
}

func FFEnumValues(t string) []interface{} {
return enumValues[t]
values := enumValues[strings.ToLower(t)]

// Convert []string to []interface{} for openapi3.Schema.Enum.
result := make([]interface{}, len(values))
for i, v := range values {
result[i] = v
}
return result
}

func (ts FFEnum) String() string {
Expand Down Expand Up @@ -74,8 +82,8 @@ func FFEnumParseString(ctx context.Context, t, val string) (FFEnum, error) {
return "", i18n.NewError(ctx, i18n.MsgInvalidEnum, t)
}
for _, possible := range e {
if possible == strings.ToLower(val) {
return FFEnum(strings.ToLower(val)), nil
if strings.EqualFold(possible, val) {
return FFEnum(strings.ToLower(possible)), nil
}
}
return "", i18n.NewError(ctx, i18n.MsgInvalidEnumValue, val, t, e)
Expand Down
18 changes: 18 additions & 0 deletions pkg/fftypes/enum_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,18 @@ func TestFFEnumValues(t *testing.T) {
assert.Equal(t, []interface{}{"test_enum_val1", "test_enum_val2"}, FFEnumValues("ut"))
}

func TestFFEnumTypeCaseInsensitive(t *testing.T) {
ctx := context.Background()
enumVal := FFEnumValue("UT_Case", "case_val1")

assert.Equal(t, []interface{}{"case_val1"}, FFEnumValues("ut_case"))
assert.Equal(t, []interface{}{"case_val1"}, FFEnumValues("UT_CASE"))

v, err := FFEnumParseString(ctx, "UT_CASE", "case_val1")
assert.NoError(t, err)
assert.Equal(t, enumVal.Lower(), v)
}

func TestFFEnumParseString(t *testing.T) {
ctx := context.Background()
v, err := FFEnumParseString(ctx, "ut", "test_enum_val1")
Expand All @@ -73,4 +85,10 @@ func TestFFEnumParseString(t *testing.T) {
v, err = FFEnumParseString(ctx, "ut", "foobar")
assert.Regexp(t, "FF00172", err)
assert.Empty(t, v)

mixed := FFEnumValue("ut_mixed", "Test_Enum_Mixed")
v, err = FFEnumParseString(ctx, "ut_mixed", "test_enum_mixed")
assert.NoError(t, err)
assert.Equal(t, FFEnum("test_enum_mixed"), v)
assert.Equal(t, mixed.Lower(), v)
}
Loading