Fix #1971: Added NullCheck in FileDataSecretEnricher

fabric8io · Feb 20, 2020 · 7d14c83 · 7d14c83
1 parent 291fbdc
commit 7d14c83
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@ Usage:
 ### 4.5-SNAPSHOT
 * Fix #1789: script to extract changelog information for notifications
 * Fix #1770: Fixed my mistake, remove constructors from OpenshiftBuildConfig which were causing PluginConfigurationException
+* Fix #1791: Fix NullPointerException in FileDataSecretEnricher (due to recent change in Kubernetes Client Builder null to LinkedHashMap conversion)
 
 ### 4.4.0 (2020-02-13)
 * Fix #1572: Support maven --batch-mode option

diff --git a/...her/standard/src/main/java/io/fabric8/maven/enricher/standard/FileDataSecretEnricher.java b/...her/standard/src/main/java/io/fabric8/maven/enricher/standard/FileDataSecretEnricher.java
@@ -50,8 +50,10 @@ private void addAnnotations(KubernetesListBuilder builder) {
             public void visit(SecretBuilder element) {
                 final Map<String, String> annotations = element.buildMetadata().getAnnotations();
                 try {
-                    final Map<String, String> secretAnnotations = createSecretFromAnnotations(annotations);
-                    element.addToData(secretAnnotations);
+                    if (annotations != null && !annotations.isEmpty()) {
+                        final Map<String, String> secretAnnotations = createSecretFromAnnotations(annotations);
+                        element.addToData(secretAnnotations);
+                    }
                 } catch (IOException e) {
                     throw new IllegalArgumentException(e);
                 }

diff --git a/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/SecretEnricher.java b/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/SecretEnricher.java
@@ -56,17 +56,19 @@ public void create(PlatformMode platformMode, KubernetesListBuilder builder) {
             @Override
             public void visit(SecretBuilder secretBuilder) {
                 Map<String, String> annotation = secretBuilder.buildMetadata().getAnnotations();
-                if (!annotation.containsKey(getAnnotationKey())) {
-                    return;
+                if (annotation != null) {
+                    if (!annotation.containsKey(getAnnotationKey())) {
+                        return;
+                    }
+                    String dockerId = annotation.get(getAnnotationKey());
+                    Map<String, String> data = generateData(dockerId);
+                    if (data == null) {
+                        return;
+                    }
+                    // remove the annotation key
+                    annotation.remove(getAnnotationKey());
+                    secretBuilder.addToData(data);
                 }
-                String dockerId = annotation.get(getAnnotationKey());
-                Map<String, String> data = generateData(dockerId);
-                if (data == null) {
-                    return;
-                }
-                // remove the annotation key
-                annotation.remove(getAnnotationKey());
-                secretBuilder.addToData(data);
             }
         });