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

Read-only tenant mode tests #792

Merged
merged 6 commits into from
Dec 20, 2023

Conversation

kajetan-nobel
Copy link
Contributor

Description

Introduces tests for read-only tenant mode.

Issues Resolved

This is a complementary PR for:
opensearch-project/OpenSearch-Dashboards#4498
opensearch-project/security-dashboards-plugin#1472

Check List

  • Commits are signed per the DCO using --signoff

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.

Signed-off-by: Kajetan Nobel <k.nobel@routegroup.pl>
Signed-off-by: Kajetan Nobel <k.nobel@routegroup.pl>
@kajetan-nobel
Copy link
Contributor Author

FYI:

I've tested it with the versions:

  • 2.5.0
  • 2.8.0
    and today with 2.9.0 which don't want to pass.

Because of that, I'm labeling it as a draft until the issue will be resolved.

@kajetan-nobel kajetan-nobel changed the title Read-only tenant mode tests Draft: Read-only tenant mode tests Jul 28, 2023
Signed-off-by: Kajetan Nobel <k.nobel@routegroup.pl>
@kajetan-nobel kajetan-nobel changed the title Draft: Read-only tenant mode tests Read-only tenant mode tests Aug 7, 2023
@kajetan-nobel
Copy link
Contributor Author

A fix for 2.9.0 has been introduced

Signed-off-by: Kajetan Nobel <kajetan.nobel@eliatra.com>
Signed-off-by: Kajetan Nobel <kajetan.nobel@eliatra.com>
Signed-off-by: Kajetan Nobel <kajetan.nobel@eliatra.com>
@kajetan-nobel
Copy link
Contributor Author

@SuZhou-Joe @ruanyl I've retested it with 2.11.1 and also improved tests. Please check one more time :)

@SuZhou-Joe SuZhou-Joe merged commit 941f2de into opensearch-project:main Dec 20, 2023
36 of 37 checks passed
@SuZhou-Joe
Copy link
Member

@kajetan-nobel need to backport 2.x?

@kajetan-nobel
Copy link
Contributor Author

kajetan-nobel commented Dec 20, 2023

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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-792-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 941f2defd6bc133c5796d37e7593f99c345f343c
# Push it to GitHub
git push --set-upstream origin backport/backport-792-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 base branch is 2.x and the compare/head branch is backport/backport-792-to-2.x.

@SuZhou-Joe
Copy link
Member

@kajetan-nobel Backport failed, could you please manually backport to 2.x and raise a PR based on the instructions provided above?

kajetan-nobel added a commit to kajetan-nobel/opensearch-dashboards-functional-test that referenced this pull request Dec 22, 2023
* feat: introduces read-only tenant mode tests

Signed-off-by: Kajetan Nobel <k.nobel@routegroup.pl>

* feat: move loadSampleData to before

Signed-off-by: Kajetan Nobel <k.nobel@routegroup.pl>

* fix: add data to correct tenant, fix for version 2.9.0

Signed-off-by: Kajetan Nobel <k.nobel@routegroup.pl>

* feat: retest and improve switching tenant

Signed-off-by: Kajetan Nobel <kajetan.nobel@eliatra.com>

---------

Signed-off-by: Kajetan Nobel <k.nobel@routegroup.pl>
Signed-off-by: Kajetan Nobel <kajetan.nobel@eliatra.com>
(cherry picked from commit 941f2de)
@kajetan-nobel
Copy link
Contributor Author

@SuZhou-Joe #983

SuZhou-Joe pushed a commit that referenced this pull request Dec 24, 2023
* feat: introduces read-only tenant mode tests

Signed-off-by: Kajetan Nobel <k.nobel@routegroup.pl>

* feat: move loadSampleData to before

Signed-off-by: Kajetan Nobel <k.nobel@routegroup.pl>

* fix: add data to correct tenant, fix for version 2.9.0

Signed-off-by: Kajetan Nobel <k.nobel@routegroup.pl>

* feat: retest and improve switching tenant

Signed-off-by: Kajetan Nobel <kajetan.nobel@eliatra.com>

---------

Signed-off-by: Kajetan Nobel <k.nobel@routegroup.pl>
Signed-off-by: Kajetan Nobel <kajetan.nobel@eliatra.com>
(cherry picked from commit 941f2de)
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