From afaa9e56b64550b51a7a539c2d629673d7787879 Mon Sep 17 00:00:00 2001 From: jeanluc Date: Sat, 6 May 2023 23:58:56 +0200 Subject: [PATCH] Fix x509_v2 unknown salt-internal kwargs --- changelog/64232.fixed.md | 1 + salt/modules/x509_v2.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 changelog/64232.fixed.md diff --git a/changelog/64232.fixed.md b/changelog/64232.fixed.md new file mode 100644 index 000000000000..45a5ccb90eac --- /dev/null +++ b/changelog/64232.fixed.md @@ -0,0 +1 @@ +Fixed x509_v2 `create_private_key`/`create_crl` unknown kwargs: __pub_fun... diff --git a/salt/modules/x509_v2.py b/salt/modules/x509_v2.py index b46d4cf57d7f..0725b1b5624d 100644 --- a/salt/modules/x509_v2.py +++ b/salt/modules/x509_v2.py @@ -901,8 +901,11 @@ def create_crl( salt.utils.versions.kwargs_warn_until(["text"], "Potassium") kwargs.pop("text") - if kwargs: - raise SaltInvocationError(f"Unrecognized keyword arguments: {list(kwargs)}") + unknown = [kwarg for kwarg in kwargs if not kwarg.startswith("_")] + if unknown: + raise SaltInvocationError( + f"Unrecognized keyword arguments: {list(unknown)}" + ) if days_valid is None: try: @@ -1235,8 +1238,9 @@ def create_private_key( for x in ignored_params: kwargs.pop(x) - if kwargs: - raise SaltInvocationError(f"Unrecognized keyword arguments: {list(kwargs)}") + unknown = [kwarg for kwarg in kwargs if not kwarg.startswith("_")] + if unknown: + raise SaltInvocationError(f"Unrecognized keyword arguments: {list(unknown)}") if encoding not in ["der", "pem", "pkcs12"]: raise CommandExecutionError(