thrift/thriftutil/enums: avoid duplicating underscores

Author: xgoffin

thrift/thriftutil/enums.go

@@ -8,7 +8,7 @@ import (
 
 func SanitizeCamelCaseThriftEnumValue(v string) string {
 	if sks := strings.SplitN(v, "_", 2); len(sks) == 2 {
-		return stringutil.CamelToSnakeCase(sks[1])
+		return strings.ReplaceAll(stringutil.CamelToSnakeCase(sks[1]), "__", "_")
 	}
 
 	return strings.ToLower(v)

thrift/thriftutil/enums_test.go

@@ -12,6 +12,7 @@ func TestSanitizeCamelCaseThriftEnumValue(t *testing.T) {
 		{"ContentType_InstagramMedia", "instagram_media"},
 		{"ContentType_Unknown", "unknown"},
 		{"regular string", "regular string"},
+		{"MFAVector_RECOVERY_CODE", "recovery_code"},
 	} {
 		if out := SanitizeCamelCaseThriftEnumValue(tt.in); tt.out != out {
 			t.Errorf("SanitizeCamelCaseThriftEnumValue(%q) = %q wanted: %q", tt.in, out, tt.out)