added support for UsernamePasswordMultiBinding

Author: daspilker

docs/Home.md

@@ -24,6 +24,7 @@ Have a look at the [Jenkins Job DSL Gradle example](https://github.com/sheehan/j
  * Added "Configure Project" column for [Extra Columns Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Extra+Columns+Plugin)
  * Added support for [PostBuildScript Plugin](https://wiki.jenkins-ci.org/display/JENKINS/PostBuildScript+Plugin)
  * Added support for [Xvfb Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Xvfb+Plugin)
+ * Enhanced support for the [Credentials Binding Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Credentials+Binding+Plugin)
  * The enum argument of `localRepository` for the Maven job and context has changed, see [[Migration]]
  * Added partial support for [Plot Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Plot+Plugin)
 * 1.30 (March 08 2015)

docs/Job-reference.md

@@ -2268,6 +2268,8 @@ job {
             file(String variable, String credentialsId)
             string(String variable, String credentialsId)
             usernamePassword(String variable, String credentialsId)
+            usernamePassword(String usernameVariable,
+                             String passwordVariable, String credentialsId) // since 1.31
             zipFile(String variable, String credentialsId)
         }
     }

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/wrapper/CredentialsBindingContext.groovy

@@ -6,28 +6,42 @@ import javaposse.jobdsl.dsl.JobManagement
 class CredentialsBindingContext implements Context {
     private final JobManagement jobManagement
 
-    Map<String, String> file = [:]
-    Map<String, String> string = [:]
-    Map<String, String> usernamePassword = [:]
-    Map<String, String> zipFile = [:]
+    final List<Node> nodes = []
 
     CredentialsBindingContext(JobManagement jobManagement) {
         this.jobManagement = jobManagement
     }
 
     void file(String variable, String credentials) {
-        this.file[variable] = jobManagement.getCredentialsId(credentials)
+        addSimpleBinding('File', variable, credentials)
     }
 
     void string(String variable, String credentials) {
-        this.string[variable] = jobManagement.getCredentialsId(credentials)
+        addSimpleBinding('String', variable, credentials)
     }
 
     void usernamePassword(String variable, String credentials) {
-        this.usernamePassword[variable] = jobManagement.getCredentialsId(credentials)
+        addSimpleBinding('UsernamePassword', variable, credentials)
+    }
+
+    void usernamePassword(String userVariableName, String passwordVariableName, String credentials) {
+        jobManagement.requireMinimumPluginVersion('credentials-binding', '1.3')
+
+        nodes << new NodeBuilder().'org.jenkinsci.plugins.credentialsbinding.impl.UsernamePasswordMultiBinding' {
+            credentialsId(jobManagement.getCredentialsId(credentials))
+            usernameVariable(userVariableName)
+            passwordVariable(passwordVariableName)
+        }
     }
 
     void zipFile(String variable, String credentials) {
-        this.zipFile[variable] = jobManagement.getCredentialsId(credentials)
+        addSimpleBinding('ZipFile', variable, credentials)
+    }
+
+    private void addSimpleBinding(String type, String variableName, String credentials) {
+        nodes << new NodeBuilder()."org.jenkinsci.plugins.credentialsbinding.impl.${type}Binding" {
+            variable(variableName)
+            credentialsId(jobManagement.getCredentialsId(credentials))
+        }
     }
 }

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/wrapper/WrapperContext.groovy

@@ -721,32 +721,7 @@ class WrapperContext implements Context {
         ContextHelper.executeInContext(closure, context)
 
         wrapperNodes << new NodeBuilder().'org.jenkinsci.plugins.credentialsbinding.impl.SecretBuildWrapper' {
-            'bindings' {
-                context.file.each { key, value ->
-                    'org.jenkinsci.plugins.credentialsbinding.impl.FileBinding' {
-                        variable(key)
-                        credentialsId(value)
-                    }
-                }
-                context.string.each { key, value ->
-                    'org.jenkinsci.plugins.credentialsbinding.impl.StringBinding' {
-                        variable(key)
-                        credentialsId(value)
-                    }
-                }
-                context.usernamePassword.each { key, value ->
-                    'org.jenkinsci.plugins.credentialsbinding.impl.UsernamePasswordBinding' {
-                        variable(key)
-                        credentialsId(value)
-                    }
-                }
-                context.zipFile.each { key, value ->
-                    'org.jenkinsci.plugins.credentialsbinding.impl.ZipFileBinding' {
-                        variable(key)
-                        credentialsId(value)
-                    }
-                }
-            }
+            bindings(context.nodes)
         }
     }
 

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/wrapper/WrapperContextSpec.groovy

@@ -1024,6 +1024,31 @@ class WrapperContextSpec extends Specification {
         }
     }
 
+    def 'call credentials binding with username password multi binding'() {
+        setup:
+        mockJobManagement.getCredentialsId('foo') >> 'bar'
+
+        when:
+        context.credentialsBinding {
+            usernamePassword('A', 'B', 'foo')
+        }
+
+        then:
+        context.wrapperNodes.size() == 1
+        with(context.wrapperNodes[0]) {
+            name() == 'org.jenkinsci.plugins.credentialsbinding.impl.SecretBuildWrapper'
+            children().size() == 1
+            bindings[0].children().size() == 1
+            with(bindings[0].'org.jenkinsci.plugins.credentialsbinding.impl.UsernamePasswordMultiBinding'[0]) {
+                children().size() == 3
+                usernameVariable[0].value() == 'A'
+                passwordVariable[0].value() == 'B'
+                credentialsId[0].value() == 'bar'
+            }
+        }
+        1 * mockJobManagement.requireMinimumPluginVersion('credentials-binding', '1.3')
+    }
+
     def 'call custom tools with no optionals'() {
         when:
         context.customTools(['foo', 'bar'])