Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.0] fix: Getting token for a specific VO in WMSUtilities #7285

Merged
merged 1 commit into from
Nov 9, 2023
Merged

[8.0] fix: Getting token for a specific VO in WMSUtilities #7285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/DIRAC/WorkloadManagementSystem/Service/WMSUtilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from DIRAC import S_OK, S_ERROR, gLogger, gConfig
from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getQueue
from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getGroupOption, getUsernameForDN
from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getGroupOption, getUsernameForDN, getVOForGroup
from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
from DIRAC.FrameworkSystem.Client.TokenManagerClient import gTokenManager
from DIRAC.Resources.Computing.ComputingElementFactory import ComputingElementFactory
Expand Down Expand Up @@ -75,7 +75,8 @@ def setPilotCredentials(ce, pilotDict):
:param pilotDict: pilot parameter dictionary
:return: S_OK/S_ERROR
"""
if "Token" in ce.ceParameters.get("Tag", []):
vo = getVOForGroup(pilotDict["OwnerGroup"])
if "Token" in ce.ceParameters.get("Tag", []) or f"Token:{vo}" in ce.ceParameters.get("Tag", []):
result = gTokenManager.getToken(
userGroup=pilotDict["OwnerGroup"],
scope=PILOT_SCOPES,
Expand Down
Loading