SecretEnricher getSecretsFromXmlConfig should return Collections.emptyList() instead of null #2554
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
sankritimishra
requested review from
manusa,
rohanKanojia and
sunix
as code owners
Eclipse JKube CI ReportStarted new GH workflow run for #2554 (2024-01-29T07:21:46Z) ⚙️ JKube E2E Tests (7692436999)
|
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #2554 +/- ##
=============================================
+ Coverage 59.36% 69.70% +10.34%
- Complexity 4586 4892 +306
=============================================
Files 500 474 -26
Lines 21211 19169 -2042
Branches 2830 2479 -351
=============================================
+ Hits 12591 13362 +771
+ Misses 7370 4586 -2784
+ Partials 1250 1221 -29 ☔ View full report in Codecov by Sentry. |
Comment on lines
133
to
134
| ResourceConfig resourceConfig = getConfiguration().getResource(); | ||
| if(resourceConfig != null && resourceConfig.getSecrets() != null) { | ||
| return resourceConfig.getSecrets(); | ||
| } | ||
| return null; | ||
| return Optional.ofNullable(resourceConfig).map(resourceConfig1 -> Optional.ofNullable(resourceConfig1.getSecrets()).orElse(Collections.emptyList())).orElse(Collections.emptyList()); |
There was a problem hiding this comment.
minor suggestion regarding formatting
Suggested change
| ResourceConfig resourceConfig = getConfiguration().getResource(); | |
| if(resourceConfig != null && resourceConfig.getSecrets() != null) { | |
| return resourceConfig.getSecrets(); | |
| } | |
| return null; | |
| return Optional.ofNullable(resourceConfig).map(resourceConfig1 -> Optional.ofNullable(resourceConfig1.getSecrets()).orElse(Collections.emptyList())).orElse(Collections.emptyList()); | |
| return Optional.ofNullable(getConfiguration().getResource()) | |
| .map(rc -> Optional.ofNullable(rc.getSecrets()) | |
| .orElse(Collections.emptyList())) | |
| .orElse(Collections.emptyList()); |
|
rohanKanojia
approved these changes
Jan 18, 2024
jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java
Outdated
Show resolved
Hide resolved
…icher/generic/SecretEnricher.java Co-authored-by: Rohan Kumar <rohan.kumar.kanojia@gmail.com>
manusa
reviewed
Jan 25, 2024
| } | ||
| return null; | ||
| return Optional.ofNullable(getConfiguration()) | ||
| .map(Configuration::getResource) |
There was a problem hiding this comment.
You're missing the required import for org.eclipse.jkube.kit.enricher.api.model.Configuration, the project won't compile unless you add it
manusa
requested changes
Jan 29, 2024
There was a problem hiding this comment.
Hi, @sankritimishra
This PR is getting really messy.
I suggest you start from scratch in a new branch (preferably named different to master).
Keep only these changes:
private List<SecretConfig> getSecretsFromXmlConfig() {
return Optional.ofNullable(getConfiguration())
.map(Configuration::getResource)
.map(ResourceConfig::getSecrets)
.orElse(Collections.emptyList());
}And try to open it on an IDE so that it can automatically fix the imports for you. At the moment I'm worried you're not even trying to compile the changed module in your local machine.
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
SecretEnricher getSecretsFromXmlConfig should return Collections.emptyList() instead of nullFixes #2530
Type of change
test, version modification, documentation, etc.)
Checklist