Code

Acme state fixup 2018.3#54006

Code

Closed

github-abcde wants to merge 12 commits intosaltstack:2018.3saltstack/salt:2018.3from basisbeeld:acme_state_fixup-2018.3basisbeeld/salt:acme_state_fixup-2018.3Copy head branch name to clipboard

+1,129-113

Commits

Commits on Jul 25, 2019

• salt/modules/acme.py: Fix function docstrings. Fix handling of "window" parameter in "needs_renewal". Pylint-inspired layout fixes.

  github-abcde

  committed
  577a204

  Copy full SHA for 577a204

• salt/states/acme.py: Add proper handling of testmode. Add proper detection if nothing/fetch/renew is needed to be done.

  github-abcde

  committed
  5dd03ad

  Copy full SHA for 5dd03ad

• Added unit tests for acme module and state.

  github-abcde

  committed
  fd4a5f7

  Copy full SHA for fd4a5f7

• salt/modules/acme.py: Changed "info" to always return a dict. Added x509.read_certificate as alternative method of getting certificate information if tls.cert_info is not available.

  github-abcde

  committed
  5086fe9

  Copy full SHA for 5086fe9

• salt/states/acme.py: Removed unused import

  github-abcde

  committed
  aa1f08e

  Copy full SHA for aa1f08e

• tests/unit/modules/test_acme.py: Added test for salt.modules.acme.info using x509.read_certificates. Fixed incorrect data placement in textwrap.dedent. Updated test for acme.info to expect dict whe…

  Show description for 3efab1e
  github-abcde

  committed
  3efab1e

  Copy full SHA for 3efab1e

• Re-add changes that got lost in the rebase (probably incorrect handling of merge conflict).

  github-abcde

  committed
  0b3c663

  Copy full SHA for 0b3c663

• More fixes that went missing in the rebase.

  github-abcde

  committed
  1070e96

  Copy full SHA for 1070e96

Commits on Jul 26, 2019

• Optimized convoluted window check in "needs_renewal". Improved/fixed function docstrings.

  github-abcde

  committed
  9566b60

  Copy full SHA for 9566b60

• Merge pull request saltstack#52455 from ogd-software/more_dictupdate_tools

  Show description for 8d1bda4
  

  twangboy

  authored and

  github-abcde

  committed
  8d1bda4

  Copy full SHA for 8d1bda4

• Removed test for json_query as that is not implemented in this branch.

  github-abcde

  committed
  d796f94

  Copy full SHA for d796f94

Commits on Aug 16, 2019

• Merge branch '2018.3' into acme_state_fixup-2018.3

  github-abcde

  authored
  de485ab

  Copy full SHA for de485ab