Merge pull request #67 from snyk-tech-services/develop

release change
snyk-tech-services · May 7, 2021 · c1c017d · c1c017d
2 parents b7ae082 + f3d1f1f
commit c1c017d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/src/lib/index.ts b/src/lib/index.ts
@@ -124,12 +124,16 @@ const getDelta = async(snykTestOutput: string = '', debugMode = false):Promise<S
     }
 
 
-    if(module.parent){
+    if(!module.parent || (isJestTesting() && !expect.getState().currentTestName.includes('module'))){
       displayOutput(newVulns,newLicenseIssues,issueTypeFilter,mode)
     }
 
 
-
+    if(newVulns.length + newLicenseIssues.length > 0){
+      process.exitCode = 1
+    } else {
+      process.exitCode = 0
+    }
 
 
   } catch (err){

diff --git a/src/lib/snyk/issues.ts b/src/lib/snyk/issues.ts
@@ -32,8 +32,10 @@ const getNewIssues = (
   MonitoredIssues.forEach((monitoredIssue) => {
     newIssues = _.reject(newIssues, (issue) => {
       let issueFromArray = issue.from;
+      let upgradePathArray = issue.upgradePath
       if (mode == 'inline') {
         issueFromArray = issueFromArray.slice(1, issueFromArray.length);
+        upgradePathArray = upgradePathArray? upgradePathArray.slice(1, issueFromArray.length):undefined;
       }
 
       return (

diff --git a/test/lib/index-inline.test.ts b/test/lib/index-inline.test.ts
@@ -120,7 +120,7 @@ describe('Test End 2 End - Inline mode', () => {
     expect(mockExit).toHaveBeenCalledWith(1);
   });
 
-  it('Test Inline mode - no new issue go modules project', async () => {
+  it('Test Inline mode - no new issue gomod project', async () => {
     setTimeout(() => {
       stdinMock.send(
         fs

diff --git a/test/lib/index-module.test.ts b/test/lib/index-module.test.ts
@@ -66,7 +66,6 @@ describe('Test End 2 End - Module', () => {
         .readFileSync(fixturesFolderPath + 'snykTestsOutputs/test-goof.json')
         .toString(),
     );
-    expect(consoleOutput).toContain('No new issues found !');
     const expectedResult = { result: 0, newVulns: [], newLicenseIssues: [] };
     expect(result).toEqual(expectedResult);
   });
@@ -79,7 +78,6 @@ describe('Test End 2 End - Module', () => {
       true,
     );
     expect(debug('snyk')).toBeTruthy();
-    expect(consoleOutput).toContain('No new issues found !');
     const expectedResult = { result: 0, newVulns: [], newLicenseIssues: [] };
     expect(result).toEqual(expectedResult);
   });
@@ -94,18 +92,6 @@ describe('Test End 2 End - Module', () => {
         .toString(),
     );
 
-    const expectedOutput = [
-      'New issue introduced !',
-      'Security Vulnerability:',
-      '  1/1: Regular Expression Denial of Service (ReDoS) [High Severity]',
-      '    Via: [email protected] => @snyk/[email protected] => [email protected]',
-      '    Fixed in: acorn 5.7.4, 6.4.1, 7.1.1',
-      '    Fixable by upgrade:  @snyk/[email protected]=>[email protected]',
-    ];
-
-    expectedOutput.forEach((line: string) => {
-      expect(consoleOutput.join()).toContain(line);
-    });
     const expectedResult = {
       result: 1,
       newVulns: [
@@ -159,6 +145,7 @@ describe('Test End 2 End - Module', () => {
           severity: 'high',
           title: 'Regular Expression Denial of Service (ReDoS)',
           from: [
+            '[email protected]',
             '[email protected]',
             '@snyk/[email protected]',
             '[email protected]',