Allow x509.certificate_managed to use a CSR

[alxwr]

This capability was present prior to e9e49d1.

What does this PR do?

Bring back signing of CSRs.

What issues does this PR fix or reference?

I don't know of any reported issue.

Previous Behavior

          ID: /path/to/my.crt                                                                                       
    Function: x509.certificate_managed                                                                                                                                          
      Result: False                                                                                                                                                             
     Comment: Attempt 1: Returned a result of "False", with the following comment: "An exception occurred in this state: Traceback (most recent call last):                     
                File "/usr/local/lib/python3.7/site-packages/salt/state.py", line 2154, in call                                                                                 
                  *cdata["args"], **cdata["kwargs"]                                                                                                                             
                File "/usr/local/lib/python3.7/site-packages/salt/loader.py", line 2085, in wrapper                                                                             
                  return f(*args, **kwargs)                                                                                                                                     
                File "/usr/local/lib/python3.7/site-packages/salt/states/x509.py", line 659, in certificate_managed                                                             
                  "public_key or signing_private_key must be specified."                                                                                                        
              salt.exceptions.SaltInvocationError: public_key or signing_private_key must be specified.

New Behavior

CSR is signed. Certificate is created.

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

• Docs
  • The docs state/imply that signing a CSR is possible. So there was no change necessary.
• Changelog - https://docs.saltstack.com/en/master/topics/development/changelog.html
• Tests written/updated

Commits signed with GPG?

No

---

@glynnforrest This may interest you.

[glynnforrest]

Thanks for the ping @alxwr, I'm sorry that e9e49d1 broke things for you. The fix looks good, though I'd like to see the error message updated please - one of the goals of #52935 was to make the error messages clear and unambiguous. Cheers for adding a test.

I can't comment on the other formatting changes you've made, e.g. {0} -> {}.

[alxwr]

Thanks for the ping @alxwr, I'm sorry that e9e49d1 broke things for you.

np :-) Thanks for the refactoring and making things easier!

The fix looks good, though I'd like to see the error message updated please - one of the goals of #52935 was to make the error messages clear and unambiguous.

I thought about that and then forgot it. :-) Thanks for the suggestion! I applied it right away.

Cheers for adding a test.

Just recently learned about nox. Great tool!

I can't comment on the other formatting changes you've made, e.g. {0} -> {}.

pre-commit run (as used in CI) made me do it. :-D
(see also #58272 (comment))

[alxwr]

@krionbsd @sagetherage Is there a reason this is not merged? :-) How long do you expect me to keep this PR up-to-date with current developments in master?

[krionbsd]

@krionbsd @sagetherage Is there a reason this is not merged? :-) How long do you expect me to keep this PR up-to-date with current developments in master?

sorry for delay, it's in the queue to be merged

[sagetherage]

thank you @krionbsd and yes, queued up for merging, we removed the label Merge Ready as it didn't mean exactly as it is worded so not to confuse, we are using more dynamic indicators for merge status and looking to be explicit and automatic instead. Apologies for the confusion and thank you for the mention! @alxwr