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

[Manual][Backport 2.x] Backport 7884 and 7954 to 2.x #7984

Conversation

wanglam
Copy link
Contributor

@wanglam wanglam commented Sep 4, 2024

Description

This PR is for backporting #7884 and #7954 to 2.x branch.
There is a unit test failed in #7884 backport PR, the #7954 would fix this unit test error.

Issues Resolved

Screenshot

Testing the changes

Changelog

  • skip

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

wanglam and others added 2 commits September 4, 2024 10:35
… API (opensearch-project#7884)

* Add validate for features field in workspace create and update API

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Changeset file for PR opensearch-project#7884 created/updated

* Changeset file for PR opensearch-project#7884 created/updated

* Move router outside align with other plugins

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Add ut and fix integration tests

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Import use case id from default nav groups

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Fix workspace routes UT

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Share feature config generator between publicn and server

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Fix osd server crashed due to import from public

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
…es UT (opensearch-project#7954)

* Fix dynamicConfigServiceMock import path in workspace routes UT

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Changeset file for PR opensearch-project#7954 created/updated

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Copy link
Contributor

github-actions bot commented Sep 4, 2024

❌ Empty Changelog Section

The Changelog section in your PR description is empty. Please add a valid changelog entry or entries. If you did add a changelog entry, check to make sure that it was not accidentally included inside the comment block in the Changelog section.

Copy link

codecov bot commented Sep 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.15%. Comparing base (f7a168d) to head (afa7b8e).
Report is 21 commits behind head on 2.x.

Additional details and impacted files
@@            Coverage Diff             @@
##              2.x    #7984      +/-   ##
==========================================
+ Coverage   61.13%   61.15%   +0.01%     
==========================================
  Files        3686     3687       +1     
  Lines       87139    87149      +10     
  Branches    13387    13389       +2     
==========================================
+ Hits        53275    53295      +20     
+ Misses      30632    30619      -13     
- Partials     3232     3235       +3     
Flag Coverage Δ
Linux_1 29.24% <100.00%> (+0.43%) ⬆️
Linux_2 56.36% <ø> (ø)
Linux_4 29.67% <ø> (ø)
Windows_1 29.25% <100.00%> (+0.43%) ⬆️
Windows_2 56.31% <ø> (ø)
Windows_3 37.98% <ø> (ø)
Windows_4 29.67% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@SuZhou-Joe
Copy link
Member

ciGroup3 failed because of #7979.

@SuZhou-Joe SuZhou-Joe merged commit d3ce40f into opensearch-project:2.x Sep 4, 2024
64 of 67 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 6, 2024
* [Workspace]Validate features parameter in workspace create and update API (#7884)

* Add validate for features field in workspace create and update API

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Changeset file for PR #7884 created/updated

* Changeset file for PR #7884 created/updated

* Move router outside align with other plugins

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Add ut and fix integration tests

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Import use case id from default nav groups

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Fix workspace routes UT

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Share feature config generator between publicn and server

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Fix osd server crashed due to import from public

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

* [Workspace]Fix dynamicConfigServiceMock import path in workspace routes UT (#7954)

* Fix dynamicConfigServiceMock import path in workspace routes UT

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Changeset file for PR #7954 created/updated

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit d3ce40f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
SuZhou-Joe pushed a commit that referenced this pull request Sep 6, 2024
* [Workspace]Validate features parameter in workspace create and update API (#7884)

* Add validate for features field in workspace create and update API



* Changeset file for PR #7884 created/updated

* Changeset file for PR #7884 created/updated

* Move router outside align with other plugins



* Add ut and fix integration tests



* Import use case id from default nav groups



* Fix workspace routes UT



* Share feature config generator between publicn and server



* Fix osd server crashed due to import from public



---------




* [Workspace]Fix dynamicConfigServiceMock import path in workspace routes UT (#7954)

* Fix dynamicConfigServiceMock import path in workspace routes UT



* Changeset file for PR #7954 created/updated

---------




---------



(cherry picked from commit d3ce40f)

Signed-off-by: Lin Wang <wonglam@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@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.

3 participants