From c032ee101f95b6b5be02ec2b43f8ad16f9af2e77 Mon Sep 17 00:00:00 2001
From: Anurag Chauhan <44864882+anuragc617@users.noreply.github.com>
Date: Mon, 2 May 2022 06:32:43 +0000
Subject: [PATCH] adding  dependency review to allowed categories

---
 script/validate-data/index.ts      | 8 ++++----
 script/validate-data/settings.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/script/validate-data/index.ts b/script/validate-data/index.ts
index 5e6327a..7f7aa44 100755
--- a/script/validate-data/index.ts
+++ b/script/validate-data/index.ts
@@ -106,17 +106,17 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string, allow
       
     }
     var path = dirname(workflowPath)
-    var folder_category = allowed_categories.find( category => category["path"] == path)["name"]
+    var folder_categories = allowed_categories.find( category => category["path"] == path)["categories"]
     if (!workflowPath.endsWith("blank.yml")) {
       if(!properties.categories || properties.categories.length == 0) {
         workflowErrors.errors.push(`Workflow categories cannot be null or empty`)
       } 
-      else if(properties.categories[0].toLowerCase() !== folder_category.toLowerCase()) {
-        workflowErrors.errors.push(`The first category in properties.json categories must be "${folder_category}" for workflow in ${basename(path)} folder.`)
+      else if(!folder_categories.some(category => properties.categories[0].toLowerCase() == category.toLowerCase())) {
+        workflowErrors.errors.push(`The first category in properties.json categories for workflow in ${basename(path)} folder must be one of "${folder_categories}"`)
       }
     }
 
-    if(folder_category.toLowerCase() == 'deployment' && !properties.creator) {
+    if(path.toLowerCase() == 'deployment' && !properties.creator) {
       workflowErrors.errors.push(`The "creator" in properties.json must be present.`)
     }
   } catch (e) {
diff --git a/script/validate-data/settings.json b/script/validate-data/settings.json
index 2765c2a..852f575 100644
--- a/script/validate-data/settings.json
+++ b/script/validate-data/settings.json
@@ -20,7 +20,7 @@
     },
     { 
       "path": "../../code-scanning",
-      "categories": ["Code Scanning", "Dependency review"],
+      "categories": ["Code Scanning", "Dependency review"]
     }
   ]
 }