Skip to content

use sonar.host.url (not sonar.core.serverBaseURL) for calling webservices #271

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use sonar.host.url (not sonar.core.serverBaseURL) for calling webservices #271

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
20 changes: 19 additions & 1 deletion src/main/java/com/talanlabs/sonar/plugins/gitlab/GitLabPluginConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public class GitLabPluginConfiguration {
private final Configuration configuration;
private final System2 system2;
private final String baseUrl;
private final String baseWsUrl;

public GitLabPluginConfiguration(Configuration configuration, System2 system2) {
super();
Expand All @@ -62,14 +63,20 @@ public GitLabPluginConfiguration(Configuration configuration, System2 system2) {
configuration.hasKey(CoreProperties.SERVER_BASE_URL) ?
configuration.get(CoreProperties.SERVER_BASE_URL).orElse(null) :
configuration.get("sonar.host.url").orElse(null);
this.baseUrl = sanitizeBaseUrl(tempBaseUrl);

String tempBaseWsUrl = configuration.get("sonar.host.url").orElse(null);
this.baseWsUrl = sanitizeBaseUrl(tempBaseWsUrl);
}

private static String sanitizeBaseUrl(String tempBaseUrl) {
if (tempBaseUrl == null) {
tempBaseUrl = "http://localhost:9000";
}
if (!tempBaseUrl.endsWith("/")) {
tempBaseUrl += "/";
}
this.baseUrl = tempBaseUrl;
return tempBaseUrl;
}

public String projectId() {
Expand Down Expand Up @@ -266,10 +273,21 @@ public PasswordAuthentication getPasswordAuthentication() {
}
}

/**
* The base URL for user-facing links (usually sonar.core.serverBaseURL, when defined in the
* SonarQube global configuration, or sonar.host.url otherwise).
*/
public String baseUrl() {
return baseUrl;
}

/**
* The base URL for calling SonarQube web-services (usually sonar.host.url).
*/
public String baseWsUrl() {
return baseWsUrl;
}

public boolean isMergeRequestDiscussionEnabled() {
return configuration.getBoolean(GitLabPlugin.GITLAB_MERGE_REQUEST_DISCUSSION).orElse(false);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/talanlabs/sonar/plugins/gitlab/SonarFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public class SonarFacade {
public SonarFacade(Configuration settings, GitLabPluginConfiguration gitLabPluginConfiguration) {
this.gitLabPluginConfiguration = gitLabPluginConfiguration;

HttpConnector httpConnector = HttpConnector.newBuilder().url(gitLabPluginConfiguration.baseUrl())
HttpConnector httpConnector = HttpConnector.newBuilder().url(gitLabPluginConfiguration.baseWsUrl())
.credentials(settings.get(CoreProperties.LOGIN).orElse(null), settings.get(CoreProperties.PASSWORD).orElse(null)).build();

wsClient = WsClientFactories.getDefault().newClient(httpConnector);
Expand Down
9 changes: 9 additions & 0 deletions src/test/java/com/talanlabs/sonar/plugins/gitlab/GitLabPluginConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@ public void testBaseUrl() {
Assertions.assertThat(config.baseUrl()).isEqualTo("http://localhost:9000/");
}

@Test
public void testBaseWsUrl() {
Assertions.assertThat(config.baseWsUrl()).isEqualTo("http://localhost:9000/");

settings.setProperty("sonar.host.url", "http://myserver2/");
config = new GitLabPluginConfiguration(settings.asConfig(), new System2());
Assertions.assertThat(config.baseWsUrl()).isEqualTo("http://myserver2/");
}

@Test
public void testGlobal() {
Assertions.assertThat(config.url()).isEqualTo("https://gitlab.com");
Expand Down
8 changes: 3 additions & 5 deletions src/test/java/com/talanlabs/sonar/plugins/gitlab/SonarFacadeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.junit.rules.TemporaryFolder;
import org.sonar.api.CoreProperties;
import org.sonar.api.batch.rule.Severity;
import org.sonar.api.config.PropertyDefinition;
import org.sonar.api.config.PropertyDefinitions;
import org.sonar.api.config.internal.MapSettings;
import org.sonar.api.resources.Qualifiers;
Expand All @@ -60,10 +59,9 @@ public class SonarFacadeTest {

@Before
public void prepare() throws IOException {
settings = new MapSettings(new PropertyDefinitions(PropertyDefinition.builder(CoreProperties.SERVER_BASE_URL).name("Server base URL")
.description("HTTP URL of this SonarQube server, such as <i>http://yourhost.yourdomain/sonar</i>. This value is used i.e. to create links in emails.")
.category(CoreProperties.CATEGORY_GENERAL).defaultValue("http://localhost:9000").build()).addComponents(GitLabPlugin.definitions()));
settings.setProperty(CoreProperties.SERVER_BASE_URL, String.format("http://%s:%d", sonar.getHostName(), sonar.getPort()));
settings = new MapSettings(new PropertyDefinitions(GitLabPlugin.definitions()));
settings.setProperty(CoreProperties.SERVER_BASE_URL, "http://whatever");
settings.setProperty("sonar.host.url", String.format("http://%s:%d", sonar.getHostName(), sonar.getPort()));
settings.setProperty(GitLabPlugin.GITLAB_QUERY_MAX_RETRY, 5);

projectDir = temp.newFolder();
Expand Down