[JENKINS-72314] Fix cloud save and roundtrip test #1471
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
reviewed
Nov 16, 2023
| @@ -455,7 +457,7 @@ public void setLabels(Map<String, String> labels) { | |||
| */ | |||
| @NonNull | |||
| public List<PodLabel> getPodLabels() { | |||
| return podLabels == null || podLabels.isEmpty() ? PodLabel.fromMap(DEFAULT_POD_LABELS) : podLabels; | |||
| return podLabels == null ? List.of() : podLabels; | |||
There was a problem hiding this comment.
The previous idiom made more sense to me actually. It depends on whether DEFAULT_POD_LABELS might ever change in the future, and if so, what we expect the impact to be on existing templates. https://www.jenkins.io/doc/developer/plugin-development/pipeline-integration/#handling-default-values has some discussion. At any rate, what about the previous handling of podLabels did not round-trip correctly?
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.
https://issues.jenkins.io/browse/JENKINS-72314
Roundtrip test was bogus so it didn't catch the regression introduced by #1443
Also fixed a few setters causing incorrect
KubernetesCloudequality.Testing done
Submitter checklist