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.

Sign up for GitHub

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

Jump to bottom

Add backend filtering for legacy internal user and service accounts #2786

Merged
merged 44 commits into from
Sep 22, 2023
Merged

Add backend filtering for legacy internal user and service accounts #2786

merged 44 commits into from
Sep 22, 2023

Conversation

samuelcostae
Copy link
Contributor

@samuelcostae samuelcostae commented May 23, 2023 •
edited by peternied
Loading

Description

Update UserAPIAction to Filter internal accounts and Service accounts.

Dashboards Plugin changes via PR opensearch-project/security-dashboards-plugin#1502

Issues Resolved

Testing

Unit Tests created

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.

samuelcostae and others added 4 commits May 11, 2023 15:52
@samuelcostae
initial draft
8326734 
Signed-off-by: scosta <samuel.costa@eliatra.com>
@samuelcostae
Merge branch 'opensearch-project:main' into 2704-filter-internal-and-…
c18908a 
…service-accounts
@RyanL1997 @samuelcostae
Fix the import org.opensearch.core.common.Strings;
7a836bd 
Signed-off-by: Ryan Liang <jiallian@amazon.com>
@samuelcostae
cleanup
8c43af9 
Signed-off-by: scosta <samuel.costa@eliatra.com>
samuelcostae and others added 8 commits May 23, 2023 15:27
@samuelcostae @DarshitChanpura
Update src/main/java/org/opensearch/security/user/UserService.java
cbc1fb4 
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Signed-off-by: Sam <128482925+samuelcostae@users.noreply.github.com>
@samuelcostae @DarshitChanpura
Update src/main/java/org/opensearch/security/dlic/rest/api/InternalUs…
d931698 
…ersApiAction.java

Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Signed-off-by: Sam <128482925+samuelcostae@users.noreply.github.com>
@samuelcostae @DarshitChanpura
Update src/main/java/org/opensearch/security/user/UserService.java
0bc21aa 
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Signed-off-by: Sam <128482925+samuelcostae@users.noreply.github.com>
@samuelcostae
restoring new endpoints. removing unused imports
44bfe91 
Signed-off-by: scosta <samuel.costa@eliatra.com>
@samuelcostae
Merge branch 'opensearch-project:main' into 2704-filter-internal-and-…
5bbc0ec 
…service-accounts
@samuelcostae
refactoring
80dc161 
Signed-off-by: scosta <samuel.costa@eliatra.com>
@samuelcostae
tests
5fc1623 
Signed-off-by: scosta <samuel.costa@eliatra.com>
@samuelcostae
Expliciting imports
d7e7498 
Signed-off-by: scosta <samuel.costa@eliatra.com>
@samuelcostae
Copy link
Contributor Author

@DarshitChanpura I had to a good bit of refactoring as I noticed that before, the beahviour in the PR was returning only the list of names of the accounts of the specified type, but the existing implementations on internalUsersAPI return the full account details.

@stephen-crawford stephen-crawford changed the title 2704 filter internal and service accounts Add backend filtering for legacy internal user and service accounts Jun 19, 2023
stephen-crawford
stephen-crawford reviewed Jun 19, 2023
View reviewed changes
Copy link
Contributor

@stephen-crawford stephen-crawford left a comment

Choose a reason for hiding this comment

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

Overall looks good to me. I left a comment about tests, but I believe this should ready for final review.

src/test/java/org/opensearch/security/dlic/rest/api/UserApiTest.java Show resolved Hide resolved
@stephen-crawford stephen-crawford marked this pull request as ready for review June 19, 2023 13:42
@stephen-crawford
Copy link
Contributor

@samuelcostae could you rebase against main and resolve any conflicts.

@samuelcostae
Merge branch 'main' into 2704-filter-internal-and-service-accounts
ca3c27c 
Signed-off-by: Sam <128482925+samuelcostae@users.noreply.github.com>
@DarshitChanpura
Copy link
Member

@samuelcostae Please let us know if you would require any help to move this along.

@peternied
Copy link
Member

@samuelcostae Thanks for the updates - sorry its taken a little bit to circle back around to this pull requests.

