From 56b125facf7e3f079c7e4199536cf16d95ba3322 Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Tue, 20 May 2025 14:41:34 +0200
Subject: [PATCH 1/2] small fixes
---
.../externalservices/kubernetes/RemoteClusterManager.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
index 8be177523..efdae1161 100644
--- a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
+++ b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
@@ -37,8 +37,8 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.time.OffsetDateTime;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -46,8 +46,8 @@ import java.util.Optional;
import java.util.stream.Collectors;
@Service
-@RequiredArgsConstructor
@Slf4j
+@RequiredArgsConstructor
public class RemoteClusterManager implements ClusterMonitoringService {
private final KClusterRepository clusterRepository;
@@ -137,11 +137,11 @@ public class RemoteClusterManager implements ClusterMonitoringService {
.state(KClusterState.UNKNOWN)
.contactEmail(view.getContactEmail())
.currentStateSince(OffsetDateTime.now())
- .domains(view.getDomainNames().stream().map(d -> {
+ .domains(!view.getDomainNames().isEmpty() ? view.getDomainNames().stream().map(d -> {
Optional<Domain> dom = domainService.findDomain(d);
return dom.orElse(null);
}
- ).toList())
+ ).toList() : Collections.emptyList())
.build(),
file);
--
GitLab
From 03cd4bc2fa24d36789de8bb2ab9daef7c5856964 Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Tue, 20 May 2025 14:41:44 +0200
Subject: [PATCH 2/2] add labels
---
src/test/shell/data/i18n/de.json | 17 ++++++++++++++++-
src/test/shell/data/i18n/en.json | 16 ++++++++++++++++
src/test/shell/data/i18n/fr.json | 15 +++++++++++++++
src/test/shell/data/i18n/pl.json | 15 +++++++++++++++
4 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/src/test/shell/data/i18n/de.json b/src/test/shell/data/i18n/de.json
index 4d8597ce9..70edc1e5f 100644
--- a/src/test/shell/data/i18n/de.json
+++ b/src/test/shell/data/i18n/de.json
@@ -192,7 +192,8 @@
"DOWN" : "Down",
"UNKNOWN" : "Unknown",
"DETAILS" : "Details",
- "STATE_SINCE" : "State last change"
+ "STATE_SINCE" : "State last change",
+ "CONTACT_MAIL" : "Contact mail"
},
"GITLAB": {
"TITLE": "GitLab Konfiguration",
@@ -1307,5 +1308,19 @@
},
"SHARED" : {
"TOGGLE" : "Toggle all"
+ },
+ "WEBHOOKS" : {
+ "TITLE" : "Webhooks settings",
+ "TITLE_SHORT" : "Webhooks",
+ "ID" : "Id",
+ "NAME" : "Name",
+ "TARGET_URL" : "Target Url",
+ "TYPE" : "Webhook type",
+ "TOKEN" : "Token value",
+ "AUTH" : "Authorization header",
+ "DOMAIN_CREATION" : "Domain creation",
+ "APPLICATION_DEPLOYMENT" : "Application deployment",
+ "USER_ASSIGNMENT" : "User assignment",
+ "DOMAIN_GROUP_CHANGE" : "Domain group change"
}
}
diff --git a/src/test/shell/data/i18n/en.json b/src/test/shell/data/i18n/en.json
index e2aea66b1..dbae76e8f 100644
--- a/src/test/shell/data/i18n/en.json
+++ b/src/test/shell/data/i18n/en.json
@@ -192,6 +192,7 @@
"UP" : "Up",
"DOWN" : "Down",
"UNKNOWN" : "Unknown",
+ "CONTACT_MAIL" : "Contact mail"
"DETAILS" : "Details",
"STATE_SINCE" : "State last change"
},
@@ -1312,5 +1313,20 @@
},
"SHARED" : {
"TOGGLE" : "Toggle all"
+ },
+ "WEBHOOKS" : {
+ "TITLE" : "Webhooks settings",
+ "TITLE_SHORT" : "Webhooks",
+ "ID" : "Id",
+ "NAME" : "Name",
+ "TARGET_URL" : "Target Url",
+ "TYPE" : "Webhook type",
+ "TOKEN" : "Token value",
+ "AUTH" : "Authorization header",
+ "DOMAIN_CREATION" : "Domain creation",
+ "APPLICATION_DEPLOYMENT" : "Application deployment",
+ "USER_ASSIGNMENT" : "User assignment",
+ "DOMAIN_GROUP_CHANGE" : "Domain group change",
+ "NEW" : "Add webhook"
}
}
diff --git a/src/test/shell/data/i18n/fr.json b/src/test/shell/data/i18n/fr.json
index 5051d9703..43daf12ff 100644
--- a/src/test/shell/data/i18n/fr.json
+++ b/src/test/shell/data/i18n/fr.json
@@ -193,6 +193,7 @@
"UP" : "Up",
"DOWN" : "Down",
"UNKNOWN" : "Unknown",
+ "CONTACT_MAIL" : "Contact mail",
"DETAILS" : "Details",
"STATE_SINCE" : "State last change"
},
@@ -1311,5 +1312,19 @@
},
"SHARED" : {
"TOGGLE" : "Toggle all"
+ },
+ "WEBHOOKS" : {
+ "TITLE" : "Webhooks settings",
+ "TITLE_SHORT" : "Webhooks",
+ "ID" : "Id",
+ "NAME" : "Name",
+ "TARGET_URL" : "Target Url",
+ "TYPE" : "Webhook type",
+ "TOKEN" : "Token value",
+ "AUTH" : "Authorization header",
+ "DOMAIN_CREATION" : "Domain creation",
+ "APPLICATION_DEPLOYMENT" : "Application deployment",
+ "USER_ASSIGNMENT" : "User assignment",
+ "DOMAIN_GROUP_CHANGE" : "Domain group change"
}
}
diff --git a/src/test/shell/data/i18n/pl.json b/src/test/shell/data/i18n/pl.json
index f3e91fadc..61ef098c7 100644
--- a/src/test/shell/data/i18n/pl.json
+++ b/src/test/shell/data/i18n/pl.json
@@ -192,6 +192,7 @@
"UP" : "Aktywny",
"DOWN" : "Nieaktywny",
"UNKNOWN" : "Nieznany",
+ "CONTACT_MAIL" : "Email kontaktowy",
"DETAILS" : "Detale",
"STATE_SINCE" : "Stan od"
},
@@ -1310,5 +1311,19 @@
},
"SHARED" : {
"TOGGLE" : "Toggle all"
+ },
+ "WEBHOOKS" : {
+ "TITLE" : "Webhooks settings",
+ "TITLE_SHORT" : "Webhooks",
+ "ID" : "Id",
+ "NAME" : "Name",
+ "TARGET_URL" : "Target Url",
+ "TYPE" : "Webhook type",
+ "TOKEN" : "Token value",
+ "AUTH" : "Authorization header",
+ "DOMAIN_CREATION" : "Domain creation",
+ "APPLICATION_DEPLOYMENT" : "Application deployment",
+ "USER_ASSIGNMENT" : "User assignment",
+ "DOMAIN_GROUP_CHANGE" : "Domain group change"
}
}
--
GitLab