Skip to content

Commit 5fb2355

Browse files
committed
Shorten some util code
1 parent 65cef4c commit 5fb2355

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

lib/validation.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,18 @@ exports.validateMetricName = function (name) {
1010
return metricRegexp.test(name);
1111
};
1212

13-
exports.validateLabelName = function (names) {
14-
let valid = true;
15-
(names || []).forEach(name => {
16-
if (!labelRegexp.test(name)) {
17-
valid = false;
18-
}
19-
});
20-
return valid;
13+
exports.validateLabelName = function (names = []) {
14+
return names.every(name => labelRegexp.test(name));
2115
};
2216

2317
exports.validateLabel = function validateLabel(savedLabels, labels) {
24-
Object.keys(labels).forEach(label => {
25-
if (savedLabels.indexOf(label) === -1) {
18+
for (const label in labels) {
19+
if (!savedLabels.includes(label)) {
2620
throw new Error(
2721
`Added label "${label}" is not included in initial labelset: ${util.inspect(
2822
savedLabels,
2923
)}`,
3024
);
3125
}
32-
});
26+
}
3327
};

0 commit comments

Comments
 (0)