Added NullCheck in FileDataSecretEnricher

Ported PR fabric8io/fabric8-maven-plugin#1792
rohanKanojia · Mar 6, 2020 · d8a9d00 · d8a9d00
1 parent b5ed36f
commit d8a9d00
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/...cher/generic/src/main/java/org/eclipse/jkube/enricher/generic/FileDataSecretEnricher.java b/...cher/generic/src/main/java/org/eclipse/jkube/enricher/generic/FileDataSecretEnricher.java
@@ -49,8 +49,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/...kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java b/...kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java
@@ -53,17 +53,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);
  }
  });