[JENKINS-49635] Support new VirtualFile.toExternalURL API

pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.2</version>
+        <version>3.5</version>
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -62,11 +62,13 @@
         </pluginRepository>
     </pluginRepositories>
     <properties>
-        <jenkins.version>2.7.3</jenkins.version>
-        <java.level>7</java.level>
-        <workflow-step-api-plugin.version>2.13</workflow-step-api-plugin.version>
+        <jenkins-core.version>2.110-20180228.232138-2</jenkins-core.version> <!-- TODO https://github.com/jenkinsci/jenkins/pull/3302 -->
+        <jenkins-war.version>2.110-20180228.232235-2</jenkins-war.version>
+        <java.level>8</java.level>
+        <workflow-step-api-plugin.version>2.15-20180228.225735-2</workflow-step-api-plugin.version> <!-- TODO https://github.com/jenkinsci/workflow-step-api-plugin/pull/33 -->
         <workflow-cps-plugin.version>2.32</workflow-cps-plugin.version>
         <workflow-support-plugin.version>2.14</workflow-support-plugin.version>
+        <workflow-api-plugin.version>2.27-20180228.232906-1</workflow-api-plugin.version> <!-- TODO https://github.com/jenkinsci/workflow-api-plugin/pull/67 -->
     </properties>
     <dependencies>
         <dependency>
