cleanup

Author: austenstone

.github/workflows/build_and_test.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-
+    
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v2

.github/workflows/build_executables.yml

@@ -10,7 +10,7 @@ jobs:
         type: [linux-x64, mac-x64, windows-x64]
 
     runs-on: ubuntu-latest
-
+    
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v2

.github/workflows/manual.yml

@@ -6,18 +6,18 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-
+    
     steps:
-
+    
       - name: Checkout Sources
         uses: actions/checkout@v2
-
+          
       - name: Invoke Action
         uses: ./
         with:
           sarifReportDir: ./samples/sarif/peter-murray/advanced-security-java
           outputDir: .
-
+          
       - name: Upload Artifacts
         uses: actions/upload-artifact@v2
         with:

.github/workflows/manual_custom_template.yml

@@ -0,0 +1,21 @@
+name: Manual Test Custom Template
+
+on:
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./
+        with:
+          token: ${{ secrets.SECURITY_TOKEN }}
+          sarifReportDir: ./samples/sarif/peter-murray/advanced-security-java
+          outputDir: .
+          templateFile: template.html
+      - uses: actions/upload-artifact@v2
+        with:
+          name: reports
+          path: ./*.pdf

.github/workflows/manual_test_repo.yml

@@ -6,19 +6,19 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-
+    
     steps:
-
+    
       - name: Checkout Sources
         uses: actions/checkout@v2
-
+          
       - name: Invoke Action
         uses: ./
         with:
           sarifReportDir: ./samples/sarif/java/detailed
           outputDir: .
           repository: octodemo/ghas-reporting
-
+          
       - name: Upload Artifacts
         uses: actions/upload-artifact@v2
         with:

action.yml

@@ -7,18 +7,22 @@ inputs:
     description: The GitHub token used to create an authenticated client
     default: ${{ github.token }}
     required: true
+
   sarifReportDir:
     description: The CodeQL output directory for SARIF report(s).
     required: true
     default: "../results"
+
   outputDir:
     description: The output directory for the generated report(s).
     required: true
     default: ${{ github.workspace }}
+
   repository:
     description: Repository name with owner. For example, peter-murray/github-security-report
     required: true
     default: ${{ github.repository }}
+
   templateFile:
     description: File to use as PDF template. For example, summary.pdf
     required: false

src/executable.ts

@@ -36,9 +36,11 @@ async function execute(reportGenerateConfig: ReportGeneratorConfig) {
     console.log(`Summary Report generated: ${file}`);
 
   } catch (err) {
-    console.log(err.stack);
-    console.error(err.message);
-    console.error();
+    if (err instanceof Error) {
+      console.error(err.message, err.stack);
+    } else {
+      console.error(JSON.stringify(err));
+    }
     program.help({error: true});
   }
 }

src/index.ts

@@ -24,7 +24,11 @@ async function run(): Promise<void> {
     const file = await generator.run();
     console.log(file);
   } catch (err) {
-    core.setFailed(err.message);
+    if (err instanceof Error) {
+      core.setFailed(err.message);
+    } else {
+      core.setFailed(JSON.stringify(err));
+    }
   }
 }