[JENKINS-41759] Pick specific describables when choosing env method

Utilizing the new function in Utils to find an UninstantiatedDescribable of a specific type enables us to call the function plain 'properties'
jenkinsci · Feb 13, 2017 · 8609c0f · 8609c0f
1 parent d0a70ca
commit 8609c0f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/...el-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy b/...el-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
@@ -436,10 +436,12 @@ public class Utils {
 
             if (a.size()==1 && a.get(0) instanceof Map && !((Map)a.get(0)).containsKey('$class')) {
                 return (Map) a.get(0)
+            } else if (a.size() == 1 && !(a.get(0) instanceof Map)) {
+                return Collections.singletonMap(UninstantiatedDescribable.ANONYMOUS_KEY, a.get(0))
             }
             throw new IllegalArgumentException("Expected named arguments but got "+a)
         } else {
-            return Collections.singletonMap(UninstantiatedDescribable.ANONYMOUS_KEY, _args);
+            return Collections.singletonMap(UninstantiatedDescribable.ANONYMOUS_KEY, _args)
         }
     }
 }
diff --git a/...va/org/jenkinsci/plugins/pipeline/modeldefinition/environment/impl/TrustedProperties.java b/...va/org/jenkinsci/plugins/pipeline/modeldefinition/environment/impl/TrustedProperties.java
@@ -47,7 +47,7 @@ public String getPath() {
         return path;
     }
 
-    @Extension @Symbol("fromPropertiesFile")
+    @Extension @Symbol("properties")
     public static class DescriptorImpl extends DeclarativeEnvironmentContributorDescriptor<TrustedProperties> {
 
     }

diff --git a/...resources/org/jenkinsci/plugins/pipeline/modeldefinition/PropertiesToMapTranslator.groovy b/...resources/org/jenkinsci/plugins/pipeline/modeldefinition/PropertiesToMapTranslator.groovy
@@ -50,28 +50,20 @@ public class PropertiesToMapTranslator implements MethodMissingWrapper, Serializ
     }
 
     def methodMissing(String s, args) {
+        if (resolveEnvironmentContributors) {
+            def describable = Utils.getDescribable(s, DeclarativeEnvironmentContributor.class, args)
+            if (describable != null) {
+                return describable.instantiate()
+            }
+        }
+
         def argValue
         if (args.length > 1) {
             argValue = args
         } else if (args.length == 1) {
             argValue = args[0]
         }
 
-        if (resolveEnvironmentContributors) {
-            def retVal
-            if (argValue != null) {
-                retVal = script."${s}"(argValue)
-            } else {
-                retVal = script."${s}"()
-            }
-
-            if (retVal instanceof UninstantiatedDescribable && isOfType(retVal, DeclarativeEnvironmentContributor.class)) {
-                return retVal.instantiate()
-            } else {
-                return retVal
-            }
-        }
-
         return script."${s}"(argValue)
     }
 

diff --git a/...el-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/UtilsTest.java b/...el-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/UtilsTest.java
@@ -61,6 +61,16 @@ public void getDescribableSingleArgument() throws Exception {
         assertEquals("credId", instance.getCredentialsId());
     }
 
+    @Test
+    public void getDescribableSingleArgumentArray() throws Exception {
+        //Apparently it can be passed like this as well
+        UninstantiatedDescribable d = Utils.getDescribable("credentials", DeclarativeEnvironmentContributor.class, new Object[] {"credId"});
+        assertNotNull(d);
+        Credentials instance = (Credentials) d.instantiate();
+        assertNotNull(instance);
+        assertEquals("credId", instance.getCredentialsId());
+    }
+
     @Test
     public void getDescribableTwoMustHaveArguments() throws Exception {
         Map<String,Object> p = new HashMap<>();

diff --git a/pipeline-model-definition/src/test/resources/environmentFromProperties.groovy b/pipeline-model-definition/src/test/resources/environmentFromProperties.groovy
@@ -26,15 +26,15 @@
 pipeline {
     environment {
         FOO = "BAZ"
-        PROP = fromPropertiesFile("marker.properties")
+        PROP = properties("marker.properties")
     }
     agent any
 
     stages {
         stage("foo") {
             environment {
                 FOO = "BAR"
-                P_ = fromPropertiesFile("stage/marker.properties")
+                P_ = properties("stage/marker.properties")
             }
 
             steps {