From ddb2cc42e9e43fdc2358fe14019ab9679e775671 Mon Sep 17 00:00:00 2001
From: Tommy Markley <markleyt@amazon.com>
Date: Fri, 14 Jan 2022 13:19:09 -0600
Subject: [PATCH] Disable WhiteSource check fails on commits/PRs (#1149)

* WhiteSource is not properly comparing scans against the latest changes
in `main`. This prevents the need to override checks to merge PRs for
those who don't have access (like the Dashboards Core members).
* Cleans up the WhiteSource config file. We don't need gradle,
maven, go, python, or ruby scans enabled.
* Replaces the deprecated `ignoreSourceFiles` config with
`fileSystemScan`.

Resolves #1150

Signed-off-by: Tommy Markley <markleyt@amazon.com>
---
 .whitesource       |  2 +-
 whitesource.config | 50 +++++++++++-----------------------------------
 2 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/.whitesource b/.whitesource
index 7dd2131e7c7d..a2f32de58b68 100644
--- a/.whitesource
+++ b/.whitesource
@@ -6,7 +6,7 @@
     "baseBranches": []
   },
   "checkRunSettings": {
-    "vulnerableCheckRunConclusionLevel": "failure",
+    "vulnerableCheckRunConclusionLevel": "success",
     "displayMode": "diff"
   },
   "issueSettings": {
diff --git a/whitesource.config b/whitesource.config
index ca19e7dff9f7..57dda2c6f696 100644
--- a/whitesource.config
+++ b/whitesource.config
@@ -52,7 +52,7 @@ forceUpdate.failBuildOnPolicyViolation=false
 ###########
 #offline=false
 #updateType=APPEND
-#ignoreSourceFiles=true
+fileSystemScan=true
 #scanComment=
 #failErrorLevel=ALL
 #requireKnownSha1=false
@@ -78,18 +78,18 @@ forceUpdate.failBuildOnPolicyViolation=false
 resolveAllDependencies=false
 #excludeDependenciesFromNodes=.*commons-io.*,.*maven-model
 
-#npm.resolveDependencies=false
-#npm.ignoreSourceFiles=false
-#npm.includeDevDependencies=true
-#npm.runPreStep=true
-#npm.ignoreNpmLsErrors=true
+npm.resolveDependencies=true
+npm.ignoreSourceFiles=false
+npm.includeDevDependencies=true
+npm.runPreStep=true
+npm.ignoreNpmLsErrors=true
 #npm.ignoreScripts=true
-#npm.yarnProject=true
+npm.yarnProject=true
 #npm.accessToken=
 #npm.identifyByNameAndVersion=true
-#npm.yarn.frozenLockfile=true
-#npm.resolveMainPackageJsonOnly=true
-#npm.removeDuplicateDependencies=false
+npm.yarn.frozenLockfile=true
+npm.resolveMainPackageJsonOnly=false
+npm.removeDuplicateDependencies=true
 #npm.resolveAdditionalDependencies=true
 #npm.failOnNpmLsErrors =
 #npm.projectNameFromDependencyFile = true
@@ -142,32 +142,6 @@ resolveAllDependencies=false
 #maven.additionalArguments=
 #maven.projectNameFromDependencyFile=true
 
-resolveAllDependencies=false
-archiveExtractionDepth=7
-followSymbolicLinks=true
-gradle.resolveDependencies=true
-gradle.aggregateModules=true
-gradle.preferredEnvironment=wrapper
-maven.resolveDependencies=true
-maven.runPreStep=true
-maven.aggregateModules=true
-maven.ignoredScopes=None
-html.resolveDependencies=true
-npm.resolveDependencies=true
-npm.runPreStep=true
-npm.yarnProject=true
-go.resolveDependencies=true
-go.collectDependenciesAtRuntime=true
-go.dependencyManager=
-python.resolveDependencies=true
-python.ignoreSourceFiles=true
-python.runPipenvPreStep=true
-python.pipenvDevDependencies=true
-python.requirementsFileIncludes=dev-requirements.txt
-python.installVirtualenv=true
-ruby.resolveDependencies=true
-ruby.ignoreSourceFiles=false
-
 #gradle.ignoredScopes=
 #gradle.resolveDependencies=true
 #gradle.runAssembleCommand=true
@@ -214,7 +188,7 @@ ruby.ignoreSourceFiles=false
 #php.runPreStep=true
 #php.includeDevDependencies=true
 
-#html.resolveDependencies=false
+html.resolveDependencies=true
 
 #cocoapods.resolveDependencies=false
 #cocoapods.runPreStep=true
@@ -274,7 +248,7 @@ followSymbolicLinks=true
 ######################
 # Archive properties #
 ######################
-#archiveExtractionDepth=2
+archiveExtractionDepth=7
 #archiveIncludes=**/*.war **/*.ear
 #archiveExcludes=**/*sources.jar