Merge pull request #76 from GrantBirki/fix-file-validation

Fix file validation in action summary

__tests__/functions/json-validator.test.js

@@ -462,6 +462,25 @@ test('successfully validates json files with a schema when files is defined', as
   expect(debugMock).toHaveBeenCalledWith(`using files: ${files.join(', ')}`)
 })
 
+test('successfully validates json files with a schema when files is defined and there are duplicates', async () => {
+  const files = [
+    '__tests__/fixtures/json/valid/json1.json',
+    '__tests__/fixtures/json/valid/json1.json',
+    '__tests__/fixtures/json/project_dir/data/config/json1.json'
+  ]
+  process.env.INPUT_FILES = files.join('\n')
+
+  expect(await jsonValidator(excludeMock)).toStrictEqual({
+    failed: 0,
+    passed: 2,
+    skipped: 0,
+    success: true,
+    violations: []
+  })
+
+  expect(debugMock).toHaveBeenCalledWith(`using files: ${files.join(', ')}`)
+})
+
 test('fails to validate a yaml file with an incorrect schema when yaml_as_json is true', async () => {
   process.env.INPUT_YAML_AS_JSON = 'true'
   process.env.INPUT_BASE_DIR = '__tests__/fixtures/yaml_as_json/invalid'

__tests__/functions/yaml-validator.test.js

@@ -128,7 +128,8 @@ test('fails to validate a yaml file without using a schema', async () => {
   )
 })
 
-test('successfully validates yaml files with a schema when files is defined', async () => {
+test('successfully validates yaml files with a schema when files is defined and there are duplicates', async () => {
+  // this file should only be validated once and not duplicated
   const files = [
     '__tests__/fixtures/yaml/valid/yaml1.yaml',
     '__tests__/fixtures/yaml/valid/yaml1.yaml'
@@ -137,7 +138,7 @@ test('successfully validates yaml files with a schema when files is defined', as
 
   expect(await yamlValidator(excludeMock)).toStrictEqual({
     failed: 0,
-    passed: 2,
+    passed: 1,
     skipped: 0,
     success: true,
     violations: []

src/functions/json-validator.js

@@ -149,6 +149,9 @@ export async function jsonValidator(exclude) {
       .withPromise()
   }
 
+  // Create a Set to track processed files
+  const processedFiles = new Set()
+
   for (const fullPath of files) {
     core.debug(`found file: ${fullPath}`)
 
@@ -188,6 +191,12 @@ export async function jsonValidator(exclude) {
       continue
     }
 
+    // Check if the file has already been processed
+    if (processedFiles.has(fullPath)) {
+      core.debug(`skipping duplicate file: ${fullPath}`)
+      continue
+    }
+
     var data
     try {
       // if the file is a yaml file but being treated as json and yamlAsJson is true
@@ -250,6 +259,9 @@ export async function jsonValidator(exclude) {
       continue
     }
 
+    // Add the file to the processedFiles Set
+    processedFiles.add(fullPath)
+
     result.passed++
     core.info(`${fullPath} is valid`)
   }

src/functions/yaml-validator.js

@@ -62,6 +62,9 @@ export async function yamlValidator(exclude) {
       .withPromise()
   }
 
+  // Create a Set to track processed files
+  const processedFiles = new Set()
+
   for (const fullPath of files) {
     core.debug(`found file: ${fullPath}`)
 
@@ -93,6 +96,12 @@ export async function yamlValidator(exclude) {
       continue
     }
 
+    // Check if the file has already been processed
+    if (processedFiles.has(fullPath)) {
+      core.debug(`skipping duplicate file: ${fullPath}`)
+      continue
+    }
+
     let multipleDocuments = false
 
     try {
@@ -176,6 +185,9 @@ export async function yamlValidator(exclude) {
       continue
     }
 
+    // Add the file to the processedFiles Set
+    processedFiles.add(fullPath)
+
     result.passed++
     core.info(`${fullPath} is valid`)
   }