chore(dependencies): Upgrade Spring Boot to 2.2.1 #3333
Conversation
…erged TemplateMerge.mergeDistinct() was merging 2 list of different types into one. Upcoming Jackson library update would have broken compilation of TemplatedPipelineModelMutator if left unmodified.
Adjusting code for Jedis 3, Jackson 2.10 upgrades.
…tifact` Artifact resolution wasn't always persisting `pipeline.expectedArtifacts.boundArtifact` depending on the expectedArtifact's type when passed to `ArtifactResolver.resolveArtifacts()`. Only `ExpectedArtifact` would get their `boundArtifact` updated; if a Map was used then a copy of that Map would be updated instead and this isn't returned to the caller. The update of Jackson to 2.10 made it so that `boundArtifact` would always be updated on a copy of the passed `expectedArtifact` no matter its type, this commit is an attempt to fix both problems. A better fix would be to make it clear what type is accepted and expected, but that's a much larger refactor.
| @@ -165,7 +164,7 @@ private void applyConfigurations( | |||
| TemplateMerge.mergeDistinct( | |||
| pipelineTemplateObjectMapper.convertValue( | |||
| pipeline.get("expectedArtifacts"), | |||
| new TypeReference<List<ExpectedArtifact>>() {}), | |||
| new TypeReference<List<HashMap<String, Object>>>() {}), | |||
There was a problem hiding this comment.
what was the reason for removing the ExpectedArtifact here?
There was a problem hiding this comment.
I've committed this change in its own commit within the PR so it'd be documented: 27ed129
The test added in the commit would fail without this code change.
| @@ -228,14 +229,14 @@ public ArtifactResolver( | |||
|
|
|||
| public void resolveArtifacts(@Nonnull Map pipeline) { | |||
| Map<String, Object> trigger = (Map<String, Object>) pipeline.get("trigger"); | |||
|
|
|||
| List<?> originalExpectedArtifacts = | |||
There was a problem hiding this comment.
could you describe what problem you ran into here and why all the extra code was necessary to work around it - not sure I totally understand the justification just from looking at it
There was a problem hiding this comment.
This was also committed in its own commit to help document the change: 688e1f9 It should explain the problem at the method level.
Feel free to read these issues/PRs to better grasp the overall context: https://docs.google.com/spreadsheets/d/112ul54xZGcN5pgKfd4hJlcstDGue-0LWghyNQ8lqBEc
A better fix would require a lot more time/effort, although probably not too much for someone with deep knowlege of the codebase.
|
|
|
Working on fixing some Jackson 2.10 incompatibilities that were forgotten, my bad for the delay. |
* jackson-module-kotlin changed the serialization behaviour for fields starting with 'is': FasterXML/jackson-module-kotlin#80 * jackson 2.10's objectMapper.convertValue() now converts everything even if the source is already from the target type. The fixed test was expected a value from a not fully converted Map.
|
Waiting on spinnaker/kork#442 and the associated keiko PR, then will commit |
Adjusting code for Jedis 3, Jackson 2.10 upgrades.
See spinnaker/spinnaker#5134
Dependent on spinnaker/kork#419 and spinnaker/keiko#72 for a Spring Boot dependency upgrade