Commit 6d4d3f1
committed
Skip recipe validation for imperative recipes in assertRecipesConfigure()
Recipes with optional parameters and a custom validate() requiring at
least one to be present fail assertRecipesConfigure() because they are
loaded with no arguments, leaving all optional params null.
Declarative recipes (from YAML) should still be validated since their
options are explicitly configured. Imperative recipes loaded with no
user-provided arguments are inherently unconfigured and validation
failures are expected.
Add a recipeValidation flag to RecipeSpec (following the existing
serializationValidation pattern) and gate validateAll() on it. In
assertRecipesConfigure(), disable validation for non-DeclarativeRecipe
instances.
Fixes #68401 parent 33ac75a commit 6d4d3f1
2 files changed
Lines changed: 27 additions & 6 deletions
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
| 95 | + | |
| 96 | + | |
95 | 97 | | |
96 | 98 | | |
97 | 99 | | |
| |||
258 | 260 | | |
259 | 261 | | |
260 | 262 | | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
261 | 268 | | |
262 | 269 | | |
263 | 270 | | |
| |||
Lines changed: 20 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
90 | 91 | | |
91 | 92 | | |
92 | 93 | | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
93 | 100 | | |
94 | 101 | | |
95 | 102 | | |
96 | | - | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
97 | 109 | | |
98 | 110 | | |
99 | 111 | | |
| |||
226 | 238 | | |
227 | 239 | | |
228 | 240 | | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
234 | 248 | | |
235 | 249 | | |
236 | 250 | | |
| |||
0 commit comments