Skip to content

Commit 83d68c5

Browse files
committed
fixup! Allow labelFromKey field
1 parent 6d2a555 commit 83d68c5

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

pkg/customresourcestate/registry_factory.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -262,33 +262,33 @@ func (c *compiledInfo) Values(v interface{}) (result []eachValue, errs []error)
262262
}
263263
result = append(result, ev...)
264264
}
265-
default:
265+
case map[string]interface{}:
266266
value, err := c.values(v)
267267
if err != nil {
268268
onError(err...)
269269
break
270270
}
271271
// labelFromKey logic
272-
if vv, ok := v.(map[string]interface{}); ok {
273-
for key, val := range vv {
274-
if key != "" && c.labelFromKey != "" {
275-
n, err := toFloat64(val, false)
276-
if err != nil {
277-
onError(err)
278-
continue
279-
}
280-
result = append(result, eachValue{
281-
Labels: map[string]string{
282-
c.labelFromKey: key,
283-
},
284-
Value: n,
285-
})
272+
for key, val := range iter {
273+
if key != "" && c.labelFromKey != "" {
274+
n, err := toFloat64(val, false)
275+
if err != nil {
276+
onError(err)
277+
continue
286278
}
279+
result = append(result, eachValue{
280+
Labels: map[string]string{
281+
c.labelFromKey: key,
282+
},
283+
Value: n,
284+
})
287285
}
288286
}
289287
if len(result) == 0 {
290288
result = value
291289
}
290+
default:
291+
result, errs = c.values(v)
292292
}
293293

294294
return

0 commit comments

Comments
 (0)