Merge pull request #77 from jenkinsci/JENKINS-40728_invalid_class_cast

Fixes class cast exception with promoted builds plugin
jenkinsci · Mar 2, 2023 · bbd48d5 · bbd48d5
2 parents c903885 + f72bc23
commit bbd48d5
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,9 +29,9 @@
 
   <dependencies>
     <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>mailer</artifactId>
-        <version>435.v79ef3972b_5c7</version>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>mailer</artifactId>
+      <version>435.v79ef3972b_5c7</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
@@ -41,13 +41,21 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1.0</version>
+      <version>1.20</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>jakarta-mail-api</artifactId>
       <version>2.0.1-2</version>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>promoted-builds</artifactId>
+      <version>3.0</version>
+      <scope>test</scope>
+    </dependency>
+
+
   </dependencies>
 
   <build>

diff --git a/src/main/java/hudson/plugins/disk_usage/DiskUsageProperty.java b/src/main/java/hudson/plugins/disk_usage/DiskUsageProperty.java
@@ -364,12 +364,14 @@ public Long getAllNonAgentOrCustomWorkspaceSize() {
             }
             Map<String, Long> paths = getAgentWorkspaceUsage().get(nodeName);
             for(Entry<String, Long> entry : paths.entrySet()) {
-                TopLevelItem item = null;
+                Item item = null;
                 if(owner instanceof TopLevelItem) {
-                    item = (TopLevelItem) owner;
+                    item = owner;
                 }
                 else {
-                    item = (TopLevelItem) owner.getParent();
+                    if (owner.getParent() instanceof TopLevelItem){
+                        item = (TopLevelItem) owner.getParent();
+                    }
                 }
                 try {
                     if(!isContainedInWorkspace(item, node, entry.getKey())) {
@@ -384,24 +386,33 @@ public Long getAllNonAgentOrCustomWorkspaceSize() {
         return size;
     }
 
-    private boolean isContainedInWorkspace(TopLevelItem item, Node node, String path) {
+    private boolean isContainedInWorkspace(Item item, Node node, String path) {
         if(node instanceof Slave) {
             Slave agent = (Slave) node;
             return path.contains(agent.getRemoteFS());
         }
         else {
-            if(node instanceof Jenkins) {
-                FilePath file = Jenkins.getInstance().getWorkspaceFor(item);
-                return path.contains(file.getRemote());
-            }
-            else {
-                try {
-                    return path.contains(node.getWorkspaceFor(item).getRemote());
+            if (item instanceof TopLevelItem){
+                TopLevelItem topLevelItem = (TopLevelItem) item;
+                if(node instanceof Jenkins) {
+                    FilePath file = Jenkins.getInstance().getWorkspaceFor(topLevelItem);
+                    if (file != null){
+                        return path.contains(file.getRemote());
+                    }
                 }
-                catch (Exception e) {
-                    return false;
+                else {
+                    try {
+                        final var file = node.getWorkspaceFor(topLevelItem);
+                        if (file != null){
+                            return path.contains(file.getRemote());
+                        }
+                    }
+                    catch (Exception e) {
+                        return false;
+                    }
                 }
             }
+            return false;
         }
     }
 

diff --git a/src/test/java/hudson/plugins/disk_usage/integration/DiskUsagePropertyTest.java b/src/test/java/hudson/plugins/disk_usage/integration/DiskUsagePropertyTest.java
@@ -2,6 +2,11 @@
 
 
 import hudson.Functions;
+import hudson.model.FreeStyleBuild;
+import hudson.model.Project;
+import hudson.plugins.promoted_builds.JobPropertyImpl;
+import hudson.plugins.promoted_builds.PromotionProcess;
+import hudson.plugins.promoted_builds.conditions.SelfPromotionCondition;
 import hudson.tasks.BatchFile;
 import java.util.ConcurrentModificationException;
 import java.util.GregorianCalendar;
@@ -51,6 +56,20 @@ public class DiskUsagePropertyTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
+    @Issue("JENKINS-40728")
+    @Test
+    public void testCalculationWorkspaceForItemInNonTopLeverGroupItem() throws Exception {
+        final var project = j.createFreeStyleProject("some-project");
+        JobPropertyImpl property = new JobPropertyImpl(project);
+        project.addProperty(property);
+        PromotionProcess process = property.addProcess("Simple-process");
+        process.conditions.add(new SelfPromotionCondition(true));
+        process.getBuildSteps().add(new Shell("echo hello > log.log"));
+        j.buildAndAssertSuccess(project);
+        DiskUsageProperty p = process.getProperty(DiskUsageProperty.class);
+        Thread.sleep(1000);
+        p.getAllNonSlaveOrCustomWorkspaceSize();
+    }
 
     @Test
     public void testGetAllDiskUsageWithoutBuilds() throws Exception {