-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Fix #27107: soft-deleted users still appear in Experts/Reviewers across all entities #27120
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
Open
yan-3005
wants to merge
31
commits into
main
Choose a base branch
from
ram/fix-27107-soft-deleted-users-in-relations
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
89122f6
Fix #27107: soft-deleted users still appear in experts/reviewers acro…
yan-3005 f56057c
Thread Include through bulk relationship resolution instead of hardco…
yan-3005 3264fb3
Fix inherited experts/owners including soft-deleted users from parent…
yan-3005 841775b
Fix soft-deleted users leaking into owners/experts/reviewers across a…
yan-3005 d4743a1
Fix test user email validation in soft-delete integration tests
yan-3005 05b41cb
Fix GlossaryTerm list test to filter by glossary ID
yan-3005 1a1888a
Fix fromId/toId swap in EntityRepository.batchFetchExperts
yan-3005 0c45006
Add merge function to Collectors.toMap in batchFetchExperts
yan-3005 639c950
Handle soft-deleted parent in setInheritedFields for DataProduct and …
yan-3005 97f328a
Remove dead setFieldsInBulk(Include) overload and collapse Include fr…
yan-3005 d9aa379
Paginate domain list to find test domain regardless of total count
yan-3005 00e7896
Merge branch 'main' into ram/fix-27107-soft-deleted-users-in-relations
yan-3005 37a014a
Revert WorksheetRepository Include change — out of scope for #27107
yan-3005 47def38
Merge branch 'main' into ram/fix-27107-soft-deleted-users-in-relations
yan-3005 4af35c3
Address PR review: add limit to DataProduct list test; align TagRepos…
yan-3005 b3d7482
Revert TagRepository Include changes — out of scope for #27107
yan-3005 d5446b1
Remove unnecessary changes and compilation error
yan-3005 736b773
Thread Include parameter through bulk relationship resolution path
yan-3005 007976e
Fix subclass bypass: use ThreadLocal to carry Include through virtual…
yan-3005 21c8e64
Merge branch 'main' into ram/fix-27107-soft-deleted-users-in-relations
yan-3005 f4a875e
Merge branch 'main' into ram/fix-27107-soft-deleted-users-in-relations
yan-3005 5e77478
Merge branch 'main' into ram/fix-27107-soft-deleted-users-in-relations
yan-3005 8b443b1
Fix null Include in setFieldsInBulk — default to NON_DELETED
yan-3005 85911a3
Merge branch 'main' into ram/fix-27107-soft-deleted-users-in-relations
yan-3005 6807212
Merge remote-tracking branch 'origin/main' into ram/fix-27107-soft-de…
yan-3005 70a4b67
Fix #27107: fix inverted ternary root cause; harden bulk-list NON_DEL…
yan-3005 344bc44
Merge branch 'main' into ram/fix-27107-soft-deleted-users-in-relations
yan-3005 7217773
Fix Copilot review: null-guard in batchFetchFollowers, remove dead 3-…
yan-3005 135be1c
fix: bump list limit to 1000000 in follower/voter IT tests to handle …
yan-3005 607743b
fix: remove unused Include param from listInternal and serializeJsons
yan-3005 9e31dbc
Merge branch 'main' into ram/fix-27107-soft-deleted-users-in-relations
yan-3005 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,14 +29,20 @@ | |
| import org.junit.jupiter.api.parallel.ExecutionMode; | ||
| import org.openmetadata.it.util.SdkClients; | ||
| import org.openmetadata.it.util.TestNamespace; | ||
| import org.openmetadata.schema.api.VoteRequest; | ||
| import org.openmetadata.schema.api.domains.CreateDomain; | ||
| import org.openmetadata.schema.api.domains.CreateDomain.DomainType; | ||
| import org.openmetadata.schema.api.teams.CreateUser; | ||
| import org.openmetadata.schema.entity.domains.Domain; | ||
| import org.openmetadata.schema.entity.teams.User; | ||
| import org.openmetadata.schema.type.ChangeEvent; | ||
| import org.openmetadata.schema.type.EntityHistory; | ||
| import org.openmetadata.schema.type.EntityReference; | ||
| import org.openmetadata.schema.type.Votes; | ||
| import org.openmetadata.sdk.client.OpenMetadataClient; | ||
| import org.openmetadata.sdk.models.ListParams; | ||
| import org.openmetadata.sdk.models.ListResponse; | ||
| import org.openmetadata.sdk.network.HttpMethod; | ||
|
|
||
| /** | ||
| * Integration tests for Domain entity operations. | ||
|
|
@@ -1153,4 +1159,204 @@ void test_renameDomainDoesNotAffectSimilarPrefixDomains(TestNamespace ns) throws | |
| // Verify old child FQN no longer works | ||
| assertThrows(Exception.class, () -> getEntityByName(oldChildFqn)); | ||
| } | ||
|
|
||
| @Test | ||
| void softDeletedExpert_notReturnedInSingleGet(TestNamespace ns) { | ||
| OpenMetadataClient client = SdkClients.adminClient(); | ||
|
|
||
| String userName = ns.shortPrefix("domain_expert"); | ||
| User expert = | ||
| client | ||
| .users() | ||
| .create( | ||
| new CreateUser() | ||
| .withName(userName) | ||
| .withEmail(userName + "@test.openmetadata.org") | ||
| .withDescription("Expert user for domain soft-delete test")); | ||
|
|
||
| CreateDomain create = | ||
| new CreateDomain() | ||
| .withName(ns.prefix("domain_softdel")) | ||
| .withDomainType(DomainType.AGGREGATE) | ||
| .withExperts(List.of(expert.getFullyQualifiedName())) | ||
| .withDescription("Domain for soft-delete expert test"); | ||
| Domain domain = createEntity(create); | ||
|
|
||
| client.users().delete(expert.getId().toString()); | ||
|
|
||
| Domain byId = client.domains().get(domain.getId().toString(), "experts"); | ||
| assertTrue( | ||
| byId.getExperts() == null || byId.getExperts().isEmpty(), | ||
| "Soft-deleted expert must not appear in single GET by ID"); | ||
|
|
||
| Domain byName = client.domains().getByName(domain.getFullyQualifiedName(), "experts"); | ||
| assertTrue( | ||
| byName.getExperts() == null || byName.getExperts().isEmpty(), | ||
| "Soft-deleted expert must not appear in single GET by name"); | ||
| } | ||
|
|
||
| @Test | ||
| void softDeletedExpert_notReturnedInListEndpoint(TestNamespace ns) { | ||
| OpenMetadataClient client = SdkClients.adminClient(); | ||
|
|
||
| String userName = ns.shortPrefix("domain_expert_list"); | ||
| User expert = | ||
| client | ||
| .users() | ||
| .create( | ||
| new CreateUser() | ||
| .withName(userName) | ||
| .withEmail(userName + "@test.openmetadata.org") | ||
| .withDescription("Expert user for domain list soft-delete test")); | ||
|
|
||
| CreateDomain create = | ||
| new CreateDomain() | ||
| .withName(ns.prefix("domain_softdel_list")) | ||
| .withDomainType(DomainType.AGGREGATE) | ||
| .withExperts(List.of(expert.getFullyQualifiedName())) | ||
| .withDescription("Domain for soft-delete expert list test"); | ||
| Domain domain = createEntity(create); | ||
|
|
||
| client.users().delete(expert.getId().toString()); | ||
|
|
||
| Domain listed = null; | ||
| ListParams params = new ListParams().setFields("experts").withLimit(100); | ||
| while (listed == null) { | ||
| ListResponse<Domain> page = listEntities(params); | ||
| listed = | ||
| page.getData().stream() | ||
| .filter(d -> d.getId().equals(domain.getId())) | ||
| .findFirst() | ||
| .orElse(null); | ||
| String after = page.getPaging() != null ? page.getPaging().getAfter() : null; | ||
| if (listed != null || after == null) break; | ||
| params = new ListParams().setFields("experts").withLimit(100).setAfter(after); | ||
| } | ||
| assertNotNull(listed, "Domain not found in list"); | ||
| assertTrue( | ||
| listed.getExperts() == null || listed.getExperts().isEmpty(), | ||
| "Soft-deleted expert must not appear in list endpoint"); | ||
| } | ||
|
|
||
| @Test | ||
| void softDeletedExpert_notReturnedInListWithIncludeAll(TestNamespace ns) { | ||
| OpenMetadataClient client = SdkClients.adminClient(); | ||
|
|
||
| String userName = ns.shortPrefix("domain_expert_all"); | ||
| User expert = | ||
| client | ||
| .users() | ||
| .create( | ||
| new CreateUser() | ||
| .withName(userName) | ||
| .withEmail(userName + "@test.openmetadata.org") | ||
| .withDescription("Expert user for domain include-all soft-delete test")); | ||
|
|
||
| CreateDomain create = | ||
| new CreateDomain() | ||
| .withName(ns.prefix("domain_softdel_all")) | ||
| .withDomainType(DomainType.AGGREGATE) | ||
| .withExperts(List.of(expert.getFullyQualifiedName())) | ||
| .withDescription("Domain for include-all soft-delete expert test"); | ||
| Domain domain = createEntity(create); | ||
|
|
||
| client.users().delete(expert.getId().toString()); | ||
|
|
||
| Domain listed = null; | ||
| ListParams params = | ||
| new ListParams().setFields("experts").withLimit(100).addFilter("include", "all"); | ||
| while (listed == null) { | ||
| ListResponse<Domain> page = listEntities(params); | ||
| listed = | ||
| page.getData().stream() | ||
| .filter(d -> d.getId().equals(domain.getId())) | ||
| .findFirst() | ||
| .orElse(null); | ||
| String after = page.getPaging() != null ? page.getPaging().getAfter() : null; | ||
| if (listed != null || after == null) break; | ||
| params = | ||
| new ListParams() | ||
| .setFields("experts") | ||
| .withLimit(100) | ||
| .addFilter("include", "all") | ||
| .setAfter(after); | ||
| } | ||
| assertNotNull(listed, "Domain not found in list with include=all"); | ||
| assertTrue( | ||
| listed.getExperts() == null || listed.getExperts().isEmpty(), | ||
| "Soft-deleted expert must not appear even when include=all (applies to top-level only)"); | ||
| } | ||
|
|
||
| @Test | ||
| void softDeletedFollower_notReturnedInListEndpoint(TestNamespace ns) { | ||
| OpenMetadataClient client = SdkClients.adminClient(); | ||
|
|
||
| String userName = ns.shortPrefix("follower_list"); | ||
| User follower = | ||
| client | ||
| .users() | ||
| .create( | ||
| new CreateUser().withName(userName).withEmail(userName + "@test.openmetadata.org")); | ||
|
|
||
| Domain domain = createEntity(createRequest(ns.prefix("dom_follower"), ns)); | ||
|
|
||
| client | ||
| .getHttpClient() | ||
| .execute( | ||
| HttpMethod.PUT, | ||
| "/v1/domains/" + domain.getId() + "/followers", | ||
| follower.getId(), | ||
| ChangeEvent.class); | ||
|
|
||
| client.users().delete(follower.getId().toString()); | ||
|
|
||
| ListParams params = new ListParams().setFields("followers").withLimit(1000000); | ||
| ListResponse<Domain> list = listEntities(params); | ||
|
Comment on lines
+1313
to
+1314
|
||
| Domain listed = | ||
| list.getData().stream() | ||
| .filter(d -> d.getId().equals(domain.getId())) | ||
| .findFirst() | ||
| .orElseThrow(() -> new AssertionError("Domain not found in list")); | ||
| assertTrue( | ||
| listed.getFollowers() == null || listed.getFollowers().isEmpty(), | ||
| "Soft-deleted follower must not appear in list endpoint"); | ||
| } | ||
|
|
||
| @Test | ||
| void softDeletedVoter_notReturnedInListEndpoint(TestNamespace ns) { | ||
| String userName = ns.shortPrefix("voter_list"); | ||
| String userEmail = userName + "@test.openmetadata.org"; | ||
|
|
||
| OpenMetadataClient adminClient = SdkClients.adminClient(); | ||
| User voter = | ||
| adminClient.users().create(new CreateUser().withName(userName).withEmail(userEmail)); | ||
|
|
||
| Domain domain = createEntity(createRequest(ns.prefix("dom_voter"), ns)); | ||
|
|
||
| OpenMetadataClient voterClient = SdkClients.createClient(userEmail, userEmail, new String[] {}); | ||
| voterClient | ||
| .getHttpClient() | ||
| .execute( | ||
| HttpMethod.PUT, | ||
| "/v1/domains/" + domain.getId() + "/vote", | ||
| new VoteRequest().withUpdatedVoteType(VoteRequest.VoteType.VOTED_UP), | ||
| ChangeEvent.class); | ||
|
|
||
| adminClient.users().delete(voter.getId().toString()); | ||
|
|
||
| ListParams params = new ListParams().setFields("votes").withLimit(1000000); | ||
| ListResponse<Domain> list = listEntities(params); | ||
|
Comment on lines
+1347
to
+1348
|
||
| Domain listed = | ||
| list.getData().stream() | ||
| .filter(d -> d.getId().equals(domain.getId())) | ||
| .findFirst() | ||
| .orElseThrow(() -> new AssertionError("Domain not found in list")); | ||
| Votes votes = listed.getVotes(); | ||
| boolean voterInUpVotes = | ||
| votes != null | ||
| && votes.getUpVoters() != null | ||
| && votes.getUpVoters().stream() | ||
| .anyMatch(ref -> ref != null && voter.getId().equals(ref.getId())); | ||
| assertFalse(voterInUpVotes, "Soft-deleted voter must not appear in list endpoint votes"); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This paging loop has no hard stop / cursor-repeat protection. If paging ever returns a non-null
afterthat doesn’t advance (or cycles), this test can hang indefinitely in CI. Consider adding a max-iterations bound and/or tracking previously seenaftercursors to fail fast with a clear assertion.