8000 fix: providing a separate session for each file (#34210) by shawkins · Pull Request #34252 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

fix: providing a separate session for each file (#34210) #34252

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 1 commit into from
Oct 23, 2024
Merged

fix: providing a separate session for each file (#34210) #34252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 21 additions & 1 deletion ...kus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ImportAtStartupDistTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@

package org.keycloak.it.cli.dist;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.function.Consumer;
import org.junit.jupiter.api.Test;
Expand All @@ -30,6 +32,9 @@
import org.keycloak.it.utils.KeycloakDistribution;
import org.keycloak.it.utils.RawKeycloakDistribution;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;

import io.quarkus.deployment.util.FileUtil;
import io.quarkus.test.junit.main.Launch;
import io.quarkus.test.junit.main.LaunchResult;
Expand All @@ -45,6 +50,21 @@ void testImport(LaunchResult result) {
CLIResult cliResult = (CLIResult) result;
cliResult.assertMessage("Realm 'quickstart-realm' imported");
}

@Test
@BeforeStartDistribution(CreateRealmConfigurationFile.class)
void testMultipleImport(KeycloakDistribution dist) throws IOException {
RawKeycloakDistribution rawDist = dist.unwrap(RawKeycloakDistribution.class);
Path dir = rawDist.getDistPath().resolve("data").resolve("import");

// add another realm
Files.write(dir.resolve("realm2.json"), Files.readAllLines(dir.resolve("realm.json")).stream()
.map(s -> s.replace("quickstart-realm", "other-realm")).toList());

CLIResult cliResult = dist.run("start-dev", "--import-realm");
cliResult.assertMessage("Realm 'quickstart-realm' imported");
cliResult.assertMessage("Realm 'other-realm' imported");
}

@Test
@BeforeStartDistribution(CreateRealmConfigurationFileAndDir.class)
Expand Down Expand Up @@ -115,7 +135,7 @@ void testImportFromDirCreatedByExport(KeycloakDistribution dist) throws IOExcept
result.assertMessage("Realm 'quickstart-realm' imported");
result.assertNoMessage("Not importing realm master from file");
}

public static class CreateRealmConfigurationFile implements Consumer<KeycloakDistribution> {

@Override
Expand Down
13 changes: 11 additions & 2 deletions services/src/main/java/org/keycloak/exportimport/ExportImportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,17 @@ private Stream<Supplier<ImportProvider>> getStartupImportProviders(String dir) {
}

return filesToImport.stream().map(file -> () -> {
ExportImportConfig.setFile(file);
return session.getProvider(ImportProvider.class, providerId);
// we need a new session to pickup the static system property
// file setting - it is picked up by the provider only at create time
// this will eventually need to be consolidated with the master existance check
// to prevent double parsing
KeycloakSession newSession = session.getKeycloakSessionFactory().create();
try {
ExportImportConfig.setFile(file);
return newSession.getProvider(ImportProvider.class, providerId);
} finally {
newSession.close();
}
});
}
return Stream.empty();
Expand Down
0