Skip to content

Commit 1682019

Browse files
opensearch-dashboards-3/3.6.0 package update (#68305)
* opensearch-dashboards-3/3.6.0 package update * Correct expected commit for opensearch-build * reportsDashboard plugin no longer requires the test cleanup in 3.6.0.0 --------- Co-authored-by: staging-update-bot <staging-update-bot@chainguard.dev> Co-authored-by: Adam Dyess <adam.dyess@chainguard.dev> Export: 27396b365c04b34fd5e247f7d67bfbfc1991523d
1 parent ab597c4 commit 1682019

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

opensearch-dashboards-3.yaml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: opensearch-dashboards-3
3-
version: "3.5.0"
4-
epoch: 15
3+
version: "3.6.0"
4+
epoch: 0
55
description: Open source visualization dashboards for OpenSearch
66
copyright:
77
- license: Apache-2.0
@@ -75,7 +75,7 @@ pipeline:
7575
with:
7676
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
7777
tag: ${{package.version}}
78-
expected-commit: 7e86cf810d6e616a3453dd93062d7e22fa16c477
78+
expected-commit: 47091b2bb937be28e29cde7c3d2c3c9ee6803c27
7979

8080
- runs: |
8181
# Workaround for "OpenSearch Dashboards should not be run as root. Use --allow-root to continue."
@@ -95,7 +95,6 @@ pipeline:
9595
# fix GHSA-6475-r3vj-m8vf, GHSA-xxjr-mmjv-4gpg, GHSA-r6q2-hw4h-h46w, GHSA-8qq5-rm4j-mr97, GHSA-w7fw-mjwx-w883
9696
# fix CVE-2026-2739 (bn.js), CVE-2025-69873 (ajv), CVE-2026-27904/CVE-2026-26996/CVE-2026-27903 (minimatch)
9797
# fix CVE-2026-0540/CVE-2025-15599 (dompurify), GHSA-5c6j-r48x-rmvq (serialize-javascript)
98-
# fix GHSA-f886-m6hf-6m8v (brace-expansion)
9998
# fix GHSA-f23m-r3pf-42rh GHSA-r5fr-rjxr-66jc (lodash/lodash-es)
10099
resolutions='{
101100
"**/cookie": "^0.7.0",
@@ -123,7 +122,6 @@ pipeline:
123122
"**/serialize-javascript": "^7.0.3",
124123
"picomatch": "^2.3.2",
125124
"**/picomatch": "^2.3.2",
126-
"brace-expansion": "^1.1.13",
127125
"basic-ftp": "^5.2.2",
128126
"@hapi/content": "^6.0.1"
129127
}'
@@ -209,7 +207,7 @@ pipeline:
209207
repository: https://github.com/opensearch-project/opensearch-build
210208
tag: ${{package.version}}
211209
destination: opensearch-build
212-
expected-commit: 139499ff11880353a9a2e47efabe762e7261754d
210+
expected-commit: 18761b2bc0e7c224ff402da1380a5c6e56330f0f
213211

214212
- runs: |
215213
install -Dm755 opensearch-build/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh "${{targets.destdir}}/usr/share/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.sh"
@@ -257,7 +255,6 @@ subpackages:
257255
"@babel/runtime": "^7.26.10",
258256
"canvg": "^4.0.3",
259257
"pbkdf2": "3.1.3",
260-
"brace-expansion": "^1.1.13",
261258
"form-data": "4.0.4",
262259
"@smithy/config-resolver": "4.4.0",
263260
"lodash": "4.18.0",
@@ -316,11 +313,15 @@ subpackages:
316313
tar xzf /tmp/minimatch-3.1.4.tgz -C "$dir" --strip-components=1
317314
done
318315
319-
if [ ${{range.value}} = "reportsDashboards" ]
320-
then
316+
if [ "${{range.value}}" = "reportsDashboards" ]; then
321317
# Remove a test directory of the `resolver` package to prevent surfacing a false-positive.
322318
# See https://github.com/browserify/resolve/issues/288
323-
rm -r build/opensearch-dashboards/${{range.value}}/node_modules/resolve/test
319+
RESOLVE_TEST="build/opensearch-dashboards/${{range.value}}/node_modules/resolve/test"
320+
if [ -d "$RESOLVE_TEST" ]; then
321+
rm -r "$RESOLVE_TEST"
322+
else
323+
echo "Directory $RESOLVE_TEST no longer exists, skipping removal"
324+
fi
324325
fi
325326
326327
mkdir -p "${{targets.contextdir}}/usr/share/opensearch-dashboards/plugins"

0 commit comments

Comments
 (0)