Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opensearch-2/2.12.0 package update #13385

Merged
merged 6 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions opensearch-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# same version they are installed into.
package:
name: opensearch-2
version: 2.11.1
epoch: 8 # Remove CVE-2022-45146 patch when bumping to 2.12 or later
version: 2.12.0
epoch: 0 # Remove CVE-2022-45146 patch when bumping to 2.12 or later
description: Open source distributed and RESTful search engine.
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -73,35 +73,22 @@ data:
index-management: ""
job-scheduler: ""
k-nn: ""
ml-commons: "ml-commons.patch" # Handles both CVE-2023-51074, CVE-2023-42503
neural-search: "CVE-2023-5072.patch"
ml-commons: ""
neural-search: ""
notifications: ""
observability: ""
performance-analyzer: ""
reporting: ""
security: "CVE-2023-44483.patch"
security: ""
security-analytics: ""
sql: "CVE-2023-5072-sql.patch"
sql: ""

pipeline:
- uses: git-checkout
with:
repository: https://github.com/opensearch-project/OpenSearch
tag: ${{package.version}}
expected-commit: 6b1986e964d440be9137eba1413015c31c5a7752

- uses: patch
with:
# Patch from: https://patch-diff.githubusercontent.com/raw/opensearch-project/OpenSearch/pull/10297.patch
patches: CVE-2022-45146.patch

- uses: patch
with:
patches: CVE-2023-46749.patch

- uses: patch
with:
patches: CVE-2023-34054.patch
expected-commit: 2c355ce1a427e4a528778d4054436b5c4b756221

- runs: |
echo "org.gradle.daemon=false" >> gradle.properties
Expand Down Expand Up @@ -189,6 +176,12 @@ subpackages:
sed -i '/startParameter.excludedTaskNames=\[/ s/]/, "check"]/g' settings.gradle
fi

# The OpenSearch version is misconfigured in the performance-analyzer plugin.
if [ "${{range.key}}" = "performance-analyzer" ]; then
sed -i 's/2.13.0-SNAPSHOT/${{package.version}}/g' build.gradle
fi


echo "org.gradle.daemon=false" >> gradle.properties
./gradlew clean assemble -Dbuild.snapshot="false" -Dbuild.version_qualifier="" -x check -x integTest -x javadoc -PfailOnJavadocWarning=false --stacktrace

Expand Down
63 changes: 0 additions & 63 deletions opensearch-2/CVE-2022-45146.patch

This file was deleted.

13 changes: 0 additions & 13 deletions opensearch-2/CVE-2023-34054.patch

This file was deleted.

13 changes: 0 additions & 13 deletions opensearch-2/CVE-2023-44483.patch

This file was deleted.

13 changes: 0 additions & 13 deletions opensearch-2/CVE-2023-46749.patch

This file was deleted.

78 changes: 0 additions & 78 deletions opensearch-2/CVE-2023-5072-sql.patch

This file was deleted.

13 changes: 0 additions & 13 deletions opensearch-2/CVE-2023-5072.patch

This file was deleted.

37 changes: 0 additions & 37 deletions opensearch-2/ml-commons.patch

This file was deleted.

Loading