Skip to content

fix #43819 - partial import fails to overwrite existing groups #43924

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

Merged
vmuzikar merged 2 commits into from
Nov 25, 2025
Merged

fix #43819 - partial import fails to overwrite existing groups #43924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a14ea9
fix #43819 - partial import fails to overwrite existing groups
MartinNowak Nov 4, 2025
dafb95f
adding a test and using a general fix
shawkins Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions services/src/main/java/org/keycloak/partialimport/PartialImportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;

import org.keycloak.connections.jpa.support.EntityManagers;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.representations.idm.PartialImportRepresentation;
Expand Down Expand Up @@ -60,6 +61,7 @@ public PartialImportResults saveResources() {

for (PartialImport partialImport : partialImports) {
partialImport.removeOverwrites(realm, session);
EntityManagers.flush(session, false);
results.addAllResults(partialImport.doImport(rep, realm, session));
}

Expand Down
12 changes: 8 additions & 4 deletions .../base/src/test/java/org/keycloak/tests/admin/partialimport/AbstractPartialImportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ protected void addUsersWithTermsAndConditions() {
piRep.setUsers(users);
}

protected void addGroups() {
protected void addGroups(int numEntities) {
List<GroupRepresentation> groups = new ArrayList<>();

for (int i=0; i < NUM_ENTITIES; i++) {
for (int i=0; i < numEntities; i++) {
GroupRepresentation group = new GroupRepresentation();
group.setName(GROUP_PREFIX + i);
group.setPath("/" + GROUP_PREFIX + i);
Expand All @@ -156,6 +156,10 @@ protected void addGroups() {
piRep.setGroups(groups);
}

protected void addGroups() {
addGroups(NUM_ENTITIES);
}

protected void addClients(boolean withServiceAccounts) {
List<ClientRepresentation> clients = new ArrayList<>();
List<UserRepresentation> serviceAccounts = new ArrayList<>();
Expand Down Expand Up @@ -294,10 +298,10 @@ protected void testOverwrite() {
protected void testOverwrite(int numberEntities) {
setOverwrite();
PartialImportResults results = doImport();
assertEquals(numberEntities, results.getAdded());
assertEquals(numberEntities, results.getAdded(), results.getErrorMessage());

results = doImport();
assertEquals(numberEntities, results.getOverwritten());
assertEquals(numberEntities, results.getOverwritten(), results.getErrorMessage());
}

private static class PartialImportRealmConfig implements RealmConfig {
Expand Down
6 changes: 6 additions & 0 deletions tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportGroupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,10 @@ public void testAddGroupsOverwrite() {
addGroups();
testOverwrite();
}

@Test
public void testAddSingleGroupOverwrite() {
addGroups(1);
testOverwrite(1);
}
}
Loading