Skip to content

Candidate 1.10.1#8505

Merged
ohemorange merged 10 commits intomasterfrom
candidate-1.10.1
Dec 3, 2020
Merged

Candidate 1.10.1#8505
ohemorange merged 10 commits intomasterfrom
candidate-1.10.1

Conversation

@bmw
Copy link
Copy Markdown
Member

@bmw bmw commented Dec 3, 2020

This PR should be merged and not squashed.

adferrand and others added 10 commits December 2, 2020 12:37
* Completely deprecate certbot-auto

* DeaDeactivate centos6/oraclelinux6 tests

* Remove tests assets

* Remove another test

* Revert "Remove tests assets"

This reverts commit e603afe.

(cherry picked from commit ff3a07d)
* Don't deprecate certbot-auto quite yet

* Remove centos6 test farm tests

* undo changes to test farm test scripts

(cherry picked from commit e5113d5)
Co-authored-by: Adrien Ferrand <ferrand.ad@gmail.com>
Fixes #8495.

To further explain the problem here, `modify_kwargs_for_default_detection` as called in `add` is simplistic and doesn't always work. See #6164 for one other example.

In this case, were bitten by the code https://github.com/certbot/certbot/blob/d1e7404358c05734aaf436ef3c9d709029d62b09/certbot/certbot/_internal/cli/helpful.py#L393-L395

The action used for deprecated arguments isn't in `ZERO_ARG_ACTIONS` so it assumes that all deprecated flags take one parameter.

Rather than trying to fix this function (which I think can only realistically be fixed by #4493), I took the approach that was previously used in `HelpfulArgumentParser.add_deprecated_argument` of bypassing this extra logic entirely. I adapted that function to now call `HelpfulArgumentParser.add` as well for consistency and to make testing easier.

* Rename deprecated arg action class

* Skip extra parsing for deprecated arguments

* Add back test of --manual-public-ip-logging-ok

* Add changelog entry

(cherry picked from commit 5f73274)
@bmw bmw added this to the 1.10.1 milestone Dec 3, 2020
@bmw bmw requested a review from ohemorange December 3, 2020 19:03
@ohemorange ohemorange merged commit d3166d7 into master Dec 3, 2020
@ohemorange ohemorange deleted the candidate-1.10.1 branch December 3, 2020 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants