From 133915942a1f99d00a9bc3b49a94b8242af1945c Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <vincenzos@spotify.com>
Date: Mon, 16 Jan 2023 11:35:17 +0100
Subject: [PATCH] scaffolder: single resource type

Signed-off-by: Vincenzo Scamporlino <vincenzos@spotify.com>
---
 packages/backend/src/plugins/permission.ts   |  7 +++++--
 plugins/scaffolder-common/src/permissions.ts | 16 ++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/backend/src/plugins/permission.ts b/packages/backend/src/plugins/permission.ts
index 84a102d6be..fdff4018d2 100644
--- a/packages/backend/src/plugins/permission.ts
+++ b/packages/backend/src/plugins/permission.ts
@@ -30,7 +30,7 @@ import {
   createScaffolderStepConditionalDecision,
   scaffolderStepConditions,
 } from '@backstage/plugin-scaffolder-backend';
-import { RESOURCE_TYPE_SCAFFOLDER_STEP } from '@backstage/plugin-scaffolder-common';
+import { RESOURCE_TYPE_SCAFFOLDER_PROPERTY } from '@backstage/plugin-scaffolder-common';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';
 
@@ -43,7 +43,10 @@ class ExamplePermissionPolicy implements PermissionPolicy {
      * This is an example of how to use the scaffolder step conditions.
      */
     if (
-      isResourcePermission(request.permission, RESOURCE_TYPE_SCAFFOLDER_STEP)
+      isResourcePermission(
+        request.permission,
+        RESOURCE_TYPE_SCAFFOLDER_PROPERTY,
+      )
     ) {
       return createScaffolderStepConditionalDecision(
         request.permission,
diff --git a/plugins/scaffolder-common/src/permissions.ts b/plugins/scaffolder-common/src/permissions.ts
index bbf465c525..334eb084b1 100644
--- a/plugins/scaffolder-common/src/permissions.ts
+++ b/plugins/scaffolder-common/src/permissions.ts
@@ -16,16 +16,14 @@
 
 import { createPermission } from '@backstage/plugin-permission-common';
 
-export const RESOURCE_TYPE_SCAFFOLDER_PARAMETER = 'scaffolder-parameter';
 export const RESOURCE_TYPE_SCAFFOLDER_PROPERTY = 'scaffolder-property';
-export const RESOURCE_TYPE_SCAFFOLDER_STEP = 'scaffolder-step';
 
 export const templateParameterReadPermission = createPermission({
   name: 'scaffolder.template.parameter.read',
   attributes: {
     action: 'read',
   },
-  resourceType: RESOURCE_TYPE_SCAFFOLDER_PARAMETER,
+  resourceType: RESOURCE_TYPE_SCAFFOLDER_PROPERTY,
 });
 
 export const templatePropertyReadPermission = createPermission({
@@ -41,16 +39,18 @@ export const templateStepReadPermission = createPermission({
   attributes: {
     action: 'read',
   },
-  resourceType: RESOURCE_TYPE_SCAFFOLDER_STEP,
+  resourceType: RESOURCE_TYPE_SCAFFOLDER_PROPERTY,
 });
 
-export const scaffolderParameterPermissions = [templateParameterReadPermission];
-export const scaffolderPropertyPermissions = [templatePropertyReadPermission];
-export const scaffolderStepPermissions = [templateStepReadPermission];
+export const scaffolderPermissions = [
+  templatePropertyReadPermission,
+  templateParameterReadPermission,
+  templateStepReadPermission,
+];
 
 /**
  * TODOs:
- * 1. Implement for Parameters & Properties
+ * 1. ~Implement for Parameters & Properties~
  * 2. What metadata should be included in the template?
  * 3. Write tests
  * 4. Write documentation