Added environment variable functionality

.github/workflows/release-drafter.yml

@@ -7,6 +7,6 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5.19.0
+      - uses: release-drafter/release-drafter@v5.20.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,5 +1,6 @@
 .settings
 .classpath
+.project 
 target
 work
 *.i*

.project

@@ -1,29 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>s3</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>s3-plugin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.40</version>
+        <version>4.47</version>
     </parent>
 
     <artifactId>s3</artifactId>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.aws-java-sdk</groupId>
             <artifactId>aws-java-sdk-minimal</artifactId>
-            <version>1.12.80</version>
+            <version>1.12.287-357.vf82d85a_6eefd</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -84,12 +84,12 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>copyartifact</artifactId>
-            <version>1.46.2</version>
+            <version>1.47</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.main</groupId>
             <artifactId>maven-plugin</artifactId>
-            <version>3.16</version>
+            <version>3.19</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-io</groupId>
@@ -101,10 +101,15 @@
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>structs</artifactId>
         </dependency>
+        <dependency>
+         	<groupId>org.jenkins-ci.plugins</groupId>
+	        <artifactId>envinject</artifactId>
+		    <version>2.875.v9b_9e962da_a_ec</version>
+	    </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.17.1</version>
+            <version>1.17.3</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -124,7 +129,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-2.289.x</artifactId>
-                <version>1342.v729ca_3818e88</version>
+                <version>1500.ve4d05cd32975</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -136,7 +141,7 @@
             <dependency>
                 <groupId>org.jenkins-ci</groupId>
                 <artifactId>symbol-annotation</artifactId>
-                <version>1.17</version>
+                <version>1.23</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

src/main/java/hudson/plugins/s3/Destination.java

@@ -65,4 +65,4 @@ public static Destination newFromRun(Run run, S3Artifact artifact)
   {
     return newFromRun(run, artifact.getBucket(), artifact.getName(), artifact.useFullProjectName());
   }
-}
+}

src/main/java/hudson/plugins/s3/Entry.java

@@ -89,12 +89,39 @@ public final class Entry implements Describable<Entry> {
     * Metadata overrides
     */
     public List<MetadataPair> userMetadata;
+
+    /**
+     * Inject pre-signed artifacts URL after upload was completed
+     */
+    public boolean injectUrl;
+
+    /**
+     * Build variable where artifacts URLs will be stored 
+     */
+    public String buildVariable;
+
 
+    /**
+     * @param bucket
+     * @param sourceFile
+     * @param excludedFile
+     * @param storageClass
+     * @param selectedRegion
+     * @param noUploadOnFailure
+     * @param uploadFromSlave
+     * @param managedArtifacts
+     * @param useServerSideEncryption
+     * @param flatten
+     * @param gzipFiles
+     * @param keepForever
+     * @param showDirectlyInBrowser
+     * @param userMetadata
+     */
     @DataBoundConstructor
     public Entry(String bucket, String sourceFile, String excludedFile, String storageClass, String selectedRegion,
                  boolean noUploadOnFailure, boolean uploadFromSlave, boolean managedArtifacts,
                  boolean useServerSideEncryption, boolean flatten, boolean gzipFiles, boolean keepForever,
-                 boolean showDirectlyInBrowser, List<MetadataPair> userMetadata) {
+                 boolean showDirectlyInBrowser, boolean injectUrl, String buildVariable, List<MetadataPair> userMetadata) {
         this.bucket = bucket;
         this.sourceFile = sourceFile;
         this.excludedFile = excludedFile;
@@ -107,10 +134,16 @@ public Entry(String bucket, String sourceFile, String excludedFile, String stora
         this.flatten = flatten;
         this.gzipFiles = gzipFiles;
         this.keepForever = keepForever;
-        this.userMetadata = userMetadata;
         this.showDirectlyInBrowser = showDirectlyInBrowser;
+        this.injectUrl = injectUrl;
+        if(injectUrl) {
+        	this.buildVariable = buildVariable;
+        } else {
+        	this.buildVariable = null;
+        }
+        this.userMetadata = userMetadata;
     }
-
+    
     @Override
     public Descriptor<Entry> getDescriptor() {
         return DESCRIPOR;

src/main/java/hudson/plugins/s3/FingerprintRecord.java

@@ -29,7 +29,7 @@ public FingerprintRecord(boolean produced, String bucket, String name, String re
     }
 
     Fingerprint addRecord(Run<?, ?> run) throws IOException {
-        final FingerprintMap map = Jenkins.getInstance().getFingerprintMap();
+    	final FingerprintMap map = Jenkins.get().getFingerprintMap();
         return map.getOrCreate(produced ? run : null, artifact.getName(), md5sum);
     }
 

src/main/java/hudson/plugins/s3/S3ArtifactsAction.java

@@ -122,4 +122,4 @@ private String getDownloadURL(AmazonS3 client, int signedUrlExpirySeconds, Run r
 
         return client.generatePresignedUrl(request).toExternalForm();
     }
-}
+}

src/main/java/hudson/plugins/s3/S3ArtifactsProjectAction.java

@@ -55,4 +55,4 @@ public String getDisplayName() {
     public String getUrlName() {
         return null;
     }
-}
+}

