import java.nio.file.Paths;
import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import com.eclipsesource.json.Json;
+import com.eclipsesource.json.JsonObject;
+import com.eclipsesource.json.JsonObject.Member;
+import com.eclipsesource.json.JsonValue;
+
class Conf {
private static final String SCANNER_HOME = "scanner.home";
private static final String SCANNER_SETTINGS = "scanner.settings";
private static final String PROPERTY_PROJECT_BASEDIR = "sonar.projectBaseDir";
private static final String PROPERTY_PROJECT_CONFIG_FILE = "sonar.projectConfigFile";
private static final String SONAR_PROJECT_PROPERTIES_FILENAME = "sonar-project.properties";
+ private static final String SONARQUBE_SCANNER_PARAMS = "SONARQUBE_SCANNER_PARAMS";
private final Cli cli;
private final Logs logger;
+ private final Map<String, String> env;
- Conf(Cli cli, Logs logger) {
+ Conf(Cli cli, Logs logger, Map<String, String> env) {
this.cli = cli;
this.logger = logger;
+ this.env = env;
}
Properties properties() throws IOException {
result.putAll(loadGlobalProperties());
result.putAll(loadProjectProperties());
result.putAll(System.getProperties());
+ result.putAll(loadEnvironmentProperties());
result.putAll(cli.properties());
// root project base directory must be present and be absolute
result.setProperty(PROPERTY_PROJECT_BASEDIR, getRootProjectBaseDir(result).toString());
return result;
}
+ private Properties loadEnvironmentProperties() {
+ Properties props = new Properties();
+
+ String scannerParams = env.get(SONARQUBE_SCANNER_PARAMS);
+ if (scannerParams != null) {
+ try {
+
+ JsonValue jsonValue = Json.parse(scannerParams);
+ JsonObject jsonObject = jsonValue.asObject();
+ Iterator<Member> it = jsonObject.iterator();
+
+ while (it.hasNext()) {
+ Member member = it.next();
+ String key = member.getName();
+ String value = member.getValue().asString();
+ props.put(key, value);
+ }
+ } catch (Exception e) {
+ throw new IllegalStateException("Failed to parse JSON in SONARQUBE_SCANNER_PARAMS environment variable", e);
+ }
+ }
+ return props;
+ }
+
private Properties loadGlobalProperties() throws IOException {
- Path settingsFile = locatePropertiesFile(cli.properties(), SCANNER_HOME, "conf/sonar-scanner.properties", SCANNER_SETTINGS);
+ Path settingsFile = locatePropertiesFile(cli.properties(), SCANNER_HOME, "conf/sonar-scanner.properties",
+ SCANNER_SETTINGS);
if (settingsFile != null && Files.isRegularFile(settingsFile)) {
logger.info("Scanner configuration file: " + settingsFile);
return toProperties(settingsFile);
Properties projectProps = new Properties();
- // include already root base directory and eventually props loaded from root config file
+ // include already root base directory and eventually props loaded from
+ // root config file
projectProps.putAll(rootProps);
rootProps.putAll(knownProps);
rootProps.setProperty(PROPERTY_PROJECT_BASEDIR, getRootProjectBaseDir(rootProps).toString());
- // projectProps will be overridden by any properties found in child project settings
+ // projectProps will be overridden by any properties found in child
+ // project settings
loadModulesProperties(rootProps, projectProps, "");
return projectProps;
}
private static void setModuleBaseDir(Path absoluteBaseDir, Properties childProps, String moduleId) {
if (!Files.isDirectory(absoluteBaseDir)) {
- throw new IllegalStateException(MessageFormat.format("The base directory of the module ''{0}'' does not exist: {1}", moduleId, absoluteBaseDir));
+ throw new IllegalStateException(MessageFormat
+ .format("The base directory of the module ''{0}'' does not exist: {1}", moduleId, absoluteBaseDir));
}
childProps.put(PROPERTY_PROJECT_BASEDIR, absoluteBaseDir.toString());
}
return moduleProps;
}
- private static Path locatePropertiesFile(Properties props, String homeKey, String relativePathFromHome, String settingsKey) {
+ private static Path locatePropertiesFile(Properties props, String homeKey, String relativePathFromHome,
+ String settingsKey) {
Path settingsFile = null;
String scannerHome = props.getProperty(homeKey, "");
if (!"".equals(scannerHome)) {
}
protected void loadModulePropsFile(Path parentAbsoluteBaseDir, Properties moduleProps, String moduleId) {
- Path propertyFile = getAbsolutePath(moduleProps.getProperty(PROPERTY_PROJECT_CONFIG_FILE), parentAbsoluteBaseDir);
+ Path propertyFile = getAbsolutePath(moduleProps.getProperty(PROPERTY_PROJECT_CONFIG_FILE),
+ parentAbsoluteBaseDir);
if (Files.isRegularFile(propertyFile)) {
moduleProps.putAll(toProperties(propertyFile));
Path absoluteBaseDir;
if (moduleProps.containsKey(PROPERTY_PROJECT_BASEDIR)) {
- absoluteBaseDir = getAbsolutePath(moduleProps.getProperty(PROPERTY_PROJECT_BASEDIR), propertyFile.getParent());
+ absoluteBaseDir = getAbsolutePath(moduleProps.getProperty(PROPERTY_PROJECT_BASEDIR),
+ propertyFile.getParent());
} else {
absoluteBaseDir = propertyFile.getParent();
}
setModuleBaseDir(absoluteBaseDir, moduleProps, moduleId);
} else {
- throw new IllegalStateException("The properties file of the module '" + moduleId + "' does not exist: " + propertyFile);
+ throw new IllegalStateException(
+ "The properties file of the module '" + moduleId + "' does not exist: " + propertyFile);
}
}
moduleProps.putAll(toProperties(propertyFile));
if (moduleProps.containsKey(PROPERTY_PROJECT_BASEDIR)) {
- Path overwrittenBaseDir = getAbsolutePath(moduleProps.getProperty(PROPERTY_PROJECT_BASEDIR), propertyFile.getParent());
+ Path overwrittenBaseDir = getAbsolutePath(moduleProps.getProperty(PROPERTY_PROJECT_BASEDIR),
+ propertyFile.getParent());
setModuleBaseDir(overwrittenBaseDir, moduleProps, moduleId);
}
}
/**
- * Returns the file denoted by the given path, may this path be relative to "baseDir" or absolute.
+ * Returns the file denoted by the given path, may this path be relative to
+ * "baseDir" or absolute.
*/
protected static Path getAbsolutePath(String path, Path baseDir) {
Path propertyFile = Paths.get(path.trim());
}
/**
- * Transforms a comma-separated list String property in to a array of trimmed strings.
+ * Transforms a comma-separated list String property in to a array of
+ * trimmed strings.
*
- * This works even if they are separated by whitespace characters (space char, EOL, ...)
+ * This works even if they are separated by whitespace characters (space
+ * char, EOL, ...)
*
*/
static String[] getListFromProperty(Properties properties, String key) {
*/
package org.sonarsource.scanner.cli;
+import static org.fest.assertions.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
+
import org.apache.commons.lang.SystemUtils;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import static org.fest.assertions.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
public class ConfTest {
@Rule
public TemporaryFolder temp = new TemporaryFolder();
+ Map<String, String> env = new HashMap<>();
Properties args = new Properties();
Logs logs = new Logs(System.out, System.err);
Cli cli = mock(Cli.class);
- Conf conf = new Conf(cli, logs);
+ Conf conf = new Conf(cli, logs, env);
@Before
public void initConf() {
+ env.clear();
when(cli.properties()).thenReturn(args);
}
assertThat(properties.getProperty("sonar.projectBaseDir")).isEqualTo(projectHome.toString());
}
+ @Test
+ public void shouldLoadEnvironmentProperties() throws IOException {
+ env.put("SONARQUBE_SCANNER_PARAMS", "{\"sonar.key1\" : \"v1\", \"sonar.key2\" : \"v2\"}");
+ args.put("sonar.key2", "v3");
+
+ Properties props = conf.properties();
+
+ assertThat(props.getProperty("sonar.key1")).isEqualTo("v1");
+ assertThat(props.getProperty("sonar.key2")).isEqualTo("v3");
+ }
+
@Test
public void shouldSupportDeepModuleConfigurationInRoot() throws Exception {
Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldSupportDeepModuleConfigurationInRoot/project").toURI());
projects / sonar-scanner-cli.git / commitdiff