cont sync

chaen · May 30, 2024 · 085f9f4 · 085f9f4
1 parent bba8478
commit 085f9f4
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/src/DIRAC/ConfigurationSystem/Client/VOMS2CSSynchronizer.py b/src/DIRAC/ConfigurationSystem/Client/VOMS2CSSynchronizer.py
@@ -177,30 +177,42 @@ def __init__(
 
             self.syncPlugin = _class["Value"]()
 
-    @staticmethod
-    def compare_entry(iam_entry, voms_entry):
+    def compare_entry(self, iam_entry, voms_entry, is_robot):
         """Compare a VOMS and IAM entry"""
 
+        if not iam_entry.get("mail") == voms_entry.get("mail"):
+            self.log.info(f"{iam_entry['nickname']} - mail : {iam_entry.get('mail')} vs {voms_entry.get('mail')}")
+            if is_robot:
+                self.log.info("\t this is expected for robots !")
+
         for field in ("CA", "certSuspended", "suspended", "mail", "nickname"):
             if not iam_entry.get(field) == voms_entry.get(field):
-                print(f"{iam_entry['nickname']} - {field} : {iam_entry.get(field)} vs {voms_entry.get(field)}")
+                self.log.info(f"{iam_entry['nickname']} - {field} : {iam_entry.get(field)} vs {voms_entry.get(field)}")
 
         if not sorted(iam_entry["Roles"]) == sorted(voms_entry["Roles"]):
-            print(f"{iam_entry['nickname']} - Roles : {iam_entry['Roles']} vs {voms_entry['Roles']}")
+            self.log.info(f"{iam_entry['nickname']} - Roles : {iam_entry['Roles']} vs {voms_entry['Roles']}")
 
     def compareUsers(self, voms_users, iam_users):
         missing_in_iam = set(voms_users) - set(iam_users)
-        suspended_in_voms = {dn for dn in voms_users if voms_users[dn]["suspended"]}
+        if missing_in_iam:
+            self.log.info("Missing entries in IAM:", missing_in_iam)
+        else:
+            self.log.info("No entry missing in IAM, GOOD !")
+        # suspended_in_voms = {dn for dn in voms_users if voms_users[dn]["suspended"]}
+        missing_in_voms = set(iam_users) - set(voms_users)
+
+        if missing_in_voms:
+            self.log.info("Entries in IAM that are not in VOMS:", missing_in_voms)
+        else:
+            self.log.info("No extra entry entries in IAM, GOOD !")
 
         # We are waiting for IAM to synchronize also suspended people
         # https://github.com/indigo-iam/voms-importer/pull/22
         # assert missing_in_iam == suspended_in_voms
 
-        for dn, cert_info in voms_users.items():
-            if dn in missing_in_iam:
-                print(f"skipping {dn}")
-                continue
-            self.compare_entry(iam_users[dn], cert_info)
+        for dn in set(iam_users) & set(voms_users):
+            is_robot = "CN=Robot:" in dn
+            self.compare_entry(iam_users[dn], voms_users[dn], is_robot=is_robot)
 
     @convertToReturnValue
     def _getUsers(self):