JENKINS-28215

Cloning settings to avoid overwriting them with expanded values on build
jenkinsci · May 4, 2015 · 675c9d6 · 675c9d6
1 parent 07f2ae4
commit 675c9d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/com/xti/jenkins/plugin/awslambda/AWSLambdaPublisher.java b/src/main/java/com/xti/jenkins/plugin/awslambda/AWSLambdaPublisher.java
@@ -80,11 +80,13 @@ public boolean perform(LambdaVariables lambdaVariables,AbstractBuild<?, ?> build
             return true;
         }
         try {
-            lambdaVariables.expandVariables(build.getEnvironment(listener));
-            LambdaUploader lambdaUploader = new LambdaUploader(lambdaVariables, build, listener);
+            LambdaVariables executionVariables = lambdaVariables.getClone();
+
+            executionVariables.expandVariables(build.getEnvironment(listener));
+            LambdaUploader lambdaUploader = new LambdaUploader(executionVariables, build, listener);
 
             lambdaUploader.upload();
-            build.addAction(new LambdaProminentAction(lambdaVariables.getFunctionName(), lambdaUploader.getLambdaResultConforms()));
+            build.addAction(new LambdaProminentAction(executionVariables.getFunctionName(), lambdaUploader.getLambdaResultConforms()));
             return true;
         } catch (Exception exc) {
             throw new RuntimeException(exc);

diff --git a/src/main/java/com/xti/jenkins/plugin/awslambda/LambdaVariables.java b/src/main/java/com/xti/jenkins/plugin/awslambda/LambdaVariables.java
@@ -179,6 +179,10 @@ public void expandVariables(EnvVars env) {
         runtime = expand(runtime, env);
     }
 
+    public LambdaVariables getClone(){
+        return new LambdaVariables(awsAccessKeyId, awsSecretKey, awsRegion, artifactLocation, description, functionName, handler, memorySize, mode, role, runtime, timeout, successOnly);
+    }
+
     private String expand(String value, EnvVars env) {
         return Util.replaceMacro(value.trim(), env);
     }