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

fix CVE for org.eclipse.core.runtime #2378

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Conversation

mingshl
Copy link
Collaborator

@mingshl mingshl commented Apr 30, 2024

Description

The Spotless Gradle Plugin brings in a transitive dependency on Eclipse Core Runtime 3.26.100. That version is impacted by a CVE. This forces the newest version, currently 3.29.0.

Issues Resolved

#1863

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Mingshi Liu <mingshl@amazon.com>
Copy link
Collaborator

@dhrubo-os dhrubo-os left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved, but please make sure to merge after passing an integration test.

@mingshl mingshl temporarily deployed to ml-commons-cicd-env April 30, 2024 18:16 — with GitHub Actions Inactive
@mingshl mingshl temporarily deployed to ml-commons-cicd-env April 30, 2024 18:16 — with GitHub Actions Inactive
@mingshl mingshl temporarily deployed to ml-commons-cicd-env April 30, 2024 18:16 — with GitHub Actions Inactive
@mingshl mingshl self-assigned this Apr 30, 2024
@mingshl
Copy link
Collaborator Author

mingshl commented Apr 30, 2024

there is a flaky test related to visualization tool

[2024-04-30T22:35:16,321][INFO ][o.o.m.t.VisualizationsToolIT] [testVisualizationNotFound] after test
REPRODUCE WITH: ./gradlew ':opensearch-ml-plugin:integTest' --tests "org.opensearch.ml.tools.VisualizationsToolIT.testVisualizationNotFound" -Dtests.seed=8D417CC63FEA4F0A -Dtests.security.manager=false -Dtests.locale=sk -Dtests.timezone=Asia/Tehran -Druntime.java=17

org.opensearch.ml.tools.VisualizationsToolIT > testVisualizationNotFound STANDARD_ERROR
    REPRODUCE WITH: ./gradlew ':opensearch-ml-plugin:integTest' --tests "org.opensearch.ml.tools.VisualizationsToolIT.testVisualizationNotFound" -Dtests.seed=8D417CC63FEA4F0A -Dtests.security.manager=false -Dtests.locale=sk -Dtests.timezone=Asia/Tehran -Druntime.java=17

org.opensearch.ml.tools.VisualizationsToolIT > testVisualizationNotFound FAILED

