Skip to content

Commit

Permalink
Some cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Nilsson committed Sep 6, 2024
1 parent 7006660 commit fd5fa01
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion PILOTVERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.8.1.63
3.8.1.64
2 changes: 1 addition & 1 deletion pilot/util/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
RELEASE = '3' # released number should be fixed at 3 for Pilot 3
VERSION = '8' # version number is '1' for first release, '0' until then, increased for bigger updates
REVISION = '1' # revision number should be reset to '0' for every new version release, increased for small updates
BUILD = '63' # build number should be reset to '1' for every new development cycle
BUILD = '64' # build number should be reset to '1' for every new development cycle

SUCCESS = 0
FAILURE = 1
Expand Down
7 changes: 0 additions & 7 deletions pilot/util/https.py
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,6 @@ def get_local_oidc_token_info() -> tuple[str or None, str or None]:
# origin of the token (panda_dev.pilot, ..)
auth_origin = os.environ.get('OIDC_AUTH_ORIGIN', os.environ.get('PANDA_AUTH_ORIGIN'))

logger.debug(f'auth_token={auth_token}, auth_origin={auth_origin}')
logger.debug(f'OIDC_AUTH_TOKEN={os.environ.get("OIDC_AUTH_TOKEN")}, OIDC_AUTH_ORIGIN={os.environ.get("OIDC_AUTH_ORIGIN")}')
logger.debug(f'PANDA_AUTH_TOKEN={os.environ.get("PANDA_AUTH_TOKEN")}, PANDA_AUTH_ORIGIN={os.environ.get("PANDA_AUTH_ORIGIN")}')

return auth_token, auth_origin


Expand Down Expand Up @@ -814,7 +810,6 @@ def request2(url: str = "",
data = {}
# https might not have been set up if running in a [middleware] container
if not _ctx.cacert:
logger.debug('setting up unset https')
https_setup(None, get_pilot_version())

# should tokens be used?
Expand Down Expand Up @@ -876,13 +871,11 @@ def request2(url: str = "",
else:
if secure and isinstance(ret, str):
if ret.startswith('{') and ret.endswith('}'):
logger.debug('loading string into dictionary')
try:
ret = json.loads(ret)
except json.JSONDecodeError as e:
logger.warning(f'failed to parse response: {e}')
else:
logger.debug('parsing string into dictionary')
# For panda server interactions, the response should be in dictionary format
# Parse the query string into a dictionary
query_dict = parse_qs(ret)
Expand Down

0 comments on commit fd5fa01

Please sign in to comment.