deprecation fixes and improvements

Author: mbowman100

.github/workflows/test.yml

@@ -9,7 +9,12 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Use local action
+      id: example
       uses: ./
       with:
         files: |
           example.openapi.yaml
+    - name: Output export variable
+      run: |
+        echo ${{ steps.example.outputs.validFiles }}
+        echo ${{ steps.example.outputs.invalidFiles }}

README.md

@@ -10,11 +10,26 @@ This action uses the swagger-cli to validate a given swagger file(s).
 
 See example for suggested command for finding all files ending in "openapi.yaml".
 
-## Outputs
+### `space_separated`
 
-`example.openapi.yaml is valid`
+**Optional** Defaults to true.
 
-`example.openapi.yaml is invalid`
+For use when passing in a list of files that are space separated.
+
+## Example output
+
+```
+Validating file: example.openapi.yaml
+example.openapi.yaml is valid
+```
+
+## Output variables
+
+### invalidFiles
+List of files that failed to validate.
+
+### validFiles
+List of valid files.
 
 ## Example usage
 
@@ -38,18 +53,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
     - name: Get OpenAPI files
+      id: getfiles
+      uses: actions/checkout@v2
       run:  |
-        FILES="$(find . \( -iname "*openapi.yaml" -or -iname "*openapi.yml" \) -not -path "./.github/*")"
-        FILES_C="$(echo "$FILES" | sed '/^\s*$/d' | wc -l)"
-        echo ::set-env name=FILE_LIST::$FILES
-        echo ::set-env name=FILE_COUNT::$FILES_C
-        echo "Found files:"
-        echo "$FILES"
+        # Using github env (newline separated file list)
+        echo 'FILE_LIST<<EOF' >> $GITHUB_ENV
+        find lib -type f -iname "*openapi.yaml" >> $GITHUB_ENV
+        echo 'EOF' >> $GITHUB_ENV
+
+        # Using step output (space separated file list)
+        FILES="$(find lib -type f -iname "*openapi.yaml")"
+        echo "::set-output name=file_list::$FILES"
     - name: swagger-validator
       uses: mbowman100/swagger-validator-action@master
       if: env.FILE_COUNT != '0' # Comment out if you want it to fail if no files found
       with:
         files: ${{ env.FILE_LIST }}
+        # files: ${{ steps.getfiles.outputs.file_list }} # For if you're using output
 ```

action.yaml

@@ -7,11 +7,16 @@ branding:
 
 inputs:
   files:
-    description: 'Swagger/OpenAPI file(s) to validate'
+    description: 'List of Swagger/OpenAPI file(s) to validate. Seperate each file with a new line or a space.'
     required: true
+  space_separated:
+    description: 'Defaults to true.'
+    required: false
 outputs:
-  file_list:
-    description: '<file name> is valid'
+  invalidFiles:
+    description: 'List of invalid files.'
+  validFiles:
+    description: 'List of valid files.'
 
 runs:
   using: 'node12'

example.openapi.yaml

@@ -30,7 +30,7 @@ paths:
               schema:
                 type: string
           content:
-            application/json:    
+            application/json:
               schema:
                 $ref: "#/components/schemas/Pets"
         default:

index.js

@@ -2,36 +2,59 @@ const core = require('@actions/core');
 const api = require("@apidevtools/swagger-cli");
 
 try {
-    const files = core.getInput('files', { required: true }).trim();
+    const files = core.getInput(
+        'files',
+        { required: true }
+    ).trim();
+
+    const space_separated = core.getInput(
+        'space_separated',
+        {
+            required: false,
+            default: '1'
+        }
+    ).trim();
 
     // Bail if no files
     if (files == '') {
-        console.log('No files to validate');
-        return core.setOutput('No files to validate');
+        return core.info('No files to validate');
+    }
+
+    if(space_separated == 1) {
+        files = files.replace(/(\.ya?ml)\s/g, `$1\n`);
     }
 
-    files.split(" ").forEach(file => {
-        console.log(`Validating file: ${file}`);
-        core.setOutput(`Validating file: ${file}`);
+    var invalidFiles = [];
+    var validFiles = [];
+    files.split(/\n/).forEach(file => {
+        core.info(`Validating file: ${file}`);
 
-        validate(file, {
+        var error = validate(file, {
             format: 2,
             type: "yaml",
             wrap: Infinity
         });
+
+        if(error) {
+            invalidFiles.push(file);
+        } else {
+            validFiles.push(file);
+        }
     });
+
+    core.setOutput('invalidFiles', invalidFiles);
+    core.setOutput('validFiles', validFiles);
 } catch (error) {
-    console.error(error);
     core.setFailed(error);
 }
 
 async function validate(file, options) {
+    var error;
     try {
         await api.validate(file, options);
-        console.log(file, " is valid");
-        core.setOutput(`${file} is valid`);
+        core.info(`${file} is valid`);
     } catch (error) {
-        console.error(error.message);
-        core.setFailed(`${file} is invalid`);
+        core.setFailed(`${file} is invalid\n${error.message}`);
     }
+    return error;
 }