From 49d12d31c1e5ee23290f135010b9dcd33dbe9430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@spotify.com>
Date: Tue, 14 Apr 2026 15:41:08 +0200
Subject: [PATCH] Rename templateModelLayer to scaffolderCatalogModelLayer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Fredrik Adelöw <freben@spotify.com>
---
 .changeset/scaffolder-common-template-model.md        | 2 +-
 plugins/catalog-backend/dev/index.ts                  | 6 ++++--
 plugins/catalog-node/src/provideStaticCatalogModel.ts | 2 +-
 plugins/scaffolder-common/report-alpha.api.md         | 6 +++---
 plugins/scaffolder-common/src/alpha.ts                | 2 +-
 plugins/scaffolder-common/src/catalogModel.ts         | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.changeset/scaffolder-common-template-model.md b/.changeset/scaffolder-common-template-model.md
index 1ffa9e4935..40c76bab3d 100644
--- a/.changeset/scaffolder-common-template-model.md
+++ b/.changeset/scaffolder-common-template-model.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder-common': minor
 ---
 
-Added a Template kind model layer with JSON Schema definition, serving as an example of how plugins can declare their own catalog entity kinds.
+Added `scaffolderCatalogModelLayer`, a Template kind model layer with JSON Schema definition, serving as an example of how plugins can declare their own catalog entity kinds.
diff --git a/plugins/catalog-backend/dev/index.ts b/plugins/catalog-backend/dev/index.ts
index 2ac0bbebcc..b948dc2377 100644
--- a/plugins/catalog-backend/dev/index.ts
+++ b/plugins/catalog-backend/dev/index.ts
@@ -16,11 +16,13 @@
 
 import { createBackend } from '@backstage/backend-defaults';
 import { provideStaticCatalogModel } from '@backstage/plugin-catalog-node/alpha';
-import { templateModelLayer } from '@backstage/plugin-scaffolder-common/alpha';
+import { scaffolderCatalogModelLayer } from '@backstage/plugin-scaffolder-common/alpha';
 
 const backend = createBackend();
 backend.add(import('../src'));
 backend.add(import('@backstage/plugin-catalog-backend-module-logs'));
-backend.add(provideStaticCatalogModel({ layers: [templateModelLayer] }));
+backend.add(
+  provideStaticCatalogModel({ layers: [scaffolderCatalogModelLayer] }),
+);
 
 backend.start();
diff --git a/plugins/catalog-node/src/provideStaticCatalogModel.ts b/plugins/catalog-node/src/provideStaticCatalogModel.ts
index 4285d03a12..489b9b5532 100644
--- a/plugins/catalog-node/src/provideStaticCatalogModel.ts
+++ b/plugins/catalog-node/src/provideStaticCatalogModel.ts
@@ -36,7 +36,7 @@ import { catalogModelExtensionPoint } from './extensions';
  * ```ts
  * backend.add(
  *   provideStaticCatalogModel({
- *     layers: [templateModelLayer],
+ *     layers: [scaffolderCatalogModelLayer],
  *   }),
  * );
  * ```
diff --git a/plugins/scaffolder-common/report-alpha.api.md b/plugins/scaffolder-common/report-alpha.api.md
index dadddff352..c7ea24100f 100644
--- a/plugins/scaffolder-common/report-alpha.api.md
+++ b/plugins/scaffolder-common/report-alpha.api.md
@@ -22,6 +22,9 @@ export const RESOURCE_TYPE_SCAFFOLDER_TEMPLATE = 'scaffolder-template';
 // @alpha
 export const scaffolderActionPermissions: ResourcePermission<'scaffolder-action'>[];
 
+// @alpha
+export const scaffolderCatalogModelLayer: CatalogModelLayer;
+
 // @alpha
 export const scaffolderPermissions: (
   | BasicPermission
@@ -51,9 +54,6 @@ export const taskReadPermission: ResourcePermission<'scaffolder-task'>;
 // @alpha
 export const templateManagementPermission: BasicPermission;
 
-// @alpha
-export const templateModelLayer: CatalogModelLayer;
-
 // @alpha
 export const templateParameterReadPermission: ResourcePermission<'scaffolder-template'>;
 
diff --git a/plugins/scaffolder-common/src/alpha.ts b/plugins/scaffolder-common/src/alpha.ts
index f5cc736504..3c7d6f1372 100644
--- a/plugins/scaffolder-common/src/alpha.ts
+++ b/plugins/scaffolder-common/src/alpha.ts
@@ -15,4 +15,4 @@
  */
 
 export * from './permissions';
-export { templateModelLayer } from './catalogModel';
+export { scaffolderCatalogModelLayer } from './catalogModel';
diff --git a/plugins/scaffolder-common/src/catalogModel.ts b/plugins/scaffolder-common/src/catalogModel.ts
index 4ee69b1dd7..d383451ea5 100644
--- a/plugins/scaffolder-common/src/catalogModel.ts
+++ b/plugins/scaffolder-common/src/catalogModel.ts
@@ -23,7 +23,7 @@ import schema from './Template.v1beta3.schema.json';
  *
  * @alpha
  */
-export const templateModelLayer = createCatalogModelLayer({
+export const scaffolderCatalogModelLayer = createCatalogModelLayer({
   layerId: 'scaffolder.backstage.io/kind-template',
   builder: model => {
     model.addKind({