snyk 1.1124.0 → 1.1126.0

package/dist/cli/thirdPartyNotice.json

@@ -2520,10 +2520,10 @@
   },
   {
     "name": "snyk-gradle-plugin",
-    "version": "3.26.0",
+    "version": "3.26.1",
     "author": "snyk.io",
     "repository": "https://github.com/snyk/snyk-gradle-plugin",
-    "source": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.26.0.tgz",
+    "source": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.26.1.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

@@ -288,11 +288,12 @@ allprojects { Project currProj ->
     )
     
     task snykResolvedDepsJson {
-
         doLast { task ->
             if (snykDepsConfExecuted) {
                 return
             }
+
+            snykDepsConfExecuted = true
             debugLog('snykResolvedDepsJson task is executing via doLast')
             // debugLog("onlyProj=$onlyProj; confNameFilter=$confNameFilter; confAttrSpec=$confAttrSpec")
             // First pass: scan all configurations that match the attribute filter and collect all attributes
@@ -383,7 +384,6 @@ allprojects { Project currProj ->
             ]
             def jsonDeps = JsonOutput.toJson(result)
             println("JSONDEPS $jsonDeps")
-            snykDepsConfExecuted = true
         }
     }
     
@@ -393,6 +393,8 @@ allprojects { Project currProj ->
             if (snykDepsConfExecuted) {
                 return
             }
+            
+            snykDepsConfExecuted = true
             debugLog('snykNormalizedResolvedDepsJson task is executing via doLast')
             // debugLog("onlyProj=$onlyProj; confNameFilter=$confNameFilter; confAttrSpec=$confAttrSpec")
             // First pass: scan all configurations that match the attribute filter and collect all attributes
@@ -485,7 +487,6 @@ allprojects { Project currProj ->
 
             def jsonDeps = JsonOutput.toJson(result)
             println("JSONDEPS $jsonDeps")
-            snykDepsConfExecuted = true
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snyk",
-  "version": "1.1124.0",
+  "version": "1.1126.0",
   "description": "snyk library and cli utility",
   "files": [
     "*"

package/src/generated/sha256sums.txt

@@ -1,10 +1,10 @@
-186d38ac68bb8903ccc47f50e42d1cd352ac6346c1ac1375aa9f9c7643ec7353  docker-mac-signed-bundle.tar.gz
-c1a29dbd4362bce0d6469a92949ebbf3dbac2a9a51ae051c7183b8f733196b3e  snyk-alpine
-11986648a2ccec5b40ea35f3604cb1d448a57269ca152760f346f6f006374609  snyk-fix.tgz
-61f1fd3bb9b266b26acb226f0b21276a4e35a0174af2eeb32926b4603eab8656  snyk-for-docker-desktop-darwin-arm64.tar.gz
-65b4921545e8fb285ee9dd8a27263daaa45972bf693eb3a620f0f09e869c5d6c  snyk-for-docker-desktop-darwin-x64.tar.gz
-0b79dcca8f28cea1d329dccae449253eb1f25fc34046f93c0ab837f4a10f257b  snyk-linux-arm64
-280821caef2597ea4ec83235224a62ae5bd59e757c6fed53a600978ed68da108  snyk-linux
-addc3240329b6a7038fce4141ca244e83feb1db0e0a6bd03aae1af065b3d3a8e  snyk-macos
-01236ed2795d01c52e908bde427e3da526e8a6a59ebee3fc542a606feed9769f  snyk-protect.tgz
-772354868df6af753f70c414b77993d40310a596a2d147f457dd5a6d23ea5c36  snyk-win.exe
+4aa2f3d0196cf450e390f48b09ce05a6e47ec54087dfa507dd6f9f448ebbca28  docker-mac-signed-bundle.tar.gz
+e42a63055a409d25a7d5c419fc5aa4160d57aeabe0fced9919ae328cd475fa9c  snyk-alpine
+a8406607b502fefd0eb6945f25232a0fd09206a03002d63978c5c213e21bc93a  snyk-fix.tgz
+3e4ef35327f446e72d5c3785c728ef3678f7b75bbe5fd52ea0174104bf1d33f0  snyk-for-docker-desktop-darwin-arm64.tar.gz
+884f03606b2dda14e1e3f7c68a351cd45526e58b1462de89daa476d6173542b3  snyk-for-docker-desktop-darwin-x64.tar.gz
+5536c1ae5e1e4ebcaa3101a81075cb506e6cf76714bd173cc3d0bde15028bd70  snyk-linux-arm64
+b902f238e0ac0e0883d62f11fbd97d5fdcda2a5dcedce89f1f79389959002bb0  snyk-linux
+04aad4e327cf2f136964e1a50511c20fe713231d6ce2478e006dece2853d0079  snyk-macos
+cd0c412594cb6dbab62b5bd1b021ee70890a82f77bd91d34d498ab7ae86c9ac1  snyk-protect.tgz
+708d98c6bed91f532d9f257260b19b71ca4e73eba90e64471bb20ccee3a05234  snyk-win.exe

package/src/generated/version

@@ -1 +1 @@
-1.1124.0
+1.1126.0

package/test/acceptance/basic.spec.ts

@@ -42,8 +42,16 @@ describe('Basic acceptance test', () => {
       'node ' + bootstrapScript + ' exec',
       { shell: true },
     );
-    console.debug(resultBootstrap.stdout.toString());
-    console.error(resultBootstrap.stderr.toString());
+
+    if (resultBootstrap.status != 0) {
+      console.debug(resultBootstrap.stdout.toString());
+      console.error(resultBootstrap.stderr.toString());
+    }
+
+    // The binary wrapper should not output anything to stdout
+    // as it will conflict with stdout from the CLI leading to incidents
+    expect(resultBootstrap.stdout.toString()).toEqual('');
+
     expect(resultBootstrap.status).toEqual(0);
     expect(fs.existsSync(executable)).toBeTruthy();
 
@@ -94,9 +102,14 @@ describe('Basic acceptance test', () => {
 
     expect(fs.existsSync(executable)).toBeTruthy();
     expect(resultIndex.status).toEqual(0);
+    // The binary wrapper should not output anything to stdout
+    // Assert the only stdout is from the CLI --version flag
     expect(
-      resultIndex.stdout.toString().includes(cliVersionForTesting),
-    ).toBeTruthy();
+      resultIndex.stdout
+        .toString()
+        .split(' ')[0]
+        .trim(),
+    ).toEqual(cliVersionForTesting);
 
     fs.unlinkSync(executable);
   });
@@ -197,8 +210,11 @@ describe('Basic acceptance test', () => {
       'node ' + bootstrapScript + ' exec',
       { shell: true, env: { ...process.env } },
     );
-    console.debug(resultBootstrap.stdout.toString());
-    console.error(resultBootstrap.stderr.toString());
+
+    if (resultBootstrap.status != 0) {
+      console.debug(resultBootstrap.stdout.toString());
+      console.error(resultBootstrap.stderr.toString());
+    }
 
     const expectedErrorMessage = 'ECONNREFUSED';
     const expectedError = resultBootstrap.stderr

package/wrapper_dist/generated/sha256sums.txt

@@ -1,10 +1,10 @@
-186d38ac68bb8903ccc47f50e42d1cd352ac6346c1ac1375aa9f9c7643ec7353  docker-mac-signed-bundle.tar.gz
-c1a29dbd4362bce0d6469a92949ebbf3dbac2a9a51ae051c7183b8f733196b3e  snyk-alpine
-11986648a2ccec5b40ea35f3604cb1d448a57269ca152760f346f6f006374609  snyk-fix.tgz
-61f1fd3bb9b266b26acb226f0b21276a4e35a0174af2eeb32926b4603eab8656  snyk-for-docker-desktop-darwin-arm64.tar.gz
-65b4921545e8fb285ee9dd8a27263daaa45972bf693eb3a620f0f09e869c5d6c  snyk-for-docker-desktop-darwin-x64.tar.gz
-0b79dcca8f28cea1d329dccae449253eb1f25fc34046f93c0ab837f4a10f257b  snyk-linux-arm64
-280821caef2597ea4ec83235224a62ae5bd59e757c6fed53a600978ed68da108  snyk-linux
-addc3240329b6a7038fce4141ca244e83feb1db0e0a6bd03aae1af065b3d3a8e  snyk-macos
-01236ed2795d01c52e908bde427e3da526e8a6a59ebee3fc542a606feed9769f  snyk-protect.tgz
-772354868df6af753f70c414b77993d40310a596a2d147f457dd5a6d23ea5c36  snyk-win.exe
+4aa2f3d0196cf450e390f48b09ce05a6e47ec54087dfa507dd6f9f448ebbca28  docker-mac-signed-bundle.tar.gz
+e42a63055a409d25a7d5c419fc5aa4160d57aeabe0fced9919ae328cd475fa9c  snyk-alpine
+a8406607b502fefd0eb6945f25232a0fd09206a03002d63978c5c213e21bc93a  snyk-fix.tgz
+3e4ef35327f446e72d5c3785c728ef3678f7b75bbe5fd52ea0174104bf1d33f0  snyk-for-docker-desktop-darwin-arm64.tar.gz
+884f03606b2dda14e1e3f7c68a351cd45526e58b1462de89daa476d6173542b3  snyk-for-docker-desktop-darwin-x64.tar.gz
+5536c1ae5e1e4ebcaa3101a81075cb506e6cf76714bd173cc3d0bde15028bd70  snyk-linux-arm64
+b902f238e0ac0e0883d62f11fbd97d5fdcda2a5dcedce89f1f79389959002bb0  snyk-linux
+04aad4e327cf2f136964e1a50511c20fe713231d6ce2478e006dece2853d0079  snyk-macos
+cd0c412594cb6dbab62b5bd1b021ee70890a82f77bd91d34d498ab7ae86c9ac1  snyk-protect.tgz
+708d98c6bed91f532d9f257260b19b71ca4e73eba90e64471bb20ccee3a05234  snyk-win.exe

package/wrapper_dist/generated/version

@@ -1 +1 @@
-1.1124.0
+1.1126.0