-
Notifications
You must be signed in to change notification settings - Fork 104
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #76 from cburroughs/uri-artifact
tell harbormaster how to link back to jenkins results
- Loading branch information
Showing
5 changed files
with
221 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
src/main/java/com/uber/jenkins/phabricator/tasks/SendHarbormasterUriTask.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| package com.uber.jenkins.phabricator.tasks; | ||
|
|
||
| import com.uber.jenkins.phabricator.conduit.ConduitAPIClient; | ||
| import com.uber.jenkins.phabricator.conduit.ConduitAPIException; | ||
| import com.uber.jenkins.phabricator.conduit.DifferentialClient; | ||
| import com.uber.jenkins.phabricator.utils.Logger; | ||
| import net.sf.json.JSONNull; | ||
| import net.sf.json.JSONObject; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class SendHarbormasterUriTask extends Task { | ||
|
|
||
| private final DifferentialClient diffClient; | ||
| private final String phid; | ||
| private final String buildUri; | ||
|
|
||
| public SendHarbormasterUriTask(Logger logger, DifferentialClient diffClient, String phid, String buildUri) { | ||
| super(logger); | ||
| this.diffClient = diffClient; | ||
| this.phid = phid; | ||
| this.buildUri = buildUri; | ||
| } | ||
|
|
||
| @Override | ||
| protected String getTag() { | ||
| return "send-harbormaster-uri"; | ||
| } | ||
|
|
||
| @Override | ||
| protected void setup() { | ||
| // Do nothing | ||
| } | ||
|
|
||
| @Override | ||
| protected void execute() { | ||
| try { | ||
| JSONObject result = diffClient.sendHarbormasterUri(phid, buildUri); | ||
| if (result.containsKey("error_info") && !(result.get("error_info") instanceof JSONNull)) { | ||
| info(String.format("Error from Harbormaster: %s", result.getString("error_info"))); | ||
| this.result = Result.FAILURE; | ||
| } else { | ||
| this.result = Result.SUCCESS; | ||
| } | ||
| } catch (ConduitAPIException e) { | ||
| e.printStackTrace(); | ||
| this.result = Result.FAILURE; | ||
| } catch (IOException e) { | ||
| e.printStackTrace(); | ||
| this.result = Result.FAILURE; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void tearDown() { | ||
| // Do nothing | ||
| } | ||
| } |
82 changes: 82 additions & 0 deletions
82
src/test/java/com/uber/jenkins/phabricator/tasks/SendHarbormasterUriTaskTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| package com.uber.jenkins.phabricator.tasks; | ||
|
|
||
| import com.uber.jenkins.phabricator.conduit.ConduitAPIException; | ||
| import com.uber.jenkins.phabricator.conduit.DifferentialClient; | ||
| import com.uber.jenkins.phabricator.utils.TestUtils; | ||
| import net.sf.json.JSONObject; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| public class SendHarbormasterUriTaskTest { | ||
| private final String buildUrl = "http://jenkins.example.com/foo/123"; | ||
| private final JSONObject validResponse = new JSONObject(); | ||
| private DifferentialClient diffClient; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| diffClient = mock(DifferentialClient.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUrlHappyPath() throws IOException, ConduitAPIException { | ||
| when(diffClient.sendHarbormasterUri(TestUtils.TEST_PHID, buildUrl)).thenReturn(validResponse); | ||
|
|
||
| assertEquals(Task.Result.SUCCESS, getResult()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testErrorInfoResponse() throws IOException, ConduitAPIException { | ||
| JSONObject errorResponse = new JSONObject(); | ||
| errorResponse.put("error_info", "i'm having a bad day"); | ||
| when(diffClient.sendHarbormasterUri(TestUtils.TEST_PHID, buildUrl)).thenReturn(errorResponse); | ||
|
|
||
| assertEquals(Task.Result.FAILURE, getResult()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testConduitAPIFailure() throws IOException, ConduitAPIException { | ||
| when(diffClient.sendHarbormasterUri(TestUtils.TEST_PHID, buildUrl)).thenThrow(ConduitAPIException.class); | ||
|
|
||
| assertEquals(Task.Result.FAILURE, getResult()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testIOExceptionFailure() throws IOException, ConduitAPIException { | ||
| when(diffClient.sendHarbormasterUri(TestUtils.TEST_PHID, buildUrl)).thenThrow(IOException.class); | ||
|
|
||
| assertEquals(Task.Result.FAILURE, getResult()); | ||
| } | ||
|
|
||
| private Task.Result getResult() { | ||
| return new SendHarbormasterUriTask( | ||
| TestUtils.getDefaultLogger(), | ||
| diffClient, | ||
| TestUtils.TEST_PHID, | ||
| buildUrl | ||
| ).run(); | ||
| } | ||
| } |