@@ -89,18 +91,12 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-api</artifactId>
-            <version>2.16</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jenkins-ci.plugins</groupId>
-                    <artifactId>scm-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>${workflow-api-plugin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>structs</artifactId>
-            <version>1.6</version>
+            <version>1.10</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -194,5 +190,12 @@
             <version>2.8</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
+            <artifactId>workflow-api</artifactId>
+            <version>${workflow-api-plugin.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/java/org/jenkinsci/plugins/workflow/steps/ArtifactUnarchiverStepExecution.java

@@ -4,20 +4,17 @@
 import hudson.AbortException;
 import hudson.FilePath;
 import hudson.model.Run;
-import jenkins.model.ArtifactManager;
-import jenkins.util.VirtualFile;
-
+import hudson.remoting.VirtualChannel;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
+import jenkins.MasterToSlaveFileCallable;
+import jenkins.util.VirtualFile;
 
-/**
- * @author Kohsuke Kawaguchi
- */
-public class ArtifactUnarchiverStepExecution extends SynchronousNonBlockingStepExecution<List<FilePath>> {
+public class ArtifactUnarchiverStepExecution extends SynchronousNonBlockingStepExecution<Void> {
 
     @SuppressFBWarnings(value="SE_TRANSIENT_FIELD_NOT_RESTORED", justification="Only used when starting.")
     private transient final Map<String,String> mapping;
@@ -31,48 +28,74 @@ public class ArtifactUnarchiverStepExecution extends SynchronousNonBlockingStepE
     }
 
     @Override
-    protected List<FilePath> run() throws Exception {
+    protected Void run() throws Exception {
         // where to copy artifacts from?
         Run<?, ?> r = getContext().get(Run.class); // TODO consider an option to override this (but in what format?)
 
-        ArtifactManager am = r.getArtifactManager();
+        VirtualFile root = r.getArtifactManager().root();
+        FilePath target = getContext().get(FilePath.class);
+        if (target.isRemote()) {
+            VirtualFile rootR = root.asRemotable();
+            if (rootR != null) {
+                return target.act(new Copy(mapping, target, rootR));
+            } else {
+                return new Copy(mapping, target, root).invoke(null, null);
+            }
+        } else {
+            return new Copy(mapping, target, root).invoke(null, null);
+        }
+    }
+
+    private static class Copy extends MasterToSlaveFileCallable<Void> {
 
-        List<FilePath> files = new ArrayList<>();
+        private static final long serialVersionUID = 1L;
 
-        for (Entry<String, String> e : mapping.entrySet()) {
-            FilePath dst = new FilePath(getContext().get(FilePath.class), e.getValue());
-            String src = e.getKey();
-            String[] all = am.root().list(src);
-            if (all.length == 0) {
-                throw new AbortException("no artifacts to unarchive in " + src);
-            } else if (all.length == 1 && all[0].equals(src)) {
-                // the source is a file
-                if (dst.isDirectory())
-                    dst = dst.child(getFileName(all[0]));
+        private final Map<String, String> _mapping;
+        private final FilePath target;
+        private final VirtualFile root;
 
-                files.add(copy(am.root().child(all[0]), dst));
-            } else {
-                // copy into a directory
-                for (String path : all) {
-                    files.add(copy(am.root().child(path), dst.child(path)));
+        Copy(Map<String, String> _mapping, FilePath target, VirtualFile root) {
+            this._mapping = _mapping;
+            this.target = target;
+            this.root = root;
+        }
+
+        @Override public Void invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
+            for (Entry<String, String> e : _mapping.entrySet()) {
+                FilePath dst = new FilePath(target, e.getValue());
+                String src = e.getKey();
+                Collection<String> all = root.list(src, null, false);
+                if (all.isEmpty()) {
+                    throw new AbortException("no artifacts to unarchive in " + src);
+                } else if (all.size() == 1 && all.iterator().next().equals(src)) {
+                    // the source is a file
+                    if (dst.isDirectory()) {
+                        dst = dst.child(getFileName(all.iterator().next()));
+                    }
+
+                    copy(root.child(all.iterator().next()), dst);
+                } else {
+                    // copy into a directory
+                    for (String path : all) {
+                        copy(root.child(path), dst.child(path));
+                    }
                 }
             }
+            return null;
         }
 
-        return files;
     }
 
-    private FilePath copy(VirtualFile src, FilePath dst) throws IOException, InterruptedException {
+    private static void copy(VirtualFile src, FilePath dst) throws IOException, InterruptedException {
         try (InputStream in = src.open()) {
             dst.copyFrom(in);
         }
-        return dst;
     }
 
     /**
      * Grabs the file name portion out of a path name.
      */
-    private String getFileName(String s) {
+    private static String getFileName(String s) {
         int idx = s.lastIndexOf('/');
         if (idx>=0) s=s.substring(idx+1);
         idx = s.lastIndexOf('\\');

src/test/java/org/jenkinsci/plugins/workflow/steps/ArtifactArchiverStepTest.java

@@ -1,22 +1,26 @@
 package org.jenkinsci.plugins.workflow.steps;
 
 import java.util.Arrays;
+import jenkins.model.ArtifactManagerConfiguration;
 import jenkins.util.VirtualFile;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
+import org.jenkinsci.plugins.workflow.DirectArtifactManagerFactory;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-import org.junit.Assert;
+import static org.junit.Assert.*;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.BuildWatcher;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 
-/**
- * @author Kohsuke Kawaguchi
- */
-public class ArtifactArchiverStepTest extends Assert {
+public class ArtifactArchiverStepTest {
+
+    @ClassRule public static BuildWatcher watcher = new BuildWatcher();
+
     @Rule public JenkinsRule j = new JenkinsRule();
 
     /**
@@ -74,5 +78,15 @@ public void archive() throws Exception {
         j.assertLogContains("one/two", b);
     }
 
-}
+    @Issue("JENKINS-49635")
+    @Test
+    public void directDownload() throws Exception {
+        ArtifactManagerConfiguration.get().getArtifactManagerFactories().add(new DirectArtifactManagerFactory());
+        j.createSlave("remote1", null, null);
+        j.createSlave("remote2", null, null);
+        WorkflowJob p = j.jenkins.createProject(WorkflowJob.class, "p");
+        p.setDefinition(new CpsFlowDefinition("node('remote1') {writeFile file: 'x', text: 'contents'; archiveArtifacts 'x'}; node('remote2') {unarchive mapping: [x: 'x']; echo(/loaded ${readFile('x')}/)}", true));
+        j.assertLogContains("loaded contents", j.buildAndAssertSuccess(p));
+    }
 
+}

src/test/java/org/jenkinsci/plugins/workflow/steps/CoreWrapperStepTest.java

@@ -40,7 +40,6 @@
 import hudson.model.Run;
 import hudson.model.Slave;
 import hudson.model.TaskListener;
-import hudson.slaves.CommandLauncher;
 import hudson.slaves.ComputerLauncher;
 import hudson.slaves.NodeProperty;
 import hudson.slaves.RetentionStrategy;