Fix JENKINS-42698

jenkinsci · Apr 4, 2017 · 8fe0f66 · 8fe0f66
1 parent 582865c
commit 8fe0f66
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/tokenmacro/impl/EnvironmentVariableMacro.java b/src/main/java/org/jenkinsci/plugins/tokenmacro/impl/EnvironmentVariableMacro.java
@@ -9,6 +9,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.tokenmacro.DataBoundTokenMacro;
 import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException;
 
@@ -23,6 +25,9 @@ public class EnvironmentVariableMacro extends DataBoundTokenMacro {
     @Parameter(required=true)
     public String var = "";
 
+    @Parameter(alias="default")
+    public String def = "";
+
     @Override
     public List<String> getAcceptedMacroNames() {
         return Collections.singletonList(MACRO_NAME);
@@ -40,6 +45,8 @@ public String evaluate(Run<?, ?> run, FilePath workspace, TaskListener listener,
         Map<String, String> env = run.getEnvironment(listener);
         if(env.containsKey(var)){
             return env.get(var);
+        } else if(StringUtils.isNotBlank(def)) {
+            return def;
         }
         return "";
     }

diff --git a/src/test/java/org/jenkinsci/plugins/tokenmacro/impl/EnvironmentVariableMacroTest.java b/src/test/java/org/jenkinsci/plugins/tokenmacro/impl/EnvironmentVariableMacroTest.java
@@ -24,4 +24,18 @@ public void testEnvironmentVariableExpansion() throws Exception {
         FreeStyleBuild b = p.scheduleBuild2(0).get();
         assertEquals("foo",TokenMacro.expand(b, StreamTaskListener.fromStdout(),"${ENV,var=\"JOB_NAME\"}"));
     }
+
+    @Test
+    public void testEnvironmentVariableExpansionDefault() throws Exception {
+        FreeStyleProject p = j.createFreeStyleProject("foo");
+        FreeStyleBuild b = p.scheduleBuild2(0).get();
+        assertEquals("You got the default",TokenMacro.expand(b, StreamTaskListener.fromStdout(),"${ENV,var=\"JORB_NAME\", default=\"You got the default\"}"));
+    }
+
+    @Test
+    public void testEnvironmentVariableExpansionMissingNoDefault() throws Exception {
+        FreeStyleProject p = j.createFreeStyleProject("foo");
+        FreeStyleBuild b = p.scheduleBuild2(0).get();
+        assertEquals("",TokenMacro.expand(b, StreamTaskListener.fromStdout(),"${ENV,var=\"JORB_NAME\"}"));
+    }
 }