From ed13657739bb730005d41b2f65ce2d6eb4b00e97 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 25 Oct 2022 16:28:57 +0000 Subject: [PATCH 01/16] fix: upgrade joda-time:joda-time from 2.11.1 to 2.11.2 Snyk has created this PR to upgrade joda-time:joda-time from 2.11.1 to 2.11.2. See this package in Maven Repository: https://mvnrepository.com/artifact/joda-time/joda-time/ See this project in Snyk: https://app.snyk.io/org/jshook/project/09fc6e1d-d8e8-4721-976a-762f04735cdc?utm_source=github&utm_medium=referral&page=upgrade-pr --- mvn-defaults/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 1853f1d24..80e43ae83 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -301,7 +301,7 @@ joda-time joda-time - 2.11.1 + 2.11.2 From 02257d41bbd50d95155af90c1e18990c200c3456 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 25 Oct 2022 16:59:33 +0000 Subject: [PATCH 02/16] fix: upgrade org.yaml:snakeyaml from 1.32 to 1.33 Snyk has created this PR to upgrade org.yaml:snakeyaml from 1.32 to 1.33. See this package in Maven Repository: https://mvnrepository.com/artifact/org.yaml/snakeyaml/ See this project in Snyk: https://app.snyk.io/org/jshook/project/03cbee46-d5d2-41d3-89cc-a2ad77ab807a?utm_source=github&utm_medium=referral&page=upgrade-pr --- mvn-defaults/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 1853f1d24..7ddd990ee 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -46,7 +46,7 @@ 2.4.14.Final 1.0.0 - 1.32 + 1.33 1.1.2.6 From 74db1d97e413ed240c4c19691d5d9cf1e8a9227b Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 25 Oct 2022 16:59:36 +0000 Subject: [PATCH 03/16] fix: upgrade org.eclipse.jetty:jetty-rewrite from 11.0.11 to 11.0.12 Snyk has created this PR to upgrade org.eclipse.jetty:jetty-rewrite from 11.0.11 to 11.0.12. See this package in Maven Repository: https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-rewrite/ See this project in Snyk: https://app.snyk.io/org/jshook/project/03cbee46-d5d2-41d3-89cc-a2ad77ab807a?utm_source=github&utm_medium=referral&page=upgrade-pr --- docsys/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 02a8e5490..de78f3778 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -65,7 +65,7 @@ org.eclipse.jetty jetty-rewrite - 11.0.11 + 11.0.12 From f64a25280f60f597da49c44ca9ccfeb9059d10f0 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 25 Oct 2022 16:59:42 +0000 Subject: [PATCH 04/16] fix: upgrade org.eclipse.jetty:jetty-servlet from 11.0.11 to 11.0.12 Snyk has created this PR to upgrade org.eclipse.jetty:jetty-servlet from 11.0.11 to 11.0.12. See this package in Maven Repository: https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-servlet/ See this project in Snyk: https://app.snyk.io/org/jshook/project/03cbee46-d5d2-41d3-89cc-a2ad77ab807a?utm_source=github&utm_medium=referral&page=upgrade-pr --- docsys/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 02a8e5490..b7b8ebd63 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -60,7 +60,7 @@ org.eclipse.jetty jetty-servlet - 11.0.11 + 11.0.12 org.eclipse.jetty From 927f4e2c6f7e607165b5c55ea144e4da86d02062 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 25 Oct 2022 16:59:47 +0000 Subject: [PATCH 05/16] fix: upgrade org.eclipse.jetty:jetty-servlets from 11.0.11 to 11.0.12 Snyk has created this PR to upgrade org.eclipse.jetty:jetty-servlets from 11.0.11 to 11.0.12. See this package in Maven Repository: https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-servlets/ See this project in Snyk: https://app.snyk.io/org/jshook/project/03cbee46-d5d2-41d3-89cc-a2ad77ab807a?utm_source=github&utm_medium=referral&page=upgrade-pr --- docsys/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 02a8e5490..3b36a0d67 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -55,7 +55,7 @@ org.eclipse.jetty jetty-servlets - 11.0.11 + 11.0.12 org.eclipse.jetty From bb27a6f7fbc7f6236e0557cdd4cf8dcc822758f0 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 27 Oct 2022 18:58:07 +0000 Subject: [PATCH 06/16] fix: upgrade io.swagger.core.v3:swagger-models from 2.2.2 to 2.2.3 Snyk has created this PR to upgrade io.swagger.core.v3:swagger-models from 2.2.2 to 2.2.3. See this package in Maven Repository: https://mvnrepository.com/artifact/io.swagger.core.v3/swagger-models/ See this project in Snyk: https://app.snyk.io/org/jshook/project/b808ba5a-fa96-49c2-9cae-4c2c2f8a1384?utm_source=github&utm_medium=referral&page=upgrade-pr --- engine-rest/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index c1b72cd64..25583745a 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -29,7 +29,7 @@ io.swagger.core.v3 swagger-models - 2.2.2 + 2.2.3 From 9a92129a83b74071b456928b8014bc35f80d623e Mon Sep 17 00:00:00 2001 From: phact Date: Tue, 1 Nov 2022 10:42:00 -0400 Subject: [PATCH 07/16] base64 --- .../from_bytebuffer/to_string/ToBase64.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_bytebuffer/to_string/ToBase64.java diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_bytebuffer/to_string/ToBase64.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_bytebuffer/to_string/ToBase64.java new file mode 100644 index 000000000..95e3f9303 --- /dev/null +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_bytebuffer/to_string/ToBase64.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2022 nosqlbench + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.nosqlbench.virtdata.library.basics.shared.from_bytebuffer.to_string; + +import com.amazonaws.util.Base64; +import io.nosqlbench.virtdata.api.annotations.Categories; +import io.nosqlbench.virtdata.api.annotations.Category; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; + +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.function.Function; + +/** + * Takes a bytebuffer and turns it into a base64 string + */ + +@ThreadSafeMapper +@Categories({Category.general}) +public class ToBase64 implements Function { + + @Override + public String apply(ByteBuffer input) { + ByteBuffer bb = input.asReadOnlyBuffer(); + bb.position(0); + byte[] b = new byte[bb.limit()]; + bb.get(b, 0, b.length); + return Base64.encodeAsString(b); + } + +} From 8f32c9496c26a8fee00eb2481652cdd60d51e1d9 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Wed, 2 Nov 2022 09:27:19 -0400 Subject: [PATCH 08/16] Updated MongoDB key-value collection to have a 'value' field --- .../resources/activities/baselinesv2/mongodb-keyvalue2.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml index 46468b531..5c970059b 100644 --- a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml +++ b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml @@ -52,13 +52,17 @@ blocks: key: { bsonType: "string", description: "'key' must be a string and is required" + }, + value: { + bsonType: "string", + description: "'value' must be a string and is optional but, recommended" } } } }, validationLevel: "strict", validationAction: "error", - comment: "keyvalue collection creation with strict types and required 'key' field." + comment: "keyvalue collection creation with strict types and a required 'key' field." } create-key-index: | { From 45ee75fef099afd9bcbf86aa9d70173355254b2e Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Wed, 2 Nov 2022 09:36:49 -0400 Subject: [PATCH 09/16] bump min_version --- .../resources/activities/baselinesv2/mongodb-keyvalue2.yaml | 2 +- .../main/resources/activities/baselinesv2/mongodb-tabular2.yaml | 2 +- .../resources/activities/baselinesv2/mongodb-timeseries2.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml index 5c970059b..197d058a1 100644 --- a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml +++ b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml @@ -2,7 +2,7 @@ # nb5 run driver=mongodb workload=/path/to/mongodb-keyvalue2.yaml tags=block:schema connection='mongodb+srv://user:pass@sample-db.host.mongodb.net/?retryWrites=true&w=majority' database=baselines -vv --show-stacktraces # nb5 run driver=mongodb workload=/path/to/mongodb-keyvalue2.yaml tags=block:rampup cycles=25 connection='mongodb+srv://user:pass@sample-db.host.mongodb.net/?retryWrites=true&w=majority' database=baselines -vv --show-stacktraces # nb5 run driver=mongodb workload=/path/to/mongodb-keyvalue2.yaml tags='block:main-.*' cycles=25 connection='mongodb+srv://user:pass@sample-db.host.mongodb.net/?retryWrites=true&w=majority' database=baselines -vv --show-stacktraces -min_version: "4.17.30" +min_version: "4.17.31" description: | This workload is analogous to the cql-keyvalue2 workload, just implemented for MongoDB. diff --git a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml index ce3e51810..049769b68 100644 --- a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml +++ b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml @@ -2,7 +2,7 @@ # nb5 run driver=mongodb workload=/path/to/mongodb-tabular2.yaml tags=block:schema connection='mongodb+srv://user:pass@sample-db.host.mongodb.net/?retryWrites=true&w=majority' database=baselines -vv --show-stacktraces # nb5 run driver=mongodb workload=/path/to/mongodb-tabular2.yaml tags=block:rampup cycles=25 connection='mongodb+srv://user:pass@sample-db.host.mongodb.net/?retryWrites=true&w=majority' database=baselines -vv --show-stacktraces # nb5 run driver=mongodb workload=/path/to/mongodb-tabular2.yaml tags='block:main.*' cycles=25 connection='mongodb+srv://user:pass@sample-db.host.mongodb.net/?retryWrites=true&w=majority' database=baselines -vv --show-stacktraces -min_version: "4.17.30" +min_version: "4.17.31" description: | This workload is analogous to the cql-tabular2 workload, just implemented for MongoDB. diff --git a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml index 386c1a94f..ef9349d1b 100644 --- a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml +++ b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml @@ -6,7 +6,7 @@ # https://www.mongodb.com/community/forums/t/how-to-store-a-uuid-with-binary-subtype-0x04-using-the-mongodb-java-driver/13184 # https://www.mongodb.com/community/forums/t/problem-inserting-uuid-field-with-binary-subtype-via-atlas-web-ui/1071/4 # https://www.mongodb.com/community/forums/t/timeseries-last-x-documents/186574/5 -min_version: "4.17.30" +min_version: "4.17.31" description: | This workload is analogous to the cql-timeseries2 workload, just implemented for MongoDB. From 2b9452fde435383b9af7ef9fd2623ce438fa7271 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Fri, 11 Nov 2022 16:17:36 -0600 Subject: [PATCH 10/16] Buildfixes, trying to unblock current builds (#777) * make example/test script more robust for meager github actions environment * improve wording around op template resolution * remove blocking issues github actions plugin, since it is broken --- .github/workflows/blocking_issues.yml | 15 --------------- .../resources/workload_definition/README.md | 18 +++++++++++------- .../examples/extension_histostatslogger.js | 8 +++----- 3 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 .github/workflows/blocking_issues.yml diff --git a/.github/workflows/blocking_issues.yml b/.github/workflows/blocking_issues.yml deleted file mode 100644 index 7bea810ac..000000000 --- a/.github/workflows/blocking_issues.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Blocking Issues - -on: - issues: - types: [closed] - pull_request_target: - types: [opened, edited] - -jobs: - blocking_issues: - runs-on: ubuntu-latest - name: Checks for blocking issues - - steps: - - uses: Levi-Lesches/blocking-issues@v1.1 diff --git a/adapters-api/src/main/resources/workload_definition/README.md b/adapters-api/src/main/resources/workload_definition/README.md index 7bcd0ba9c..c0464384e 100644 --- a/adapters-api/src/main/resources/workload_definition/README.md +++ b/adapters-api/src/main/resources/workload_definition/README.md @@ -63,17 +63,21 @@ The process of loading a workload definition occurs in several discrete steps du session: 1. The workload file is loaded. -2. Template variables are interposed. +2. Template variables from the activity parameters are interposed into the raw contents of the + file. 3. The file is deserialized from its native form into a raw data structure. 4. The raw data structure is transformed into a normalized data structure according to the Op Template normalization rules. -5. The data is provided to the ParsedOp API for use by the developer. -6. The DriverAdapter is loaded which understands the op fields provided in the op template. -7. The DriverAdapter uses its documented rules to determine which types of native driver operations +5. Each op template is then denormalized as a self-contained data + structure, containing all the provided bindings, params, and tags from the upper layers of the + doc structure. +6. The data is provided to the ParsedOp API for use by the developer. +7. The DriverAdapter is loaded which understands the op fields provided in the op template. +8. The DriverAdapter uses its documented rules to determine which types of native driver operations each op template is intended to represent. This is called **Op Mapping**. -8. The DriverAdapter uses the identified types to create dispensers of native driver operations. - This is called **Op Dispensing**. -9. The op dispensers are arranged into an indexed bank of op sources according to the specified +9. The DriverAdapter (via the selected Op Mapper) uses the identified types to create dispensers of + native driver operations. This is called **Op Dispensing**. +10. The op dispensers are arranged into an indexed bank of op sources according to the specified ratios and or sequencing strategy. From this point on, NoSQLBench has the ability to construct an operation for any given cycle at high speed. diff --git a/nbr-examples/src/test/resources/scripts/examples/extension_histostatslogger.js b/nbr-examples/src/test/resources/scripts/examples/extension_histostatslogger.js index 377c1b357..01b1f1194 100644 --- a/nbr-examples/src/test/resources/scripts/examples/extension_histostatslogger.js +++ b/nbr-examples/src/test/resources/scripts/examples/extension_histostatslogger.js @@ -18,16 +18,14 @@ activitydef = { "alias" : "testhistostatslogger", "driver" : "diag", "cycles" : "50000", - "threads" : "20", - "interval" : "2000", - "targetrate" : "10000.0", + "threads" : "5", + "rate" : "100.0", "op" : "noop" }; histostatslogger.logHistoStats("testing extention histostatslogger", ".*", "logs/histostats.csv", "0.5s"); print("started logging to logs/histostats.csv for all metrics at 1/2" + " second intervals."); - scenario.start(activitydef); -scenario.waitMillis(2000); +scenario.waitMillis(4000); scenario.stop(activitydef); From a05c511de7d34ef63502df7189d1a78621a9e956 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 14 Nov 2022 09:50:20 -0600 Subject: [PATCH 11/16] fix: upgrade org.eclipse.jetty:jetty-server from 11.0.11 to 11.0.12 (#763) Snyk has created this PR to upgrade org.eclipse.jetty:jetty-server from 11.0.11 to 11.0.12. See this package in Maven Repository: https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-server/ See this project in Snyk: https://app.snyk.io/org/jshook/project/03cbee46-d5d2-41d3-89cc-a2ad77ab807a?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- docsys/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 17538bfee..5ea4dcbf4 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jetty jetty-server - 11.0.11 + 11.0.12 org.eclipse.jetty From eb1de8f1d5c40421f72c69a064e89a42bc9e3b71 Mon Sep 17 00:00:00 2001 From: jeffbanks Date: Mon, 14 Nov 2022 10:39:10 -0600 Subject: [PATCH 12/16] Timing changes for github actions to properly perform build/test step. --- .../scripts/examples/extension_histostatslogger.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nbr-examples/src/test/resources/scripts/examples/extension_histostatslogger.js b/nbr-examples/src/test/resources/scripts/examples/extension_histostatslogger.js index 377c1b357..50c99758b 100644 --- a/nbr-examples/src/test/resources/scripts/examples/extension_histostatslogger.js +++ b/nbr-examples/src/test/resources/scripts/examples/extension_histostatslogger.js @@ -18,16 +18,15 @@ activitydef = { "alias" : "testhistostatslogger", "driver" : "diag", "cycles" : "50000", - "threads" : "20", - "interval" : "2000", - "targetrate" : "10000.0", + "threads" : "5", + "rate" : "100.0", "op" : "noop" }; histostatslogger.logHistoStats("testing extention histostatslogger", ".*", "logs/histostats.csv", "0.5s"); print("started logging to logs/histostats.csv for all metrics at 1/2" + " second intervals."); - scenario.start(activitydef); -scenario.waitMillis(2000); +scenario.waitMillis(4000); scenario.stop(activitydef); + From 6999a675f7a6f2fa916221baa77a67f341e63197 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 14 Nov 2022 17:03:11 -0600 Subject: [PATCH 13/16] [Snyk] Upgrade io.dropwizard.metrics:metrics-core from 4.2.10 to 4.2.12 (#765) * fix: upgrade io.dropwizard.metrics:metrics-core from 4.2.10 to 4.2.12 Snyk has created this PR to upgrade io.dropwizard.metrics:metrics-core from 4.2.10 to 4.2.12. See this package in Maven Repository: https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core/ See this project in Snyk: https://app.snyk.io/org/jshook/project/fc9e1bd9-1d9a-474f-bde4-efb614c52ffe?utm_source=github&utm_medium=referral&page=upgrade-pr * Timing change for github actions Co-authored-by: snyk-bot Co-authored-by: jeffbanks --- mvn-defaults/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index d48f66855..a408b78e4 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -141,7 +141,7 @@ io.dropwizard.metrics metrics-core - 4.2.10 + 4.2.12 From 5fc22bbaa5a35d9e9cc45ed126231f57130754eb Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 14 Nov 2022 17:16:14 -0600 Subject: [PATCH 14/16] fix: upgrade com.google.code.gson:gson from 2.9.0 to 2.9.1 (#766) Snyk has created this PR to upgrade com.google.code.gson:gson from 2.9.0 to 2.9.1. See this package in Maven Repository: https://mvnrepository.com/artifact/com.google.code.gson/gson/ See this project in Snyk: https://app.snyk.io/org/jshook/project/fc9e1bd9-1d9a-474f-bde4-efb614c52ffe?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- mvn-defaults/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index a408b78e4..a7cd31bad 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -271,7 +271,7 @@ com.google.code.gson gson - 2.9.0 + 2.9.1 From 2158dfa339088367bc1e4ae693c00e9d978a353e Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 14 Nov 2022 17:16:39 -0600 Subject: [PATCH 15/16] fix: upgrade io.netty:netty-handler from 4.1.81.Final to 4.1.82.Final (#767) Snyk has created this PR to upgrade io.netty:netty-handler from 4.1.81.Final to 4.1.82.Final. See this package in Maven Repository: https://mvnrepository.com/artifact/io.netty/netty-handler/ See this project in Snyk: https://app.snyk.io/org/jshook/project/faf9c31c-14e2-456a-9f66-9dda91c923d9?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- mvn-defaults/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index a7cd31bad..e0dcc4f7e 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -189,7 +189,7 @@ io.netty netty-handler - 4.1.81.Final + 4.1.82.Final From 33e330dc350f96c90590daa6a7cdf8a56d1a2344 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 14 Nov 2022 18:32:52 -0600 Subject: [PATCH 16/16] [Snyk] Security upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.325 to 1.12.330 (#768) * 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 Co-authored-by: jeffbanks --- nb-api/pom.xml | 2 +- .../testing/ExitStatusIntegrationTests.java | 25 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/nb-api/pom.xml b/nb-api/pom.xml index d2aea36ec..5b4546aea 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -97,7 +97,7 @@ com.amazonaws aws-java-sdk-s3 - 1.12.325 + 1.12.330 diff --git a/nbr/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java b/nbr/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java index f50704c62..3d0185c04 100644 --- a/nbr/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java +++ b/nbr/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java @@ -19,40 +19,40 @@ package io.nosqlbench.cli.testing; import org.junit.jupiter.api.Test; import java.util.Optional; -import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; -public class ExitStatusIntegrationTests { +class ExitStatusIntegrationTests { 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"; + @Test - public void testExitStatusOnBadParam() { + void testExitStatusOnBadParam() { ProcessInvoker invoker = new ProcessInvoker(); invoker.setLogDir("logs/test"); ProcessResult result = invoker.run("exitstatus_badparam", 15, java, "-jar", JARNAME, "--logs-dir", "logs/test/badparam/", - "badparam" + "badparam" ); 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(result.exitStatus).isEqualTo(2); } @Test - public void testExitStatusOnActivityInitException() { + void testExitStatusOnActivityInitException() { ProcessInvoker invoker = new ProcessInvoker(); invoker.setLogDir("logs/test"); ProcessResult result = invoker.run("exitstatus_initexception", 15, 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(); - String stderr = result.getStdoutData().stream().collect(Collectors.joining("\n")); + String stderr = String.join("\n", result.getStdoutData()); assertThat(stderr).contains("For input string: \"notanumber\""); assertThat(result.exitStatus).isEqualTo(2); } @@ -73,19 +73,18 @@ public class ExitStatusIntegrationTests { // } @Test - public void testExitStatusOnActivityOpException() { + void testExitStatusOnActivityOpException() { ProcessInvoker invoker = new ProcessInvoker(); invoker.setLogDir("logs/test"); ProcessResult result = invoker.run("exitstatus_asyncstoprequest", 30, 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(); - 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(result.exitStatus).isEqualTo(2); } - }