diff --git a/plugins/scaffolder-backend/src/service/rules.test.ts b/plugins/scaffolder-backend/src/service/rules.test.ts index 0f6f4851b4..7d8e0eb445 100644 --- a/plugins/scaffolder-backend/src/service/rules.test.ts +++ b/plugins/scaffolder-backend/src/service/rules.test.ts @@ -22,7 +22,7 @@ describe('hasTag', () => { expect( hasTag.apply( { - 'backstage:accessControl': { + 'backstage:permissions': { tags: ['foo', 'bar'], }, }, @@ -33,7 +33,7 @@ describe('hasTag', () => { ).toEqual(false); }); - it('returns false when accessControl is missing', () => { + it('returns false when backstage:permissions is missing', () => { expect( hasTag.apply( {}, @@ -51,7 +51,7 @@ describe('hasTag', () => { apiVersion: 'backstage.io/v1alpha1', kind: 'Component', metadata: { - 'backstage:accessControl': { + 'backstage:permissions': { tags: [], }, }, @@ -67,7 +67,7 @@ describe('hasTag', () => { expect( hasTag.apply( { - 'backstage:accessControl': { + 'backstage:permissions': { tags: ['foo', 'bar'], }, }, diff --git a/plugins/scaffolder-backend/src/service/rules.ts b/plugins/scaffolder-backend/src/service/rules.ts index 0eb012acf3..ba91b18bf5 100644 --- a/plugins/scaffolder-backend/src/service/rules.ts +++ b/plugins/scaffolder-backend/src/service/rules.ts @@ -36,7 +36,7 @@ export const hasTag = createScaffolderPermissionRule({ tag: z.string().describe('Name of the tag to match on'), }), apply: (resource, { tag }) => { - return resource['backstage:accessControl']?.tags?.includes(tag) ?? false; + return resource['backstage:permissions']?.tags?.includes(tag) ?? false; }, toQuery: () => ({}), }); diff --git a/plugins/scaffolder-common/api-report.md b/plugins/scaffolder-common/api-report.md index 10e1b09ce6..aba929228f 100644 --- a/plugins/scaffolder-common/api-report.md +++ b/plugins/scaffolder-common/api-report.md @@ -52,7 +52,7 @@ export interface TaskStep { // @public export interface TemplateEntityStepV1beta3 extends JsonObject { // (undocumented) - 'backstage:accessControl'?: TemplateSpecValuesMetadata; + 'backstage:permissions'?: TemplateSpecValuesMetadata; // (undocumented) action: string; // (undocumented) @@ -95,7 +95,7 @@ export type TemplateInfo = { // @public export interface TemplateParameter extends JsonObject { // (undocumented) - 'backstage:accessControl'?: TemplateSpecValuesMetadata; + 'backstage:permissions'?: TemplateSpecValuesMetadata; // (undocumented) properties?: { [name: string]: JsonObject; diff --git a/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts b/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts index 99ffdcb7c2..790a0e4409 100644 --- a/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts +++ b/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts @@ -78,7 +78,7 @@ export interface TemplateEntityStepV1beta3 extends JsonObject { action: string; input?: JsonObject; if?: string | boolean; - 'backstage:accessControl'?: TemplateAccessControl; + 'backstage:permissions'?: TemplatePermissions; } /** @@ -87,7 +87,7 @@ export interface TemplateEntityStepV1beta3 extends JsonObject { * @public */ export interface TemplateParameter extends JsonObject { - 'backstage:accessControl'?: TemplateAccessControl; + 'backstage:permissions'?: TemplatePermissions; properties?: { [name: string]: JsonObject }; } @@ -96,7 +96,7 @@ export interface TemplateParameter extends JsonObject { * * @public */ -export interface TemplateAccessControl extends JsonObject { +export interface TemplatePermissions extends JsonObject { tags?: string[]; } diff --git a/plugins/scaffolder-common/src/index.ts b/plugins/scaffolder-common/src/index.ts index 14f89c2bc9..1b154f9ba7 100644 --- a/plugins/scaffolder-common/src/index.ts +++ b/plugins/scaffolder-common/src/index.ts @@ -30,5 +30,5 @@ export type { TemplateEntityV1beta3, TemplateEntityStepV1beta3, TemplateParameter, - TemplateAccessControl as TemplateSpecValuesMetadata, + TemplatePermissions as TemplateSpecValuesMetadata, } from './TemplateEntityV1beta3';