@samuelcostae
Merge branch 'main' into 2704-filter-internal-and-service-accounts
fce3ef9 
# Conflicts:
#	src/main/java/org/opensearch/security/dlic/rest/api/InternalUsersApiAction.java
@samuelcostae
draft changes after refactor
6a82370 
Signed-off-by: Sam <samuel.costa@eliatra.com>
@samuelcostae
draft changes after refactor
0351efa 
Signed-off-by: Sam <samuel.costa@eliatra.com>
@samuelcostae
Merge branch 'main' into 2704-filter-internal-and-service-accounts
28ed6a7
@stephen-crawford
Copy link
Contributor

This is associated with #2704

@samuelcostae
changes from PR feedback
b9bf81b 
Signed-off-by: Sam <samuel.costa@eliatra.com>
DarshitChanpura
DarshitChanpura reviewed Sep 19, 2023
View reviewed changes
Copy link
Member

@DarshitChanpura DarshitChanpura left a comment

Choose a reason for hiding this comment

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

Looks close. Final two comments.

src/main/java/org/opensearch/security/user/UserService.java Outdated Show resolved Hide resolved
src/test/java/org/opensearch/security/dlic/rest/api/UserApiTest.java Show resolved Hide resolved
peternied
peternied reviewed Sep 20, 2023
View reviewed changes
Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

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

Last blocker in my mind is the structure of the UserService code, please iterate on @DarshitChanpura suggestion to slim down that code.

samuelcostae and others added 3 commits September 20, 2023 15:35
@samuelcostae @DarshitChanpura
Update src/main/java/org/opensearch/security/user/UserService.java
81cbbc0 
Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Signed-off-by: Sam <128482925+samuelcostae@users.noreply.github.com>
@samuelcostae
small bug fix
82708fd 
Signed-off-by: Sam <samuel.costa@eliatra.com>
@samuelcostae
spotless and draft unit test
0d3916d 
Signed-off-by: Sam <samuel.costa@eliatra.com>
peternied
peternied reviewed Sep 20, 2023
View reviewed changes
Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

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

Adding some feedback about the new unit tests - really close.

src/test/java/org/opensearch/security/UserServiceUnitTests.java Outdated Show resolved Hide resolved
src/test/java/org/opensearch/security/UserServiceUnitTests.java Outdated Show resolved Hide resolved
src/test/java/org/opensearch/security/UserServiceUnitTests.java Show resolved Hide resolved
src/test/java/org/opensearch/security/UserServiceUnitTests.java Outdated Show resolved Hide resolved
@samuelcostae
test and filter enum changes
34a90dd 
Signed-off-by: Sam <samuel.costa@eliatra.com>
@samuelcostae
Service/Attributes bug on Handling new account put rest request
d887b40 
Signed-off-by: Sam <samuel.costa@eliatra.com>
@samuelcostae
Service/Attributes bug on Handling new account put rest request
6c24fe2 
Signed-off-by: Sam <samuel.costa@eliatra.com>
@peternied
Copy link
Member

@scrawfor99 Could you take another look?

stephen-crawford
stephen-crawford approved these changes Sep 22, 2023
View reviewed changes
Copy link
Contributor

@stephen-crawford stephen-crawford left a comment

Choose a reason for hiding this comment

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

Great job Sam :)

@stephen-crawford stephen-crawford merged commit 7f6944c into opensearch-project:main Sep 22, 2023
56 of 57 checks passed
RyanL1997 added a commit to RyanL1997/security that referenced this pull request Nov 2, 2023
@RyanL1997
Add opensearch-project#2786
55bc688 
Signed-off-by: Ryan Liang <jiallian@amazon.com>
This was referenced Nov 2, 2023
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DarshitChanpura DarshitChanpura DarshitChanpura left review comments

@peternied peternied peternied approved these changes

@stephen-crawford stephen-crawford stephen-crawford approved these changes

@cliu123 cliu123 Awaiting requested review from cliu123

@cwperks cwperks Awaiting requested review from cwperks cwperks is a code owner

@davidlago davidlago Awaiting requested review from davidlago

@RyanL1997 RyanL1997 Awaiting requested review from RyanL1997 RyanL1997 is a code owner

@reta reta Awaiting requested review from reta reta is a code owner

@willyborankin willyborankin Awaiting requested review from willyborankin willyborankin is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Extensions] Filter internal users for Service Accounts and add associated API
5 participants
@samuelcostae @stephen-crawford @DarshitChanpura @peternied @RyanL1997