From 6bcf17c70a6b836d00ee8669baf44d01a6a3a3b1 Mon Sep 17 00:00:00 2001
From: Christopher Fenner <Christopher.Fenner@sap.com>
Date: Tue, 26 Jun 2018 16:05:43 +0200
Subject: [PATCH] add snyk html report

---
 resources/default_pipeline_environment.yml |  2 +-
 vars/snykExecute.groovy                    | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/resources/default_pipeline_environment.yml b/resources/default_pipeline_environment.yml
index b1c4bf5dd..871363632 100644
--- a/resources/default_pipeline_environment.yml
+++ b/resources/default_pipeline_environment.yml
@@ -121,11 +121,11 @@ steps:
     excludeMtaModules: []
     monitor: true
     scanType: 'npm'
-    snykResultFile: 'snyk.json'
     stashContent:
       - 'buildDescriptor'
       - 'opensourceConfiguration'
     toJson: false
+    toHtml: false
   testsPublishResults:
     junit:
       pattern: '**/target/surefire-reports/*.xml'
diff --git a/vars/snykExecute.groovy b/vars/snykExecute.groovy
index a5c627718..2b98b30ff 100644
--- a/vars/snykExecute.groovy
+++ b/vars/snykExecute.groovy
@@ -15,7 +15,6 @@ import groovy.transform.Field
     'monitor',
     'scanType',
     'snykOrg',
-    'snykResultFile',
     'toJson',
     'toHtml'
 ])
@@ -82,20 +81,17 @@ def call(Map parameters = [:]) {
                             }
                             cmd.push('&& snyk test')
                             if(config.toJson)
-                                cmd.push("--json > ${config.snykResultFile}")
+                                cmd.push("--json > snyk.json")
                             try{
                                 sh cmd.join(' ')
                             }finally{
-                                if(config.toHtml)
-                                    sh "snyk-to-html -i ${path}${config.snykResultFile} -o ${path}snyk.html"
+                                if(config.toHtml) sh "snyk-to-html -i ${path}snyk.json -o ${path}snyk.html"
                             }
                         }
                     }
                 }finally{
-                    if(config.toJson)
-                        archiveArtifacts "${path.replaceAll('\\./', '')}${config.snykResultFile}"
-                    if(config.toHtml)
-                        archiveArtifacts "${path.replaceAll('\\./', '')}snyk.html"
+                    if(config.toJson) archiveArtifacts "${path.replaceAll('\\./', '')}snyk.json"
+                    if(config.toHtml) archiveArtifacts "${path.replaceAll('\\./', '')}snyk.html"
                 }
                 break
             default: