revi-archive/Teamcity-Phabricator-Plugin
1
0
Fork 0
Code Activity

Fix SharedParameters Issue and Tidy-up

Browse source 
There was an issue in which we assumed that the phabricator settings were always set, this is obviously incorrect so check that they exist before attempting to add them to shared parameters for the agent to use.

Also gone through and tidied up a few loose ends highlighted by SonarQube.
This commit is contained in:
Steven Cooney 2019-06-04 11:04:25 +01:00
parent 951fe608b7
commit a97efb1597
6 changed files with 46 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorAgentLogger.java
View file

@ -4,18 +4,20 @@ import jetbrains.buildServer.log.Loggers;
public final class PhabricatorAgentLogger implements PhabricatorPluginLogger { public final class PhabricatorAgentLogger implements PhabricatorPluginLogger {
private final String LOGGING_PREFIX_TEMPLATE = "Phabricator Plugin - %s";
@Override @Override
public void info(String message) { public void info(String message) {
Loggers.AGENT.info(String.format("Phabricator Plugin - %s", message)); Loggers.AGENT.info(String.format(LOGGING_PREFIX_TEMPLATE, message));
} }
@Override @Override
public void warn(String message, Exception e) { public void warn(String message, Exception e) {
Loggers.AGENT.warn(String.format("Phabricator Plugin - %s", message), e); Loggers.AGENT.warn(String.format(LOGGING_PREFIX_TEMPLATE, message), e);
} }
@Override @Override
public void error(String message, Exception e) { public void error(String message, Exception e) {
Loggers.AGENT.error(String.format("Phabricator Plugin - %s", message), e); Loggers.AGENT.error(String.format(LOGGING_PREFIX_TEMPLATE, message), e);
} }
} }

23
Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginConfig.java
View file

