Skip to content

[Backport 2.x][Workspace]Add permission control logic for workspace#6531

Merged
SuZhou-Joe merged 2 commits intoopensearch-project:2.xfrom
wanglam:backport-6052-to-2.x
Apr 19, 2024
Merged

[Backport 2.x][Workspace]Add permission control logic for workspace#6531
SuZhou-Joe merged 2 commits intoopensearch-project:2.xfrom
wanglam:backport-6052-to-2.x

Conversation

@wanglam
Copy link
Copy Markdown
Collaborator

@wanglam wanglam commented Apr 18, 2024

Description

backport fb31b2d from #6052

This PR is for manual backport #6052 to 2.x branch.

Issues Resolved

#6051

Screenshot

Testing the changes

See #6052

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

…ject#6052)

* Add permission control for workspace

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

* Add changelog for permission control in workspace

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

* Fix integration tests and remove no need type

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

* Update permission enabled for workspace CRUD integration tests

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

* Change back to config schema

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

* feat: do not append workspaces field when no workspaces present (#6)

* feat: do not append workspaces field when no workspaces present

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* feat: do not append workspaces field when no workspaces present

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

---------

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: authInfo destructure (#7)

* fix: authInfo destructure

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* fix: unit test error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

---------

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* Fix permissions assign in attributes

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

* Remove deleteByWorkspace since not exists

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

* refactor: remove formatWorkspacePermissionModeToStringArray

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

* Remove current not used code

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

* Add missing unit tests for permission control

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

* Update workspaces API test describe

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

* Fix workspace CRUD API integration tests failed

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

* Address PR comments

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

* Store permissions when savedObjects.permissions.enabled

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

* Add permission control for deleteByWorkspace

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

* Update src/plugins/workspace/server/permission_control/client.ts

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* Update src/plugins/workspace/server/permission_control/client.ts

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

* Refactor permissions field in workspace create and update API

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

* Fix workspace CRUD API integration tests

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

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Co-authored-by: SuZhou-Joe <suzhou@amazon.com>
@wanglam wanglam force-pushed the backport-6052-to-2.x branch from 161cb94 to 8e26bca Compare April 18, 2024 07:38
@SuZhou-Joe SuZhou-Joe changed the title [Backport 2.x][Workspace]Manual backport 6052 to 2.x [Backport 2.x][Workspace]Add permission control logic for workspace Apr 18, 2024
@SuZhou-Joe SuZhou-Joe added Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry workspace v2.14.0 labels Apr 18, 2024
@wanglam wanglam marked this pull request as ready for review April 18, 2024 08:38
@ZilongX
Copy link
Copy Markdown
Collaborator

ZilongX commented Apr 18, 2024

picking up latest 2.x and re-running all checks

@SuZhou-Joe SuZhou-Joe merged commit 6d881e0 into opensearch-project:2.x Apr 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry v2.14.0 workspace

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants