chore(scaffolder-backend): revert addition of internal type

Signed-off-by: Frank Kong <frkong@redhat.com>

plugins/scaffolder-backend/api-report.md

@@ -479,7 +479,9 @@ export interface RouterOptions {
   // (undocumented)
   logger: Logger;
   // (undocumented)
-  permissionRules?: Array<ScaffolderPermissionRuleInput>;
+  permissionRules?: Array<
+    TemplatePermissionRuleInput | ActionPermissionRuleInput
+  >;
   // (undocumented)
   permissions?: PermissionsService;
   // (undocumented)
@@ -498,11 +500,6 @@ export type RunCommandOptions = ExecuteShellCommandOptions;
 // @public @deprecated
 export const ScaffolderEntitiesProcessor: typeof ScaffolderEntitiesProcessor_2;
 
-// @public (undocumented)
-export type ScaffolderPermissionRuleInput =
-  | TemplatePermissionRuleInput
-  | ActionPermissionRuleInput;
-
 // @public @deprecated
 export type SerializedTask = SerializedTask_2;
 

plugins/scaffolder-backend/src/service/router.ts

@@ -104,14 +104,6 @@ import {
 import { InternalTaskSecrets } from '../scaffolder/tasks/types';
 import { checkPermission } from '../util/checkPermissions';
 
-/**
- *
- * @public
- */
-export type ScaffolderPermissionRuleInput =
-  | TemplatePermissionRuleInput
-  | ActionPermissionRuleInput;
-
 /**
  *
  * @public
@@ -125,7 +117,7 @@ export type TemplatePermissionRuleInput<
   TParams
 >;
 function isTemplatePermissionRuleInput(
-  permissionRule: ScaffolderPermissionRuleInput,
+  permissionRule: TemplatePermissionRuleInput | ActionPermissionRuleInput,
 ): permissionRule is TemplatePermissionRuleInput {
   return permissionRule.resourceType === RESOURCE_TYPE_SCAFFOLDER_TEMPLATE;
 }
@@ -143,7 +135,7 @@ export type ActionPermissionRuleInput<
   TParams
 >;
 function isActionPermissionRuleInput(
-  permissionRule: ScaffolderPermissionRuleInput,
+  permissionRule: TemplatePermissionRuleInput | ActionPermissionRuleInput,
 ): permissionRule is ActionPermissionRuleInput {
   return permissionRule.resourceType === RESOURCE_TYPE_SCAFFOLDER_ACTION;
 }
@@ -176,7 +168,9 @@ export interface RouterOptions {
   additionalTemplateFilters?: Record<string, TemplateFilter>;
   additionalTemplateGlobals?: Record<string, TemplateGlobal>;
   permissions?: PermissionsService;
-  permissionRules?: Array<ScaffolderPermissionRuleInput>;
+  permissionRules?: Array<
+    TemplatePermissionRuleInput | ActionPermissionRuleInput
+  >;
   auth?: AuthService;
   httpAuth?: HttpAuthService;
   identity?: IdentityApi;