@ -47,7 +47,7 @@ public class PhabricatorPluginConfig {
public void setParameters(Map<String, String> parameters) { public void setParameters(Map<String, String> parameters) {
params = parameters; params = parameters;
logger.info(String.format("Looking for parameters")); logger.info("Looking for parameters");
for (String param : params.keySet()) { for (String param : params.keySet()) {
if (!isNullOrEmpty(param)) { if (!isNullOrEmpty(param)) {
logger.info(String.format("Found %s", param)); logger.info(String.format("Found %s", param));
@ -62,26 +62,35 @@ public class PhabricatorPluginConfig {
logger.warn(String.format("Failed to parse phabricator URL: %s", logger.warn(String.format("Failed to parse phabricator URL: %s",
params.get(Constants.PHABRICATOR_URL_SETTING)), e); params.get(Constants.PHABRICATOR_URL_SETTING)), e);
} }
break;
case Constants.PHABRICATOR_CONDUIT_TOKEN_SETTING: case Constants.PHABRICATOR_CONDUIT_TOKEN_SETTING:
logger.info("Found Phabricator Conduit Token"); logger.info("Found Phabricator Conduit Token");
conduitToken = params.get(Constants.PHABRICATOR_CONDUIT_TOKEN_SETTING); conduitToken = params.get(Constants.PHABRICATOR_CONDUIT_TOKEN_SETTING);
break;
case Constants.BRANCH_NAME: case Constants.BRANCH_NAME:
logger.info(String.format("Found branch name: %s", params.get(Constants.BRANCH_NAME))); logger.info(String.format("Found branch name: %s", params.get(Constants.BRANCH_NAME)));
branchName = params.get(Constants.BRANCH_NAME); branchName = params.get(Constants.BRANCH_NAME);
break;
case Constants.BUILD_ID: case Constants.BUILD_ID:
logger.info(String.format("Found build id: %s", params.get(Constants.BUILD_ID))); logger.info(String.format("Found build id: %s", params.get(Constants.BUILD_ID)));
buildId = params.get(Constants.BUILD_ID); buildId = params.get(Constants.BUILD_ID);
break;
case Constants.DIFF_ID: case Constants.DIFF_ID:
logger.info(String.format("Found diff ID: %s", params.get(Constants.DIFF_ID))); logger.info(String.format("Found diff ID: %s", params.get(Constants.DIFF_ID)));
diffId = params.get(Constants.DIFF_ID); diffId = params.get(Constants.DIFF_ID);
break;
case Constants.HARBORMASTER_PHID: case Constants.HARBORMASTER_PHID:
logger.info(String.format("Found harbormaster target PHID: %s", logger.info(String.format("Found harbormaster target PHID: %s",
params.get(Constants.HARBORMASTER_PHID))); params.get(Constants.HARBORMASTER_PHID)));
harbormasterPHID = params.get(Constants.HARBORMASTER_PHID); harbormasterPHID = params.get(Constants.HARBORMASTER_PHID);
break;
case Constants.REVISION_ID: case Constants.REVISION_ID:
logger.info(String.format("Found revision ID: %s", params.get(Constants.REVISION_ID))); logger.info(String.format("Found revision ID: %s", params.get(Constants.REVISION_ID)));
revisionId = params.get(Constants.REVISION_ID); revisionId = params.get(Constants.REVISION_ID);
break;
default:
// Another parameter which we do not care about
break;
} }
} }
} }
@ -110,16 +119,6 @@ public class PhabricatorPluginConfig {
private URL parsePhabricatorURL(String input) throws MalformedURLException { private URL parsePhabricatorURL(String input) throws MalformedURLException {
URL inputURL = new URL(input); URL inputURL = new URL(input);
String scheme = inputURL.getProtocol();
if (scheme == null)
scheme = "http";
int port = inputURL.getPort();
if (port == -1) {
if (scheme == "https")
port = 443;
else
port = 80;
}
return inputURL; return inputURL;
} }

8
Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorServerLogger.java
View file

@ -4,18 +4,20 @@ import jetbrains.buildServer.log.Loggers;
public final class PhabricatorServerLogger implements PhabricatorPluginLogger { public final class PhabricatorServerLogger implements PhabricatorPluginLogger {
private final String LOGGING_PREFIX_TEMPLATE = "Phabricator Plugin - %s";
@Override @Override
public void info(String message) { public void info(String message) {
Loggers.SERVER.info(String.format("Phabricator Plugin - %s", message)); Loggers.SERVER.info(String.format(LOGGING_PREFIX_TEMPLATE, message));
} }
@Override @Override
public void warn(String message, Exception e) { public void warn(String message, Exception e) {
Loggers.SERVER.warn(String.format("Phabricator Plugin - %s", message), e); Loggers.SERVER.warn(String.format(LOGGING_PREFIX_TEMPLATE, message), e);
} }
@Override @Override
public void error(String message, Exception e) { public void error(String message, Exception e) {
Loggers.SERVER.error(String.format("Phabricator Plugin - %s", message), e); Loggers.SERVER.error(String.format(LOGGING_PREFIX_TEMPLATE, message), e);
} }
} }

6
Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/java/uk/xlab/teamcity/phabricator/BuildTracker.java
View file

@ -76,7 +76,7 @@ public class BuildTracker implements Runnable {
logger.info(String.format("Build %s finished: %s", build.getBuildNumber(), build.getBuildStatus())); logger.info(String.format("Build %s finished: %s", build.getBuildNumber(), build.getBuildStatus()));
String harbormasterBuildStatus = parseTeamCityBuildStatus(build.getBuildStatus()); String harbormasterBuildStatus = parseTeamCityBuildStatus(build.getBuildStatus());
NotifyHarbormaster(harbormasterBuildStatus); notifyHarbormaster(harbormasterBuildStatus);
} }
} }
@ -84,7 +84,7 @@ public class BuildTracker implements Runnable {
* Compose and dispatch an API call to harbormaster to notify of the build * Compose and dispatch an API call to harbormaster to notify of the build
* status * status
*/ */
private void NotifyHarbormaster(String buildStatus) { private void notifyHarbormaster(String buildStatus) {
URL phabricatorURL = phabricatorConfig.getPhabricatorURL(); URL phabricatorURL = phabricatorConfig.getPhabricatorURL();
try (CloseableHttpClient client = HttpClients.createDefault()) { try (CloseableHttpClient client = HttpClients.createDefault()) {
@ -110,7 +110,7 @@ public class BuildTracker implements Runnable {
} }
} }
private String parseTeamCityBuildStatus(Status buildFinishedStatus){ private String parseTeamCityBuildStatus(Status buildFinishedStatus) {
if (buildFinishedStatus.isSuccessful()) { if (buildFinishedStatus.isSuccessful()) {
return "pass"; return "pass";
} }

24
Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorBuildStartContextProcessor.java
View file

@ -13,10 +13,24 @@ public class PhabricatorBuildStartContextProcessor implements BuildStartContextP
// agent // agent
Map<String, String> parameters = context.getBuild().getBuildOwnParameters(); Map<String, String> parameters = context.getBuild().getBuildOwnParameters();
context.addSharedParameter(Constants.BRANCH_NAME, parameters.get(Constants.BRANCH_NAME)); if (parameters.containsKey(Constants.BRANCH_NAME)) {
context.addSharedParameter(Constants.BUILD_ID, parameters.get(Constants.BUILD_ID)); context.addSharedParameter(Constants.BRANCH_NAME, parameters.get(Constants.BRANCH_NAME));
context.addSharedParameter(Constants.DIFF_ID, parameters.get(Constants.DIFF_ID)); }
context.addSharedParameter(Constants.HARBORMASTER_PHID, parameters.get(Constants.HARBORMASTER_PHID));
context.addSharedParameter(Constants.REVISION_ID, parameters.get(Constants.REVISION_ID)); if (parameters.containsKey(Constants.BUILD_ID)) {
context.addSharedParameter(Constants.BUILD_ID, parameters.get(Constants.BUILD_ID));
}
if (parameters.containsKey(Constants.DIFF_ID)) {
context.addSharedParameter(Constants.DIFF_ID, parameters.get(Constants.DIFF_ID));
}
if (parameters.containsKey(Constants.HARBORMASTER_PHID)) {
context.addSharedParameter(Constants.HARBORMASTER_PHID, parameters.get(Constants.HARBORMASTER_PHID));
}
if (parameters.containsKey(Constants.REVISION_ID)) {
context.addSharedParameter(Constants.REVISION_ID, parameters.get(Constants.REVISION_ID));
}
} }
} }

5
Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginBuildFeature.java
View file

@ -48,9 +48,10 @@ public class PhabricatorPluginBuildFeature extends BuildFeature {
public String describeParameters(@NotNull final Map<String, String> params) { public String describeParameters(@NotNull final Map<String, String> params) {
String url = ""; String url = "";
for (String key : params.keySet()) { for (Map.Entry<String, String> entry : params.entrySet()) {
String key = entry.getKey();
if (key.equals(Constants.PHABRICATOR_URL_SETTING)) { if (key.equals(Constants.PHABRICATOR_URL_SETTING)) {
url = params.get(key); url = entry.getValue();
} }
} }