feat (jkube-kit/resource) : Add toggle to preserve HelmParameter case #2369
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
bryopsida
requested review from
manusa,
rohanKanojia and
sunix
as code owners
Eclipse JKube CI ReportStarted new GH workflow run for #2369 (2023-09-22T09:45:35Z) ⚙️ JKube E2E Tests (6272503804)
|
Codecov Report
@@ Coverage Diff @@
## master #2369 +/- ##
============================================
+ Coverage 59.36% 61.08% +1.72%
- Complexity 4586 4775 +189
============================================
Files 500 518 +18
Lines 21211 21387 +176
Branches 2830 2825 -5
============================================
+ Hits 12591 13064 +473
+ Misses 7370 7101 -269
+ Partials 1250 1222 -28
... and 63 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
bryopsida
force-pushed
the
2356-preserve-helm-param-case
branch
from
29817d0
to
e9755b1
Compare
rohanKanojia
reviewed
Sep 6, 2023
| @@ -167,6 +171,10 @@ Defaults to empty string. | |||
| The parameters can also represent a Golang expression | |||
| | | |||
|
|
|||
| | preserveParameterCase | |||
| | A boolean toggling whether the parameter case is preserved when generating the Values.yaml file, off by default | |||
There was a problem hiding this comment.
nit, would be better to write default value just like other fields.
Suggested change
| | A boolean toggling whether the parameter case is preserved when generating the Values.yaml file, off by default | |
| | A boolean toggling whether the parameter case is preserved when generating the Values.yaml file | |
| Defaults to `false` |
rohanKanojia
reviewed
Sep 6, 2023
| import java.util.Collections; | ||
| import java.util.Map; | ||
| import java.util.Properties; | ||
| import java.util.*; |
There was a problem hiding this comment.
Could you please revert to individual imports instead of wildcards?
rohanKanojia
reviewed
Sep 6, 2023
| helmConfig.setApiVersion("v2"); | ||
|
|
||
| File file = File.createTempFile("api-version-test", ".tmp"); | ||
| file.deleteOnExit(); |
There was a problem hiding this comment.
What's the significance of creating this file in the scope of this test?
There was a problem hiding this comment.
Leftover that I missed, removed it.
rohanKanojia
reviewed
Sep 6, 2023
| helmConfig.setPreserveParameterCase(true); | ||
|
|
||
| File file = File.createTempFile("case-preservation-test", ".tmp"); | ||
| file.deleteOnExit(); |
There was a problem hiding this comment.
Even When I comment out these file creation lines, tests seem to pass. Could this possibly be a leftover?
There was a problem hiding this comment.
Sure is, I've removed it.
rohanKanojia
reviewed
Sep 6, 2023
| @@ -140,6 +140,36 @@ void deserialize() throws Exception { | |||
| .toBuilder().name("ngnix").version("1.2.3").repository("https://example.com/charts").build())); | |||
| } | |||
|
|
|||
| @Test | |||
| void canEnableCasePresevation() throws IOException { | |||
There was a problem hiding this comment.
Suggested change
| void canEnableCasePresevation() throws IOException { | |
| void canEnableCasePreservation() throws IOException { |
rohanKanojia
reviewed
Sep 6, 2023
| @@ -83,7 +83,7 @@ public HelmService(JKubeConfiguration jKubeConfiguration, ResourceServiceConfig | |||
| this.logger = logger; | |||
| } | |||
|
|
|||
| /** | |||
| /**∂ | |||
rohanKanojia
reviewed
Sep 6, 2023
| return parameter.getName(); | ||
| } else { | ||
| return parameter.getName().toLowerCase(); | ||
| } |
There was a problem hiding this comment.
This just my opinion, but we should try to use original method here:
public String getHelmName(final boolean preserveCase) {
if (preserveCase) {
return parameter.getName();
}
return getHelmName();
}There was a problem hiding this comment.
Switched to use the original method as suggested.
bryopsida
force-pushed
the
2356-preserve-helm-param-case
branch
from
e9755b1
to
ee410c7
Compare
rohanKanojia
approved these changes
Sep 7, 2023
bryopsida
force-pushed
the
2356-preserve-helm-param-case
branch
2 times, most recently
from
587168d
to
73ac8fa
Compare
|
Looking at the test failures it looks like a ssh connectivity failure, is there anything I need to do on my end? Tests were passing before I rebased to address a merge conflict in the changelog. |
|
hello @manusa do you remember the reason why the HelmParameters were turned to lowercase ? |
No, I haven't approved the PR yet because I want to check it out and see if I can remember why this was done in the first place. |
Adds preserveParameterCase to HelmConfig to allow opting in to preserve HelmParameter case in Values.yaml. Adds apiVersion to HelmConfig to allow specifying chart schema version. Signed-off-by: bryopsida <8363252+bryopsida@users.noreply.github.com>
manusa
force-pushed
the
2356-preserve-helm-param-case
branch
from
73ac8fa
to
c3824db
Compare
Signed-off-by: Marc Nuri <marc@marcnuri.com>
manusa
force-pushed
the
2356-preserve-helm-param-case
branch
from
c3824db
to
58bb4f4
Compare
Signed-off-by: Marc Nuri <marc@marcnuri.com>
manusa
force-pushed
the
2356-preserve-helm-param-case
branch
from
069cfde
to
fae04b3
Compare
manusa
approved these changes
Sep 22, 2023
|
Kudos, SonarCloud Quality Gate passed!
|
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.
Description
Adds preserveParameterCase to HelmConfig to allow opting in to preserve HelmParameter case in Values.yaml.
Adds apiVersion to HelmConfig to allow specifying chart schema version.
Fixes #2356
Type of change
test, version modification, documentation, etc.)
Checklist