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

[Backport 2.x] Always show security screen and shows error page when trying to access forbidden data-source (#1964) #1984

Merged

Conversation

DarshitChanpura
Copy link
Member

Description

Manually backports #1964

Manual backport is required because:

  • Service Accounts is not present in 2.x line and there were changes made to service account related files on the commit that went into main.
  • User page has conflict since some display text changed in the original commit.

Check List

  • New functionality includes testing
    - [ ] New functionality has been documented
  • 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.

Copy link

codecov bot commented Jun 3, 2024

Codecov Report

Attention: Patch coverage is 59.48276% with 47 lines in your changes missing coverage. Please review.

Project coverage is 70.36%. Comparing base (33ea906) to head (826380a).

Files Patch % Lines
...onfiguration/panels/tenant-list/configure_tab1.tsx 25.00% 10 Missing and 2 partials ⚠️
public/apps/configuration/panels/user-list.tsx 46.15% 4 Missing and 3 partials ⚠️
public/apps/configuration/app-router.tsx 25.00% 6 Missing ⚠️
public/apps/configuration/panels/role-list.tsx 40.00% 2 Missing and 4 partials ⚠️
.../apps/configuration/panels/auth-view/auth-view.tsx 68.75% 4 Missing and 1 partial ⚠️
...uration/panels/permission-list/permission-list.tsx 69.23% 3 Missing and 1 partial ⚠️
...blic/apps/configuration/access-error-component.tsx 66.66% 1 Missing and 1 partial ⚠️
...ps/configuration/panels/tenant-list/manage_tab.tsx 77.77% 1 Missing and 1 partial ⚠️
...s/configuration/panels/tenant-list/tenant-list.tsx 50.00% 1 Missing ⚠️
public/apps/configuration/top-nav-menu.tsx 75.00% 0 Missing and 1 partial ⚠️
... and 1 more
Additional details and impacted files
@@            Coverage Diff             @@
##              2.x    #1984      +/-   ##
==========================================
+ Coverage   69.60%   70.36%   +0.76%     
==========================================
  Files          95       96       +1     
  Lines        2461     2541      +80     
  Branches      332      377      +45     
==========================================
+ Hits         1713     1788      +75     
+ Misses        666      660       -6     
- Partials       82       93      +11     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@DarshitChanpura DarshitChanpura self-assigned this Jun 4, 2024
Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

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

I think some files were pulled in in the merge conflict

@derek-ho
Copy link
Collaborator

derek-ho commented Jun 4, 2024

We should delete service accounts on main if we have no plans to move forward with it, to prevent these pesky backport failures

@DarshitChanpura
Copy link
Member Author

DarshitChanpura commented Jun 4, 2024

Argh, good catch. Removed those files.

@derek-ho derek-ho merged commit 5549d1c into opensearch-project:2.x Jun 4, 2024
17 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants