PodTemplate’s copy constructor was incomplete #608
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jglick
commented
Sep 30, 2019
| this.setVolumes(from.getVolumes()); | ||
| this.setWorkspaceVolume(from.getWorkspaceVolume()); | ||
| this.yaml = from.yaml; | ||
| this.setYamls(from.getYamls()); | ||
| this.setShowRawYaml(from.isShowRawYaml()); | ||
| this.setNodeProperties(from.getNodeProperties()); | ||
| this.showRawYaml = from.showRawYaml; |
There was a problem hiding this comment.
Just to avoid having the field be defined in the copy when null in the original.
| this.setShowRawYaml(from.isShowRawYaml()); | ||
| this.setNodeProperties(from.getNodeProperties()); | ||
| this.showRawYaml = from.showRawYaml; | ||
| if (from.nodeProperties != null) { |
| @@ -171,12 +171,15 @@ public PodTemplate(PodTemplate from) { | |||
| this.setServiceAccount(from.getServiceAccount()); | |||
| this.setSlaveConnectTimeout(from.getSlaveConnectTimeout()); | |||
| this.setActiveDeadlineSeconds(from.getActiveDeadlineSeconds()); | |||
| this.setIdleMinutes(from.getIdleMinutes()); | |||
There was a problem hiding this comment.
But this was really wrong: the idleMinutes in the copy was always zero.
jglick
commented
Sep 30, 2019
| @@ -740,10 +725,6 @@ protected Object readResolve() { | |||
| yamls = null; | |||
| } | |||
|
|
|||
| if (showRawYaml == null) { | |||
| showRawYaml = Boolean.TRUE; | |||
There was a problem hiding this comment.
isShowRawYamlSet would go from false to true after a restart, if setShowRawYaml had never been called to begin with. (It would be called reliably from a GUI save, and from the podTemplate step we would not be doing deserialization except in Snippet Generator, so maybe this does not matter.)
kerogers-cloudbees
approved these changes
Sep 30, 2019
Vlatombe
approved these changes
Oct 1, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Evidently unused in this plugin, but can cause problems in downstream plugins.
Note that
PodTemplateUtils.combine(PodTemplate, PodTemplate)also has a similar long enumeration of fields, and could well be missing some, though this seems to have better test coverage.