From a4f3c20430bb0e8f57724c51ae05fb39b004a535 Mon Sep 17 00:00:00 2001 From: Vincenzo Scamporlino Date: Mon, 20 Mar 2023 14:02:20 +0100 Subject: [PATCH] scaffolder: rename rules to permissionRules Signed-off-by: Vincenzo Scamporlino --- plugins/scaffolder-backend/api-report.md | 4 ++-- plugins/scaffolder-backend/src/service/router.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md index d116fe60ff..41207f05be 100644 --- a/plugins/scaffolder-backend/api-report.md +++ b/plugins/scaffolder-backend/api-report.md @@ -664,9 +664,9 @@ export interface RouterOptions { // (undocumented) permissionApi?: PermissionEvaluator; // (undocumented) - reader: UrlReader; + permissionRules?: TemplatePermissionRuleInput[]; // (undocumented) - rules?: TemplatePermissionRuleInput[]; + reader: UrlReader; // (undocumented) scheduler?: PluginTaskScheduler; // (undocumented) diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts index e8a39444a7..1f2d390f9f 100644 --- a/plugins/scaffolder-backend/src/service/router.ts +++ b/plugins/scaffolder-backend/src/service/router.ts @@ -113,7 +113,7 @@ export interface RouterOptions { additionalTemplateFilters?: Record; additionalTemplateGlobals?: Record; permissionApi?: PermissionEvaluator; - rules?: TemplatePermissionRuleInput[]; + permissionRules?: TemplatePermissionRuleInput[]; identity?: IdentityApi; } @@ -209,7 +209,7 @@ export async function createRouter( additionalTemplateFilters, additionalTemplateGlobals, permissionApi, - rules, + permissionRules, } = options; const logger = parentLogger.child({ plugin: 'scaffolder' }); @@ -289,8 +289,8 @@ export async function createRouter( scaffolderTemplateRules, ); - if (rules) { - templateRules.push(...rules); + if (permissionRules) { + templateRules.push(...permissionRules); } const isAuthorized = createConditionAuthorizer(Object.values(templateRules));