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

Refractor: move permission control service to workspace directory and keep saved objects as clean as possible #166

Merged
merged 2 commits into from
Sep 15, 2023

Conversation

SuZhou-Joe
Copy link
Collaborator

@SuZhou-Joe SuZhou-Joe commented Sep 15, 2023

Description

Issues Resolved

Screenshot

Testing the changes

Check List

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

… keep saved objects as clean as possible

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
@codecov-commenter
Copy link

codecov-commenter commented Sep 15, 2023

Codecov Report

Merging #166 (bde5660) into workspace (f350eb3) will decrease coverage by 30.96%.
Report is 4 commits behind head on workspace.
The diff coverage is n/a.

@@              Coverage Diff               @@
##           workspace     #166       +/-   ##
==============================================
- Coverage      65.71%   34.75%   -30.96%     
==============================================
  Files           3336     1922     -1414     
  Lines          64652    38145    -26507     
  Branches       10316     5463     -4853     
==============================================
- Hits           42484    13257    -29227     
- Misses         19688    24284     +4596     
+ Partials        2480      604     -1876     
Flag Coverage Δ
Linux_1 34.75% <ø> (+<0.01%) ⬆️
Linux_3 ?
Linux_4 ?
Windows_1 ?
Windows_2 ?
Windows_4 ?

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

see 2144 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

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

@ruanyl ruanyl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice refactor!

@SuZhou-Joe SuZhou-Joe merged commit c2a9bd2 into ruanyl:workspace Sep 15, 2023
@opensearch-workspace-development

The backport to workspace-2.9 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch-Dashboards/backport-workspace-2.9 workspace-2.9
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-workspace-2.9
# Create a new branch
git switch --create backport/backport-166-to-workspace-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c2a9bd24acba983353f43db80ec98f54ba7e15c3
# Push it to GitHub
git push --set-upstream origin backport/backport-166-to-workspace-2.9
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-workspace-2.9

Then, create a pull request where the base branch is workspace-2.9 and the compare/head branch is backport/backport-166-to-workspace-2.9.

@opensearch-workspace-development

The backport to workspace-2.9 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch-Dashboards/backport-workspace-2.9 workspace-2.9
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-workspace-2.9
# Create a new branch
git switch --create backport/backport-166-to-workspace-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c2a9bd24acba983353f43db80ec98f54ba7e15c3
# Push it to GitHub
git push --set-upstream origin backport/backport-166-to-workspace-2.9
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-workspace-2.9

Then, create a pull request where the base branch is workspace-2.9 and the compare/head branch is backport/backport-166-to-workspace-2.9.

SuZhou-Joe added a commit that referenced this pull request Sep 15, 2023
… keep saved objects as clean as possible (#166) (#172)

* refractor: move permission control service to workspace directory and keep saved objects as clean as possible

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

* feat: make lint pass

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

---------

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
(cherry picked from commit c2a9bd2)
ruanyl pushed a commit that referenced this pull request Sep 15, 2023
… keep saved objects as clean as possible (#166)

* refractor: move permission control service to workspace directory and keep saved objects as clean as possible

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

* feat: make lint pass

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

---------

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
SuZhou-Joe added a commit that referenced this pull request Sep 16, 2023
… keep saved objects as clean as possible (#166)

* refractor: move permission control service to workspace directory and keep saved objects as clean as possible

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

* feat: make lint pass

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

---------

Signed-off-by: SuZhou-Joe <suzhou@amazon.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.

4 participants