Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SecretEnricher getSecretsFromXmlConfig should return Collections.emptyList() instead of null #2554

Closed
wants to merge 13 commits into from
Closed

SecretEnricher getSecretsFromXmlConfig should return Collections.emptyList() instead of null #2554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
82999a0
refactor:JKubeConfigurationTest uses deprecated ObjectMapper.configur…
sankritimishra Jan 12, 2024
f90f423
SecretEnricher getSecretsFromXmlConfig should return Collections.empt…
sankritimishra Jan 13, 2024
0fa2292
Merge branch 'eclipse:master' into master
sankritimishra Jan 13, 2024
2672ed6
refactor:JKubeConfigurationTest uses deprecated ObjectMapper.configur…
sankritimishra Jan 16, 2024
940570c
Merge branch 'master' of https://github.com/sankritimishra/jkube
sankritimishra Jan 16, 2024
2ac3b86
Removed unnecessary import
sankritimishra Jan 16, 2024
39a7043
Removed null check from the caller
sankritimishra Jan 17, 2024
e50b2d1
Reverted the import change
sankritimishra Jan 17, 2024
e2d5535
Implemented formatting changes
sankritimishra Jan 17, 2024
e7935bc
Update jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enr…
sankritimishra Jan 24, 2024
218fc1d
Added the required import for org.eclipse.jkube.kit.enricher.api.mode…
sankritimishra Jan 25, 2024
0c25af0
Adding the import for org.eclipse.jkube.kit.enricher.api.model.Config…
sankritimishra Jan 28, 2024
098ebbe
Merge branch 'eclipse:master' into master
sankritimishra Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions jkube-kit/enricher/generic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.3</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
16 changes: 9 additions & 7 deletions ...kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,19 @@
import io.fabric8.kubernetes.api.model.SecretBuilder;
import org.eclipse.jkube.kit.common.util.Base64Util;
import org.eclipse.jkube.kit.config.resource.PlatformMode;
import org.eclipse.jkube.kit.enricher.api.model.Configuration;
import org.eclipse.jkube.kit.config.resource.ResourceConfig;
import org.eclipse.jkube.kit.config.resource.SecretConfig;
import org.eclipse.jkube.kit.enricher.api.BaseEnricher;
import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext;
import org.eclipse.jkube.kit.enricher.api.util.SecretConstants;
import org.apache.commons.lang3.StringUtils;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Collections;


public abstract class SecretEnricher extends BaseEnricher {

Expand Down Expand Up @@ -76,7 +79,7 @@ private void addSecretsFromXmlConfiguration(KubernetesListBuilder builder) {
log.verbose("Adding secrets resources from plugin configuration");
List<SecretConfig> secrets = getSecretsFromXmlConfig();
Map<String, Integer> secretToIndexMap = new HashMap<>();
if (secrets == null || secrets.isEmpty()) {
if (secrets.isEmpty()) {
return;
}

Expand Down Expand Up @@ -128,11 +131,10 @@ private void addSecretsFromXmlConfiguration(KubernetesListBuilder builder) {
}

private List<SecretConfig> getSecretsFromXmlConfig() {
ResourceConfig resourceConfig = getConfiguration().getResource();
if(resourceConfig != null && resourceConfig.getSecrets() != null) {
return resourceConfig.getSecrets();
}
return null;
return Optional.ofNullable(getConfiguration())
.map(Configuration::getResource)
.map(ResourceConfig::getSecrets)
.orElse(Collections.emptyList());
}

private String getDockerIdFromAnnotation(Map<String, String> annotation) {
Expand Down
4 changes: 3 additions & 1 deletion .../generic/src/main/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ public TriggersAnnotationEnricher(JKubeEnricherContext buildContext) {

@Override
public void enrich(PlatformMode platformMode, KubernetesListBuilder builder) {

if(platformMode != PlatformMode.openshift){
return;
}
builder.accept(new TypedVisitor<StatefulSetBuilder>() {
@Override
public void visit(StatefulSetBuilder o) {
Expand Down
Loading