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.

Sign up for GitHub

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

Jump to bottom

Backport 2.x to main #630

Merged
merged 43 commits into from
Jan 10, 2023
Merged

Backport 2.x to main #630

merged 43 commits into from
Jan 10, 2023

Conversation

rupal-bq
Copy link
Contributor

Description

Merge 2.x to main for removing chromium and repo split changes

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc 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.

opensearch-trigger-bot bot and others added 30 commits August 5, 2022 17:43
@opensearch-trigger-bot @ps48
Remove odfe bwc test (#408) (#409)
7bc1ca5 
* removed odfe bwc test

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* removed bwc test from workflows

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit 556b5fb)

Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>
@ps48 @vmmusings
Remove odfe bwc test (#408)
a7ba6ad 
* removed odfe bwc test

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* removed bwc test from workflows

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit 556b5fb)
@vmmusings
Bump version 2.2.0
c91534a 
Signed-off-by: vamsi-amazon <reddyvam@amazon.com>
@opensearch-trigger-bot @vmmusings
Bump version 2.2.0 (#413)
51567f2 
Signed-off-by: vamsi-amazon <reddyvam@amazon.com>
(cherry picked from commit c91534a)

Co-authored-by: vamsi-amazon <reddyvam@amazon.com>
@vmmusings
Release notes for 2.2.0
1d3980a 
Signed-off-by: vamsi-amazon <reddyvam@amazon.com>
(cherry picked from commit f43f7de)
@vmmusings
Release notes for 2.2.0
1b25f94 
Signed-off-by: vamsi-amazon <reddyvam@amazon.com>
(cherry picked from commit f43f7de)
@joshuali925
[2.x] Restrict chromium requests (#435)
8d6e1ab 
* Fix regex validation, detect iframe, embed, object tags

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Disallow redirection to non-localhost urls

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Disallow connection to non-allowlisted urls

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Disable JIT

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Fix workflow

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Try to fix CI

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Fix localstorage logic

Signed-off-by: Joshua Li <joshuali925@gmail.com>

Signed-off-by: Joshua Li <joshuali925@gmail.com>
@joshuali925
[2.2] Restrict chromium requests (#431)
8808446 
* Fix regex validation, detect iframe, embed, object tags

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Disallow redirection to non-localhost urls

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Disallow connection to non-allowlisted urls

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Disable JIT

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Fix workflow

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Try to fix CI

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Fix localstorage logic

Signed-off-by: Joshua Li <joshuali925@gmail.com>

Signed-off-by: Joshua Li <joshuali925@gmail.com>
@opensearch-ci-bot
Increment version to 2.2.1-SNAPSHOT
d19fc7f 
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
@prudhvigodithi
Merge pull request #438 from opensearch-project/create-pull-request/2…
cefc610 
….2.1-SNAPSHOT

[AUTO] Increment version to 2.2.1-SNAPSHOT
@opensearch-ci-bot
Increment version to 2.3.0-SNAPSHOT
88d1c68 
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
@vmmusings
Added release notes for 2.2.1 release
be6a0e9 
Signed-off-by: vamsi-amazon <reddyvam@amazon.com>
@mengweieric
Merge pull request #442 from opensearch-project/create-pull-request/2…
0538e50 
….3.0-SNAPSHOT

[AUTO] Increment version to 2.3.0-SNAPSHOT
@mengweieric
resolved conflicts
b9ee930 
Signed-off-by: Eric Wei <menwe@amazon.com>
@mengweieric
Merge pull request #459 from mengweieric/release-notes-2.3.0
383c000 
Release notes for 2.3.0

(cherry picked from commit b0c5643)
@mengweieric
Merge pull request #462 from mengweieric/backport/backport-459-to-2.x
df2e78f 
Manually backport release notes to 2.x
@rupal-bq
[2.x] Upgrade puppeteer (#489)
b118a27 
* upgrade puppeteer & change report timeout

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Change timeout

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq
Bump verison 2.4.0 (#499)
20c7f05 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@opensearch-trigger-bot @prudhvigodithi
add group = org.opensearch.plugin (#506) (#507)
82be162 
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>

Signed-off-by: prudhvigodithi <pgodithi@amazon.com>
(cherry picked from commit b25984b)

Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>
@derek-ho
feat: enable windows and macos build (#504) (#511)
3f66415 
Signed-off-by: Derek Ho <dxho@amazon.com>
@rupal-bq
Update version for jsdom, terser and jsoup (#515)
6bda432 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq
Fix snakeyaml vulnerability issue by disabling detekt (#517)
efeb8ec 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq
Update ktlint version (#519)
b7c471d 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq
Upgrade minimatch, moment (#513)
c45371f 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq
Revert detekt changes with upgraded version 1.21.0 (#527)
2c56b2f 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq
Add loader-utils to resolutions (#525)
2cda237 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@opensearch-trigger-bot @rupal-bq
Nit: add resolutions at once place (#529) (#530)
93575b8 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
(cherry picked from commit 0dada24)

Co-authored-by: Rupal Mahajan <maharup@amazon.com>
@opensearch-trigger-bot @rupal-bq
add release notes for 2.4.0.0 (#532) (#533)
ac137c1 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
(cherry picked from commit a1c4839)

Co-authored-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq @dependabot
Bump loader-utils from 2.0.3 to 2.0.4 in /dashboards-reports (#539) (#…
28ea7a0 
…541)

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md)
- [Commits](webpack/loader-utils@v2.0.3...v2.0.4)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit f250deb)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@rupal-bq
update qs 6.5.3 (#545)
18da18b 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
joshuali925 and others added 13 commits November 28, 2022 17:54
@joshuali925
Fix metrics tests and ClassNotFoundException when calling stats API (#…
926dc7f 
…546)

Signed-off-by: Joshua Li <joshuali925@gmail.com>
@rupal-bq @joshuali925
Use advanced settings for leading wildcards in query for csv reports (#…
5b9e73b 
…549)

* Fetch allowLeadingWildcards from config

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Fix tests

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* nit

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* add default value for allowLeadingWildCards

Co-authored-by: Joshua Li <joshuali925@gmail.com>
Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
Co-authored-by: Joshua Li <joshuali925@gmail.com>
@opensearch-trigger-bot @opensearch-ci-bot
Increment version to 2.5.0-SNAPSHOT (#528)
c4ac89f 
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
@opensearch-trigger-bot @rupal-bq
[1.x] Upgrade decode-uri-component (#558) (#560)
993f80d 
* upgrade loader-utils for CVE-2022-37601

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update async for CVE-2021-43138

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Fix cross-fetch for CVE-2022-1365

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Fix for CVE-2022-37599, CVE-2022-37603

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update terser for CVE-2022-25858

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update minimatch for CVE-2022-3517

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update moment for CVE-2022-24785

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update jsdom for CVE-2021-20066

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update execa for GMS-2020-2

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update qs for CVE-2022-24999

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update moment for CVE-2022-31129

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update decode-uri-component for CVE-2022-38900

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
(cherry picked from commit d3f36b5)

Co-authored-by: Rupal Mahajan <maharup@amazon.com>
@opensearch-trigger-bot @rupal-bq
Fix windows and macos CI (#569) (#571)
5ceee02 
* Update windows & mac CI for reo name change

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Fix linux build

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
(cherry picked from commit 9ce8684)

Co-authored-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq
Add ERR_ADDRESS_INVALID in Troubleshooting (#574)
c5bb86a 
* Add workaround for ERR_ADDRESS_INVALID in doc

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* nit

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq
Add release notes for 2.4.1 (#580)
9613cba 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq
Remove jackson-databind and jackson-annotations (#587)
fb301e2 
* Remove jackson-databind and jackson-annotations dependencies

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* resolve dompurify conflicting dependencies

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* fix build

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@joshuali925 @opensearch-trigger-bot @opensearch-ci-bot
Use front-end report generation instead of chromium (#586)
faf8c19 
* Increment version to 2.4.1-SNAPSHOT (#540)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

* --wip--

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Add initial implementation of client reporting generation

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Fix url with basepath

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Update header footer height

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Update dialog text to not close dialog

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Remove console.log

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Remove unused components

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Remove chromium references

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Add report generation error handling

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Minor refactors

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Add postinstall patch to support safari for html2canvas

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Add dompurify

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Fix build error

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Remove chromium from CI

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Update CI artifact name

Signed-off-by: Joshua Li <joshuali925@gmail.com>

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
@rupal-bq
Remove front end code (#620)
7b584ac 
* Remove frontend code

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Move one level up

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update workflow file

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* nit: remove dashboard setup from readme

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@joshuali925
Remove unnecessary scripts after repo split (#622)
b5ea7ff 
Signed-off-by: Joshua Li <joshuali925@gmail.com>
@rupal-bq
Include integration tests in windows workflow (#624)
e36c232 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq
Merge 2.x
331d974 
Signed-off-by: Rupal Mahajan <maharup@amazon.com>
@rupal-bq rupal-bq requested a review from a team as a code owner January 10, 2023 18:41
@rupal-bq
Copy link
Contributor Author

Build failure is due to bwc tests. Not related to these changes so merging this PR.

@rupal-bq rupal-bq merged commit 71d1b62 into opensearch-project:main Jan 10, 2023
@zelinh zelinh mentioned this pull request Jan 10, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joshuali925 joshuali925 joshuali925 approved these changes

@kavithacm kavithacm kavithacm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@rupal-bq @kavithacm @joshuali925 @ps48 @vmmusings @opensearch-ci-bot @prudhvigodithi @mengweieric @derek-ho