From b285e53d4a747a666f4d8eb554ee70561d5fb23b Mon Sep 17 00:00:00 2001 From: Lucas De Souza Date: Mon, 28 Nov 2022 12:16:00 -0600 Subject: [PATCH] cleanup Co-authored-by: Zeky Abubaker Signed-off-by: Lucas De Souza --- .../src/ingestion/CatalogRules.ts | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/plugins/catalog-backend/src/ingestion/CatalogRules.ts b/plugins/catalog-backend/src/ingestion/CatalogRules.ts index 3cda33533b..d4eda1db7e 100644 --- a/plugins/catalog-backend/src/ingestion/CatalogRules.ts +++ b/plugins/catalog-backend/src/ingestion/CatalogRules.ts @@ -96,21 +96,14 @@ export class DefaultCatalogRulesEnforcer implements CatalogRulesEnforcer { if (config.has('catalog.rules')) { const globalRules = config .getConfigArray('catalog.rules') - .map(ruleConfig => { - const rule: CatalogRule = { - allow: ruleConfig.getStringArray('allow').map(kind => ({ kind })), - }; - - const locConf = ruleConfig.getOptionalConfigArray('locations'); - if (locConf) - rule.locations = locConf.map(locationConfig => ({ + .map(ruleConf => ({ + allow: ruleConf.getStringArray('allow').map(kind => ({ kind })), + locations: ruleConf.getOptionalConfigArray('locations')?.map(locationConfig => ({ match: locationConfig.getOptionalString('match'), type: locationConfig.getString('type'), - target: locationConfig.getOptionalString('target'), - })); - - return rule; - }); + target: locationConfig.getOptionalString('target') + })) + })); rules.push(...globalRules); } else { rules.push(...DefaultCatalogRulesEnforcer.defaultRules);