Addressed feedback

2025-03-03 15:02:35 +02:00 · 2019-03-29 13:58:41 +01:00 · 2019-03-29 13:58:41 +01:00 · c82bcc9c86
commit c82bcc9c86
parent 50b0e8e377
6 changed files with 115 additions and 79 deletions
--- a/resources/default_pipeline_environment.yml
+++ b/resources/default_pipeline_environment.yml
@ -332,7 +332,7 @@ steps:
        - 'buildDescriptor'
        - 'opensourceConfiguration'
      additionalInstallCommand: >-
-        curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+        curl --fail https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
        && mkdir -p \$GOPATH/src/${config.whitesource.projectName.substring(0, config.whitesource.projectName.lastIndexOf('/'))}
        && ln -s \$(pwd) \$GOPATH/src/${config.whitesource.projectName}
        && cd \$GOPATH/src/${config.whitesource.projectName} && dep ensure
--- a/src/com/sap/piper/DescriptorUtils.groovy
+++ b/src/com/sap/piper/DescriptorUtils.groovy
@ -13,20 +13,22 @@ def version = Pattern.compile("(.*)version=['\"](.*?)['\"](.*)", Pattern.DOTALL)
@Field
 def method = Pattern.compile("(.*)\\(\\)", Pattern.DOTALL)

