diff --git a/plugins/scaffolder-backend/src/service/conditionExports.ts b/plugins/scaffolder-backend/src/service/conditionExports.ts index 2fb0d5d554..70285c8f5f 100644 --- a/plugins/scaffolder-backend/src/service/conditionExports.ts +++ b/plugins/scaffolder-backend/src/service/conditionExports.ts @@ -14,17 +14,17 @@ * limitations under the License. */ -import { RESOURCE_TYPE_SCAFFOLDER_PROPERTY } from '@backstage/plugin-scaffolder-common'; +import { RESOURCE_TYPE_SCAFFOLDER_TEMPLATE } from '@backstage/plugin-scaffolder-common'; import { createConditionExports } from '@backstage/plugin-permission-node'; import { scaffolderStepRules } from './rules'; const { - conditions: scaffolderStepConditions, - createConditionalDecision: createScaffolderStepConditionalDecision, + conditions: scaffolderConditions, + createConditionalDecision: createScaffolderConditionalDecision, } = createConditionExports({ pluginId: 'scaffolder', - resourceType: RESOURCE_TYPE_SCAFFOLDER_PROPERTY, + resourceType: RESOURCE_TYPE_SCAFFOLDER_TEMPLATE, rules: scaffolderStepRules, }); -export { scaffolderStepConditions, createScaffolderStepConditionalDecision }; +export { scaffolderConditions, createScaffolderConditionalDecision }; diff --git a/plugins/scaffolder-backend/src/service/rules.ts b/plugins/scaffolder-backend/src/service/rules.ts index b9d9e62c1b..dad0b84097 100644 --- a/plugins/scaffolder-backend/src/service/rules.ts +++ b/plugins/scaffolder-backend/src/service/rules.ts @@ -16,7 +16,7 @@ import { makeCreatePermissionRule } from '@backstage/plugin-permission-node'; import { - RESOURCE_TYPE_SCAFFOLDER_PROPERTY, + RESOURCE_TYPE_SCAFFOLDER_TEMPLATE, TemplateEntityStepV1beta3, TemplateParameter, } from '@backstage/plugin-scaffolder-common'; @@ -26,12 +26,12 @@ import { z } from 'zod'; export const createScaffolderStepPermissionRule = makeCreatePermissionRule< TemplateEntityStepV1beta3 | TemplateProperty | TemplateParameter, {}, - typeof RESOURCE_TYPE_SCAFFOLDER_PROPERTY + typeof RESOURCE_TYPE_SCAFFOLDER_TEMPLATE >(); const hasTag = createScaffolderStepPermissionRule({ name: 'HAS_TAG', - resourceType: RESOURCE_TYPE_SCAFFOLDER_PROPERTY, + resourceType: RESOURCE_TYPE_SCAFFOLDER_TEMPLATE, description: 'Match a scaffolder step with the given tag', paramsSchema: z.object({ tag: z.string().describe('Name of the tag to match on'), diff --git a/plugins/scaffolder-common/src/permissions.ts b/plugins/scaffolder-common/src/permissions.ts index 334eb084b1..1117fb268b 100644 --- a/plugins/scaffolder-common/src/permissions.ts +++ b/plugins/scaffolder-common/src/permissions.ts @@ -16,14 +16,14 @@ import { createPermission } from '@backstage/plugin-permission-common'; -export const RESOURCE_TYPE_SCAFFOLDER_PROPERTY = 'scaffolder-property'; +export const RESOURCE_TYPE_SCAFFOLDER_TEMPLATE = 'scaffolder-template'; export const templateParameterReadPermission = createPermission({ name: 'scaffolder.template.parameter.read', attributes: { action: 'read', }, - resourceType: RESOURCE_TYPE_SCAFFOLDER_PROPERTY, + resourceType: RESOURCE_TYPE_SCAFFOLDER_TEMPLATE, }); export const templatePropertyReadPermission = createPermission({ @@ -31,7 +31,7 @@ export const templatePropertyReadPermission = createPermission({ attributes: { action: 'read', }, - resourceType: RESOURCE_TYPE_SCAFFOLDER_PROPERTY, + resourceType: RESOURCE_TYPE_SCAFFOLDER_TEMPLATE, }); export const templateStepReadPermission = createPermission({ @@ -39,7 +39,7 @@ export const templateStepReadPermission = createPermission({ attributes: { action: 'read', }, - resourceType: RESOURCE_TYPE_SCAFFOLDER_PROPERTY, + resourceType: RESOURCE_TYPE_SCAFFOLDER_TEMPLATE, }); export const scaffolderPermissions = [