From bd6ea9c6a92ffbfa8676212b85d590e12decdbf5 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Wed, 3 Jun 2020 14:44:30 -0600 Subject: [PATCH] mgr/cephadm: fix RGWSpec mypy errors cephadm/module.py:34: note: In module imported here: cephadm/services/cephadmservice.py: note: In member "config" of class "RgwService": cephadm/services/cephadmservice.py:167: error: Incompatible types in assignment (expression has type "List[str]", variable has type "str") Signed-off-by: Michael Fritch --- src/pybind/mgr/cephadm/services/cephadmservice.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index 3755ea1b6e1..6acbb60493b 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -163,8 +163,12 @@ class RgwService(CephadmService): if spec.rgw_frontend_ssl_certificate: if isinstance(spec.rgw_frontend_ssl_certificate, list): cert_data = '\n'.join(spec.rgw_frontend_ssl_certificate) - else: + elif isinstance(spec.rgw_frontend_ssl_certificate, str): cert_data = spec.rgw_frontend_ssl_certificate + else: + raise OrchestratorError( + 'Invalid rgw_frontend_ssl_certificate: %s' + % spec.rgw_frontend_ssl_certificate) ret, out, err = self.mgr.check_mon_command({ 'prefix': 'config-key set', 'key': f'rgw/cert/{spec.rgw_realm}/{spec.rgw_zone}.crt', @@ -174,8 +178,12 @@ class RgwService(CephadmService): if spec.rgw_frontend_ssl_key: if isinstance(spec.rgw_frontend_ssl_key, list): key_data = '\n'.join(spec.rgw_frontend_ssl_key) + elif isinstance(spec.rgw_frontend_ssl_certificate, str): + key_data = spec.rgw_frontend_ssl_key else: - key_data = spec.rgw_frontend_ssl_key # type: ignore + raise OrchestratorError( + 'Invalid rgw_frontend_ssl_key: %s' + % spec.rgw_frontend_ssl_key) ret, out, err = self.mgr.check_mon_command({ 'prefix': 'config-key set', 'key': f'rgw/cert/{spec.rgw_realm}/{spec.rgw_zone}.key', -- 2.39.5