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

Fixes the permissions spec and related to fixtures to reflect correct action-group names #1449

Conversation

DarshitChanpura
Copy link
Member

Description

  • Re-arranges the fixture load in a test to reflect the correct updates.
  • Updates action-group names in fixture files.

Issues Resolved

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.

… action-group names

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@@ -73,13 +73,7 @@ if (Cypress.env('SECURITY_ENABLED')) {
});

it('should create new action group successfully by selecting `Create from blank`', () => {
cy.mockPermissionsAction(
Copy link
Member Author

Choose a reason for hiding this comment

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

we should not be loading the action group before creating it. The action-group test-creation should not be present on initial page load.

@DarshitChanpura
Copy link
Member Author

Flaky error;

1) Permissions page
       should create new action group successfully by selecting `Create from selection`:
     CypressError: Timed out retrying after 60000ms: `cy.wait()` timed out waiting `60000ms` for the 1st request to the route: `getPermissions`. No request ever occurred.

seems to be an issue with cypress, as mentioned here: #284

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
This reverts commit 0619d35.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@Hailong-am Hailong-am merged commit a8ba15a into opensearch-project:main Aug 1, 2024
40 checks passed
@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-1449-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a8ba15a0175cc1684a020cac5712de12c99c68d9
# Push it to GitHub
git push --set-upstream origin backport/backport-1449-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-1449-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.16 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.16 2.16
# Navigate to the new working tree
cd .worktrees/backport-2.16
# Create a new branch
git switch --create backport/backport-1449-to-2.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a8ba15a0175cc1684a020cac5712de12c99c68d9
# Push it to GitHub
git push --set-upstream origin backport/backport-1449-to-2.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.16

Then, create a pull request where the base branch is 2.16 and the compare/head branch is backport/backport-1449-to-2.16.

@SuZhou-Joe
Copy link
Member

@DarshitChanpura Seems failed to backport automatically, could you please backport to 2.x manually?

DarshitChanpura added a commit to DarshitChanpura/opensearch-dashboards-functional-test that referenced this pull request Aug 2, 2024
… action-group names (opensearch-project#1449)

* Fixes the permissions spec and related to fixtures to reflect correct action-group names

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Adds a test case to check for button availability before making a call

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Adds a focus call

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Temp add 10 CI runs

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Fixes sanity test spec

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Temp add 10 CI runs"

This reverts commit 0619d35.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit a8ba15a)
DarshitChanpura added a commit to DarshitChanpura/opensearch-dashboards-functional-test that referenced this pull request Aug 2, 2024
… action-group names (opensearch-project#1449)

* Fixes the permissions spec and related to fixtures to reflect correct action-group names

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Adds a test case to check for button availability before making a call

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Adds a focus call

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Temp add 10 CI runs

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Fixes sanity test spec

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Temp add 10 CI runs"

This reverts commit 0619d35.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit a8ba15a)
@DarshitChanpura
Copy link
Member Author

@DarshitChanpura Seems failed to backport automatically, could you please backport to 2.x manually?

@SuZhou-Joe Done. Could you please review backports?

SuZhou-Joe pushed a commit that referenced this pull request Aug 2, 2024
… action-group names (#1449) (#1483)

* Fixes the permissions spec and related to fixtures to reflect correct action-group names

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Adds a test case to check for button availability before making a call

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Adds a focus call

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Temp add 10 CI runs

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Fixes sanity test spec

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Temp add 10 CI runs"

This reverts commit 0619d35.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit a8ba15a)
SuZhou-Joe pushed a commit that referenced this pull request Aug 2, 2024
… action-group names (#1449) (#1482)

* Fixes the permissions spec and related to fixtures to reflect correct action-group names

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Adds a test case to check for button availability before making a call

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Adds a focus call

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Temp add 10 CI runs

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Fixes sanity test spec

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Temp add 10 CI runs"

This reverts commit 0619d35.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit a8ba15a)
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