Merge pull request #82 from vimeo/flags_skip_unhandled_types

flags/pflags: skip registering flags on some types
vimeo · Jan 29, 2024 · 273ee56 · 273ee56
2 parents c805913 + 266ab41
commit 273ee56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/sources/flag/flag.go b/sources/flag/flag.go
@@ -315,10 +315,12 @@ func (s *Set) registerFlags(tmpl reflect.Value, ptyp reflect.Type) error {
 			case stringSet:
 				s.Flags.Var(flaghelper.NewStringSetFlag(fieldVal.Addr().Interface().(*map[string]struct{})), name, help)
 			default:
-				return fmt.Errorf("unhandled type %s", ft)
+				// Unhandled type. Just keep going.
+				continue
 			}
 		default:
-			return fmt.Errorf("unhandled type %s", ft)
+			// Unhandled type. Just keep going.
+			continue
 		}
 	}
 	return nil

diff --git a/sources/pflag/pflag.go b/sources/pflag/pflag.go
@@ -327,11 +327,13 @@ func (s *Set) registerFlags(tmpl reflect.Value, ptyp reflect.Type) error {
 				f = fieldVal.Addr().Interface()
 				s.Flags.VarP(flaghelper.NewStringSetFlag(fieldVal.Addr().Interface().(*map[string]struct{})), name, shorthand, help)
 			default:
-				return fmt.Errorf("unhandled type %s", ft)
+				// Unhandled type. Just keep going.
+				continue
 			}
 
 		default:
-			return fmt.Errorf("unhandled type %s", ft)
+			// Unhandled type. Just keep going.
+			continue
 		}
 
 		v := reflect.ValueOf(f)