From 82999a0dbdd23d0984c9944e4f1153827a54b6a2 Mon Sep 17 00:00:00 2001 From: sankriti mishra Date: Fri, 12 Jan 2024 16:00:06 +0530 Subject: [PATCH 1/9] refactor:JKubeConfigurationTest uses deprecated ObjectMapper.configure method --- .../jkube/kit/config/image/build/BuildConfigurationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jkube-kit/config/image/src/test/java/org/eclipse/jkube/kit/config/image/build/BuildConfigurationTest.java b/jkube-kit/config/image/src/test/java/org/eclipse/jkube/kit/config/image/build/BuildConfigurationTest.java index 2b6082472d..7f9d7d8d14 100644 --- a/jkube-kit/config/image/src/test/java/org/eclipse/jkube/kit/config/image/build/BuildConfigurationTest.java +++ b/jkube-kit/config/image/src/test/java/org/eclipse/jkube/kit/config/image/build/BuildConfigurationTest.java @@ -19,6 +19,7 @@ import java.util.Collections; import java.util.stream.Stream; +import com.fasterxml.jackson.databind.json.JsonMapper; import org.assertj.core.api.Assertions; import org.eclipse.jkube.kit.common.AssemblyConfiguration; @@ -234,8 +235,7 @@ void getAssembly_withAssembly_shouldReturnAssembly() { @Test void rawDeserialization() throws IOException { // Given - final ObjectMapper mapper = new ObjectMapper(); - mapper.configure(MapperFeature.USE_ANNOTATIONS, false); + final ObjectMapper mapper = JsonMapper.builder().configure(MapperFeature.USE_ANNOTATIONS, false).build(); // When final BuildConfiguration result = mapper.readValue( BuildConfigurationTest.class.getResourceAsStream("/build-configuration.json"), From f90f4230a448df11b4e429bfc266f197e8773b25 Mon Sep 17 00:00:00 2001 From: sankriti mishra Date: Sat, 13 Jan 2024 23:34:34 +0530 Subject: [PATCH 2/9] SecretEnricher getSecretsFromXmlConfig should return Collections.emptyList() instead of null --- .../eclipse/jkube/enricher/generic/SecretEnricher.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java index 29045a06f9..7cf9a067e4 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java @@ -28,9 +28,7 @@ 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.*; public abstract class SecretEnricher extends BaseEnricher { @@ -129,10 +127,8 @@ private void addSecretsFromXmlConfiguration(KubernetesListBuilder builder) { private List getSecretsFromXmlConfig() { ResourceConfig resourceConfig = getConfiguration().getResource(); - if(resourceConfig != null && resourceConfig.getSecrets() != null) { - return resourceConfig.getSecrets(); - } - return null; + return Optional.ofNullable(resourceConfig.getSecrets()).orElse(Collections.emptyList()); + } private String getDockerIdFromAnnotation(Map annotation) { From 2672ed675ba818f54f0f71c66965025f99f8b256 Mon Sep 17 00:00:00 2001 From: sankriti mishra Date: Tue, 16 Jan 2024 17:23:33 +0530 Subject: [PATCH 3/9] refactor:JKubeConfigurationTest uses deprecated ObjectMapper.configure method --- .../org/eclipse/jkube/enricher/generic/SecretEnricher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java index 7cf9a067e4..b22ef45973 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java @@ -27,6 +27,7 @@ import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext; import org.eclipse.jkube.kit.enricher.api.util.SecretConstants; import org.apache.commons.lang3.StringUtils; +import org.graalvm.compiler.nodes.calc.IntegerDivRemNode; import java.util.*; @@ -127,8 +128,7 @@ private void addSecretsFromXmlConfiguration(KubernetesListBuilder builder) { private List getSecretsFromXmlConfig() { ResourceConfig resourceConfig = getConfiguration().getResource(); - return Optional.ofNullable(resourceConfig.getSecrets()).orElse(Collections.emptyList()); - + return Optional.ofNullable(resourceConfig).map(resourceConfig1 -> Optional.ofNullable(resourceConfig1.getSecrets()).orElse(Collections.emptyList())).orElse(Collections.emptyList()); } private String getDockerIdFromAnnotation(Map annotation) { From 2ac3b860edf2f0209b5f6bf3e32fb4e5bb78f4a6 Mon Sep 17 00:00:00 2001 From: sankriti mishra Date: Tue, 16 Jan 2024 17:49:10 +0530 Subject: [PATCH 4/9] Removed unnecessary import --- .../java/org/eclipse/jkube/enricher/generic/SecretEnricher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java index b22ef45973..e455fefb90 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java @@ -27,7 +27,7 @@ import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext; import org.eclipse.jkube.kit.enricher.api.util.SecretConstants; import org.apache.commons.lang3.StringUtils; -import org.graalvm.compiler.nodes.calc.IntegerDivRemNode; + import java.util.*; From 39a70438ed101ad7897259421a77a2a2f884b5dd Mon Sep 17 00:00:00 2001 From: sankriti mishra Date: Wed, 17 Jan 2024 12:08:18 +0530 Subject: [PATCH 5/9] Removed null check from the caller --- .../java/org/eclipse/jkube/enricher/generic/SecretEnricher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java index e455fefb90..10fda8968b 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java @@ -75,7 +75,7 @@ private void addSecretsFromXmlConfiguration(KubernetesListBuilder builder) { log.verbose("Adding secrets resources from plugin configuration"); List secrets = getSecretsFromXmlConfig(); Map secretToIndexMap = new HashMap<>(); - if (secrets == null || secrets.isEmpty()) { + if (secrets.isEmpty()) { return; } From e50b2d15ef8438ea9558c1cb605f426b7977d0c1 Mon Sep 17 00:00:00 2001 From: sankriti mishra Date: Wed, 17 Jan 2024 17:43:18 +0530 Subject: [PATCH 6/9] Reverted the import change --- .../org/eclipse/jkube/enricher/generic/SecretEnricher.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java index 10fda8968b..5a5f03b2cd 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java @@ -27,10 +27,13 @@ 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; -import java.util.*; - public abstract class SecretEnricher extends BaseEnricher { public SecretEnricher(JKubeEnricherContext buildContext, String name) { From e2d55353df53806c43c5eb40e37cb72f9ffb6a26 Mon Sep 17 00:00:00 2001 From: sankriti mishra Date: Thu, 18 Jan 2024 00:23:33 +0530 Subject: [PATCH 7/9] Implemented formatting changes --- .../org/eclipse/jkube/enricher/generic/SecretEnricher.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java index 5a5f03b2cd..4951bdd329 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java @@ -130,8 +130,10 @@ private void addSecretsFromXmlConfiguration(KubernetesListBuilder builder) { } private List getSecretsFromXmlConfig() { - ResourceConfig resourceConfig = getConfiguration().getResource(); - 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()); } private String getDockerIdFromAnnotation(Map annotation) { From e7935bc239cec0ea5f4da7976ca616bcdc320b24 Mon Sep 17 00:00:00 2001 From: Sankriti Mishra <104777910+sankritimishra@users.noreply.github.com> Date: Wed, 24 Jan 2024 15:48:52 +0530 Subject: [PATCH 8/9] Update jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java Co-authored-by: Rohan Kumar --- .../eclipse/jkube/enricher/generic/SecretEnricher.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java index 4951bdd329..6a761071e7 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java @@ -130,10 +130,10 @@ private void addSecretsFromXmlConfiguration(KubernetesListBuilder builder) { } private List getSecretsFromXmlConfig() { - return Optional.ofNullable(getConfiguration().getResource()) - .map(rc -> Optional.ofNullable(rc.getSecrets()) - .orElse(Collections.emptyList())) - .orElse(Collections.emptyList()); + return Optional.ofNullable(getConfiguration()) + .map(Configuration::getResource) + .map(ResourceConfig::getSecrets) + .orElse(Collections.emptyList()); } private String getDockerIdFromAnnotation(Map annotation) { From 218fc1d8202ce670bda90a2927cd58a36cc86a50 Mon Sep 17 00:00:00 2001 From: sankriti mishra Date: Thu, 25 Jan 2024 23:58:37 +0530 Subject: [PATCH 9/9] Added the required import for org.eclipse.jkube.kit.enricher.api.model.Configuration --- jkube-kit/enricher/generic/pom.xml | 6 ++++++ .../org/eclipse/jkube/enricher/generic/SecretEnricher.java | 7 ++++--- .../jkube/enricher/generic/TriggersAnnotationEnricher.java | 4 +++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jkube-kit/enricher/generic/pom.xml b/jkube-kit/enricher/generic/pom.xml index 6acce17578..494f7d7a4b 100644 --- a/jkube-kit/enricher/generic/pom.xml +++ b/jkube-kit/enricher/generic/pom.xml @@ -68,6 +68,12 @@ com.google.code.gson gson + + com.fasterxml.jackson.core + jackson-databind + 2.15.3 + test + diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java index 4951bdd329..a779d3771f 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java @@ -21,6 +21,7 @@ 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; @@ -130,9 +131,9 @@ private void addSecretsFromXmlConfiguration(KubernetesListBuilder builder) { } private List getSecretsFromXmlConfig() { - return Optional.ofNullable(getConfiguration().getResource()) - .map(rc -> Optional.ofNullable(rc.getSecrets()) - .orElse(Collections.emptyList())) + return Optional.ofNullable(getConfiguration()) + .map(Configuration::getResource) + .map(ResourceConfig::getSecrets) .orElse(Collections.emptyList()); } diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricher.java index e9161b8f54..a1254c2f42 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricher.java @@ -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() { @Override public void visit(StatefulSetBuilder o) {