diff --git a/changelogs/fragments/242-fix-failed-token-deletion.yml b/changelogs/fragments/242-fix-failed-token-deletion.yml index a0b770d..9aad842 100644 --- a/changelogs/fragments/242-fix-failed-token-deletion.yml +++ b/changelogs/fragments/242-fix-failed-token-deletion.yml @@ -1,2 +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 + - 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). diff --git a/plugins/modules/openshift_adm_migrate_template_instances.py b/plugins/modules/openshift_adm_migrate_template_instances.py index ba3039d..0033e14 100644 --- a/plugins/modules/openshift_adm_migrate_template_instances.py +++ b/plugins/modules/openshift_adm_migrate_template_instances.py @@ -295,9 +295,9 @@ class OpenShiftMigrateTemplateInstances(AnsibleOpenshiftModule): object_type in transforms.keys() and obj["ref"].get("apiVersion") != transforms[object_type] ): - ti_elem["status"]["objects"][i]["ref"][ - "apiVersion" - ] = transforms[object_type] + ti_elem["status"]["objects"][i]["ref"]["apiVersion"] = ( + transforms[object_type] + ) ti_to_be_migrated.append(ti_elem) return ti_to_be_migrated diff --git a/plugins/modules/openshift_auth.py b/plugins/modules/openshift_auth.py index 6e213ab..62db3f7 100644 --- a/plugins/modules/openshift_auth.py +++ b/plugins/modules/openshift_auth.py @@ -225,7 +225,7 @@ def get_oauthaccesstoken_objectname_from_token(token_name): sha256Prefix = "sha256~" if token_name.startswith(sha256Prefix): - content = token_name[len(sha256Prefix):] + content = token_name[len(sha256Prefix) :] else: content = token_name b64encoded = urlsafe_b64encode(hashlib.sha256(content.encode()).digest()).rstrip( diff --git a/plugins/modules/openshift_route.py b/plugins/modules/openshift_route.py index ea73db7..8e95b43 100644 --- a/plugins/modules/openshift_route.py +++ b/plugins/modules/openshift_route.py @@ -421,9 +421,9 @@ class OpenShiftRoute(AnsibleOpenshiftModule): if tls_insecure_policy == "disallow": tls_insecure_policy = None else: - tls_ca_cert = ( - tls_cert - ) = tls_dest_ca_cert = tls_key = tls_insecure_policy = None + tls_ca_cert = tls_cert = tls_dest_ca_cert = tls_key = ( + tls_insecure_policy + ) = None route = { "apiVersion": "route.openshift.io/v1", diff --git a/tox.ini b/tox.ini index d4ad40b..3217e2e 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ install_command = pip install {opts} {packages} [testenv:black] deps = - black >= 23.0, < 24.0 + black >= 25.0, < 26.0 commands = black {toxinidir}/plugins {toxinidir}/tests @@ -24,10 +24,12 @@ commands = deps = flake8 {[testenv:black]deps} + {[testenv:ansible-lint]deps} commands = black -v --check --diff {toxinidir}/plugins {toxinidir}/tests flake8 {toxinidir} + ansible-lint [flake8] # E123, E125 skipped as they are invalid PEP-8.