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

[Workspace] Only OSD admin can create workspace #6831

Merged
merged 27 commits into from
Jun 4, 2024
Merged

[Workspace] Only OSD admin can create workspace #6831

merged 27 commits into from
Jun 4, 2024

Conversation

yubonluo
Copy link
Contributor

@yubonluo yubonluo commented May 24, 2024 •
edited
Loading

Description

Only OSD admin can create workspace

Issues Resolved

#6830

Screenshot

image

Testing the changes

  1. Clone the latest osd/security-dashboard plugin code and run yarn osd bootstrap
  2. Modify config/opensearch_dashboards.yml
opensearchDashboards.dashboardAdmin.groups: ["dashboard_admin"]
opensearchDashboards.dashboardAdmin.users: ["username"]
workspace.enabled: true 
opensearch.username: "username"
opensearch.password: "password" 
opensearch.ssl.verificationMode: none
savedObjects.permission.enabled: true
  1. Run yarn start --no-base-path
  2. Create a workspace.

Changelog

  • feat: [Workspace] Only OSD admin can create workspace

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

@yubonluo
Only OSD admin can create workspace
ffb4a0f 
Signed-off-by: yubonluo <yubonluo@amazon.com>
@codecov Codecov
Copy link

codecov bot commented May 24, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.43%. Comparing base (766a39a) to head (acadee6).
Report is 416 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #6831      +/-   ##
==========================================
+ Coverage   67.41%   67.43%   +0.01%     
==========================================
  Files        3444     3444              
  Lines       67839    67847       +8     
  Branches    11033    11035       +2     
==========================================
+ Hits        45734    45751      +17     
+ Misses      19439    19429      -10     
- Partials     2666     2667       +1
Flag Coverage Δ
Linux_1 33.08% <100.00%> (+0.01%) ⬆️
Linux_2 55.12% <ø> (ø)
Linux_3 45.25% <ø> (+<0.01%) ⬆️
Linux_4 34.82% <ø> (ø)
Windows_1 33.13% <100.00%> (+0.03%) ⬆️
Windows_2 55.09% <ø> (ø)
Windows_3 ?
Windows_4 34.82% <ø> (ø)

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.

yubonluo added 4 commits May 27, 2024 12:55
@yubonluo
optimize the code
893b039 
Signed-off-by: yubonluo <yubonluo@amazon.com>
@yubonluo
Merge branch 'main' of github.com:opensearch-project/OpenSearch-Dashb…
5ec5b15 
…oards into main-create-workspace-OSDAdmin
@yubonluo
Merge branch 'main-create-workspace-OSDAdmin' of github.com:yubonluo/…
832b1e5 
…OpenSearch-Dashboards into main-create-workspace-OSDAdmin
@yubonluo
delete useless code
11f6396 
Signed-off-by: yubonluo <yubonluo@amazon.com>
@yubonluo
solve conflict
deb4341 
Signed-off-by: yubonluo <yubonluo@amazon.com>
yubonluo added 2 commits May 31, 2024 14:10
@yubonluo
optimize the code
8c3675b 
Signed-off-by: yubonluo <yubonluo@amazon.com>
@yubonluo
Merge branch 'main-create-workspace-OSDAdmin' of github.com:yubonluo/…
2e2350b 
…OpenSearch-Dashboards into main-create-workspace-OSDAdmin
@yubonluo
Copy link
Contributor Author

yubonluo commented Jun 3, 2024

CC @SuZhou-Joe @ruanyl If you don‘t have any concerns about this CR, could you please help me approve it?

