From 4390318dfa45a4f27271407caea01d53c2b144f9 Mon Sep 17 00:00:00 2001 From: Ivan Zinchenko Date: Mon, 6 Sep 2021 17:41:02 +0200 Subject: [PATCH 1/2] added api token support --- .../hub/sonar/manager/SonarManager.java | 1 + .../hub/sonar/manager/SonarManagerTest.java | 22 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManager.java b/src/main/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManager.java index e5f8dfc..4102d2a 100644 --- a/src/main/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManager.java +++ b/src/main/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManager.java @@ -58,6 +58,7 @@ public Optional getBlackDuckServerConfigFromSettings() { configBuilder.setUrl(getValue(HubPropertyConstants.HUB_URL)); configBuilder.setUsername(getValue(HubPropertyConstants.HUB_USERNAME)); configBuilder.setPassword(getValue(HubPropertyConstants.HUB_PASSWORD)); + configBuilder.setApiToken(getValue(HubPropertyConstants.HUB_SONAR_PREFIX + ".token")); configBuilder.setTimeoutInSeconds(getValue(HubPropertyConstants.HUB_TIMEOUT)); configBuilder.setTrustCert(Boolean.parseBoolean(getValue(HubPropertyConstants.HUB_TRUST_SSL_CERT))); diff --git a/src/test/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManagerTest.java b/src/test/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManagerTest.java index 5ee394a..5431c7b 100644 --- a/src/test/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManagerTest.java +++ b/src/test/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManagerTest.java @@ -23,12 +23,16 @@ */ package com.blackducksoftware.integration.hub.sonar.manager; +import static com.blackducksoftware.integration.hub.sonar.HubPropertyConstants.HUB_URL; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; +import java.util.Optional; +import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; import org.junit.Before; import org.junit.Test; import org.sonar.api.batch.sensor.SensorContext; @@ -45,6 +49,7 @@ public class SonarManagerTest { private static final String DELIMITER = ", "; private static final String EXAMPLE_KEY = "key"; + public static final String HUB_TOKEN = HubPropertyConstants.HUB_SONAR_PREFIX + ".token"; private File baseDir; private SensorContext sensorContext; @@ -118,8 +123,7 @@ public void getValuesTest() { @Test public void getHubPluginVersionTest() { SonarManager manager = new SonarManager(sensorContext); - - assertTrue("" != manager.getHubPluginVersionFromFile("/plugin.properties")); + assertNotEquals("", manager.getHubPluginVersionFromFile("/plugin.properties")); } @Test @@ -128,4 +132,18 @@ public void getHubPluginVersionUnknownTest() { assertEquals("", manager.getHubPluginVersionFromFile("/NULL")); } + + @Test + public void getBlackDuckServerConfigFromSettingsTest() { + MapSettings settings = new MapSettings(); + settings.setProperty(HUB_URL, "http://127.0.0.1/valid/url"); + settings.setProperty(HUB_TOKEN, HUB_TOKEN + ".testValue"); + + sensorContext = new MockSensorContext(settings.asConfig(), new MockFileSystem(baseDir)); + SonarManager manager = new SonarManager(sensorContext); + + Optional blackDuckServerConfig = manager.getBlackDuckServerConfigFromSettings(); + assertTrue(blackDuckServerConfig.isPresent()); + assertEquals(settings.asConfig().get(HUB_TOKEN), blackDuckServerConfig.get().getApiToken()); + } } From 34f56a824dd536f2cfa723c40a81ae5b5779762e Mon Sep 17 00:00:00 2001 From: Ivan Zinchenko Date: Mon, 6 Sep 2021 17:53:21 +0200 Subject: [PATCH 2/2] added api token property const --- .../integration/hub/sonar/HubPropertyConstants.java | 1 + .../integration/hub/sonar/manager/SonarManager.java | 2 +- .../integration/hub/sonar/manager/SonarManagerTest.java | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/blackducksoftware/integration/hub/sonar/HubPropertyConstants.java b/src/main/java/com/blackducksoftware/integration/hub/sonar/HubPropertyConstants.java index 851feaf..49181dc 100644 --- a/src/main/java/com/blackducksoftware/integration/hub/sonar/HubPropertyConstants.java +++ b/src/main/java/com/blackducksoftware/integration/hub/sonar/HubPropertyConstants.java @@ -40,6 +40,7 @@ public class HubPropertyConstants { public static final String HUB_URL = HUB_SONAR_PREFIX + "url"; public static final String HUB_USERNAME = HUB_SONAR_PREFIX + "username"; public static final String HUB_PASSWORD = HUB_SONAR_PREFIX + "password"; + public static final String HUB_API_TOKEN = HUB_SONAR_PREFIX + "token"; public static final String HUB_TIMEOUT = HUB_SONAR_PREFIX + "timeout"; public static final String HUB_TRUST_SSL_CERT = HUB_SONAR_PREFIX + "trust.ssl.cert"; diff --git a/src/main/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManager.java b/src/main/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManager.java index 4102d2a..122fd06 100644 --- a/src/main/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManager.java +++ b/src/main/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManager.java @@ -58,7 +58,7 @@ public Optional getBlackDuckServerConfigFromSettings() { configBuilder.setUrl(getValue(HubPropertyConstants.HUB_URL)); configBuilder.setUsername(getValue(HubPropertyConstants.HUB_USERNAME)); configBuilder.setPassword(getValue(HubPropertyConstants.HUB_PASSWORD)); - configBuilder.setApiToken(getValue(HubPropertyConstants.HUB_SONAR_PREFIX + ".token")); + configBuilder.setApiToken(getValue(HubPropertyConstants.HUB_API_TOKEN)); configBuilder.setTimeoutInSeconds(getValue(HubPropertyConstants.HUB_TIMEOUT)); configBuilder.setTrustCert(Boolean.parseBoolean(getValue(HubPropertyConstants.HUB_TRUST_SSL_CERT))); diff --git a/src/test/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManagerTest.java b/src/test/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManagerTest.java index 5431c7b..8e946bc 100644 --- a/src/test/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManagerTest.java +++ b/src/test/java/com/blackducksoftware/integration/hub/sonar/manager/SonarManagerTest.java @@ -23,6 +23,7 @@ */ package com.blackducksoftware.integration.hub.sonar.manager; +import static com.blackducksoftware.integration.hub.sonar.HubPropertyConstants.HUB_API_TOKEN; import static com.blackducksoftware.integration.hub.sonar.HubPropertyConstants.HUB_URL; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -49,7 +50,6 @@ public class SonarManagerTest { private static final String DELIMITER = ", "; private static final String EXAMPLE_KEY = "key"; - public static final String HUB_TOKEN = HubPropertyConstants.HUB_SONAR_PREFIX + ".token"; private File baseDir; private SensorContext sensorContext; @@ -137,13 +137,13 @@ public void getHubPluginVersionUnknownTest() { public void getBlackDuckServerConfigFromSettingsTest() { MapSettings settings = new MapSettings(); settings.setProperty(HUB_URL, "http://127.0.0.1/valid/url"); - settings.setProperty(HUB_TOKEN, HUB_TOKEN + ".testValue"); + settings.setProperty(HUB_API_TOKEN, HUB_API_TOKEN + ".testValue"); sensorContext = new MockSensorContext(settings.asConfig(), new MockFileSystem(baseDir)); SonarManager manager = new SonarManager(sensorContext); Optional blackDuckServerConfig = manager.getBlackDuckServerConfigFromSettings(); assertTrue(blackDuckServerConfig.isPresent()); - assertEquals(settings.asConfig().get(HUB_TOKEN), blackDuckServerConfig.get().getApiToken()); + assertEquals(settings.asConfig().get(HUB_API_TOKEN), blackDuckServerConfig.get().getApiToken()); } }