src/main/java/hudson/plugins/s3/S3BucketPublisher.java

@@ -3,7 +3,6 @@
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.regions.Region;
 import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3Client;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -37,6 +36,7 @@
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.Symbol;
+import org.jenkinsci.plugins.envinject.EnvInjectPluginAction;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
@@ -51,11 +51,15 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+
 public final class S3BucketPublisher extends Recorder implements SimpleBuildStep {
+
+	public static final String S3_DEFAULT_ENDPOINT = "https://s3.amazonaws.com";
 
     private String profileName;
     @Extension
@@ -248,7 +252,7 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath ws, @Nonnull Launc
         try {
             final Map<String, String> envVars = run.getEnvironment(listener);
             final Map<String, String> record = Maps.newHashMap();
-            final List<FingerprintRecord> artifacts = new CopyOnWriteArrayList();
+            final List<FingerprintRecord> artifacts = new CopyOnWriteArrayList<>();
 
             for (Entry entry : entries) {
                 if (entry.noUploadOnFailure && Result.FAILURE.equals(run.getResult())) {
@@ -301,18 +305,42 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath ws, @Nonnull Launc
                     fingerprintRecord.setKeepForever(entry.keepForever);
                     fingerprintRecord.setShowDirectlyInBrowser(entry.showDirectlyInBrowser);
                 }
-
                 if (entry.managedArtifacts) {
                     artifacts.addAll(fingerprints);
                     fillFingerprints(run, listener, record, fingerprints);
                 }
+                addS3ArtifactsAction(run, profile, fingerprints);
+                if(entry.injectUrl) {
+                    StringBuilder links = new StringBuilder("");
+                    final String s3Endpoint;
+                    if (StringUtils.isNotEmpty(ClientHelper.ENDPOINT)) {
+                        s3Endpoint = ClientHelper.ENDPOINT;
+                    } else {
+                        s3Endpoint = S3_DEFAULT_ENDPOINT;
+                    }
+                	for (FingerprintRecord fingerprintRecord : fingerprints) {
+                		StringBuffer sb = new StringBuffer(s3Endpoint);
+                		sb.append("/")
+                		.append(fingerprintRecord.getArtifact().getBucket())
+                		.append("/")
+                		.append(fingerprintRecord.getArtifact().getName())
+                		.append("\n");
+                		links.append(sb.toString());
+                	}
+                	EnvInjectPluginAction envInjectAction = run.getAction(EnvInjectPluginAction.class);
+	                if (envInjectAction != null) {
+	                    Map<String, String> envMap = new HashMap<String, String>();
+	                    envMap.put(entry.buildVariable, links.toString());
+	                    Set<String> set = run.getEnvironment(listener).keySet();
+						envInjectAction.overrideAll(set, envMap);
+	                }
+                }
             }
-
             // don't bother adding actions if none of the artifacts are managed
             if (!artifacts.isEmpty()) {
-                addS3ArtifactsAction(run, profile, artifacts);
                 addFingerprintAction(run, record);
             }
+
         } catch (AmazonClientException|IOException e) {
             if (!isDontSetBuildResultOnFailure()) {
                 e.printStackTrace(listener.error("Failed to upload files"));
@@ -323,7 +351,7 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath ws, @Nonnull Launc
 
         }
     }
-
+    
     private void addS3ArtifactsAction(Run<?, ?> run, S3Profile profile, List<FingerprintRecord> artifacts) {
         S3ArtifactsAction existingAction = run.getAction(S3ArtifactsAction.class);
         if (existingAction != null) {

src/main/java/hudson/plugins/s3/S3CopyArtifact.java

@@ -101,7 +101,7 @@ public class S3CopyArtifact extends Builder implements SimpleBuildStep {
     private final Boolean flatten;
     private final Boolean optional;
 
-    private static final BuildSelector DEFAULT_BUILD_SELECTOR = new StatusBuildSelector(true);
+    private static final BuildSelector DEFAULT_BUILD_SELECTOR = new StatusBuildSelector();
 
     @DataBoundConstructor
     public S3CopyArtifact(String projectName, BuildSelector buildSelector, String filter,
@@ -344,16 +344,15 @@ public FormValidation doCheckProjectName(
             }
             else if (value.indexOf('$') >= 0) {
                 result = FormValidation.warning(Messages.CopyArtifact_ParameterizedName());
-            }
-            else {
+            }  else {
                 AbstractProject nearProject = AbstractProject.findNearest(value);
                 if (nearProject != null) {
                     result = FormValidation.error(
                             Messages.BuildTrigger_NoSuchProjectWithSuggestion(
                                     value, nearProject.getName()));
                 } else {
                     result = FormValidation.error(
-                            Messages.BuildTrigger_NoSuchProject(value));
+                    		Messages.BuildTrigger_NoSuchProject(value));
                 }
             }
             return result;
@@ -370,9 +369,9 @@ public String getDisplayName() {
         }
 
         public DescriptorExtensionList<BuildSelector, Descriptor<BuildSelector>> getBuildSelectors() {
-            final DescriptorExtensionList<BuildSelector, Descriptor<BuildSelector>> list = DescriptorExtensionList.createDescriptorList(Jenkins.getInstance(), BuildSelector.class);
+            final DescriptorExtensionList<BuildSelector, Descriptor<BuildSelector>> list = DescriptorExtensionList.createDescriptorList(Jenkins.get(), BuildSelector.class);
             // remove from list some of the CopyArchiver build selector that we can't deal with
-            list.remove(WorkspaceSelector.DESCRIPTOR);
+            list.remove(Jenkins.get().getDescriptor());
             return list;
         }
     }
@@ -448,11 +447,13 @@ private void add(String projectName, int buildNumber) {
         }
 
         @Override
-        public void buildEnvVars(AbstractBuild<?,?> build, EnvVars env) {
+        public void buildEnvironment(@Nonnull Run<?, ?> run, EnvVars env) {
             if (data!=null) {
                 env.putAll(data);
             }
         }
+
+
 
         @Override
         public String getIconFileName() { return null; }

src/main/java/hudson/plugins/s3/S3Profile.java

@@ -304,4 +304,4 @@ public String toString() {
     private ProxyConfiguration getProxy() {
         return Jenkins.get().proxy;
     }
-}
+}

src/main/resources/hudson/plugins/s3/Entry/config.jelly

@@ -40,6 +40,13 @@
         <f:entry field="showDirectlyInBrowser" title="Show content directly in browser">
             <f:checkbox />
         </f:entry>
+
+        <f:optionalBlock field="injectUrl" title="Inject artifacts URLs to variable" inline="true" checked="${instance.buildVariable != null}">
+            <f:entry title="Build variable" field="buildVariable">
+                <f:textbox/>
+            </f:entry>
+        </f:optionalBlock>
+
         <f:entry title="Metadata tags">
             <f:repeatableProperty field="userMetadata">
                 <f:entry title="">