ssube
/
salty-dog
1
0
Fork 0
Code

fix(rule): log and apply mutation when rule has > 0 diffs

This commit is contained in:
ssube 2019-11-01 05:46:31 -05:00
parent 3b2e421c0c
commit 63b6e48cc7
Signed by: ssube
GPG Key ID: 3EED7B957D362AF1
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rule.ts
View File

@ -6,7 +6,7 @@ import { LogLevel } from 'noicejs';
import { YamlParser } from './parser/YamlParser'; import { YamlParser } from './parser/YamlParser';
import { readFileSync } from './source'; import { readFileSync } from './source';
import { ensureArray, isNilOrEmpty } from './utils'; import { ensureArray, hasItems } from './utils';
import { friendlyError } from './utils/ajv'; import { friendlyError } from './utils/ajv';
import { Visitor } from './visitor'; import { Visitor } from './visitor';
import { VisitorContext } from './visitor/VisitorContext'; import { VisitorContext } from './visitor/VisitorContext';
@ -198,11 +198,7 @@ export async function visitRules(ctx: VisitorContext, rules: Array<Rule>, data:
} }
const itemDiff = diff(item, itemCopy); const itemDiff = diff(item, itemCopy);
if (isNilOrEmpty(itemDiff)) { if (hasItems(itemDiff)) {
ctx.logger.info({ rule: rule.name }, 'rule passed');
continue;
}
ctx.logger.info({ ctx.logger.info({
diff: itemDiff, diff: itemDiff,
item, item,
@ -212,6 +208,9 @@ export async function visitRules(ctx: VisitorContext, rules: Array<Rule>, data:
if (ctx.innerOptions.mutate) { if (ctx.innerOptions.mutate) {
applyDiff(item, itemCopy); applyDiff(item, itemCopy);
} }
} else {
ctx.logger.info({ rule: rule.name }, 'rule passed');
}
} }
} }

2
src/utils/index.ts
View File

@ -1,6 +1,6 @@
import { isNil } from 'lodash'; import { isNil } from 'lodash';
export function isNilOrEmpty(val: Array<unknown> | null | undefined): val is Array<unknown> { export function hasItems(val: Array<unknown> | null | undefined): val is Array<unknown> {
return (Array.isArray(val) && val.length > 0); return (Array.isArray(val) && val.length > 0);
} }