diff options
| author | Adrien Ferrand <adferrand@users.noreply.github.com> | 2022-01-31 11:17:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 11:17:40 +0300 |
| commit | 0181a0b07f2a475389cb5a5f5b31a0bc538efa5e (patch) | |
| tree | c426f5de5b0348a2bb88b36aa75550367332c24f /certbot-compatibility-test | |
| parent | fb1b105ba24939f379d0e005f8315a7c59b39e91 (diff) | |
Fully type certbot apache (#9177)
* Work in progress
* Work in progress
* Work in progress
* Work in progress
* Fix issues around nullability of VirtualHost.path, may discuss that during review
* Work in progress
* Fix remaining types
* Various lint fixes
* Reconfigure tox and mypy to disallow untyped defs globally
* Cleanup compatibility tests
* Use cast for unused v2 logic
* Improve types
* Remove unused comment
* Fix coverage
* Better types
* Fix another type
* Update certbot-apache/certbot_apache/_internal/apacheparser.py
Co-authored-by: alexzorin <alex@zor.io>
* Update certbot-apache/certbot_apache/_internal/assertions.py
Co-authored-by: alexzorin <alex@zor.io>
* Fix type
* Various fixes
* Refactor imports
* Keep naming convention consistent on TypeVars
* Improve types
* Improve types
* Remove remaining Sequence[str] in the project
Co-authored-by: alexzorin <alex@zor.io>
Diffstat (limited to 'certbot-compatibility-test')
3 files changed, 3 insertions, 9 deletions
diff --git a/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py b/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py index b25d2d04b..a115e8419 100644 --- a/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py +++ b/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py @@ -21,6 +21,7 @@ from certbot_compatibility_test import util from acme import challenges from acme.challenges import Challenge from certbot._internal import constants +from certbot.plugins import common from certbot.achallenges import AnnotatedChallenge logger = logging.getLogger(__name__) @@ -49,7 +50,7 @@ class Proxy(interfaces.ConfiguratorProxy): self.args = args self.http_port = 80 self.https_port = 443 - self._configurator: interfaces.Configurator + self._configurator: common.Configurator self._all_names: Optional[Set[str]] = None self._test_names: Optional[Set[str]] = None diff --git a/certbot-compatibility-test/certbot_compatibility_test/configurators/nginx/common.py b/certbot-compatibility-test/certbot_compatibility_test/configurators/nginx/common.py index f08d6b1b8..4a103194f 100644 --- a/certbot-compatibility-test/certbot_compatibility_test/configurators/nginx/common.py +++ b/certbot-compatibility-test/certbot_compatibility_test/configurators/nginx/common.py @@ -2,12 +2,10 @@ import os import shutil import subprocess -from typing import cast from typing import Set from typing import Tuple from certbot_compatibility_test import errors -from certbot_compatibility_test import interfaces from certbot_compatibility_test import util from certbot_compatibility_test.configurators import common as configurators_common from certbot_nginx._internal import configurator @@ -48,8 +46,7 @@ class Proxy(configurators_common.Proxy): setattr(self.le_config, "nginx_" + k, constants.os_constant(k)) conf = configuration.NamespaceConfig(self.le_config) - self._configurator = cast(interfaces.Configurator, configurator.NginxConfigurator( - config=conf, name="nginx")) + self._configurator = configurator.NginxConfigurator(config=conf, name="nginx") self._configurator.prepare() def cleanup_from_tests(self) -> None: diff --git a/certbot-compatibility-test/certbot_compatibility_test/interfaces.py b/certbot-compatibility-test/certbot_compatibility_test/interfaces.py index 1f696ac93..ae8eeffca 100644 --- a/certbot-compatibility-test/certbot_compatibility_test/interfaces.py +++ b/certbot-compatibility-test/certbot_compatibility_test/interfaces.py @@ -63,7 +63,3 @@ class InstallerProxy(PluginProxy, interfaces.Installer, metaclass=ABCMeta): class ConfiguratorProxy(AuthenticatorProxy, InstallerProxy, metaclass=ABCMeta): """Wraps a Certbot configurator""" - - -class Configurator(interfaces.Installer, interfaces.Authenticator, metaclass=ABCMeta): - """Represents a plugin that has both Installer and Authenticator capabilities""" |