Merge pull request #45 from jeffret-b/checkIsValid

Use new isValid() API for ParameterDefinition.

Author: jglick

src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStepExecution.java

@@ -170,13 +170,7 @@ private List<ParameterValue> completeDefaultParameters(List<ParameterValue> para
                         }
                     } else {
                         String description = Util.fixNull(pDef.getDescription());
-                        if (pDef instanceof ChoiceParameterDefinition) {
-                            ParameterValue pv = allParameters.get(pDef.getName());
-                            if (!((ChoiceParameterDefinition)pDef).getChoices().contains(pv.getValue())) {
-                                throw new AbortException("Value for choice parameter '" + pDef.getName() + "' is '" + pv.getValue() + "', "
-                                        + "but valid choices are " + ((ChoiceParameterDefinition)pDef).getChoices());
-                            }
-                        } else if (pDef instanceof SimpleParameterDefinition && !(pDef instanceof StringParameterDefinition)) {
+                        if (pDef instanceof SimpleParameterDefinition && !(pDef instanceof StringParameterDefinition) && !(pDef instanceof ChoiceParameterDefinition)) {
                             // c.f. https://github.com/jenkinsci/parameterized-trigger-plugin/blob/633587c4b0ae027175c738b3a2f46554a672f330/src/main/java/hudson/plugins/parameterizedtrigger/ProjectSpecificParameterValuesActionTransform.java
                             ParameterValue pv = allParameters.get(pDef.getName());
                             if (pv instanceof StringParameterValue) {
@@ -192,6 +186,11 @@ private List<ParameterValue> completeDefaultParameters(List<ParameterValue> para
                                 allParameters.put(pDef.getName(), convertedValue);
                             }
                         }
+                        ParameterValue pv = allParameters.get(pDef.getName());
+                        if (!pDef.isValid(pv)) {
+                            throw new AbortException("Invalid parameter value: " + pv);
+                        }
+
                         // TODO: Should we try to detect some unconvertible cases and fail here instead of allowing it?
                         // For example, someone passing BooleanParameterValue for a PasswordParameterDefinition?
 

src/test/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStepTest.java

@@ -698,7 +698,7 @@ public void invalidChoiceParameterValue() throws Exception {
 
         WorkflowJob us = j.jenkins.createProject(WorkflowJob.class, "us");
         us.setDefinition(new CpsFlowDefinition("build job: 'ds', parameters: [string(name: 'letter', value: 'c')]\n", true));
-        j.assertLogContains("Value for choice parameter 'letter' is 'c', but valid choices are [a, b]",
+        j.assertLogContains("Invalid parameter value: (StringParameterValue) letter='c'",
                 j.assertBuildStatus(Result.FAILURE, us.scheduleBuild2(0)));
     }