fix: log in case policies are not consistent across VCPs

Signed-off-by: Sven Trieflinger <sven.trieflinger@de.bosch.com>
carbynestack · Nov 13, 2024 · ff1da62 · ff1da62
1 parent 7bc1db2
commit ff1da62
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/clients/java/src/main/java/io/carbynestack/thymus/client/PolicyResponse.java b/clients/java/src/main/java/io/carbynestack/thymus/client/PolicyResponse.java
@@ -19,14 +19,14 @@
 @NoArgsConstructor(force = true)
 public class PolicyResponse {
 
-    private static final Pattern POLICY_ID_PATTERN = Pattern.compile("stackable/bundles/([^/]+)/([^/]+)");
+    private static final Pattern POLICY_ID_PATTERN = Pattern.compile("([^/]+):([^/]+)");
 
     String id;
 
     String raw;
 
     public PolicyResponse(Policy policy) {
-        this.id = "stackable/bundles/" + policy.getName().getNamespace() + "/" + policy.getName().getName();
+        this.id = policy.getName().getNamespace() + ":" + policy.getName().getName();
         this.raw = policy.getSource();
     }
 

diff --git a/clients/java/src/main/java/io/carbynestack/thymus/client/ThymusVCClient.java b/clients/java/src/main/java/io/carbynestack/thymus/client/ThymusVCClient.java
@@ -63,13 +63,16 @@ public Future<Either<ThymusError, Set<NamespacedName>>> getPolicies() {
         return Future.sequence(invocations).map(results -> {
             Set<ThymusError> errors = new HashSet<>();
             Set<NamespacedName> commonPolicies = new HashSet<>();
+            Set<NamespacedName> allPolicies = new HashSet<>();
             results.zipWithIndex().forEach(r -> {
                 val index = r._2;
                 val result = r._1;
                 if (result._2.isLeft()) {
                     // Collect all errors indexed by the endpoint
                     errors.add(result._2.getLeft());
                 } else {
+                    allPolicies.addAll(result._2.get());
+
                     // Compute the intersection of all policies
                     if (index == 0) {
                         commonPolicies.addAll(result._2.get());
@@ -78,6 +81,10 @@ public Future<Either<ThymusError, Set<NamespacedName>>> getPolicies() {
                     }
                 }
             });
+            if (commonPolicies.size() != allPolicies.size()) {
+                allPolicies.removeAll(commonPolicies);
+                log.debug("There are policies that are not common across all VCPs: {}", allPolicies);
+            }
             if (!errors.isEmpty()) {
                 val me = new ThymusError.MultiError().setErrors(errors);
                 return Either.left(me);