libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Do not run build when executing import and export commands (#13942)

Browse source 
Closes #13940
This commit is contained in:
Pedro Igor 2022-08-25 08:43:18 -03:00 committed by GitHub
parent 1c5a77ef19
commit 2b9a0bff51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java
View file

@ -52,6 +52,8 @@ import org.keycloak.config.MultiOption;
import org.keycloak.config.OptionCategory; import org.keycloak.config.OptionCategory;
import org.keycloak.quarkus.runtime.cli.command.AbstractStartCommand; import org.keycloak.quarkus.runtime.cli.command.AbstractStartCommand;
import org.keycloak.quarkus.runtime.cli.command.Build; import org.keycloak.quarkus.runtime.cli.command.Build;
import org.keycloak.quarkus.runtime.cli.command.Export;
import org.keycloak.quarkus.runtime.cli.command.Import;
import org.keycloak.quarkus.runtime.cli.command.ImportRealmMixin; import org.keycloak.quarkus.runtime.cli.command.ImportRealmMixin;
import org.keycloak.quarkus.runtime.cli.command.Main; import org.keycloak.quarkus.runtime.cli.command.Main;
import org.keycloak.quarkus.runtime.cli.command.Start; import org.keycloak.quarkus.runtime.cli.command.Start;
@ -102,24 +104,31 @@ public final class Picocli {
private static int runReAugmentationIfNeeded(List<String> cliArgs, CommandLine cmd) { private static int runReAugmentationIfNeeded(List<String> cliArgs, CommandLine cmd) {
int exitCode = 0; int exitCode = 0;
if (!isHelpCommand(cliArgs)) { if (shouldSkipRebuild(cliArgs)) {
if (cliArgs.contains(StartDev.NAME)) { return exitCode;
String profile = Environment.getProfile(); }
if (profile == null) { if (cliArgs.contains(StartDev.NAME)) {
// force the server image to be set with the dev profile String profile = Environment.getProfile();
Environment.forceDevProfile();
} if (profile == null) {
} // force the server image to be set with the dev profile
if (requiresReAugmentation(cmd)) { Environment.forceDevProfile();
exitCode = runReAugmentation(cliArgs, cmd);
} }
} }
if (requiresReAugmentation(cmd)) {
exitCode = runReAugmentation(cliArgs, cmd);
}
return exitCode; return exitCode;
} }
private static boolean isHelpCommand(List<String> cliArgs) { private static boolean shouldSkipRebuild(List<String> cliArgs) {
return cliArgs.contains("--help") || cliArgs.contains("-h") || cliArgs.contains("--help-all"); return cliArgs.contains("--help")
|| cliArgs.contains("-h")
|| cliArgs.contains("--help-all")
|| cliArgs.contains(Export.NAME)
|| cliArgs.contains(Import.NAME);
} }
public static boolean requiresReAugmentation(CommandLine cmd) { public static boolean requiresReAugmentation(CommandLine cmd) {

4
quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Export.java
View file

@ -22,11 +22,13 @@ import static org.keycloak.exportimport.ExportImportConfig.ACTION_EXPORT;
import picocli.CommandLine.Command; import picocli.CommandLine.Command;
import picocli.CommandLine.Option; import picocli.CommandLine.Option;
@Command(name = "export", @Command(name = Export.NAME,
header = "Export data from realms to a file or directory.", header = "Export data from realms to a file or directory.",
description = "%nExport data from realms to a file or directory.") description = "%nExport data from realms to a file or directory.")
public final class Export extends AbstractExportImportCommand implements Runnable { public final class Export extends AbstractExportImportCommand implements Runnable {
public static final String NAME = "export";
@Option(names = "--users", @Option(names = "--users",
arity = "1", arity = "1",
description = "Set how users should be exported. Possible values are: skip, realm_file, same_file, different_files.", description = "Set how users should be exported. Possible values are: skip, realm_file, same_file, different_files.",

4
quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Import.java
View file

@ -24,11 +24,13 @@ import static org.keycloak.exportimport.Strategy.OVERWRITE_EXISTING;
import picocli.CommandLine.Command; import picocli.CommandLine.Command;
import picocli.CommandLine.Option; import picocli.CommandLine.Option;
@Command(name = "import", @Command(name = Import.NAME,
header = "Import data from a directory or a file.", header = "Import data from a directory or a file.",
description = "%nImport data from a directory or a file.") description = "%nImport data from a directory or a file.")
public final class Import extends AbstractExportImportCommand implements Runnable { public final class Import extends AbstractExportImportCommand implements Runnable {
public static final String NAME = "import";
@Option(names = "--override", @Option(names = "--override",
arity = "1", arity = "1",
description = "Set if existing data should be skipped or overridden.", description = "Set if existing data should be skipped or overridden.",

1
quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ExportDistTest.java vendored
View file

@ -35,6 +35,7 @@ public class ExportDistTest {
CLIResult cliResult = (CLIResult) result; CLIResult cliResult = (CLIResult) result;
cliResult.assertMessage("Export of realm 'master' requested."); cliResult.assertMessage("Export of realm 'master' requested.");
cliResult.assertMessage("Export finished successfully"); cliResult.assertMessage("Export finished successfully");
cliResult.assertNoMessage("Changes detected in configuration");
} }
@Test @Test

1
quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ImportDistTest.java vendored
View file

@ -49,5 +49,6 @@ public class ImportDistTest {
CLIResult cliResult = (CLIResult) result; CLIResult cliResult = (CLIResult) result;
cliResult.assertMessage("Realm 'master' imported"); cliResult.assertMessage("Realm 'master' imported");
cliResult.assertMessage("Import finished successfully"); cliResult.assertMessage("Import finished successfully");
cliResult.assertNoMessage("Changes detected in configuration");
} }
} }