-
Notifications
You must be signed in to change notification settings - Fork 176
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 Cannot find module when import ResourceType in server from public folder #1705
fix Cannot find module when import ResourceType in server from public folder #1705
Conversation
Signed-off-by: Yulong Ruan <ruanyl@amazon.com>
Hi @ruanyl , thanks for taking this on. Could you also fix the lint? https://github.com/opensearch-project/security-dashboards-plugin/actions/runs/7306997494/job/19912250179?pr=1705#step:5:22 |
Signed-off-by: Yulong Ruan <ruanyl@amazon.com>
Signed-off-by: Yulong Ruan <ruanyl@amazon.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1705 +/- ##
=======================================
Coverage 67.09% 67.09%
=======================================
Files 94 94
Lines 2404 2404
Branches 318 318
=======================================
Hits 1613 1613
Misses 713 713
Partials 78 78 ☔ View full report in Codecov by Sentry. |
@derek-ho The CI for this PR is being impacted by the custom admin pw changes. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cwperks I'm unclear if we should merge this change or not - please merge or request changes with details on how we can get this change in - thanks.
Merging this change. To catch these issue with CI, we should prioritize updating the Github worflows to create a build of OSD and run the build. #1709 |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1705-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 09b2f59453b4b3d356ba7627d1e1af663fb075bd
# Push it to GitHub
git push --set-upstream origin backport/backport-1705-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
… folder (opensearch-project#1705) * fix Cannot find module Signed-off-by: Yulong Ruan <ruanyl@amazon.com> * fix prettier error Signed-off-by: Yulong Ruan <ruanyl@amazon.com> * fix failed tests Signed-off-by: Yulong Ruan <ruanyl@amazon.com> --------- Signed-off-by: Yulong Ruan <ruanyl@amazon.com> Co-authored-by: Craig Perkins <cwperx@amazon.com> (cherry picked from commit 09b2f59)
…m public folder (opensearch-project#1705)" This reverts commit 09b2f59. Signed-off-by: Derek Ho <dxho@amazon.com>
…rver from public folder (opensearch-project#1705)"" This reverts commit 2de58e3. Signed-off-by: Derek Ho <dxho@amazon.com>
Description
Solution:
Moved the shared enum
ResourceType
betweenserver
andpublic
tocommon
folderCategory
Bug fix
Why these changes are required?
What is the old behavior before changes and new behavior after changes?
Issues Resolved
Testing
[Please provide details of testing done: unit testing, integration testing and manual testing]
Check List
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.