kubernetes
/
kube-state-metrics
mirror of https://github.com/kubernetes/kube-state-metrics.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test due to map iteration 

Signed-off-by: Joel Whittaker-Smith <jdws.dev@gmail.com>
This commit is contained in:
Joel Whittaker-Smith 2020-10-08 23:35:28 +02:00
parent 5d56275d2b
commit 2826d10f65
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/allow/allow_labels.go
View File

@ -49,7 +49,7 @@ func (a Labels) Allowed(metric string, labels, values []string) ([]string, []str
var finalLabels, finalValues []string var finalLabels, finalValues []string
labelSet := labelSet(allowedLabels) labelSet := labelSet(allowedLabels)
for allowedLabel := range labelSet { for _, allowedLabel := range labelSet {
for i, label := range labels { for i, label := range labels {
if label == allowedLabel { if label == allowedLabel {
finalLabels = append(finalLabels, label) finalLabels = append(finalLabels, label)
@ -61,12 +61,16 @@ func (a Labels) Allowed(metric string, labels, values []string) ([]string, []str
return finalLabels, finalValues return finalLabels, finalValues
} }
func labelSet(lists ...[]string) map[string]interface{} { func labelSet(lists ...[]string) []string {
m := make(map[string]interface{}) m := make(map[string]interface{})
var set []string
for _, list := range lists { for _, list := range lists {
for _, e := range list { for _, e := range list {
m[e] = struct{}{} if _, ok := m[e]; !ok {
m[e] = struct{}{}
set = append(set, e)
}
} }
} }
return m return set
} }