From 141e721fc01df9d4c7682f8c118005569d91b05d Mon Sep 17 00:00:00 2001 From: joshua-ostrom Date: Fri, 23 Apr 2021 15:01:17 -0400 Subject: [PATCH 1/2] Version bump to 2.11.6 --- lib/salus.rb | 2 +- spec/fixtures/integration/expected_report.json | 2 +- spec/fixtures/processor/local_uri/expected_report.json | 2 +- spec/fixtures/processor/remote_uri/expected_report.json | 2 +- spec/fixtures/yarn_audit/success_with_exclusions/yarn.lock | 2 +- spec/lib/salus/report_spec.rb | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/salus.rb b/lib/salus.rb index 424082cd..3c9e76f4 100644 --- a/lib/salus.rb +++ b/lib/salus.rb @@ -9,7 +9,7 @@ require 'sarif/sarif_report' module Salus - VERSION = '2.11.5'.freeze + VERSION = '2.11.6'.freeze DEFAULT_REPO_PATH = './repo'.freeze # This is inside the docker container at /home/repo. SafeYAML::OPTIONS[:default_mode] = :safe diff --git a/spec/fixtures/integration/expected_report.json b/spec/fixtures/integration/expected_report.json index 47590f65..957a0f2f 100644 --- a/spec/fixtures/integration/expected_report.json +++ b/spec/fixtures/integration/expected_report.json @@ -1,5 +1,5 @@ { - "version": "2.11.5", + "version": "2.11.6", "passed": true, "running_time": 0.0, "scans": { diff --git a/spec/fixtures/processor/local_uri/expected_report.json b/spec/fixtures/processor/local_uri/expected_report.json index 4d8832f8..af7cc8df 100644 --- a/spec/fixtures/processor/local_uri/expected_report.json +++ b/spec/fixtures/processor/local_uri/expected_report.json @@ -1,5 +1,5 @@ { - "version": "2.11.5", + "version": "2.11.6", "passed": true, "running_time": 0.0, "scans": { diff --git a/spec/fixtures/processor/remote_uri/expected_report.json b/spec/fixtures/processor/remote_uri/expected_report.json index 43702aab..9f24a15b 100644 --- a/spec/fixtures/processor/remote_uri/expected_report.json +++ b/spec/fixtures/processor/remote_uri/expected_report.json @@ -1,5 +1,5 @@ { - "version": "2.11.5", + "version": "2.11.6", "passed": true, "running_time": 0.0, "scans": { diff --git a/spec/fixtures/yarn_audit/success_with_exclusions/yarn.lock b/spec/fixtures/yarn_audit/success_with_exclusions/yarn.lock index 036bb605..52bda8f0 100644 --- a/spec/fixtures/yarn_audit/success_with_exclusions/yarn.lock +++ b/spec/fixtures/yarn_audit/success_with_exclusions/yarn.lock @@ -1717,7 +1717,7 @@ status-board@1.1.80: string_decoder@^1.1.1: version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42.11.694a46cf1a8e30b0a84f56c78c3edac21e" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== dependencies: safe-buffer "~5.2.0" diff --git a/spec/lib/salus/report_spec.rb b/spec/lib/salus/report_spec.rb index 166afcbc..3ee3156f 100644 --- a/spec/lib/salus/report_spec.rb +++ b/spec/lib/salus/report_spec.rb @@ -188,7 +188,7 @@ def build_report(report_uri) report = build_report(directive) stub_request(:post, "https://nerv.tk3/salus-report").with(body: "{\n \"foo\": \"bar\",\n"\ - " \"abc\": \"def\",\n \"report\": {\n \"version\": \"2.11.5\",\n \"project_nam"\ + " \"abc\": \"def\",\n \"report\": {\n \"version\": \"2.11.6\",\n \"project_nam"\ "e\": \"eva00\",\n \"passed\": false,\n \"scans\": {\n \"DerpScanner\": {\n "\ " \"scanner_name\": \"DerpScanner\",\n \"passed\": false,\n \"warn"\ "\": {\n },\n \"info\": {\n \"asdf\": \"qwerty\"\n },\n "\ @@ -214,7 +214,7 @@ def build_report(report_uri) report = build_report(directive) stub_request(:post, "https://nerv.tk3/salus-report").with(body: "---\nfoo: bar\nabc: def\n"\ - "report:\n :version: 2.11.5\n :project_name: eva00\n :passed: false\n :scans:\n "\ + "report:\n :version: 2.11.6\n :project_name: eva00\n :passed: false\n :scans:\n "\ "DerpScanner:\n :scanner_name: DerpScanner\n :passed: false\n :warn: {}\n"\ " :info:\n :asdf: qwerty\n :errors: []\n :errors:\n - :message: derp"\ "\n - :message: derp\n - :message: derp\n - :message: derp\n - :message: derp\n "\ @@ -239,7 +239,7 @@ def build_report(report_uri) report.instance_variable_set(:@config, config) stub_request(:post, "https://nerv.tk3/salus-report").with(body: "{\"foo\"=>\"bar\", \"abc"\ - "\"=>\"def\", \"report\"=>\"==== Salus Scan v2.11.5 for eva00\\n\\n==== Salus "\ + "\"=>\"def\", \"report\"=>\"==== Salus Scan v2.11.6 for eva00\\n\\n==== Salus "\ "Configuration Files Used:\\n\\n word\\n\\n\\n==== Salus Errors\\n\\n [\\n {\\n "\ " \\\"message\\\": \\\"derp\\\"\\n },\\n {\\n \\\"message\\\": \\\"derp\\"\ "\"\\n },\\n {\\n \\\"message\\\": \\\"derp\\\"\\n },\\n {\\n "\ From ddde9a60d3f92c2245f843732195fef9ae93e3f9 Mon Sep 17 00:00:00 2001 From: joshua-ostrom Date: Fri, 23 Apr 2021 15:03:14 -0400 Subject: [PATCH 2/2] reverted change from greedy grep --- spec/fixtures/yarn_audit/success_with_exclusions/yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/fixtures/yarn_audit/success_with_exclusions/yarn.lock b/spec/fixtures/yarn_audit/success_with_exclusions/yarn.lock index 52bda8f0..036bb605 100644 --- a/spec/fixtures/yarn_audit/success_with_exclusions/yarn.lock +++ b/spec/fixtures/yarn_audit/success_with_exclusions/yarn.lock @@ -1717,7 +1717,7 @@ status-board@1.1.80: string_decoder@^1.1.1: version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42.11.694a46cf1a8e30b0a84f56c78c3edac21e" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== dependencies: safe-buffer "~5.2.0"