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

Allow URL params for Security plugin intercept calls #1276

Merged
merged 15 commits into from
May 16, 2024

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented May 7, 2024

Description

This change fixes integ test failures seen in the 2.14.0 integ test for the security-dashboards-plugin: opensearch-project/security-dashboards-plugin#1893

In 2.14.0, the security-dashboards-plugin added support for multiple data sources (MDS) and allows dataSourceId to pass as a url param for MDS enabled Dashboards instances. This change updates the calls to cy.intercept to allow url params. The tests currently hang on these calls.

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: Craig Perkins <[email protected]>
@SuZhou-Joe
Copy link
Member

SuZhou-Joe commented May 7, 2024

Will help to merge once all the CI checks complete.

@cwperks
Copy link
Member Author

cwperks commented May 7, 2024

Thanks @SuZhou-Joe!

@kavilla
Copy link
Member

kavilla commented May 8, 2024

Checked with @cwperks . Seems: #1266 addresses this issue and will have a follow up. Will remove the 2.14 label for tracking purposes. If that was incorrect @cwperks please re-add. Thank you!

cwperks added 6 commits May 15, 2024 20:41
Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Craig Perkins <[email protected]>
@cwperks cwperks merged commit ed49fa5 into opensearch-project:main May 16, 2024
37 of 41 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-1276-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ed49fa53ab96265f989576ca0a25b3d3b30948d0
# Push it to GitHub
git push --set-upstream origin backport/backport-1276-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-1276-to-2.x.

cwperks added a commit to cwperks/opensearch-dashboards-functional-test that referenced this pull request May 16, 2024
…ect#1276)

* Allow url params in intercept

Signed-off-by: Craig Perkins <[email protected]>

* Disable home modal

Signed-off-by: Craig Perkins <[email protected]>

* Update cypress/integration/plugins/security-dashboards-plugin/change_tenant_successfully.js

Signed-off-by: SuZhou-Joe <[email protected]>

* Fix CI check on main

Signed-off-by: Craig Perkins <[email protected]>

* Change text back

Signed-off-by: Craig Perkins <[email protected]>

* Move tenancy test over

Signed-off-by: Derek Ho <[email protected]>

* Use correct header when creating dashboard in tenancy_change_on_shortlink.js

Signed-off-by: Craig Perkins <[email protected]>

* Adjust import

Signed-off-by: Craig Perkins <[email protected]>

* Remove @

Signed-off-by: Craig Perkins <[email protected]>

* Add wildcard

Signed-off-by: Craig Perkins <[email protected]>

* Fix sanity_tests.spec.js

Signed-off-by: Craig Perkins <[email protected]>

* Close the modal

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Co-authored-by: SuZhou-Joe <[email protected]>
Co-authored-by: Derek Ho <[email protected]>
(cherry picked from commit ed49fa5)
SuZhou-Joe added a commit that referenced this pull request Sep 3, 2024
…1276) (#1332)

* Allow URL params for Security plugin intercept calls (#1276)

* Allow url params in intercept

Signed-off-by: Craig Perkins <[email protected]>

* Disable home modal

Signed-off-by: Craig Perkins <[email protected]>

* Update cypress/integration/plugins/security-dashboards-plugin/change_tenant_successfully.js

Signed-off-by: SuZhou-Joe <[email protected]>

* Fix CI check on main

Signed-off-by: Craig Perkins <[email protected]>

* Change text back

Signed-off-by: Craig Perkins <[email protected]>

* Move tenancy test over

Signed-off-by: Derek Ho <[email protected]>

* Use correct header when creating dashboard in tenancy_change_on_shortlink.js

Signed-off-by: Craig Perkins <[email protected]>

* Adjust import

Signed-off-by: Craig Perkins <[email protected]>

* Remove @

Signed-off-by: Craig Perkins <[email protected]>

* Add wildcard

Signed-off-by: Craig Perkins <[email protected]>

* Fix sanity_tests.spec.js

Signed-off-by: Craig Perkins <[email protected]>

* Close the modal

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Co-authored-by: SuZhou-Joe <[email protected]>
Co-authored-by: Derek Ho <[email protected]>
(cherry picked from commit ed49fa5)

* Update text

Signed-off-by: Craig Perkins <[email protected]>

* Update all instances

Signed-off-by: Craig Perkins <[email protected]>

* Update cypress.json

Signed-off-by: SuZhou-Joe <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Co-authored-by: SuZhou-Joe <[email protected]>
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.

6 participants