JENKINS-47912: Fixed regression

README.md

@@ -449,6 +449,7 @@ String result = invokeLambda(
 # Changelog
 
 ## current master
+* Fixed regression added by #27 (#JENKINS-47912)
 
 ## 1.17
 * Add policy for withAWS support - allows an additional policy to be combined with the policy associated with the assumed role. 

src/main/java/de/taimos/pipeline/aws/AWSClientFactory.java

@@ -56,6 +56,9 @@ public static <B extends AwsSyncClientBuilder<?, T>, T> T create(B clientBuilder
 	}
 
 	public static <B extends AwsSyncClientBuilder<?, ?>> B configureBuilder(final B clientBuilder, final EnvVars vars) {
+		if (clientBuilder == null) {
+			throw new IllegalArgumentException("ClientBuilder must not be null");
+		}
 		if (StringUtils.isNotBlank(vars.get(AWS_ENDPOINT_URL))) {
 			clientBuilder.setEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(vars.get(AWS_ENDPOINT_URL), vars.get(AWS_REGION)));
 		} else {

src/main/java/de/taimos/pipeline/aws/AbstractS3Step.java

@@ -21,6 +21,8 @@
 
 package de.taimos.pipeline.aws;
 
+import java.io.Serializable;
+
 import org.jenkinsci.plugins.workflow.steps.AbstractStepImpl;
 import org.kohsuke.stapler.DataBoundSetter;
 
@@ -54,10 +56,38 @@ public void setPayloadSigningEnabled(final boolean payloadSigningEnabled) {
 		this.payloadSigningEnabled = payloadSigningEnabled;
 	}
 
-	protected AmazonS3ClientBuilder createAmazonS3ClientBuilder() {
-		return AmazonS3ClientBuilder.standard()
-				.withPathStyleAccessEnabled(this.isPathStyleAccessEnabled())
-				.withPayloadSigningEnabled(this.isPayloadSigningEnabled());
+	protected S3ClientOptions createS3ClientOptions() {
+		S3ClientOptions options = new S3ClientOptions();
+		options.setPathStyleAccessEnabled(this.isPathStyleAccessEnabled());
+		options.setPayloadSigningEnabled(this.isPayloadSigningEnabled());
+		return options;
+	}
+
+	public static class S3ClientOptions implements Serializable {
+		private boolean pathStyleAccessEnabled = false;
+		private boolean payloadSigningEnabled = false;
+
+		public boolean isPathStyleAccessEnabled() {
+			return this.pathStyleAccessEnabled;
+		}
+
+		public void setPathStyleAccessEnabled(final boolean pathStyleAccessEnabled) {
+			this.pathStyleAccessEnabled = pathStyleAccessEnabled;
+		}
+
+		public boolean isPayloadSigningEnabled() {
+			return this.payloadSigningEnabled;
+		}
+
+		public void setPayloadSigningEnabled(final boolean payloadSigningEnabled) {
+			this.payloadSigningEnabled = payloadSigningEnabled;
+		}
+
+		protected AmazonS3ClientBuilder createAmazonS3ClientBuilder() {
+			return AmazonS3ClientBuilder.standard()
+					.withPathStyleAccessEnabled(this.isPathStyleAccessEnabled())
+					.withPayloadSigningEnabled(this.isPayloadSigningEnabled());
+		}
 	}
 
 }

src/main/java/de/taimos/pipeline/aws/S3DeleteStep.java

@@ -115,7 +115,7 @@ public boolean start() throws Exception {
 				public void run() {
 					try {
 						Execution.this.listener.getLogger().format("Deleting s3://%s/%s%n", bucket, path);
-						AmazonS3 s3Client = AWSClientFactory.create(Execution.this.step.createAmazonS3ClientBuilder(), Execution.this.envVars);
+						AmazonS3 s3Client = AWSClientFactory.create(Execution.this.step.createS3ClientOptions().createAmazonS3ClientBuilder(), Execution.this.envVars);
 
 						if (!path.endsWith("/")) {
 							// See if the thing that we were given is a file.

src/main/java/de/taimos/pipeline/aws/S3DownloadStep.java

@@ -37,7 +37,6 @@
 import com.amazonaws.event.ProgressEvent;
 import com.amazonaws.event.ProgressEventType;
 import com.amazonaws.event.ProgressListener;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.transfer.Download;
 import com.amazonaws.services.s3.transfer.MultipleFileDownload;
 import com.amazonaws.services.s3.transfer.TransferManager;
@@ -147,7 +146,7 @@ public void run() {
 								return;
 							}
 						}
-						target.act(new RemoteDownloader(Execution.this.step.createAmazonS3ClientBuilder(), Execution.this.envVars, Execution.this.listener, bucket, path));
+						target.act(new RemoteDownloader(Execution.this.step.createS3ClientOptions(), Execution.this.envVars, Execution.this.listener, bucket, path));
 						Execution.this.listener.getLogger().println("Download complete");
 						Execution.this.getContext().onSuccess(null);
 					} catch (Exception e) {
@@ -169,14 +168,14 @@ private static class RemoteDownloader implements FilePath.FileCallable<Void> {
 
 		protected static final long serialVersionUID = 1L;
 
-		private final transient AmazonS3ClientBuilder amazonS3ClientBuilder;
+		private final S3ClientOptions amazonS3ClientOptions;
 		private final EnvVars envVars;
 		private final TaskListener taskListener;
 		private final String bucket;
 		private final String path;
 
-		RemoteDownloader(AmazonS3ClientBuilder amazonS3ClientBuilder, EnvVars envVars, TaskListener taskListener, String bucket, String path) {
-			this.amazonS3ClientBuilder = amazonS3ClientBuilder;
+		RemoteDownloader(S3ClientOptions amazonS3ClientOptions, EnvVars envVars, TaskListener taskListener, String bucket, String path) {
+			this.amazonS3ClientOptions = amazonS3ClientOptions;
 			this.envVars = envVars;
 			this.taskListener = taskListener;
 			this.bucket = bucket;
@@ -186,7 +185,7 @@ private static class RemoteDownloader implements FilePath.FileCallable<Void> {
 		@Override
 		public Void invoke(File localFile, VirtualChannel channel) throws IOException, InterruptedException {
 			TransferManager mgr = TransferManagerBuilder.standard()
-					.withS3Client(AWSClientFactory.create(this.amazonS3ClientBuilder, this.envVars))
+					.withS3Client(AWSClientFactory.create(this.amazonS3ClientOptions.createAmazonS3ClientBuilder(), this.envVars))
 					.build();
 
 			if (this.path == null || this.path.isEmpty() || this.path.endsWith("/")) {

src/main/java/de/taimos/pipeline/aws/S3FindFilesStep.java

@@ -161,7 +161,7 @@ public FileWrapper[] run() throws Exception {
 
 			Execution.this.listener.getLogger().format("Searching s3://%s/%s for glob:'%s' %s%n", bucket, path, glob, onlyFiles ? "(only files)" : "");
 
-			AmazonS3 s3Client = AWSClientFactory.create(Execution.this.step.createAmazonS3ClientBuilder(), Execution.this.envVars);
+			AmazonS3 s3Client = AWSClientFactory.create(Execution.this.step.createS3ClientOptions().createAmazonS3ClientBuilder(), Execution.this.envVars);
 
 			// Construct a PatternMatcher to match the files.
 			// Essentially, we're going to match against "${path}/${glob}".  Obviously,

src/main/java/de/taimos/pipeline/aws/S3UploadStep.java

@@ -44,7 +44,6 @@
 import com.amazonaws.event.ProgressEvent;
 import com.amazonaws.event.ProgressEventType;
 import com.amazonaws.event.ProgressListener;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.Headers;
 import com.amazonaws.services.s3.model.CannedAccessControlList;
 import com.amazonaws.services.s3.model.ObjectMetadata;
@@ -247,7 +246,7 @@ public void run() {
 								return;
 							}
 
-							child.act(new RemoteUploader(Execution.this.step.createAmazonS3ClientBuilder(), Execution.this.envVars, Execution.this.listener, bucket, path, metadatas, acl, cacheControl));
+							child.act(new RemoteUploader(Execution.this.step.createS3ClientOptions(), Execution.this.envVars, Execution.this.listener, bucket, path, metadatas, acl, cacheControl));
 
 							Execution.this.listener.getLogger().println("Upload complete");
 							Execution.this.getContext().onSuccess(null);
@@ -257,7 +256,7 @@ public void run() {
 							for (FilePath child : children) {
 								child.act(new FeedList(fileList));
 							}
-							dir.act(new RemoteListUploader(Execution.this.step.createAmazonS3ClientBuilder(), Execution.this.envVars, Execution.this.listener, fileList, bucket, path, metadatas, acl, cacheControl));
+							dir.act(new RemoteListUploader(Execution.this.step.createS3ClientOptions(), Execution.this.envVars, Execution.this.listener, fileList, bucket, path, metadatas, acl, cacheControl));
 							Execution.this.listener.getLogger().println("Upload complete");
 							Execution.this.getContext().onSuccess(null);
 						}
@@ -279,7 +278,7 @@ public void stop(@Nonnull Throwable cause) throws Exception {
 	private static class RemoteUploader implements FilePath.FileCallable<Void> {
 
 		protected static final long serialVersionUID = 1L;
-		private final transient AmazonS3ClientBuilder amazonS3ClientBuilder;
+		private final S3ClientOptions amazonS3ClientOptions;
 		private final EnvVars envVars;
 		private final TaskListener taskListener;
 		private final String bucket;
@@ -288,8 +287,8 @@ private static class RemoteUploader implements FilePath.FileCallable<Void> {
 		private final CannedAccessControlList acl;
 		private final String cacheControl;
 
-		RemoteUploader(AmazonS3ClientBuilder amazonS3ClientBuilder, EnvVars envVars, TaskListener taskListener, String bucket, String path, Map<String, String> metadatas, CannedAccessControlList acl, String cacheControl) {
-			this.amazonS3ClientBuilder = amazonS3ClientBuilder;
+		RemoteUploader(S3ClientOptions amazonS3ClientOptions, EnvVars envVars, TaskListener taskListener, String bucket, String path, Map<String, String> metadatas, CannedAccessControlList acl, String cacheControl) {
+			this.amazonS3ClientOptions = amazonS3ClientOptions;
 			this.envVars = envVars;
 			this.taskListener = taskListener;
 			this.bucket = bucket;
@@ -302,7 +301,7 @@ private static class RemoteUploader implements FilePath.FileCallable<Void> {
 		@Override
 		public Void invoke(File localFile, VirtualChannel channel) throws IOException, InterruptedException {
 			TransferManager mgr = TransferManagerBuilder.standard()
-					.withS3Client(AWSClientFactory.create(this.amazonS3ClientBuilder, this.envVars))
+					.withS3Client(AWSClientFactory.create(this.amazonS3ClientOptions.createAmazonS3ClientBuilder(), this.envVars))
 					.build();
 			if (localFile.isFile()) {
 				Preconditions.checkArgument(this.path != null && !this.path.isEmpty(), "Path must not be null or empty when uploading file");
@@ -384,7 +383,7 @@ public void checkRoles(RoleChecker roleChecker) throws SecurityException {
 	private static class RemoteListUploader implements FilePath.FileCallable<Void> {
 
 		protected static final long serialVersionUID = 1L;
-		private final transient AmazonS3ClientBuilder amazonS3ClientBuilder;
+		private final S3ClientOptions amazonS3ClientOptions;
 		private final EnvVars envVars;
 		private final TaskListener taskListener;
 		private final String bucket;
@@ -394,8 +393,8 @@ private static class RemoteListUploader implements FilePath.FileCallable<Void> {
 		private final CannedAccessControlList acl;
 		private final String cacheControl;
 
-		RemoteListUploader(AmazonS3ClientBuilder amazonS3ClientBuilder, EnvVars envVars, TaskListener taskListener, List<File> fileList, String bucket, String path, Map<String, String> metadatas, CannedAccessControlList acl, final String cacheControl) {
-			this.amazonS3ClientBuilder = amazonS3ClientBuilder;
+		RemoteListUploader(S3ClientOptions amazonS3ClientOptions, EnvVars envVars, TaskListener taskListener, List<File> fileList, String bucket, String path, Map<String, String> metadatas, CannedAccessControlList acl, final String cacheControl) {
+			this.amazonS3ClientOptions = amazonS3ClientOptions;
 			this.envVars = envVars;
 			this.taskListener = taskListener;
 			this.fileList = fileList;
@@ -409,7 +408,7 @@ private static class RemoteListUploader implements FilePath.FileCallable<Void> {
 		@Override
 		public Void invoke(File localFile, VirtualChannel channel) throws IOException, InterruptedException {
 			TransferManager mgr = TransferManagerBuilder.standard()
-					.withS3Client(AWSClientFactory.create(this.amazonS3ClientBuilder, this.envVars))
+					.withS3Client(AWSClientFactory.create(this.amazonS3ClientOptions.createAmazonS3ClientBuilder(), this.envVars))
 					.build();
 			Preconditions.checkArgument(this.path != null && !this.path.isEmpty(), "Path must not be null or empty when uploading file");
 			final MultipleFileUpload fileUpload;

src/test/java/de/taimos/pipeline/aws/AbstractS3StepTest.java

@@ -21,15 +21,16 @@
 
 package de.taimos.pipeline.aws;
 
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+
 public class AbstractS3StepTest {
 	@Test
 	public void gettersWorkAsExpected() throws Exception {
 		S3DeleteStep step = new S3DeleteStep( "my-bucket", "my-path" , true, true);
-		final AmazonS3ClientBuilder amazonS3ClientBuilder = step.createAmazonS3ClientBuilder();
+		final AmazonS3ClientBuilder amazonS3ClientBuilder = step.createS3ClientOptions().createAmazonS3ClientBuilder();
 		Assert.assertEquals( true, amazonS3ClientBuilder.isPathStyleAccessEnabled() );
 		Assert.assertEquals( true, amazonS3ClientBuilder.isPayloadSigningEnabled() );
 	}