From 8a1ed41fe59d9ab6ec5b44f38c76ef16bde1b5d4 Mon Sep 17 00:00:00 2001 From: Alexei Znamensky <103110+russoz@users.noreply.github.com> Date: Sat, 11 Oct 2025 22:46:04 +1300 Subject: [PATCH] java_keystore: simplify code (#10905) * java_keystore: simplify code * add changelog frag --- changelogs/fragments/10905-java-keystore-simplify.yml | 2 ++ plugins/modules/java_keystore.py | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/10905-java-keystore-simplify.yml diff --git a/changelogs/fragments/10905-java-keystore-simplify.yml b/changelogs/fragments/10905-java-keystore-simplify.yml new file mode 100644 index 0000000000..7b2a0de53a --- /dev/null +++ b/changelogs/fragments/10905-java-keystore-simplify.yml @@ -0,0 +1,2 @@ +minor_changes: + - java_keystore - remove redundant function (https://github.com/ansible-collections/community.general/pull/10905). diff --git a/plugins/modules/java_keystore.py b/plugins/modules/java_keystore.py index 9222ae679b..6cb063e883 100644 --- a/plugins/modules/java_keystore.py +++ b/plugins/modules/java_keystore.py @@ -259,7 +259,7 @@ class JavaKeystore: except (OSError, ValueError) as e: self.module.fail_json(msg="Unable to read the provided certificate: %s" % to_native(e)) - fp = hex_decode(cert.fingerprint(hashes.SHA256())).upper() + fp = cert.fingerprint(hashes.SHA256()).hex().upper() fingerprint = ':'.join([fp[i:i + 2] for i in range(0, len(fp), 2)]) else: current_certificate_fingerprint_cmd = [ @@ -507,10 +507,6 @@ def create_file(content): return tmpfile -def hex_decode(s): - return s.hex() - - def main(): choose_between = (['certificate', 'certificate_path'], ['private_key', 'private_key_path'])