From ec13659446e192fd35961beb9d49b969649c6774 Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <vincenzos@spotify.com>
Date: Fri, 24 Mar 2023 12:02:28 +0100
Subject: [PATCH] scaffolder-backend: remove matchesinput rule

Signed-off-by: Vincenzo Scamporlino <vincenzos@spotify.com>
---
 plugins/scaffolder-backend/package.json       |  1 -
 .../scaffolder-backend/src/service/rules.ts   | 63 +++++--------------
 yarn.lock                                     |  1 -
 3 files changed, 14 insertions(+), 51 deletions(-)

diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 9b28ac8199..dbcf0f624a 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -66,7 +66,6 @@
     "@gitbeaker/core": "^35.6.0",
     "@gitbeaker/node": "^35.1.0",
     "@octokit/webhooks": "^10.0.0",
-    "ajv": "^8.12.0",
     "azure-devops-node-api": "^11.0.1",
     "command-exists": "^1.2.9",
     "compression": "^1.7.4",
diff --git a/plugins/scaffolder-backend/src/service/rules.ts b/plugins/scaffolder-backend/src/service/rules.ts
index 379f95db10..30aebd1583 100644
--- a/plugins/scaffolder-backend/src/service/rules.ts
+++ b/plugins/scaffolder-backend/src/service/rules.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import Ajv from 'ajv';
 import { makeCreatePermissionRule } from '@backstage/plugin-permission-node';
 import {
   RESOURCE_TYPE_SCAFFOLDER_TEMPLATE,
@@ -36,7 +35,19 @@ export const createTemplatePermissionRule = makeCreatePermissionRule<
   typeof RESOURCE_TYPE_SCAFFOLDER_TEMPLATE
 >();
 
-const ajv = new Ajv({ allErrors: true });
+export const hasTag = createTemplatePermissionRule({
+  name: 'HAS_TAG',
+  resourceType: RESOURCE_TYPE_SCAFFOLDER_TEMPLATE,
+  description: `Match parameters or steps with the given tag`,
+  paramsSchema: z.object({
+    tag: z.string().describe('Name of the tag to match on'),
+  }),
+  apply: (resource, { tag }) => {
+    return resource['backstage:permissions']?.tags?.includes(tag) ?? false;
+  },
+  toQuery: () => ({}),
+});
+
 export const createActionPermissionRule = makeCreatePermissionRule<
   {
     action: string;
@@ -59,39 +70,6 @@ export const hasActionId = createActionPermissionRule({
   toQuery: () => ({}),
 });
 
-export const matchesInput = createActionPermissionRule({
-  name: 'MATCHES_INPUT',
-  resourceType: RESOURCE_TYPE_SCAFFOLDER_ACTION,
-  description: `Matches actionId and the input given`,
-  paramsSchema: z.object({
-    action: z.string().describe('Name of the actionId to match on'),
-    input: z
-      .any()
-      .optional()
-      .describe('JSON schema to validate input against')
-      .superRefine((value, ctx) => {
-        if (value && ajv.validateSchema(value)) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: 'Invalid JSON schema',
-          });
-        }
-      }),
-  }),
-  apply: (resource, { action, input }) => {
-    if (resource.action !== action) {
-      return true;
-    }
-
-    if (!input) {
-      return true;
-    }
-
-    return ajv.validate(input, resource.input);
-  },
-  toQuery: () => ({}),
-});
-
 export const hasInputProperty = createActionPermissionRule({
   name: 'HAS_INPUT',
   resourceType: RESOURCE_TYPE_SCAFFOLDER_ACTION,
@@ -122,18 +100,5 @@ export const hasInputProperty = createActionPermissionRule({
   toQuery: () => ({}),
 });
 
-export const hasTag = createTemplatePermissionRule({
-  name: 'HAS_TAG',
-  resourceType: RESOURCE_TYPE_SCAFFOLDER_TEMPLATE,
-  description: `Match parameters or steps with the given tag`,
-  paramsSchema: z.object({
-    tag: z.string().describe('Name of the tag to match on'),
-  }),
-  apply: (resource, { tag }) => {
-    return resource['backstage:permissions']?.tags?.includes(tag) ?? false;
-  },
-  toQuery: () => ({}),
-});
-
 export const scaffolderTemplateRules = { hasTag };
-export const scaffolderActionRules = { matchesInput, hasInputProperty };
+export const scaffolderActionRules = { hasActionId, hasInputProperty };
diff --git a/yarn.lock b/yarn.lock
index 1fe70bea95..b566ae3bdd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8020,7 +8020,6 @@ __metadata:
     "@types/nunjucks": ^3.1.4
     "@types/supertest": ^2.0.8
     "@types/zen-observable": ^0.8.0
-    ajv: ^8.12.0
     azure-devops-node-api: ^11.0.1
     command-exists: ^1.2.9
     compression: ^1.7.4