-def getMavenGAV(fileName) {
+@NonCPS
+def getMavenGAV(file = 'pom.xml') {
    def result = [:]
-    def descriptor = readMavenPom(file: fileName)
+    def descriptor = readMavenPom(file: file)
    def group = descriptor.getGroupId()
    def artifact = descriptor.getArtifactId()
    def version = descriptor.getVersion()
    result['packaging'] = descriptor.getPackaging()
-    result['group'] = (null != group && group.length() > 0) ? group : sh(returnStdout: true, script: "mvn -f ${fileName} help:evaluate -Dexpression=project.groupId | grep -Ev '(^\\s*\\[|Download|Java\\w+:)'").trim()
-    result['artifact'] = (null != artifact && artifact.length() > 0) ? artifact : sh(returnStdout: true, script: "mvn -f ${fileName} help:evaluate -Dexpression=project.artifactId | grep -Ev '(^\\s*\\[|Download|Java\\w+:)'").trim()
-    result['version'] = (null != version && version.length() > 0) ? version : sh(returnStdout: true, script: "mvn -f ${fileName} help:evaluate -Dexpression=project.version | grep ^[0-9].*").trim()
-    echo "loaded ${result} from ${fileName}"
+    result['group'] = (null != group && group.length() > 0) ? group : sh(returnStdout: true, script: "mvn -f ${file} help:evaluate -Dexpression=project.groupId | grep -Ev '(^\\s*\\[|Download|Java\\w+:)'").trim()
+    result['artifact'] = (null != artifact && artifact.length() > 0) ? artifact : sh(returnStdout: true, script: "mvn -f ${file} help:evaluate -Dexpression=project.artifactId | grep -Ev '(^\\s*\\[|Download|Java\\w+:)'").trim()
+    result['version'] = (null != version && version.length() > 0) ? version : sh(returnStdout: true, script: "mvn -f ${file} help:evaluate -Dexpression=project.version | grep ^[0-9].*").trim()
+    echo "loaded ${result} from ${file}"
    return result
 }

+@NonCPS
 def getNpmGAV(file = 'package.json') {
    def result = [:]
    def descriptor = readJSON(file: file)
@ -46,6 +48,7 @@ def getNpmGAV(file = 'package.json') {
    return result
 }

+@NonCPS
 def getDlangGAV(file = 'dub.json') {
    def result = [:]
    def descriptor = readJSON(file: file)
@ -58,6 +61,7 @@ def getDlangGAV(file = 'dub.json') {
    return result
 }

+@NonCPS
 def getSbtGAV(file = 'sbtDescriptor.json') {
    def result = [:]
    def descriptor = readJSON(file: file)
@ -70,6 +74,7 @@ def getSbtGAV(file = 'sbtDescriptor.json') {
    return result
 }

+@NonCPS
 def getPipGAV(file = 'setup.py') {
    def result = [:]
    def descriptor = readFile(file: file)
@ -88,7 +93,8 @@ def getPipGAV(file = 'setup.py') {
    return result
 }

-def getGoGAV(file = './Gopkg.toml', URI repoUrl) {
+@NonCPS
+def getGoGAV(file = 'Gopkg.toml', URI repoUrl) {
    def name = "${repoUrl.getHost()}${repoUrl.getPath().replaceAll(/\.git/, '')}"
    def path = file.substring(0, file.lastIndexOf('/') + 1)
    def module = path?.replaceAll(/\./, '')?.replaceAll('/', '')
@ -109,6 +115,7 @@ def getGoGAV(file = './Gopkg.toml', URI repoUrl) {
    return result
 }

+@NonCPS
 private getVersionFromFile(file) {
    try {
        def versionString = readFile(file: file)
--- a/src/com/sap/piper/integration/WhitesourceRepository.groovy
+++ b/src/com/sap/piper/integration/WhitesourceRepository.groovy
@ -20,26 +20,10 @@ class WhitesourceRepository implements Serializable {
        def fetchedVulnerabilities = []
        if (config.whitesource.projectNames) {
            for (int i = 0; i < whitesourceProjectsMetaInformation.size(); i++) {
-                def metaInfo = whitesourceProjectsMetaInformation[i]
-
-                def requestBody = [
-                    requestType : "getProjectAlertsByType",
-                    alertType : "SECURITY_VULNERABILITY",
-                    projectToken: metaInfo.token
-                ]
-
-                def response = fetchWhitesourceResource(requestBody)
-                fetchedVulnerabilities.addAll(response.alerts)
+                fetchSecurityAlertsPerItem(whitesourceProjectsMetaInformation[i].token, "getProjectAlertsByType", fetchedVulnerabilities)
            }
        } else {
-            def requestBody = [
-                requestType : "getProductAlertsByType",
-                alertType : "SECURITY_VULNERABILITY",
-                productToken: config.whitesource.productToken,
-            ]
-
-            def response = fetchWhitesourceResource(requestBody)
-            fetchedVulnerabilities.addAll(response.alerts)
+            fetchSecurityAlertsPerItem(config.whitesource.productToken, "getProductAlertsByType", fetchedVulnerabilities)
        }

        sortVulnerabilitiesByScore(fetchedVulnerabilities)
@ -47,6 +31,17 @@ class WhitesourceRepository implements Serializable {
        return fetchedVulnerabilities
    }

+    private fetchSecurityAlertsPerItem(token, type, List<Object> fetchedVulnerabilities) {
+        def requestBody = [
+            requestType : type,
+            alertType   : "SECURITY_VULNERABILITY",
+            projectToken: token
+        ]
+
+        def response = fetchWhitesourceResource(requestBody)
+        fetchedVulnerabilities.addAll(response.alerts)
+    }
+
    protected def fetchWhitesourceResource(Map requestBody) {
        final def response = httpWhitesource(requestBody)
        def parsedResponse = new JsonUtils().jsonStringToGroovyObject(response.content)
@ -206,7 +201,7 @@ class WhitesourceRepository implements Serializable {
        if(config.verbose)
            script.echo "Sending curl request with parameters ${params}"

-        script.sh "${config.verbose ? '' : '#!/bin/sh -e\n'}curl -o ${fileName} -X POST ${config.whitesource.serviceUrl} -H 'Content-Type: application/json' -d \'${serializedContent}\'"
+        script.sh "${config.verbose ? '' : '#!/bin/sh -e\n'}curl --fail -o ${fileName} -X POST ${config.whitesource.serviceUrl} -H 'Content-Type: application/json' -d \'${serializedContent}\'"
    }

    @NonCPS
--- a/test/groovy/WhitesourceExecuteScanTest.groovy
+++ b/test/groovy/WhitesourceExecuteScanTest.groovy
@ -12,7 +12,6 @@ import org.junit.Test
 import org.junit.rules.ExpectedException
 import org.junit.rules.RuleChain
 import org.springframework.beans.factory.annotation.Autowired
-import org.yaml.snakeyaml.Yaml
 import util.*

 import static org.hamcrest.Matchers.*
--- a/test/groovy/com/sap/piper/DescriptorUtilsTest.groovy
+++ b/test/groovy/com/sap/piper/DescriptorUtilsTest.groovy
@ -11,6 +11,7 @@ import util.JenkinsErrorRule
 import util.JenkinsLoggingRule
 import util.JenkinsSetupRule
 import util.LibraryLoadingTestExecutionListener
+import util.Rules

 import static org.hamcrest.Matchers.is
 import static org.junit.Assert.assertEquals
@ -29,10 +30,7 @@ class DescriptorUtilsTest extends BasePiperTest {
    public JenkinsLoggingRule loggingRule = new JenkinsLoggingRule(this)

    @Rule
-    public RuleChain ruleChain =
-        RuleChain.outerRule(setUpRule)
-            .around(errorRule)
-            .around(environmentRule)
+    public RuleChain ruleChain = Rules.getCommonRules(this)
            .around(loggingRule)

    DescriptorUtils descriptorUtils
--- a/test/groovy/com/sap/piper/WhitesourceConfigurationHelperTest.groovy
+++ b/test/groovy/com/sap/piper/WhitesourceConfigurationHelperTest.groovy
@ -13,6 +13,7 @@ import util.Rules
 import static org.hamcrest.Matchers.containsString
 import static org.hamcrest.Matchers.hasItem
 import static org.hamcrest.Matchers.not
+import static org.hamcrest.Matchers.allOf
 import static org.junit.Assert.assertThat

 class WhitesourceConfigurationHelperTest extends BasePiperTest {
@ -38,11 +39,15 @@ class WhitesourceConfigurationHelperTest extends BasePiperTest {
    void testExtendConfigurationFileUnifiedAgentEmptyConfig() {
        helper.registerAllowedMethod('readProperties', [Map], {return new Properties()})
        WhitesourceConfigurationHelper.extendUAConfigurationFile(nullScript, utils, [scanType: 'none', whitesource: [configFilePath: './config',serviceUrl: "http://some.host.whitesource.com/api/", orgToken: 'abcd', productName: 'DIST - name1', productToken: '1234', userKey: '0000']], "./")
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], not(containsString("log.level=debug")))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("apiKey=abcd"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productName=DIST - name1"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productToken=1234"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("userKey=0000"))
+        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'],
+                    allOf(
+                        not(containsString("log.level=debug")),
+                        containsString("apiKey=abcd"),
+                        containsString("productName=DIST - name1"),
+                        containsString("productToken=1234"),
+                        containsString("userKey=0000")
+                    )
+        )

        assertThat(jlr.log, containsString("[Whitesource] Configuration for scanType: 'none' is not yet hardened, please do a quality assessment of your scan results."))
    }
@ -51,11 +56,15 @@ class WhitesourceConfigurationHelperTest extends BasePiperTest {
    void testExtendConfigurationFileUnifiedAgentConfigDeeper() {
        helper.registerAllowedMethod('readProperties', [Map], { m -> if (!m.file.contains('testModule')) return new Properties() else return null })
        WhitesourceConfigurationHelper.extendUAConfigurationFile(nullScript, utils, [scanType: 'none', whitesource: [configFilePath: './config',serviceUrl: "http://some.host.whitesource.com/api/", orgToken: 'abcd', productName: 'DIST - name1', productToken: '1234', userKey: '0000']], "./testModule/")
-        assertThat(jwfr.files['./testModule/config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], not(containsString("log.level=debug")))
-        assertThat(jwfr.files['./testModule/config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("apiKey=abcd"))
-        assertThat(jwfr.files['./testModule/config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productName=DIST - name1"))
-        assertThat(jwfr.files['./testModule/config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productToken=1234"))
-        assertThat(jwfr.files['./testModule/config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("userKey=0000"))
+        assertThat(jwfr.files['./testModule/config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'],
+            allOf(
+                not(containsString("log.level=debug")),
+                containsString("apiKey=abcd"),
+                containsString("productName=DIST - name1"),
+                containsString("productToken=1234"),
+                containsString("userKey=0000")
+            )
+        )

        assertThat(jlr.log, containsString("[Whitesource] Configuration for scanType: 'none' is not yet hardened, please do a quality assessment of your scan results."))
    }
@ -63,10 +72,14 @@ class WhitesourceConfigurationHelperTest extends BasePiperTest {
    @Test
    void testExtendConfigurationFileUnifiedAgentMaven() {
        WhitesourceConfigurationHelper.extendUAConfigurationFile(nullScript, utils, [scanType: 'none', whitesource: [configFilePath: './config',serviceUrl: "http://some.host.whitesource.com/api/", orgToken: 'abcd', productName: 'DIST - name1', productToken: '1234', userKey: '0000']], "./")
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("apiKey=abcd"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productName=DIST - name1"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productToken=1234"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("userKey=0000"))
+        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'],
+            allOf(
+                containsString("apiKey=abcd"),
+                containsString("productName=DIST - name1"),
+                containsString("productToken=1234"),
+                containsString("userKey=0000")
+            )
+        )

        assertThat(jlr.log, containsString("[Whitesource] Configuration for scanType: 'none' is not yet hardened, please do a quality assessment of your scan results."))
    }
@ -74,10 +87,14 @@ class WhitesourceConfigurationHelperTest extends BasePiperTest {
    @Test
    void testExtendConfigurationFileUnifiedAgentNpm() {
        WhitesourceConfigurationHelper.extendUAConfigurationFile(nullScript, utils, [scanType: 'npm', whitesource: [configFilePath: './config',serviceUrl: "http://some.host.whitesource.com/api/", orgToken: 'abcd', productName: 'DIST - name1', productToken: '1234', userKey: '0000']], "./")
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("apiKey=abcd"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productName=DIST - name1"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productToken=1234"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("userKey=0000"))
+        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'],
+            allOf(
+                containsString("apiKey=abcd"),
+                containsString("productName=DIST - name1"),
+                containsString("productToken=1234"),
+                containsString("userKey=0000")
+            )
+        )

        assertThat(jlr.log, containsString("[Whitesource] Configuration for scanType: 'npm' is not yet hardened, please do a quality assessment of your scan results."))
    }
@ -85,10 +102,14 @@ class WhitesourceConfigurationHelperTest extends BasePiperTest {
    @Test
    void testExtendConfigurationFileUnifiedAgentSbt() {
        WhitesourceConfigurationHelper.extendUAConfigurationFile(nullScript, utils, [scanType: 'sbt', whitesource: [configFilePath: './config',serviceUrl: "http://some.host.whitesource.com/api/", orgToken: 'abcd', productName: 'DIST - name1', productToken: '1234', userKey: '0000']], "./")
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("apiKey=abcd"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productName=DIST - name1"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productToken=1234"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("userKey=0000"))
+        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'],
+            allOf(
+                containsString("apiKey=abcd"),
+                containsString("productName=DIST - name1"),
+                containsString("productToken=1234"),
+                containsString("userKey=0000")
+            )
+        )

        assertThat(jlr.log, containsString("[Whitesource] Configuration for scanType: 'sbt' is not yet hardened, please do a quality assessment of your scan results."))

@ -97,10 +118,14 @@ class WhitesourceConfigurationHelperTest extends BasePiperTest {
    @Test
    void testExtendConfigurationFileUnifiedAgentDlang() {
        WhitesourceConfigurationHelper.extendUAConfigurationFile(nullScript, utils, [scanType: 'dlang', whitesource: [configFilePath: './config',serviceUrl: "http://some.host.whitesource.com/api/", orgToken: 'abcd', productName: 'DIST - name1', productToken: '1234', userKey: '0000']], "./")
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("apiKey=abcd"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productName=DIST - name1"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productToken=1234"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("userKey=0000"))
+        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'],
+            allOf(
+                containsString("apiKey=abcd"),
+                containsString("productName=DIST - name1"),
+                containsString("productToken=1234"),
+                containsString("userKey=0000")
+            )
+        )

        assertThat(jlr.log, containsString("[Whitesource] Configuration for scanType: 'dlang' is not yet hardened, please do a quality assessment of your scan results."))
    }
@ -108,11 +133,15 @@ class WhitesourceConfigurationHelperTest extends BasePiperTest {
    @Test
    void testExtendConfigurationFileUnifiedAgentPip() {
        WhitesourceConfigurationHelper.extendUAConfigurationFile(nullScript, utils, [scanType: 'pip', whitesource: [configFilePath: './config',serviceUrl: "http://some.host.whitesource.com/api/", orgToken: 'abcd', productName: 'DIST - name1', productToken: '1234', userKey: '0000']], "./")
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("apiKey=abcd"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productName=DIST - name1"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productToken=1234"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("userKey=0000"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("python.resolveDependencies=true"))
+        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'],
+            allOf(
+                containsString("apiKey=abcd"),
+                containsString("productName=DIST - name1"),
+                containsString("productToken=1234"),
+                containsString("userKey=0000"),
+                containsString("python.resolveDependencies=true")
+            )
+        )

        assertThat(jlr.log, not(containsString("[Whitesource] Configuration for scanType: 'pip' is not yet hardened, please do a quality assessment of your scan results.")))
    }
@ -121,12 +150,16 @@ class WhitesourceConfigurationHelperTest extends BasePiperTest {
    void testExtendConfigurationFileUnifiedAgentGolangVerbose() {
        def config = [scanType: 'golang', whitesource: [configFilePath: './config', serviceUrl: "http://some.host.whitesource.com/api/", orgToken: 'abcd', productName: 'SHC - name2', productToken: '1234', userKey: '0000'], stashContent: ['some', 'stashes'], verbose: true]
        WhitesourceConfigurationHelper.extendUAConfigurationFile(nullScript, utils, config, "./")
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("apiKey=abcd"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productName=SHC - name2"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productToken=1234"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("userKey=0000"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("go.resolveDependencies=true"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("log.level=debug"))
+        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'],
+            allOf(
+                containsString("apiKey=abcd"),
+                containsString("productName=SHC - name2"),
+                containsString("productToken=1234"),
+                containsString("userKey=0000"),
+                containsString("go.resolveDependencies=true"),
+                containsString("log.level=debug")
+            )
+        )

        assertThat(config.stashContent, hasItem(containsString('modified whitesource config ')))
        assertThat(jlr.log, not(containsString("[Warning][Whitesource] Configuration for scanType: 'golang' is not yet hardened, please do a quality assessment of your scan results.")))
@ -139,16 +172,20 @@ class WhitesourceConfigurationHelperTest extends BasePiperTest {
        helper.registerAllowedMethod('readProperties', [Map], {return p})

        WhitesourceConfigurationHelper.extendUAConfigurationFile(nullScript, utils, [scanType: 'pip', whitesource: [configFilePath: './config', serviceUrl: "http://some.host.whitesource.com/api/", orgToken: 'cdfg', productName: 'name', productToken: '1234', userKey: '0000'], verbose: true], "./")
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("apiKey=cdfg"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productName=name"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("productToken=1234"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("userKey=0000"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("python.resolveDependencies=true"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("log.level=debug"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("python.resolveDependencies=true"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("python.ignoreSourceFiles=true"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("python.ignorePipInstallErrors=true"))
-        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'], containsString("python.installVirtualenv=false"))
+        assertThat(jwfr.files['./config.847f9aec2f93de9000d5fa4e6eaace2283ae6377'],
+            allOf(
+                containsString("apiKey=cdfg"),
+                containsString("productName=name"),
+                containsString("productToken=1234"),
+                containsString("userKey=0000"),
+                containsString("python.resolveDependencies=true"),
+                containsString("log.level=debug"),
+                containsString("python.resolveDependencies=true"),
+                containsString("python.ignoreSourceFiles=true"),
+                containsString("python.ignorePipInstallErrors=true"),
+                containsString("python.installVirtualenv=false")
+            )
+        )
    }
 }