diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index 3e28f4706ab2e..5893ab07bd86a 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -3894,7 +3894,25 @@ Now, the run command picks the user configuration: camel run * ---- -The user configuration file is stored in `~/.camel-jbang-user.properties` +=== Configuration Locations + +Camel JBang uses two possible configuration files: + +- Global configuration: ~/.camel-jbang-user.properties +- Local configuration: ./camel-jbang-user.properties + +=== Configuration Precedence + +When both files exist, the local configuration takes precedence over the global configuration. + +=== Using Configuration Commands + +All camel config commands target the global configuration by default. To work with the local configuration instead, add the `--global=false` flag: +[source,bash] +---- +camel config --global=false +---- +This directs all configuration changes to the local ./camel-jbang-user.properties file. IMPORTANT: You cannot use both a set version via `camel config set` and also a version specified via `--camel-version` option, i.e., the following is not possible: diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java index d192bd894fabe..faf76da33d63c 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java @@ -192,7 +192,7 @@ public static void run(CamelJBangMain main, String... args) { return new String[] { v }; }); - CommandLineHelper.augmentWithUserConfiguration(commandLine, args); + CommandLineHelper.augmentWithUserConfiguration(commandLine); int exitCode = commandLine.execute(args); main.quit(exitCode); } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java index 855258f38efe8..0e8c44ad9225f 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java @@ -30,6 +30,9 @@ public class ConfigGet extends CamelCommand { @CommandLine.Parameters(description = "Configuration key", arity = "1") String key; + @CommandLine.Option(names = { "--global" }, description = "Use global or local configuration") + boolean global = true; + public ConfigGet(CamelJBangMain main) { super(main); } @@ -43,7 +46,7 @@ public Integer doCall() throws Exception { } else { printer().println(key + " key not found"); } - }); + }, !global); return 0; } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java index 2c215dbeaede0..8734c7734d93f 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java @@ -24,19 +24,35 @@ @CommandLine.Command(name = "list", description = "Displays user configuration", sortOptions = false, showDefaultValues = true) public class ConfigList extends CamelCommand { + @CommandLine.Option(names = { "--global" }, description = "Use global or local configuration") + boolean global = true; + public ConfigList(CamelJBangMain main) { super(main); } @Override public Integer doCall() throws Exception { + listConfigurations(true); + if (!global) { + return 0; + } + + listConfigurations(false); + return 0; + } + + private void listConfigurations(boolean local) { CommandLineHelper .loadProperties(p -> { + if (!p.stringPropertyNames().isEmpty()) { + String configurationType = local ? "Local" : "Global"; + printer().println("----- " + configurationType + " -----"); + } for (String k : p.stringPropertyNames()) { String v = p.getProperty(k); printer().printf("%s = %s%n", k, v); } - }); - return 0; + }, local); } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java index 174800e97ad49..1f51bcd874fe1 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java @@ -16,6 +16,8 @@ */ package org.apache.camel.dsl.jbang.core.commands.config; +import java.io.IOException; + import org.apache.camel.dsl.jbang.core.commands.CamelCommand; import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain; import org.apache.camel.dsl.jbang.core.common.CommandLineHelper; @@ -29,13 +31,20 @@ public class ConfigSet extends CamelCommand { @CommandLine.Parameters(description = "Configuration parameter (ex. key=value)", arity = "1") String configuration; + @CommandLine.Option(names = { "--global" }, description = "Use global or local configuration") + boolean global = true; + public ConfigSet(CamelJBangMain main) { super(main); } @Override public Integer doCall() throws Exception { - CommandLineHelper.createPropertyFile(); + return setConfiguration(!global); + } + + private int setConfiguration(boolean local) throws IOException { + CommandLineHelper.createPropertyFile(local); if (configuration.split("=").length == 1) { printer().println("Configuration parameter not in key=value format"); @@ -46,8 +55,8 @@ public Integer doCall() throws Exception { String key = StringHelper.before(configuration, "=").trim(); String value = StringHelper.after(configuration, "=").trim(); properties.put(key, value); - CommandLineHelper.storeProperties(properties, printer()); - }); + CommandLineHelper.storeProperties(properties, printer(), local); + }, local); return 0; } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java index 375a289af147a..43bcd703ab0d5 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java @@ -28,6 +28,9 @@ public class ConfigUnset extends CamelCommand { @CommandLine.Parameters(description = "Configuration key", arity = "1") String key; + @CommandLine.Option(names = { "--global" }, description = "Use global or local configurations") + boolean global = true; + public ConfigUnset(CamelJBangMain main) { super(main); } @@ -36,8 +39,8 @@ public ConfigUnset(CamelJBangMain main) { public Integer doCall() throws Exception { CommandLineHelper.loadProperties(properties -> { properties.remove(key); - CommandLineHelper.storeProperties(properties, printer()); - }); + CommandLineHelper.storeProperties(properties, printer(), !global); + }, !global); return 0; } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java index c8af9e9d94c24..dc28fd73d64ae 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java @@ -28,6 +28,9 @@ showDefaultValues = true) public class VersionGet extends CamelCommand { + @CommandLine.Option(names = { "--global" }, description = "Use global or local configuration") + boolean global = true; + public VersionGet(CamelJBangMain main) { super(main); } @@ -63,7 +66,7 @@ public Integer doCall() throws Exception { printer().println(" repos = " + repos); } } - }); + }, !global); return 0; } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java index 1c95a3475bdc3..51b503a6ac55d 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java @@ -43,13 +43,17 @@ public class VersionSet extends CamelCommand { @CommandLine.Option(names = { "--reset" }, description = "Reset by removing any custom version settings") boolean reset; + @CommandLine.Option(names = { "--global" }, description = "Use global or local configuration") + boolean global = true; + public VersionSet(CamelJBangMain main) { super(main); } @Override public Integer doCall() throws Exception { - CommandLineHelper.createPropertyFile(); + boolean local = !global; + CommandLineHelper.createPropertyFile(local); CommandLineHelper.loadProperties(properties -> { if (reset) { @@ -67,8 +71,8 @@ public Integer doCall() throws Exception { properties.put("runtime", runtime.runtime()); } } - CommandLineHelper.storeProperties(properties, printer()); - }); + CommandLineHelper.storeProperties(properties, printer(), local); + }, local); return 0; } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CommandLineHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CommandLineHelper.java index 518af84247122..129bfc2f71da1 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CommandLineHelper.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CommandLineHelper.java @@ -19,7 +19,10 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Properties; import java.util.function.Consumer; @@ -34,6 +37,7 @@ public final class CommandLineHelper { private static volatile String homeDir = System.getProperty("user.home"); public static final String USER_CONFIG = ".camel-jbang-user.properties"; + public static final String LOCAL_USER_CONFIG = "camel-jbang-user.properties"; public static final String CAMEL_DIR = ".camel"; public static final String CAMEL_JBANG_WORK_DIR = ".camel-jbang"; @@ -41,22 +45,43 @@ private CommandLineHelper() { super(); } - public static void augmentWithUserConfiguration(CommandLine commandLine, String... args) { - File file = getUserPropertyFile(); + public static void augmentWithUserConfiguration(CommandLine commandLine) { + File file = getUserConfigurationFile(); if (file.isFile() && file.exists()) { - commandLine.setDefaultValueProvider(new CamelUserConfigDefaultValueProvider(file)); + Properties properties = new Properties(); + try { + properties.load(new FileReader(file)); + } catch (IOException e) { + commandLine.setDefaultValueProvider(new CamelUserConfigDefaultValueProvider(file)); + } + + commandLine.setDefaultValueProvider(new CamelUserConfigDefaultValueProvider(properties)); + } + } + + private static File getUserConfigurationFile() { + File file; + if (Files.exists(Path.of(LOCAL_USER_CONFIG))) { + file = new File(LOCAL_USER_CONFIG); + } else { + file = getUserPropertyFile(false); } + return file; } - public static void createPropertyFile() throws IOException { - File file = getUserPropertyFile(); + public static void createPropertyFile(boolean local) throws IOException { + File file = getUserPropertyFile(local); if (!file.exists()) { file.createNewFile(); } } public static void loadProperties(Consumer consumer) { - File file = getUserPropertyFile(); + loadProperties(consumer, false); + } + + public static void loadProperties(Consumer consumer, boolean local) { + File file = getUserPropertyFile(local); if (file.isFile() && file.exists()) { FileInputStream fis = null; try { @@ -72,8 +97,8 @@ public static void loadProperties(Consumer consumer) { } } - public static void storeProperties(Properties properties, Printer printer) { - File file = getUserPropertyFile(); + public static void storeProperties(Properties properties, Printer printer, boolean local) { + File file = getUserPropertyFile(local); if (file.isFile() && file.exists()) { try (FileOutputStream fos = new FileOutputStream(file)) { properties.store(fos, null); @@ -81,12 +106,22 @@ public static void storeProperties(Properties properties, Printer printer) { throw new RuntimeException(ex); } } else { - printer.println(USER_CONFIG + " does not exist"); + printer.println(file.getName() + " does not exist"); } } - private static File getUserPropertyFile() { - return new File(homeDir, USER_CONFIG); + /** + * Get the config file in current directory (local = true) or the default one + * + * @param local + * @return + */ + private static File getUserPropertyFile(boolean local) { + if (local) { + return new File(LOCAL_USER_CONFIG); + } else { + return new File(homeDir, USER_CONFIG); + } } /** @@ -131,6 +166,10 @@ private static class CamelUserConfigDefaultValueProvider extends CommandLine.Pro public CamelUserConfigDefaultValueProvider(File file) { super(file); } + + public CamelUserConfigDefaultValueProvider(Properties properties) { + super(properties); + } } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/UserConfigHelper.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/UserConfigHelper.java index a0ea04775e196..56f0ee8971ae6 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/UserConfigHelper.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/UserConfigHelper.java @@ -32,13 +32,24 @@ private UserConfigHelper() { } public static void createUserConfig(String content) throws IOException { - CommandLineHelper.useHomeDir("target"); - Path userConfigDir = Paths.get("target"); - if (!userConfigDir.toFile().exists()) { - userConfigDir.toFile().mkdirs(); + createUserConfig(content, false); + } + + public static void createUserConfig(String content, boolean local) throws IOException { + Path userConfigDir; + String configFileName = CommandLineHelper.USER_CONFIG; + if (!local) { + CommandLineHelper.useHomeDir("target"); + userConfigDir = Paths.get("target"); + if (!userConfigDir.toFile().exists()) { + userConfigDir.toFile().mkdirs(); + } + } else { + userConfigDir = Paths.get("."); + configFileName = CommandLineHelper.LOCAL_USER_CONFIG; } - Files.writeString(userConfigDir.resolve(CommandLineHelper.USER_CONFIG), content, + Files.writeString(userConfigDir.resolve(configFileName), content, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING); diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/BaseConfigTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/BaseConfigTest.java new file mode 100644 index 0000000000000..93815174be9fc --- /dev/null +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/BaseConfigTest.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.dsl.jbang.core.commands.config; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; + +import org.apache.camel.dsl.jbang.core.commands.CamelCommandBaseTest; +import org.apache.camel.dsl.jbang.core.common.CommandLineHelper; +import org.junit.jupiter.api.AfterEach; + +public class BaseConfigTest extends CamelCommandBaseTest { + + @AfterEach + void removeLocalConfigFile() throws IOException { + Files.deleteIfExists(Paths.get(CommandLineHelper.LOCAL_USER_CONFIG)); + } +} diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGetTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGetTest.java index 5bd4e722d8d7c..34a3c0505b7c8 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGetTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGetTest.java @@ -17,13 +17,12 @@ package org.apache.camel.dsl.jbang.core.commands.config; -import org.apache.camel.dsl.jbang.core.commands.CamelCommandBaseTest; import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain; import org.apache.camel.dsl.jbang.core.commands.UserConfigHelper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -class ConfigGetTest extends CamelCommandBaseTest { +class ConfigGetTest extends BaseConfigTest { @Test public void shouldGetConfig() throws Exception { @@ -47,4 +46,16 @@ public void shouldHandleConfigGetKeyNotFound() throws Exception { Assertions.assertEquals("foo key not found", printer.getOutput()); } + @Test + public void shouldGetLocalConfig() throws Exception { + UserConfigHelper.createUserConfig("foo=bar", true); + + ConfigGet command = new ConfigGet(new CamelJBangMain().withPrinter(printer)); + command.key = "foo"; + command.global = false; + command.doCall(); + + Assertions.assertEquals("bar", printer.getOutput()); + } + } diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigListTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigListTest.java index ab458d5564bcd..28e2a8174b901 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigListTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigListTest.java @@ -19,13 +19,12 @@ import java.util.List; -import org.apache.camel.dsl.jbang.core.commands.CamelCommandBaseTest; import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain; import org.apache.camel.dsl.jbang.core.commands.UserConfigHelper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -class ConfigListTest extends CamelCommandBaseTest { +class ConfigListTest extends BaseConfigTest { @Test public void shouldHandleEmptyConfig() throws Exception { @@ -48,11 +47,49 @@ public void shouldListUserConfig() throws Exception { ConfigList command = new ConfigList(new CamelJBangMain().withPrinter(printer)); command.doCall(); + List lines = printer.getLines(); + Assertions.assertEquals(4, lines.size()); + Assertions.assertEquals("----- Global -----", lines.get(0)); + Assertions.assertEquals("camel-version = latest", lines.get(1)); + Assertions.assertEquals("kamelets-version = greatest", lines.get(2)); + Assertions.assertEquals("foo = bar", lines.get(3)); + } + + @Test + public void shouldListLocalUserConfig() throws Exception { + UserConfigHelper.createUserConfig(""" + camel-version=local + kamelets-version=local + """, true); + + ConfigList command = new ConfigList(new CamelJBangMain().withPrinter(printer)); + command.global = false; + command.doCall(); + List lines = printer.getLines(); Assertions.assertEquals(3, lines.size()); - Assertions.assertEquals("camel-version = latest", lines.get(0)); - Assertions.assertEquals("kamelets-version = greatest", lines.get(1)); - Assertions.assertEquals("foo = bar", lines.get(2)); + Assertions.assertEquals("----- Local -----", lines.get(0)); + Assertions.assertEquals("camel-version = local", lines.get(1)); + Assertions.assertEquals("kamelets-version = local", lines.get(2)); } + @Test + public void shouldListGlobalAndLocalUserConfig() throws Exception { + UserConfigHelper.createUserConfig(""" + camel-version=local + """, true); + UserConfigHelper.createUserConfig(""" + kamelets-version=global + """); + + ConfigList command = new ConfigList(new CamelJBangMain().withPrinter(printer)); + command.doCall(); + + List lines = printer.getLines(); + Assertions.assertEquals(4, lines.size()); + Assertions.assertEquals("----- Local -----", lines.get(0)); + Assertions.assertEquals("camel-version = local", lines.get(1)); + Assertions.assertEquals("----- Global -----", lines.get(2)); + Assertions.assertEquals("kamelets-version = global", lines.get(3)); + } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSetTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSetTest.java index 4aaeeda5b5f96..d20c201bc286a 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSetTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSetTest.java @@ -17,14 +17,13 @@ package org.apache.camel.dsl.jbang.core.commands.config; -import org.apache.camel.dsl.jbang.core.commands.CamelCommandBaseTest; import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain; import org.apache.camel.dsl.jbang.core.commands.UserConfigHelper; import org.apache.camel.dsl.jbang.core.common.CommandLineHelper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -class ConfigSetTest extends CamelCommandBaseTest { +class ConfigSetTest extends BaseConfigTest { @Test public void shouldSetConfig() throws Exception { @@ -58,4 +57,19 @@ public void shouldOverwriteConfig() throws Exception { }); } + @Test + public void setLocalConfig() throws Exception { + ConfigSet command = new ConfigSet(new CamelJBangMain().withPrinter(printer)); + command.configuration = "foo=local"; + command.global = false; + command.doCall(); + + Assertions.assertEquals("", printer.getOutput()); + + CommandLineHelper.loadProperties(properties -> { + Assertions.assertEquals(1, properties.size()); + Assertions.assertEquals("local", properties.get("foo")); + }, true); + } + } diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnsetTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnsetTest.java index 3be78082a2094..4a7db6d22019b 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnsetTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnsetTest.java @@ -17,14 +17,13 @@ package org.apache.camel.dsl.jbang.core.commands.config; -import org.apache.camel.dsl.jbang.core.commands.CamelCommandBaseTest; import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain; import org.apache.camel.dsl.jbang.core.commands.UserConfigHelper; import org.apache.camel.dsl.jbang.core.common.CommandLineHelper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -class ConfigUnsetTest extends CamelCommandBaseTest { +class ConfigUnsetTest extends BaseConfigTest { @Test public void shouldUnsetConfig() throws Exception { @@ -67,4 +66,23 @@ public void shouldHandleMissingKeyToUnset() throws Exception { }); } + @Test + public void unsetLocalConfig() throws Exception { + UserConfigHelper.createUserConfig(""" + camel-version=local + foo=bar + """, true); + + ConfigUnset command = new ConfigUnset(new CamelJBangMain().withPrinter(printer)); + command.key = "foo"; + command.global = false; + command.doCall(); + + Assertions.assertEquals("", printer.getOutput()); + + CommandLineHelper.loadProperties(properties -> { + Assertions.assertEquals(1, properties.size()); + Assertions.assertEquals("local", properties.get("camel-version")); + }, true); + } } diff --git a/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile b/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile index faa93c3bbbc1f..fc4719bb20a19 100644 --- a/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile +++ b/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile @@ -39,7 +39,7 @@ ADD 99-ssh-jbang.conf /etc/ssh/sshd_config.d/ RUN sed -i "s|#auth sufficient pam_wheel.so trust use_uid|auth sufficient pam_wheel.so trust use_uid|g" /etc/pam.d/su #create new user -RUN groupadd -g $CUSTOM_GID jbang \ +RUN groupadd -f -g $CUSTOM_GID jbang \ && useradd -u $CUSTOM_UID -g $CUSTOM_GID -s /bin/bash jbang #to avoid prompt su - root password