Merge branch 'JENKINS-24823'

Conflicts: docs/Home.md
jenkinsci · Sep 23, 2014 · 77d8ef8 · 77d8ef8
2 parents 8bd5750 + 9ff8244
commit 77d8ef8
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 0 deletions.
diff --git a/docs/Home.md b/docs/Home.md
@@ -18,6 +18,7 @@ And finally, if you want to get more involved, [here's how...](https://github.co
 ## Release Notes
 * 1.26 (unreleased)
  * Support for [Test Stability Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Test+stability+plugin)
+ * Support for [Mask Passwords Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Mask+Passwords+Plugin)
  * Support for [Analysis Collector Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Analysis+Collector+Plugin)
  * Support for [Delivery Pipeline Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Delivery+Pipeline+Plugin)
  * Support for [Notification Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Notification+Plugin)

diff --git a/docs/Job-DSL-Commands.md b/docs/Job-DSL-Commands.md
@@ -141,6 +141,7 @@ job(Map<String, ?> arguments = [:]) {
         injectPasswords() // since 1.23
         keychains(Closure closure) // since 1.24
         logSizeChecker(Closure closure = null) // since 1.23
+        maskPasswords() // since 1.26
         preBuildCleanup(Closure closure = null) // since 1.22
         release(Closure releaseClosure) // since 1.22
         runOnSameNodeAs(String jobName, boolean useSameWorkspace = false)

diff --git a/docs/Job-reference.md b/docs/Job-reference.md
@@ -1441,6 +1441,21 @@ job {
 
 (since 1.26)
 
+## Mask Passwords
+
+```groovy
+job {
+    wrappers {
+        maskPasswords()
+    }
+}
+```
+
+Masks the passwords that occur in the console output. Requires the 
+[Mask Passwords Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Mask+Passwords+Plugin)
+
+(since 1.26)
+
 # Build Steps
 
 Adds step block to contain an ordered list of build steps. Cannot be used for jobs with type 'maven'.

diff --git a/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/wrapper/WrapperContext.groovy b/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/wrapper/WrapperContext.groovy
@@ -630,4 +630,12 @@ class WrapperContext implements Context {
             updateDisplayName(setDisplayName)
         }
     }
+
+    /**
+     * <com.michelin.cio.hudson.plugins.maskpasswords.MaskPasswordsBuildWrapper>
+     * </com.michelin.cio.hudson.plugins.maskpasswords.MaskPasswordsBuildWrapper>
+     */
+    def maskPasswords() {
+        wrapperNodes << new NodeBuilder().'com.michelin.cio.hudson.plugins.maskpasswords.MaskPasswordsBuildWrapper'()
+    }
 }
diff --git a/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/wrapper/WrapperHelperSpec.groovy b/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/wrapper/WrapperHelperSpec.groovy
@@ -823,4 +823,13 @@ class WrapperHelperSpec extends Specification {
             updateDisplayName[0].value() == true
         }
     }
+
+    def 'call mask passwords'() {
+        when:
+        context.maskPasswords()
+
+        then:
+        context.wrapperNodes.size() == 1
+        context.wrapperNodes[0].name() == 'com.michelin.cio.hudson.plugins.maskpasswords.MaskPasswordsBuildWrapper'
+    }
 }