Fix x509_v2 unknown salt-internal kwargs

saltstack · May 10, 2023 · afaa9e5 · afaa9e5
1 parent 816fdb8
commit afaa9e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/changelog/64232.fixed.md 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
@@ -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(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed x509_v2 `create_private_key`/`create_crl` unknown kwargs: __pub_fun...