Merge remote-tracking branch 'pdalpra/http-request-fixes'

Author: daspilker

docs/Home.md

@@ -29,6 +29,8 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
 * 1.49 (unreleased)
  * Enhanced support for the [Sauce OnDemand Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Sauce+OnDemand+Plugin)
    ([JENKINS-36370](https://issues.jenkins-ci.org/browse/JENKINS-36370))
+ * Enhanced support for the [HTTP Request Plugin](https://wiki.jenkins-ci.org/display/JENKINS/HTTP+Request+Plugin)
+   ([#879](https://github.com/jenkinsci/job-dsl-plugin/pull/879))
  * Updated [Structs Plugin](https://github.com/jenkinsci/structs-plugin) dependency to version 1.2
  * Improved support for [[Automatically Generated DSL]]: print deprecation warnings and show deprecated methods in API
    viewer

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/step/HttpRequestContext.groovy

@@ -1,16 +1,23 @@
 package javaposse.jobdsl.dsl.helpers.step
 
-import javaposse.jobdsl.dsl.Context
+import javaposse.jobdsl.dsl.AbstractContext
+import javaposse.jobdsl.dsl.JobManagement
+import javaposse.jobdsl.dsl.RequiresPlugin
 
 import static javaposse.jobdsl.dsl.Preconditions.checkArgument
 
-class HttpRequestContext implements Context {
+class HttpRequestContext extends AbstractContext {
     private static final Set<String> VALID_MODES = ['POST', 'GET', 'DELETE', 'PUT']
 
     String httpMode
     String authentication
     Boolean returnCodeBuildRelevant
     Boolean logResponseBody
+    Boolean passBuildParameters
+
+    HttpRequestContext(JobManagement jobManagement) {
+        super(jobManagement)
+    }
 
     /**
      * Sets the HTTP method to use. Must be one of {@code 'GET'}, {@code 'POST'}, {@code 'PUT'} or {@code 'DELETE'}.
@@ -40,4 +47,14 @@ class HttpRequestContext implements Context {
     void logResponseBody(boolean logResponseBody = true) {
         this.logResponseBody = logResponseBody
     }
+
+    /**
+     * Allows to pass build parameters to the request URL. Defaults to {@code false}.
+     *
+     * @since 1.49
+     */
+    @RequiresPlugin(id = 'http_request', minimumVersion = '1.8.7')
+    void passBuildParameters(boolean passBuildParameters = true) {
+        this.passBuildParameters = passBuildParameters
+    }
 }

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/step/StepContext.groovy

@@ -841,11 +841,14 @@ class StepContext extends AbstractExtensibleContext {
      */
     @RequiresPlugin(id = 'http_request')
     void httpRequest(String requestUrl, @DslContext(HttpRequestContext) Closure closure = null) {
-        HttpRequestContext context = new HttpRequestContext()
+        HttpRequestContext context = new HttpRequestContext(jobManagement)
         ContextHelper.executeInContext(closure, context)
 
         stepNodes << new NodeBuilder().'jenkins.plugins.http__request.HttpRequest' {
             url(requestUrl)
+            if (context.passBuildParameters != null) {
+                passBuildParameters(context.passBuildParameters)
+            }
             if (context.httpMode != null) {
                 httpMode(context.httpMode)
             }

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/step/StepContextSpec.groovy

@@ -2935,20 +2935,23 @@ class StepContextSpec extends Specification {
             authentication('bob')
             returnCodeBuildRelevant()
             logResponseBody()
+            passBuildParameters()
         }
 
         then:
         context.stepNodes.size() == 1
         with(context.stepNodes[0]) {
             name() == 'jenkins.plugins.http__request.HttpRequest'
-            children().size() == 5
+            children().size() == 6
             url[0].value() == 'http://www.example.com'
             httpMode[0].value() == 'GET'
             authentication[0].value() == 'bob'
             returnCodeBuildRelevant[0].value() == true
             logResponseBody[0].value() == true
+            passBuildParameters[0].value() == true
         }
         1 * jobManagement.requirePlugin('http_request')
+        1 * jobManagement.requireMinimumPluginVersion('http_request', '1.8.7')
     }
 
     def 'call http request with invalid HTTP mode'() {