From 0a266a671646994b6f7f87cf7ba2aa0c39f3b888 Mon Sep 17 00:00:00 2001 From: Carter Hale <44034905+HaleCT2@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:59:30 -0400 Subject: [PATCH] Fix Failed Token Delete with PEP8 Indent (#242) Co-authored-by: carter --- changelogs/fragments/242-fix-failed-token-deletion.yml | 2 ++ plugins/modules/openshift_auth.py | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/242-fix-failed-token-deletion.yml diff --git a/changelogs/fragments/242-fix-failed-token-deletion.yml b/changelogs/fragments/242-fix-failed-token-deletion.yml new file mode 100644 index 0000000..a0b770d --- /dev/null +++ b/changelogs/fragments/242-fix-failed-token-deletion.yml @@ -0,0 +1,2 @@ +bugfixes: + - openshift_auth - fix issue where openshift_auth module sometimes does not delete the auth token. Based on stale PR (https://github.com/openshift/community.okd/pull/194). \ No newline at end of file diff --git a/plugins/modules/openshift_auth.py b/plugins/modules/openshift_auth.py index 4fdb169..6e213ab 100644 --- a/plugins/modules/openshift_auth.py +++ b/plugins/modules/openshift_auth.py @@ -224,8 +224,10 @@ def get_oauthaccesstoken_objectname_from_token(token_name): """ sha256Prefix = "sha256~" - content = token_name.strip(sha256Prefix) - + if token_name.startswith(sha256Prefix): + content = token_name[len(sha256Prefix):] + else: + content = token_name b64encoded = urlsafe_b64encode(hashlib.sha256(content.encode()).digest()).rstrip( b"=" )