[JENKINS-59342] Use the Jenkins rootdir path

jenkinsci · Oct 21, 2019 · cbf1261 · cbf1261
1 parent faaf96d
commit cbf1261
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/support/impl/AbstractItemDirectoryComponent.java b/src/main/java/com/cloudbees/jenkins/support/impl/AbstractItemDirectoryComponent.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.file.Path;
 import java.util.logging.Level;
 
 /**
@@ -41,12 +42,14 @@ public AbstractItemDirectoryComponent(String includes, String excludes, boolean
     @Override
     public void addContents(@NonNull Container container, @NonNull AbstractItem item) {
         try {
-            list(item.getRootDir(), new FileVisitor() {
+            File itemRootDir = item.getRootDir();
+            Path relativeToRoot = new File(Jenkins.get().getRootDir(), "jobs").toPath()
+                    .relativize(itemRootDir.toPath());
+            list(itemRootDir, new FileVisitor() {
 
                 @Override
                 public void visitSymlink(File link, String target, String relativePath) {
-                    container.add(new PrintedContent("items/{0}/{1}",
-                            item.getFullName(), relativePath) {
+                    container.add(new PrintedContent("items/{0}/{1}", relativeToRoot.toString(), relativePath) {
 
                         @Override
                         protected void printTo(PrintWriter out) {
@@ -55,14 +58,14 @@ protected void printTo(PrintWriter out) {
 
                         @Override
                         public boolean shouldBeFiltered() {
-                            return false;
+                            return true;
                         }
                     });
                 }
 
                 @Override
                 public void visit(File file, String s) {
-                    container.add(new FileContent("items/{0}/{1}", new String[]{item.getFullName(), s}, file));
+                    container.add(new FileContent("items/{0}/{1}", new String[]{relativeToRoot.toString(), s}, file));
                 }
 
                 @Override

diff --git a/src/main/java/com/cloudbees/jenkins/support/impl/RunDirectoryComponent.java b/src/main/java/com/cloudbees/jenkins/support/impl/RunDirectoryComponent.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.file.Path;
 import java.util.logging.Level;
 
 /**
@@ -41,31 +42,30 @@ public RunDirectoryComponent(String includes, String excludes, boolean defaultEx
     @Override
     public void addContents(@NonNull Container container, @NonNull Run item) {
         try {
-            String relativeToParentPath = item.getParent().getRootDir().toPath().relativize(item.getRootDir().toPath()).toString();
+            File itemRootDir = item.getRootDir();
+            Path relativeToRoot = new File(Jenkins.get().getRootDir(), "jobs").toPath()
+                    .relativize(itemRootDir.toPath());
             list(item.getRootDir(), new FileVisitor() {
 
                 @Override
                 public void visitSymlink(File link, String target, String relativePath) {
-                    container.add(new PrintedContent("items/{0}/{1}/{2}", 
-                            item.getParent().getFullName(), relativeToParentPath, relativePath) {
+                    container.add(new PrintedContent("items/{0}/{1}", relativeToRoot.toString(), relativePath) {
+
                         @Override
                         protected void printTo(PrintWriter out) {
                             out.println("symlink -> " + target);
                         }
 
                         @Override
                         public boolean shouldBeFiltered() {
-                            return false;
+                            return true;
                         }
                     });
                 }
 
                 @Override
                 public void visit(File file, String s) {
-                    container.add(new FileContent(
-                            "items/{0}/{1}/{2}",
-                            new String[]{item.getParent().getFullName(), relativeToParentPath, s},
-                            file)
+                    container.add(new FileContent("items/{0}/{1}", new String[]{relativeToRoot.toString(), s}, file)
                     );
                 }
 

diff --git a/src/test/java/com/cloudbees/jenkins/support/actions/SupportAbstractItemActionTest.java b/src/test/java/com/cloudbees/jenkins/support/actions/SupportAbstractItemActionTest.java
@@ -70,7 +70,7 @@ public void generateFreestyleBundleDefaultsAndCheckContent() throws Exception {
                 SupportPlugin.class,
                 j.createWebClient());
 
-        String itemEntryPrefix = "items/testFolder/testFreestyle";
+        String itemEntryPrefix = "items/testFolder/jobs/testFreestyle";
         assertNotNull(z.getEntry("manifest.md"));
         assertNotNull(z.getEntry(itemEntryPrefix + "/config.xml"));
         assertNotNull(z.getEntry(itemEntryPrefix + "/nextBuildNumber"));

diff --git a/src/test/java/com/cloudbees/jenkins/support/actions/SupportRunActionTest.java b/src/test/java/com/cloudbees/jenkins/support/actions/SupportRunActionTest.java
@@ -43,7 +43,7 @@ public void generateBundleDefaultsAndCheckContent() throws Exception {
                 SupportPlugin.class,
                 j.createWebClient());
 
-        String buildsEntryPrefix = "items/testFolder/testFreestyle/builds/" + fBuild.number;
+        String buildsEntryPrefix = "items/testFolder/jobs/testFreestyle/builds/" + fBuild.number;
         assertNotNull(z.getEntry("manifest.md"));
         assertNotNull(z.getEntry(buildsEntryPrefix + "/build.xml"));
     }

diff --git a/src/test/java/com/cloudbees/jenkins/support/impl/AbstractItemComponentTest.java b/src/test/java/com/cloudbees/jenkins/support/impl/AbstractItemComponentTest.java
@@ -134,7 +134,7 @@ public void addContentsFromFreestyle() throws Exception {
 
         Map<String, String> output = SupportTestUtils.invokeComponentToMap(new AbstractItemDirectoryComponent(), p);
 
-        String prefix = "items/" + FOLDER_NAME + "/" + JOB_NAME;
+        String prefix = "items/" + FOLDER_NAME + "/jobs/" + JOB_NAME;
         assertTrue(output.containsKey(prefix + "/config.xml"));
         assertTrue(output.containsKey(prefix + "/builds/1/build.xml"));
         assertTrue(output.containsKey(prefix + "/builds/1/log"));
@@ -159,7 +159,7 @@ public void addContentsFromPipeline() throws Exception {
 
         Map<String, String> output = SupportTestUtils.invokeComponentToMap(new AbstractItemDirectoryComponent(), p);
 
-        String prefix = "items/" + FOLDER_NAME + "/" + JOB_NAME;
+        String prefix = "items/" + FOLDER_NAME + "/jobs/" + JOB_NAME;
         assertTrue(output.containsKey(prefix + "/config.xml"));
         assertTrue(output.containsKey(prefix + "/nextBuildNumber"));
         assertTrue(output.containsKey(prefix + "/builds/1/build.xml"));