Merge pull request #259 from martinda/extensive-build-info

Extensive build info

src/main/docker/Dockerfile

@@ -1,4 +1,4 @@
-ARG jenkins_tag=2.277.4-jdk11
+ARG jenkins_tag=2.303.3-lts-jdk11
 
 FROM jenkins/jenkins:$jenkins_tag
 

src/main/docker/plugins.yml

@@ -4,3 +4,4 @@ plugins:
     - artifactId: cloudbees-folder
     - artifactId: configuration-as-code
     - artifactId: workflow-aggregator
+    - artifactId: badge

src/main/java/com/cdancy/jenkins/rest/domain/job/Action.java

@@ -19,6 +19,7 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
+import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.json.SerializedNames;
 
 import java.util.List;
@@ -30,14 +31,24 @@ public abstract class Action {
 
     public abstract List<Parameter> parameters();
 
+    @Nullable
+    public abstract String text();
+
+    @Nullable
+    public abstract String iconPath();
+
+    @Nullable
+    public abstract String _class();
     Action() {
     }
 
-    @SerializedNames({"causes", "parameters"})
-    public static Action create(final List<Cause> causes, final List<Parameter> parameters) {
+    @SerializedNames({"causes", "parameters", "text", "iconPath", "_class"})
+    public static Action create(final List<Cause> causes, final List<Parameter> parameters, final String text, final String iconPath, final String _class) {
         return new AutoValue_Action(
             causes != null ? ImmutableList.copyOf(causes) : ImmutableList.<Cause>of(),
-            parameters != null ? ImmutableList.copyOf(parameters) : ImmutableList.<Parameter>of());
+            parameters != null ? ImmutableList.copyOf(parameters) : ImmutableList.<Parameter>of(),
+            text, iconPath, _class
+        );
     }
 }
 

src/test/java/com/cdancy/jenkins/rest/features/JobsApiLiveTest.java

@@ -43,6 +43,7 @@ public class JobsApiLiveTest extends BaseJenkinsApiLiveTest {
 
     private static final String FREESTYLE_JOB_NAME = "FreeStyleSleep";
     private static final String PIPELINE_JOB_NAME = "PipelineSleep";
+    private static final String PIPELINE_WITH_ACTION_JOB_NAME = "PipelineAction";
 
     @Test
     public void testCreateJob() {
@@ -249,6 +250,39 @@ public void testGetBuildParametersOfLastJob() {
         assertEquals(parameters.size(), 0);
     }
 
+    @Test
+    public void testBuildInfoActions() throws InterruptedException {
+        String config = payloadFromResource("/pipeline-with-action.xml");
+        RequestStatus createStatus = api().create(null, PIPELINE_WITH_ACTION_JOB_NAME, config);
+        assertTrue(createStatus.value());
+        IntegerResponse qId = api().build(null, PIPELINE_WITH_ACTION_JOB_NAME);
+        assertNotNull(qId);
+        assertTrue(qId.value() > 0);
+        QueueItem queueItem = getRunningQueueItem(qId.value());
+        assertNotNull(queueItem);
+        assertNotNull(queueItem.executable());
+        assertNotNull(queueItem.executable().number());
+        BuildInfo buildInfo = getCompletedBuild(PIPELINE_WITH_ACTION_JOB_NAME, queueItem);
+        assertEquals(buildInfo.result(), "SUCCESS");
+        System.out.println(buildInfo);
+        boolean found = false;
+        for (int idx = 0; idx < buildInfo.actions().size(); idx++) {
+            if (buildInfo.actions().get(idx).text() != null) {
+                if (buildInfo.actions().get(idx).text().equals("Hudson, we have a problem.") &&
+                    buildInfo.actions().get(idx).iconPath().equals("error.svg") &&
+                    buildInfo.actions().get(idx)._class().equals("com.jenkinsci.plugins.badge.action.BadgeSummaryAction")) {
+                    found = true;
+                }
+            }
+        }
+        assertTrue(found);
+
+        // The Job is no longer needed, delete it.
+        RequestStatus success = api().delete(null, PIPELINE_WITH_ACTION_JOB_NAME);
+        assertNotNull(success);
+        assertTrue(success.value());
+    }
+
     @Test(dependsOnMethods = "testGetBuildParametersOfLastJob")
     public void testCreateJobThatAlreadyExists() {
         String config = payloadFromResource("/freestyle-project.xml");

src/test/java/com/cdancy/jenkins/rest/features/JobsApiMockTest.java

@@ -127,6 +127,12 @@ public void testGetBuildInfo() throws Exception {
             assertNotNull(output);
             assertEquals(output.fullDisplayName(), "fish #10");
             assertEquals(output.artifacts().size(), 1);
+            assertEquals(output.actions().size(), 5);
+            assertEquals(output.actions().get(2).text(), "<strong>There could be HTML text here</strong>");
+            assertEquals(output.actions().get(2).iconPath(), "clipboard.png");
+            assertEquals(output.actions().get(2)._class(), "com.jenkinsci.plugins.badge.action.BadgeSummaryAction");
+            assertEquals(output.actions().get(3).text(), null);
+            assertEquals(output.actions().get(4)._class(), "org.jenkinsci.plugins.displayurlapi.actions.RunDisplayAction");
             assertSent(server, "GET", "/job/fish/10/api/json");
         } finally {
             jenkinsApi.close();

src/test/resources/build-info.json

@@ -20,6 +20,15 @@
           "userName" : "anonymous"
         }
       ]
+    },
+    {
+       "text" : "<strong>There could be HTML text here</strong>",
+       "iconPath" : "clipboard.png",
+       "_class" : "com.jenkinsci.plugins.badge.action.BadgeSummaryAction"
+    },
+    {},
+    {
+       "_class" : "org.jenkinsci.plugins.displayurlapi.actions.RunDisplayAction"
     }
   ],
   "artifacts" : [
@@ -56,4 +65,4 @@
         "fullName": "username"
     }
   ]
-}
+}

src/test/resources/pipeline-with-action.xml

@@ -0,0 +1,12 @@
+<flow-definition plugin="workflow-job@1145.v7f2433caa07f">
+    <actions/>
+    <description/>
+    <keepDependencies>false</keepDependencies>
+    <properties/>
+    <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2648.va9433432b33c">
+        <script>node { createSummary("error.svg").appendText("Hudson, we have a problem.", false, false, false, "red"); }</script>
+        <sandbox>true</sandbox>
+    </definition>
+    <triggers/>
+    <disabled>false</disabled>
+</flow-definition>