updated GetBoolField to use if instead of single case switch.

also updated GetIntField to follow GetStringField structure.

Author: smiller333

pkg/kstatus/status/util.go

@@ -119,16 +119,18 @@ func GetStringField(obj map[string]interface{}, fieldPath string, defaultValue s
 return rv
 }
 
-// GetIntField return field as string defaulting to value if not found
+// GetIntField return field as int defaulting to value if not found
 func GetIntField(obj map[string]interface{}, fieldPath string, defaultValue int) int {
+var rv = defaultValue
+
 fields := strings.Split(fieldPath, ".")
 if fields[0] == "" {
 fields = fields[1:]
 }
 
 val, found, err := apiunstructured.NestedFieldNoCopy(obj, fields...)
 if !found || err != nil {
-return defaultValue
+return rv
 }
 
 switch v := val.(type) {
@@ -139,23 +141,25 @@ func GetIntField(obj map[string]interface{}, fieldPath string, defaultValue int)
 case int64:
 return int(v)
 }
-return defaultValue
+return rv
 }
 
+// GetBoolField return field as boolean defaulting to value if not found
 func GetBoolField(obj map[string]interface{}, fieldPath string, defaultValue bool) bool {
+var rv = defaultValue
+
 fields := strings.Split(fieldPath, ".")
 if fields[0] == "" {
 fields = fields[1:]
 }
 
 val, found, err := apiunstructured.NestedFieldNoCopy(obj, fields...)
 if !found || err != nil {
-return defaultValue
+return rv
 }
 
-switch v := val.(type) {
-case bool:
+if v, ok := val.(bool); ok {
 return v
 }
-return defaultValue
+return rv
 }