@yubonluo yubonluo requested review from SuZhou-Joe and ruanyl June 3, 2024 05:29
SuZhou-Joe
SuZhou-Joe previously approved these changes Jun 3, 2024
View reviewed changes
yubonluo added 2 commits June 4, 2024 01:16
@yubonluo
Optimize the code
35b04bd 
Signed-off-by: yubonluo <yubonluo@amazon.com>
@yubonluo
Merge branch 'main-create-workspace-OSDAdmin' of github.com:yubonluo/…
4962ab2 
…OpenSearch-Dashboards into main-create-workspace-OSDAdmin
@SuZhou-Joe SuZhou-Joe merged commit 32fbe18 into opensearch-project:main Jun 4, 2024
74 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 4, 2024
@github-actions @opensearch-changeset-bot
[Workspace] Only OSD admin can create workspace (#6831)
909ada0 
* Only OSD admin can create workspace

Signed-off-by: yubonluo <yubonluo@amazon.com>

* Changeset file for PR #6831 created/updated

* Changeset file for PR #6831 created/updated

* optimize the code

Signed-off-by: yubonluo <yubonluo@amazon.com>

* delete useless code

Signed-off-by: yubonluo <yubonluo@amazon.com>

* add integration tests

Signed-off-by: yubonluo <yubonluo@amazon.com>

* optimize the code

Signed-off-by: yubonluo <yubonluo@amazon.com>

* delete useless code

Signed-off-by: yubonluo <yubonluo@amazon.com>

* optimize the code

Signed-off-by: yubonluo <yubonluo@amazon.com>

* optimize the code

Signed-off-by: yubonluo <yubonluo@amazon.com>

* optimize the code

Signed-off-by: yubonluo <yubonluo@amazon.com>

* add overwrite check

Signed-off-by: yubonluo <yubonluo@amazon.com>

* optimize the code

Signed-off-by: yubonluo <yubonluo@amazon.com>

* optimize the code

Signed-off-by: yubonluo <yubonluo@amazon.com>

* Add the logic of whether to update the operation

Signed-off-by: yubonluo <yubonluo@amazon.com>

* optimize the code

Signed-off-by: yubonluo <yubonluo@amazon.com>

* Optimize the code

Signed-off-by: yubonluo <yubonluo@amazon.com>

* Optimize the code

Signed-off-by: yubonluo <yubonluo@amazon.com>

---------

Signed-off-by: yubonluo <yubonluo@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit 32fbe18)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Jun 4, 2024
Merged
SuZhou-Joe pushed a commit that referenced this pull request Jun 4, 2024
@opensearch-trigger-bot @github-actions @opensearch-changeset-bot
[Workspace] Only OSD admin can create workspace (#6831) (#6900)
ead2800 
* Only OSD admin can create workspace



* Changeset file for PR #6831 created/updated

* Changeset file for PR #6831 created/updated

* optimize the code



* delete useless code



* add integration tests



* optimize the code



* delete useless code



* optimize the code



* optimize the code



* optimize the code



* add overwrite check



* optimize the code



* optimize the code



* Add the logic of whether to update the operation



* optimize the code



* Optimize the code



* Optimize the code



---------



(cherry picked from commit 32fbe18)

Signed-off-by: yubonluo <yubonluo@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
Reviewers

@Hailong-am Hailong-am Hailong-am left review comments

@wanglam wanglam wanglam left review comments

@virajsanghvi virajsanghvi virajsanghvi left review comments

@SuZhou-Joe SuZhou-Joe SuZhou-Joe approved these changes

@ruanyl ruanyl ruanyl approved these changes

@ananzh ananzh Awaiting requested review from ananzh ananzh is a code owner

@kavilla kavilla Awaiting requested review from kavilla kavilla is a code owner

@AMoo-Miki AMoo-Miki Awaiting requested review from AMoo-Miki AMoo-Miki is a code owner

@ashwin-pc ashwin-pc Awaiting requested review from ashwin-pc ashwin-pc is a code owner

@joshuarrrr joshuarrrr Awaiting requested review from joshuarrrr joshuarrrr is a code owner

@abbyhu2000 abbyhu2000 Awaiting requested review from abbyhu2000 abbyhu2000 is a code owner

@zengyan-amazon zengyan-amazon Awaiting requested review from zengyan-amazon zengyan-amazon is a code owner

@zhongnansu zhongnansu Awaiting requested review from zhongnansu zhongnansu is a code owner

@manasvinibs manasvinibs Awaiting requested review from manasvinibs manasvinibs is a code owner

@ZilongX ZilongX Awaiting requested review from ZilongX ZilongX is a code owner

@Flyingliuhub Flyingliuhub Awaiting requested review from Flyingliuhub Flyingliuhub is a code owner

@curq curq Awaiting requested review from curq curq is a code owner

@bandinib-amzn bandinib-amzn Awaiting requested review from bandinib-amzn bandinib-amzn is a code owner

@BionIT BionIT Awaiting requested review from BionIT BionIT is a code owner

@xinruiba xinruiba Awaiting requested review from xinruiba xinruiba is a code owner

@zhyuanqi zhyuanqi Awaiting requested review from zhyuanqi zhyuanqi is a code owner

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

Assignees

@Flyingliuhub Flyingliuhub

Labels
backport 2.x in-next repeat-contributor v2.15.0 workspace
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@yubonluo @ruanyl @virajsanghvi @wanglam @SuZhou-Joe @Hailong-am @AMoo-Miki @Flyingliuhub