IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Snyk] Security upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.325 to 1.12.330 (#768)

Browse Source 
* fix: nb-api/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-3038424

* Timing change for github actions; warnings cleanup/refactor

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: jeffbanks <jeff.banks@datastax.com>
This commit is contained in:
Jonathan Shook 2022-11-14 18:32:52 -06:00 committed by GitHub
parent 2158dfa339
commit 33e330dc35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nb-api/pom.xml
View File

@ -97,7 +97,7 @@
<dependency> <dependency>
<groupId>com.amazonaws</groupId> <groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId> <artifactId>aws-java-sdk-s3</artifactId>
<version>1.12.325</version> <version>1.12.330</version>
</dependency> </dependency>
<dependency> <dependency>

25
nbr/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java
View File

@ -19,40 +19,40 @@ package io.nosqlbench.cli.testing;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
public class ExitStatusIntegrationTests { class ExitStatusIntegrationTests {
private final String java = Optional.ofNullable(System.getenv( private final String java = Optional.ofNullable(System.getenv(
"JAVA_HOME")).map(v -> v+"/bin/java").orElse("java"); "JAVA_HOME")).map(v -> v + "/bin/java").orElse("java");
private final static String JARNAME = "target/nbr.jar"; private final static String JARNAME = "target/nbr.jar";
@Test @Test
public void testExitStatusOnBadParam() { void testExitStatusOnBadParam() {
ProcessInvoker invoker = new ProcessInvoker(); ProcessInvoker invoker = new ProcessInvoker();
invoker.setLogDir("logs/test"); invoker.setLogDir("logs/test");
ProcessResult result = invoker.run("exitstatus_badparam", 15, ProcessResult result = invoker.run("exitstatus_badparam", 15,
java, "-jar", JARNAME, "--logs-dir", "logs/test/badparam/", java, "-jar", JARNAME, "--logs-dir", "logs/test/badparam/",
"badparam" "badparam"
); );
assertThat(result.exception).isNull(); assertThat(result.exception).isNull();
String stderr = result.getStderrData().stream().collect(Collectors.joining("\n")); String stderr = String.join("\n", result.getStderrData());
assertThat(stderr).contains("Scenario stopped due to error"); assertThat(stderr).contains("Scenario stopped due to error");
assertThat(result.exitStatus).isEqualTo(2); assertThat(result.exitStatus).isEqualTo(2);
} }
@Test @Test
public void testExitStatusOnActivityInitException() { void testExitStatusOnActivityInitException() {
ProcessInvoker invoker = new ProcessInvoker(); ProcessInvoker invoker = new ProcessInvoker();
invoker.setLogDir("logs/test"); invoker.setLogDir("logs/test");
ProcessResult result = invoker.run("exitstatus_initexception", 15, ProcessResult result = invoker.run("exitstatus_initexception", 15,
java, "-jar", JARNAME, "--logs-dir", "logs/test/initerror", "run", java, "-jar", JARNAME, "--logs-dir", "logs/test/initerror", "run",
"driver=diag", "op=initdelay:initdelay=notanumber" "driver=diag", "op=initdelay:initdelay=notanumber"
); );
assertThat(result.exception).isNull(); assertThat(result.exception).isNull();
String stderr = result.getStdoutData().stream().collect(Collectors.joining("\n")); String stderr = String.join("\n", result.getStdoutData());
assertThat(stderr).contains("For input string: \"notanumber\""); assertThat(stderr).contains("For input string: \"notanumber\"");
assertThat(result.exitStatus).isEqualTo(2); assertThat(result.exitStatus).isEqualTo(2);
} }
@ -73,19 +73,18 @@ public class ExitStatusIntegrationTests {
// } // }
@Test @Test
public void testExitStatusOnActivityOpException() { void testExitStatusOnActivityOpException() {
ProcessInvoker invoker = new ProcessInvoker(); ProcessInvoker invoker = new ProcessInvoker();
invoker.setLogDir("logs/test"); invoker.setLogDir("logs/test");
ProcessResult result = invoker.run("exitstatus_asyncstoprequest", 30, ProcessResult result = invoker.run("exitstatus_asyncstoprequest", 30,
java, "-jar", JARNAME, "--logs-dir", "logs/test/asyncstop", "run", java, "-jar", JARNAME, "--logs-dir", "logs/test/asyncstop", "run",
"driver=diag", "cyclerate=5", "op=erroroncycle:erroroncycle=10", "cycles=2000", "-vvv" "driver=diag", "cyclerate=1", "op=erroroncycle:erroroncycle=10", "cycles=2000", "-vvv"
); );
assertThat(result.exception).isNull(); assertThat(result.exception).isNull();
String stdout = result.getStdoutData().stream().collect(Collectors.joining("\n")); String stdout = String.join("\n", result.getStdoutData());
assertThat(stdout).contains("Diag was requested to stop on cycle 10"); assertThat(stdout).contains("Diag was requested to stop on cycle 10");
assertThat(result.exitStatus).isEqualTo(2); assertThat(result.exitStatus).isEqualTo(2);
} }
} }