snyk 1.1061.0 → 1.1062.0

package/dist/cli/thirdPartyNotice.json

@@ -2484,10 +2484,10 @@
   },
   {
     "name": "snyk-gradle-plugin",
-    "version": "3.24.5",
+    "version": "3.24.6",
     "author": "snyk.io",
     "repository": "https://github.com/snyk/snyk-gradle-plugin",
-    "source": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.24.5.tgz",
+    "source": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.24.6.tgz",
     "license": "Apache-2.0",
     "licenseText": "Copyright 2017 Snyk Ltd.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n"
   },

package/dist/lib/init.gradle

@@ -336,22 +336,29 @@ allprojects { Project currProj ->
                 def resolvableConfigs = findProjectConfigs(proj, confNameFilter, confAttrSpec)
                 def resolvedConfigs = []
                 resolvableConfigs.each({ config ->
-                    def resConf = config.resolvedConfiguration
+                    ResolvedConfiguration resConf = config.getResolvedConfiguration()
                     debugLog("config `$config.name' resolution has errors: ${resConf.hasError()}")
                     if (!resConf.hasError()) {
                         resolvedConfigs.add(resConf)
-                        debugLog("first level module dependencies for config `$config.name': $resConf.firstLevelModuleDependencies")
+                        debugLog("Fully resolved config `$config.name' with deps: $resConf.firstLevelModuleDependencies")
+                    } else {
+                        // even if some dependencies fail to resolve, we prefer a partial result to none
+                        LenientConfiguration lenientConf = resConf.getLenientConfiguration()
+                        debugLog("Partially resolved config `$config.name' with: $lenientConf.firstLevelModuleDependencies")
+                        debugLog("Couldn't resolve: ${lenientConf.getUnresolvedModuleDependencies()}")
+                        resolvedConfigs.add(lenientConf)
                     }
                 })
                 if (resolvedConfigs.isEmpty() && !resolvableConfigs.isEmpty()) {
                     throw new RuntimeException('Configurations: ' + resolvableConfigs.collect { it.name } +
                             ' for project ' + proj + ' could not be resolved.')
                 }
+                List nonemptyFirstLevelDeps = [] 
+                resolvedConfigs.each { nonemptyFirstLevelDeps.addAll(it.getFirstLevelModuleDependencies()) }
 
-                def nonemptyFirstLevelDeps = resolvedConfigs.resolvedConfiguration.firstLevelModuleDependencies.findAll({ !it.isEmpty() })
                 debugLog("non-empty first level deps for project `$proj.name': $nonemptyFirstLevelDeps")
-                
                 debugLog('converting gradle graph to snyk-graph format')
+                
                 def projGraph = getSnykGraph(nonemptyFirstLevelDeps)
                 String projKey = formatPath(proj.path)
                 // if project is root ":", it's formatted to "" - we can't have an empty string as a key so use default name
@@ -455,11 +462,16 @@ allprojects { Project currProj ->
                 def resolvableConfigs = findProjectConfigs(proj, confNameFilter, confAttrSpec)
                 def resolvedConfigs = []
                 resolvableConfigs.each({ config ->
-                    def resConf = config.resolvedConfiguration
+                    ResolvedConfiguration resConf = config.resolvedConfiguration
                     debugLog("config `$config.name' resolution has errors: ${resConf.hasError()}")
                     if (!resConf.hasError()) {
                         resolvedConfigs.add(resConf)
-                        debugLog("first level module dependencies for config `$config.name': $resConf.firstLevelModuleDependencies")
+                        debugLog("Fully resolved config `$config.name' with: $resConf.firstLevelModuleDependencies")
+                    } else { 
+                        LenientConfiguration lenientConf = resConf.getLenientConfiguration()
+                        debugLog("Partially resolved config `$config.name' with: $lenientConf.firstLevelModuleDependencies")
+                        debugLog("Couldn't resolve: ${lenientConf.getUnresolvedModuleDependencies()}")
+                        resolvedConfigs.add(lenientConf)
                     }
                 })
                 if (!resolvableConfigs.isEmpty() && resolvedConfigs.isEmpty()) {
@@ -467,8 +479,9 @@ allprojects { Project currProj ->
                             ' for project ' + proj + ' could not be resolved.')
                 }
                 
-                def nonemptyFirstLevelDeps = resolvedConfigs.resolvedConfiguration.firstLevelModuleDependencies.findAll({ !it.isEmpty() })
-                
+                List nonemptyFirstLevelDeps = [] 
+                resolvedConfigs.each { nonemptyFirstLevelDeps.addAll(it.getFirstLevelModuleDependencies()) }
+
                 debugLog("non-empty first level deps for project `$proj.name': $nonemptyFirstLevelDeps")
                 debugLog('converting gradle graph to snyk-graph format')
                 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snyk",
-  "version": "1.1061.0",
+  "version": "1.1062.0",
   "description": "snyk library and cli utility",
   "files": [
     "help/cli-commands",