DIRAC 9.0.11__tar.gz → 9.0.12__tar.gz

{dirac-9.0.11/src/DIRAC.egg-info → dirac-9.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.11
+Version: 9.0.12
 Summary: DIRAC is an interware, meaning a software framework for distributed computing.
 Home-page: https://github.com/DIRACGrid/DIRAC/
 License: GPL-3.0-only
@@ -19,7 +19,7 @@ Requires-Dist: cachetools
 Requires-Dist: certifi
 Requires-Dist: cwltool
 Requires-Dist: diraccfg
-Requires-Dist: DIRACCommon==v9.0.11
+Requires-Dist: DIRACCommon==v9.0.12
 Requires-Dist: diracx-client>=v0.0.1
 Requires-Dist: diracx-core>=v0.0.1
 Requires-Dist: diracx-cli>=v0.0.1

{dirac-9.0.11 → dirac-9.0.12}/release.notes

@@ -1,3 +1,17 @@
+[v9.0.12]
+
+*Resources
+
+FIX: (#8393) make client_id and secret optional to avoid KeyError exceptions.
+
+*ConfigurationSystem
+
+NEW: (#8392) handle adding user AffiliationEnds section in the CS when modifying the user from CSAPI
+
+*MonitoringSystem
+
+FIX: (#8391) Addapt webApp to new getTransformations API
+
 [v9.0.11]
 
 *WorkloadManagement

{dirac-9.0.11 → dirac-9.0.12}/setup.cfg

@@ -26,7 +26,7 @@ install_requires =
 	certifi
 	cwltool
 	diraccfg
-	DIRACCommon==v9.0.11
+	DIRACCommon==v9.0.12
 	diracx-client >=v0.0.1
 	diracx-core >=v0.0.1
 	diracx-cli >=v0.0.1

{dirac-9.0.11 → dirac-9.0.12}/src/DIRAC/AccountingSystem/Client/Types/Network.py

@@ -1,6 +1,6 @@
-""" Accounting class to stores network metrics gathered by perfSONARs.
+"""Accounting class to stores network metrics gathered by perfSONARs.
 
-    Filled by "Accounting/Network" agent
+Filled by "Accounting/Network" agent
 """
 
 from DIRAC.AccountingSystem.Client.Types.BaseAccountingType import BaseAccountingType
@@ -16,12 +16,12 @@ class Network(BaseAccountingType):
 
         # IPv6 address has up to 45 chars
         self.definitionKeyFields = [
-            ("SourceIP", "VARCHAR(50)"),
-            ("DestinationIP", "VARCHAR(50)"),
-            ("SourceHostName", "VARCHAR(50)"),
-            ("DestinationHostName", "VARCHAR(50)"),
-            ("Source", "VARCHAR(50)"),
-            ("Destination", "VARCHAR(50)"),
+            ("SourceIP", "VARCHAR(64)"),
+            ("DestinationIP", "VARCHAR(64)"),
+            ("SourceHostName", "VARCHAR(255)"),
+            ("DestinationHostName", "VARCHAR(255)"),
+            ("Source", "VARCHAR(255)"),
+            ("Destination", "VARCHAR(255)"),
         ]
 
         self.definitionAccountingFields = [

{dirac-9.0.11 → dirac-9.0.12}/src/DIRAC/AccountingSystem/Client/Types/PilotSubmission.py

@@ -1,6 +1,6 @@
-""" Accounting Type for Pilot Submission
+"""Accounting Type for Pilot Submission
 
-    Filled by the "WorkloadManagement/SiteDirector" agent(s)
+Filled by the "WorkloadManagement/SiteDirector" agent(s)
 """
 
 from DIRAC.AccountingSystem.Client.Types.BaseAccountingType import BaseAccountingType
@@ -13,7 +13,7 @@ class PilotSubmission(BaseAccountingType):
         super().__init__()
 
         self.definitionKeyFields = [
-            ("HostName", "VARCHAR(100)"),
+            ("HostName", "VARCHAR(255)"),
             ("SiteDirector", "VARCHAR(100)"),
             ("Site", "VARCHAR(100)"),
             ("CE", "VARCHAR(100)"),

{dirac-9.0.11 → dirac-9.0.12}/src/DIRAC/ConfigurationSystem/Client/CSAPI.py

@@ -456,13 +456,23 @@ class CSAPI:
             gLogger.error("User is not registered: ", repr(username))
             return S_OK(False)
         for prop in properties:
-            if prop == "Groups":
+            if prop in ["Groups", "AffiliationEnds"]:
                 continue
             prevVal = self.__csMod.getValue(f"{self.__baseSecurity}/Users/{username}/{prop}")
             if not prevVal or prevVal != properties[prop]:
                 gLogger.info(f"Setting {prop} property for user {username} to {properties[prop]}")
                 self.__csMod.setOptionValue(f"{self.__baseSecurity}/Users/{username}/{prop}", properties[prop])
                 modifiedUser = True
+        if properties.get("AffiliationEnds", None):
+            user_affiliationends_section = f"{self.__baseSecurity}/Users/{username}/AffiliationEnds"
+            # add the section for AffiliationEnds
+            res = gConfig.getSections(user_affiliationends_section)
+            if not res["OK"]:
+                self.__csMod.createSection(user_affiliationends_section)
+            # now set value VO = end date
+            for vo, end_date in properties["AffiliationEnds"].items():
+                self.__csMod.setOptionValue(f"{user_affiliationends_section}/{vo}", end_date)
+                modifiedUser = True
         if "Groups" in properties:
             result = self.listGroups()
             if not result["OK"]:

{dirac-9.0.11 → dirac-9.0.12}/src/DIRAC/FrameworkSystem/DB/InstalledComponentsDB.py

@@ -1,6 +1,7 @@
 """
 Classes and functions for easier management of the InstalledComponents database
 """
+
 import re
 import datetime
 
@@ -90,7 +91,7 @@ class Host(componentsBase):
     __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
     hostID = Column("HostID", Integer, primary_key=True)
-    hostName = Column("HostName", String(64), nullable=False)
+    hostName = Column("HostName", String(255), nullable=False)
     cpu = Column("CPU", String(64), nullable=False)
     installationList = relationship("InstalledComponent", backref="installationHost")
 
@@ -219,7 +220,7 @@ class HostLogging(componentsBase):
     __tablename__ = "HostLogging"
     __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
-    hostName = Column("HostName", String(32), nullable=False, primary_key=True)
+    hostName = Column("HostName", String(255), nullable=False, primary_key=True)
     # status
     DIRAC = Column("DIRACVersion", String(64))
     Extension = Column("Extension", String(512))

{dirac-9.0.11 → dirac-9.0.12}/src/DIRAC/FrameworkSystem/Utilities/MonitoringUtilities.py

@@ -1,6 +1,7 @@
 """
 Utilities for ComponentMonitoring features
 """
+
 import datetime
 import socket
 
@@ -30,7 +31,6 @@ def monitorInstallation(componentType, system, component, module=None, cpu=None,
 
     if not hostname:
         hostname = socket.getfqdn()
-        hostname = hostname[0:64]
     instance = component[0:32]
 
     result = monitoringClient.installationExists(

{dirac-9.0.11 → dirac-9.0.12}/src/DIRAC/FrameworkSystem/scripts/dirac_uninstall_component.py

@@ -2,6 +2,7 @@
 """
 Uninstallation of a DIRAC component
 """
+
 import socket
 
 from DIRAC import exit as DIRACexit

{dirac-9.0.11 → dirac-9.0.12}/src/DIRAC/MonitoringSystem/Service/WebAppHandler.py

@@ -2,6 +2,7 @@
 The WebAppHandler module provides a class to handle web requests from the DIRAC WebApp.
 It is not indented to be used in diracx
 """
+
 from DIRAC import S_ERROR, S_OK
 from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getSites
@@ -527,13 +528,21 @@ class WebAppHandler(RequestHandler):
         ops = Operations()
         # Prepare the standard structure now within the resultDict dictionary
         resultDict = {}
-        trList = res["Records"]
+        # Reconstruct just the values list
+        trList = [
+            [str(item) if not isinstance(item, int) else item for item in trans_dict.values()]
+            for trans_dict in res["Value"]
+        ]
+
         # Create the total records entry
         nTrans = len(trList)
         resultDict["TotalRecords"] = nTrans
         # Create the ParameterNames entry
-        # As this list is a reference to the list in the DB, we cannot extend it, therefore copy it
-        resultDict["ParameterNames"] = list(res["ParameterNames"])
+        try:
+            resultDict["ParameterNames"] = list(res["Value"][0].keys())
+        except IndexError:
+            # As this list is a reference to the list in the DB, we cannot extend it, therefore copy it
+            resultDict["ParameterNames"] = list(cls.transformationDB.TRANSPARAMS)
         # Add the job states to the ParameterNames entry
         taskStateNames = TASKS_STATE_NAMES + ops.getValue("Transformations/AdditionalTaskStates", [])
         resultDict["ParameterNames"] += ["Jobs_" + x for x in taskStateNames]

{dirac-9.0.11 → dirac-9.0.12}/src/DIRAC/Resources/IdProvider/IdProviderFactory.py

@@ -75,8 +75,10 @@ class IdProviderFactory:
 
             if client_name_prefix:
                 client_name_prefix = client_name_prefix + "_"
-            pDict["client_id"] = pDict[f"{client_name_prefix}client_id"]
-            pDict["client_secret"] = pDict[f"{client_name_prefix}client_secret"]
+            if f"{client_name_prefix}client_id" in pDict:
+                pDict["client_id"] = pDict[f"{client_name_prefix}client_id"]
+            if f"{client_name_prefix}client_secret" in pDict:
+                pDict["client_secret"] = pDict[f"{client_name_prefix}client_secret"]
 
         pDict.update(kwargs)
         pDict["ProviderName"] = name

{dirac-9.0.11 → dirac-9.0.12}/src/DIRAC/Resources/IdProvider/tests/Test_IdProviderFactory.py

@@ -63,6 +63,12 @@ Resources
       client_secret = IdP_client_secret
       scope = openid+profile+offline_access+eduperson_entitlement
     }
+    SomeIdP3.partial
+    {
+      ProviderType = OAuth2
+      issuer = https://and-another-idp.url/
+      scope = openid+profile+offline_access+eduperson_entitlement
+    }
   }
 }
 """
@@ -77,6 +83,7 @@ idps = IdProviderFactory()
         ("SomeIdP1.2", {"OK": True}, "https://idp.url/", "IdP_client_id2", "IdP_client_secret"),
         ("SomeIdP2", {"OK": True}, "https://another-idp.url/", "IdP_client_id1", "IdP_client_secret"),
         ("SomeIdP3", {"OK": True}, "https://and-another-idp.url/", "IdP_client_id3", "IdP_client_secret"),
+        ("SomeIdP3.partial", {"OK": True}, "https://and-another-idp.url/", None, None),
         # Try to get an unknown DIRAC client
         ("DIRACUnknown", {"OK": False, "Message": "DIRACUnknown does not exist"}, None, None, None),
     ],

{dirac-9.0.11 → dirac-9.0.12/src/DIRAC.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.11
+Version: 9.0.12
 Summary: DIRAC is an interware, meaning a software framework for distributed computing.
 Home-page: https://github.com/DIRACGrid/DIRAC/
 License: GPL-3.0-only
@@ -19,7 +19,7 @@ Requires-Dist: cachetools
 Requires-Dist: certifi
 Requires-Dist: cwltool
 Requires-Dist: diraccfg
-Requires-Dist: DIRACCommon==v9.0.11
+Requires-Dist: DIRACCommon==v9.0.12
 Requires-Dist: diracx-client>=v0.0.1
 Requires-Dist: diracx-core>=v0.0.1
 Requires-Dist: diracx-cli>=v0.0.1

{dirac-9.0.11 → dirac-9.0.12}/src/DIRAC.egg-info/requires.txt

@@ -4,7 +4,7 @@ cachetools
 certifi
 cwltool
 diraccfg
-DIRACCommon==v9.0.11
+DIRACCommon==v9.0.12
 diracx-client>=v0.0.1
 diracx-core>=v0.0.1
 diracx-cli>=v0.0.1