Merge pull request #7348 from aldbr/v9.0_REMOVE_valid-arg-setToken

[8.0] fix: remove valid arg from setToken

Author: chrisburr

src/DIRAC/Resources/Computing/AREXComputingElement.py

@@ -96,13 +96,13 @@ def _reset(self):
 
     #############################################################################
 
-    def setToken(self, token, valid):
+    def setToken(self, token):
         """Set the token and update the headers
 
         :param token: OAuth2Token object or dictionary containing token structure
         :param int valid: validity period in seconds
         """
-        super().setToken(token, valid)
+        super().setToken(token)
         self.headers["Authorization"] = "Bearer " + self.token["access_token"]
 
     def _arcIDToJobReference(self, arcJobID):

src/DIRAC/Resources/Computing/ComputingElement.py

@@ -102,9 +102,8 @@ def setProxy(self, proxy, valid=0):
         self.proxy = proxy
         self.valid = datetime.datetime.utcnow() + second * valid
 
-    def setToken(self, token, valid=0):
+    def setToken(self, token):
         self.token = token
-        self.valid = datetime.datetime.utcnow() + second * valid
 
     def _prepareProxy(self):
         """Set the environment variable X509_USER_PROXY"""

src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py

@@ -451,7 +451,7 @@ def submitPilots(self):
                 result = self.__getPilotToken(audience=ce.audienceName)
                 if not result["OK"]:
                     return result
-                ce.setToken(result["Value"], 3500)
+                ce.setToken(result["Value"])
 
             # now really submitting
             res = self._submitPilotsToQueue(pilotsToSubmit, ce, queueName)
@@ -1267,7 +1267,7 @@ def _updatePilotStatusPerQueue(self, queue, proxy):
             if not result["OK"]:
                 self.log.error("Failed to get token", f"{ceName}: {result['Message']}")
                 return
-            ce.setToken(result["Value"], 3500)
+            ce.setToken(result["Value"])
 
         result = ce.getJobStatus(stampedPilotRefs)
         if not result["OK"]: