From cc85ce43296f83330d03260efb2ba203969ae860 Mon Sep 17 00:00:00 2001
From: Lukasz Lopatowski <llopat@man.poznan.pl>
Date: Tue, 21 Sep 2021 11:23:41 +0200
Subject: [PATCH] NMAAS-1028: Minor update
---
.../components/helm/HelmChartUpdateListener.java | 2 +-
.../nmaas/portal/events/ApplicationListUpdatedEvent.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmChartUpdateListener.java b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmChartUpdateListener.java
index d075c0116..62ebe235f 100644
--- a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmChartUpdateListener.java
+++ b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmChartUpdateListener.java
@@ -26,7 +26,7 @@ public class HelmChartUpdateListener {
@Loggable(LogLevel.INFO)
public ApplicationEvent trigger(ApplicationListUpdatedEvent event) {
// add Helm repository from KubernetesTemplate (it will be overwritten if already exists)
- if (Arrays.asList(ADDED, UPDATED).contains(event.getAction())) {
+ if (Arrays.asList(ADDED, UPDATED).contains(event.getAction()) && event.getDeploymentSpec() != null) {
String repoName = event.getDeploymentSpec().getKubernetesTemplate().getHelmChartRepository().getName();
String repoUrl = event.getDeploymentSpec().getKubernetesTemplate().getHelmChartRepository().getUrl();
if (StringUtils.hasText(repoName) && StringUtils.hasText(repoUrl)) {
diff --git a/src/main/java/net/geant/nmaas/portal/events/ApplicationListUpdatedEvent.java b/src/main/java/net/geant/nmaas/portal/events/ApplicationListUpdatedEvent.java
index 7cba66f40..7e171535a 100644
--- a/src/main/java/net/geant/nmaas/portal/events/ApplicationListUpdatedEvent.java
+++ b/src/main/java/net/geant/nmaas/portal/events/ApplicationListUpdatedEvent.java
@@ -26,4 +26,11 @@ public class ApplicationListUpdatedEvent extends ApplicationEvent {
DELETED;
}
+ @Override
+ public String toString() {
+ return "ApplicationListUpdatedEvent{" +
+ "name=" + name + ", version=" + version + ", action=" + action + ", deploymentSpec=" + ((deploymentSpec != null) ? "provided" : "empty") +
+ '}';
+ }
+
}
--
GitLab