Do not order all Yaml maps by keys, only the Helm values file#2702
Merged
manusa merged 1 commit intoeclipse-jkube:masterfrom Feb 21, 2024
Conversation
Signed-off-by: Jurrie Overgoor <eclipse.org@jurr.org>
Member
Eclipse JKube CI ReportStarted new GH workflow run for #2702 (2024-02-20T15:10:14Z) ⚙️ JKube E2E Tests (7975506222)
|
Jurrie
commented
Feb 20, 2024
| static { | ||
| for (ObjectMapper mapper : new ObjectMapper[]{JSON_MAPPER, YAML_MAPPER}) { | ||
| mapper.enable(SerializationFeature.INDENT_OUTPUT) | ||
| .enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS) |
Contributor
Author
There was a problem hiding this comment.
According to 2a478d1 (where this was introduced) it's used to order the Helm values.yaml file. That seems like using a sledgehammer to crack a nut. So that was reimplemented in https://github.com/eclipse/jkube/pull/2702/files#diff-33ee7412751801538cf1742ee790e3e2d82ab812d60f3d0c4913a9bf3a433ac0R377.
Jurrie
commented
Feb 20, 2024
| // Since Base64.decodeBase64 handles URL-safe encoding, must explicitly check | ||
| // the correct characters are used | ||
| assertThat(config.toHeaderValue(new KitLogger.SilentLogger())) | ||
| .isEqualTo("eyJlbWFpbCI6InJvbGFuZEBqb2xva2lhLm9yZyIsInBhc3N3b3JkIjoiIz5zZWNyZXRzPz8iLCJ1c2VybmFtZSI6InJvbGFuZCJ9"); |
Contributor
Author
There was a problem hiding this comment.
This was changed because of https://github.com/eclipse/jkube/pull/2702/files#r1495937819.
Previously it read {"email":"roland@jolokia.org","password":"#>secrets??","username":"roland"} and now it reads {"username":"roland","password":"#>secrets??","email":"roland@jolokia.org"}
Jurrie
commented
Feb 20, 2024
| // Since Base64.decodeBase64 handles URL-safe encoding, must explicitly check | ||
| // the correct characters are used | ||
| assertThat(config.toHeaderValue()) | ||
| .isEqualTo("eyJlbWFpbCI6InJvbGFuZEBqb2xva2lhLm9yZyIsInBhc3N3b3JkIjoiIz5zZWNyZXRzPz8iLCJ1c2VybmFtZSI6InJvbGFuZCJ9"); |
Contributor
Author
There was a problem hiding this comment.
This was changed because of https://github.com/eclipse/jkube/pull/2702/files#r1495937819.
Previously it read {"email":"roland@jolokia.org","password":"#>secrets??","username":"roland"} and now it reads {"username":"roland","password":"#>secrets??","email":"roland@jolokia.org"}
|
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2702 +/- ##
=============================================
+ Coverage 59.36% 70.50% +11.14%
- Complexity 4586 5003 +417
=============================================
Files 500 486 -14
Lines 21211 19463 -1748
Branches 2830 2505 -325
=============================================
+ Hits 12591 13722 +1131
+ Misses 7370 4517 -2853
+ Partials 1250 1224 -26 ☔ View full report in Codecov by Sentry. |
manusa
approved these changes
Feb 21, 2024
Member
manusa
left a comment
manusa
left a comment
There was a problem hiding this comment.
LGTM.
Thanks for the extra-work 🙌
rohanKanojia
approved these changes
Feb 21, 2024
Jurrie
deleted the
feature/Only_order_Helm_values.yaml_files_alphabetically
branch
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
This pull request keeps the ordering of lines in Yaml fragments as-is. The only exception is the Helm
values.yamlfile, which is still sorted alphabetically.This change is needed when we eventually want to allow plain Helm directives in Yaml fragments.
This pull request is an exerpt of #2689.
Type of change
test, version modification, documentation, etc.)
Checklist