org.opensearch.client.ResponseException: method [DELETE], host [http://127.0.0.1:46451/], URI [/_plugins/_ml/models/7WNlMI8BA-goW0opkA9U], status line [HTTP/1.1 400 Bad Request]

Suite: Test class org.opensearch.ml.tools.VisualizationsToolIT
{"error":{"root_cause":[{"type":"status_exception","reason":"Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete"}],"type":"status_exception","reason":"Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete"},"status":400}
2> REPRODUCE WITH: ./gradlew ':opensearch-ml-plugin:integTest' --tests "org.opensearch.ml.tools.VisualizationsToolIT.testVisualizationNotFound" -Dtests.seed=8D417CC63FEA4F0A -Dtests.security.manager=false -Dtests.locale=sk -Dtests.timezone=Asia/Tehran -Druntime.java=17
at __randomizedtesting.SeedInfo.seed([8D417CC63FEA4F0A:4222D85B38D9750A]:0)
2> org.opensearch.client.ResponseException: method [DELETE], host [http://127.0.0.1:46451/], URI [/_plugins/_ml/models/7WNlMI8BA-goW0opkA9U], status line [HTTP/1.1 400 Bad Request]
at app//org.opensearch.client.RestClient.convertResponse(RestClient.java:385)
{"error":{"root_cause":[{"type":"status_exception","reason":"Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete"}],"type":"status_exception","reason":"Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete"},"status":400}

@Hailong-am can you fix this flaky test?

@mingshl mingshl merged commit aa3616d into opensearch-project:main Apr 30, 2024
11 of 14 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 30, 2024
Signed-off-by: Mingshi Liu <mingshl@amazon.com>
(cherry picked from commit aa3616d)
mingshl added a commit that referenced this pull request Apr 30, 2024
Signed-off-by: Mingshi Liu <mingshl@amazon.com>
(cherry picked from commit aa3616d)

Co-authored-by: Mingshi Liu <113382730+mingshl@users.noreply.github.com>
opensearch-trigger-bot bot added a commit that referenced this pull request Apr 30, 2024
Signed-off-by: Mingshi Liu <mingshl@amazon.com>
(cherry picked from commit aa3616d)

Co-authored-by: Mingshi Liu <113382730+mingshl@users.noreply.github.com>
(cherry picked from commit af63e5e)
mingshl pushed a commit that referenced this pull request Apr 30, 2024
Signed-off-by: Mingshi Liu <mingshl@amazon.com>
(cherry picked from commit aa3616d)

Co-authored-by: Mingshi Liu <113382730+mingshl@users.noreply.github.com>
(cherry picked from commit af63e5e)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
@mingshl mingshl removed the infra label May 1, 2024
@mingshl mingshl mentioned this pull request May 1, 2024
5 tasks
@Hailong-am
Copy link
Contributor

there is a flaky test related to visualization tool

[2024-04-30T22:35:16,321][INFO ][o.o.m.t.VisualizationsToolIT] [testVisualizationNotFound] after test
REPRODUCE WITH: ./gradlew ':opensearch-ml-plugin:integTest' --tests "org.opensearch.ml.tools.VisualizationsToolIT.testVisualizationNotFound" -Dtests.seed=8D417CC63FEA4F0A -Dtests.security.manager=false -Dtests.locale=sk -Dtests.timezone=Asia/Tehran -Druntime.java=17

org.opensearch.ml.tools.VisualizationsToolIT > testVisualizationNotFound STANDARD_ERROR
    REPRODUCE WITH: ./gradlew ':opensearch-ml-plugin:integTest' --tests "org.opensearch.ml.tools.VisualizationsToolIT.testVisualizationNotFound" -Dtests.seed=8D417CC63FEA4F0A -Dtests.security.manager=false -Dtests.locale=sk -Dtests.timezone=Asia/Tehran -Druntime.java=17

org.opensearch.ml.tools.VisualizationsToolIT > testVisualizationNotFound FAILED

org.opensearch.client.ResponseException: method [DELETE], host [http://127.0.0.1:46451/], URI [/_plugins/_ml/models/7WNlMI8BA-goW0opkA9U], status line [HTTP/1.1 400 Bad Request]

Suite: Test class org.opensearch.ml.tools.VisualizationsToolIT {"error":{"root_cause":[{"type":"status_exception","reason":"Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete"}],"type":"status_exception","reason":"Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete"},"status":400} 2> REPRODUCE WITH: ./gradlew ':opensearch-ml-plugin:integTest' --tests "org.opensearch.ml.tools.VisualizationsToolIT.testVisualizationNotFound" -Dtests.seed=8D417CC63FEA4F0A -Dtests.security.manager=false -Dtests.locale=sk -Dtests.timezone=Asia/Tehran -Druntime.java=17 at __randomizedtesting.SeedInfo.seed([8D417CC63FEA4F0A:4222D85B38D9750A]:0) 2> org.opensearch.client.ResponseException: method [DELETE], host [http://127.0.0.1:46451/], URI [/_plugins/_ml/models/7WNlMI8BA-goW0opkA9U], status line [HTTP/1.1 400 Bad Request] at app//org.opensearch.client.RestClient.convertResponse(RestClient.java:385) {"error":{"root_cause":[{"type":"status_exception","reason":"Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete"}],"type":"status_exception","reason":"Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete"},"status":400}

@Hailong-am can you fix this flaky test?

Raise #2416 to fix this flaky test

dhrubo-os pushed a commit to dhrubo-os/ml-commons that referenced this pull request May 17, 2024
…earch-project#2380)

Signed-off-by: Mingshi Liu <mingshl@amazon.com>
(cherry picked from commit aa3616d)

Co-authored-by: Mingshi Liu <113382730+mingshl@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants