Merge ~ballot/charm-k8s-mm-pd-bot/+git/charm-k8s-mm-pd-bot:cleaning into charm-k8s-mm-pd-bot:master

[Benjamin Allot]

Cleaning some leftovers

* Cleaner interaction with the Makefile
* Juju like behavior for settings
* More tests

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Tom Haddon (mthaddon)]

A few comments inline (nothing major).

It seems `make test` doesn't include lint, which was somewhat unexpected. `make lint` also fails as follows:

https://paste.ubuntu.com/p/P5FPFH9vh3/

Also, you're missing a commit message for this MP.

review: Needs Fixing

[Benjamin Allot (ballot)]

Comment about the ops_mail stuff inline

[Benjamin Allot (ballot)]

> A few comments inline (nothing major).
>
> It seems `make test` doesn't include lint, which was somewhat unexpected.
> `make lint` also fails as follows:
>
> https://paste.ubuntu.com/p/P5FPFH9vh3/
>
> Also, you're missing a commit message for this MP.

Ack, will fix.
I separated "lint" and "test" on purpose by habit but I can put them back together.

[Tom Haddon (mthaddon)]

Two small comments inline

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision a081974526fc33356f335fb4b70bd6b0548683c3

diff --git a/.gitignore b/.gitignore
index 1ce05c5..b2d8d5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,11 @@
 *.swp
+/.coverage
 /.tox
 /build
+/charm
 /mm-pd-bot.charm
 __pycache__
+
+# Keep this order to whitelist the example
 bot.cfg
 !/examples/bot.cfg
-/.coverage
diff --git a/Makefile b/Makefile
index 2dceafc..ee2da42 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,17 @@
+PROJECTPATH = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+PROJECT := mm-pd-bot
+CHARM ?= $(PROJECT).charm
+CHARM_FILE := $(PROJECTPATH)/$(CHARM)
+
+SOURCES := $(shell find $(PROJECTPATH)/src -name "*.py")
+TESTS := $(shell find $(PROJECTPATH)/tests -name "*.py" -o -name "requirements.txt")
+
+# Rebuild the charm each time we have an update in the sources or tests
+$(CHARM_FILE): $(SOURCES) $(TESTS) $(PROJECTPATH)/requirements.txt
+	charmcraft build -f $(PROJECTPATH)
+
+all: test
+
 blacken:
 	@echo "Normalising python layout with black."
 	@tox -e black
@@ -6,19 +20,16 @@ lint: blacken
 	@echo "Running flake8"
 	@tox -e lint
 
-# We actually use the build directory created by charmcraft,
-# but the .charm file makes a much more convenient sentinel.
-
-unittest: mm-pd-bot.charm
+unittest: $(CHARM_FILE)
 	@tox -e unit
 
 test: lint unittest
 
 clean:
 	@echo "Cleaning files"
-	@git clean -fXd
-
-mm-pd-bot.charm: src/*.py requirements.txt
-	charmcraft build
+	@find $(PROJECTPATH) -name "*.pyc" -exec rm -f {} +
+	@find $(PROJECTPATH) -name "__pycache__" -type d -exec rm -rf {} +
+	@rm -f $(CHARM_FILE)
+	@rm -rf $(PROJECTPATH)/{build,charm} # Delete the build directory
 
-.PHONY: lint test unittest clean
+.PHONY: all lint test unittest clean
diff --git a/config.yaml b/config.yaml
index 48ac478..1e1e3e8 100644
--- a/config.yaml
+++ b/config.yaml
@@ -22,6 +22,7 @@ options:
       The whole configuration file of the bot is passed as content to this setting.
 
       This setting is required.
+    default: ''
   tls_secret_name:
     type: string
     description: |
diff --git a/src/charm.py b/src/charm.py
index 4de6b21..b17ced0 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -13,7 +13,6 @@ from ops.main import main
 from ops.model import (
     ActiveStatus,
     BlockedStatus,
-    MaintenanceStatus,
 )
 
 
@@ -36,8 +35,6 @@ BOT_CFG_SECTION = 'MattermostBot'
 class MmPdBotK8sCharmConfigError(Exception):
     """Exception when configuration is bad."""
 
-    pass
-
 
 class MmPdBotK8sCharm(CharmBase):
     def __init__(self, *args) -> None:
@@ -74,7 +71,7 @@ class MmPdBotK8sCharm(CharmBase):
         """
         errors = []
         for required in REQUIRED_JUJU_SETTINGS:
-            if required not in self.model.config:
+            if not self.model.config[required]:
                 logger.error("Required setting empty: %s", required)
                 errors.append(required)
         if errors:
@@ -117,9 +114,8 @@ class MmPdBotK8sCharm(CharmBase):
     def _load_mm_pd_bot_configuration(self, configuration: str) -> configparser.ConfigParser:
         """Load the bot configuration
 
-        :param str configuration: The configuration of the bot.
+        :param configuration: The configuration of the bot.
         :returns: Returns a configparser.ConfigParser object with the configuration.
-        :rtype: configparser.ConfigParser
         :raises: MmPdBotK8sCharmConfigError if the configuration is invalid.
         """
         config = configparser.ConfigParser(allow_no_value=True)
@@ -132,11 +128,7 @@ class MmPdBotK8sCharm(CharmBase):
         return config
 
     def _validate_mm_pd_bot_configuration(self) -> None:
-        """Check the configuration part related to mm_pd_bot configuration.
-
-        :returns: List of errors detected
-        :rtype: list
-        """
+        """Check the configuration part related to mm_pd_bot configuration."""
         self.bot_config = self._load_mm_pd_bot_configuration(self.model.config['mm_pd_bot_cfg'])
         self._validate_mm_pd_bot_configuration_content()
         self._validate_bot_creds()
@@ -153,7 +145,6 @@ class MmPdBotK8sCharm(CharmBase):
         """Return an envConfig with some core configuration.
 
         :returns: A dictionary used for envConfig in podspec
-        :rtype: dict
         """
         config = self.model.config
         pod_config = {
@@ -165,7 +156,7 @@ class MmPdBotK8sCharm(CharmBase):
     def _update_pod_spec_for_k8s_ingress(self, pod_spec: dict) -> None:
         """Add resources to pod_spec configuring site ingress, if needed.
 
-        :param dict pod_spec: pod spec v3 as defined by juju.
+        :param pod_spec: pod spec v3 as defined by juju.
         """
 
         hostname = self.bot_config.get('httpd', 'hostname')
@@ -202,7 +193,7 @@ class MmPdBotK8sCharm(CharmBase):
         }
         if tls_secret_name:
             ingress['spec']['tls'] = [
-                {'hosts': [bot_listening_url_parsed.hostname], 'secretName': tls_secret_name,},
+                {'hosts': [bot_listening_url_parsed.hostname], 'secretName': tls_secret_name},
             ]
         else:
             annotations['nginx.ingress.kubernetes.io/ssl-redirect'] = 'false'
@@ -221,7 +212,7 @@ class MmPdBotK8sCharm(CharmBase):
         pod_spec['kubernetesResources'] = resources
 
     def _make_pod_spec(self) -> None:
-        """Return a pod spec with some core configuration."""
+        """Create a pod spec with some core configuration."""
 
         config = self.model.config
         container_port = self.bot_config.getint('httpd', 'listen-port')
@@ -258,7 +249,7 @@ class MmPdBotK8sCharm(CharmBase):
     def configure_pod(self, event: ops.framework.EventBase) -> None:
         """Assemble the pod spec and apply it, if possible.
 
-        :param ops.framework.EventBase event: Event that triggered the method.
+        :param event: Event that triggered the method.
         """
 
         if not self.unit.is_leader():
@@ -270,14 +261,13 @@ class MmPdBotK8sCharm(CharmBase):
             self.unit.status = BlockedStatus(str(exc))
             return
 
-        self.unit.status = MaintenanceStatus('Assembling pod spec')
+        logger.info('Assembling pod spec')
         pod_spec = self._make_pod_spec()
         self._update_pod_spec_for_k8s_ingress(pod_spec)
-
-        self.unit.status = MaintenanceStatus('Setting pod spec')
+        logger.info('Setting pod spec')
         self.model.pod.set_spec(pod_spec)
         self.unit.status = ActiveStatus()
 
 
-if __name__ == '__main__':
+if __name__ == '__main__':  # pragma: no cover
     main(MmPdBotK8sCharm, use_juju_for_storage=True)
diff --git a/tests/unit/scenario.py b/tests/unit/scenario.py
index 4c83a52..9c62641 100644
--- a/tests/unit/scenario.py
+++ b/tests/unit/scenario.py
@@ -39,7 +39,7 @@ def get_cfg_content(configuration='good_configuration') -> str:
         sys.exit(1)
 
 
-def get_juju_settings() -> list:
+def get_juju_settings_default_value() -> list:
     """Return the list of juju settings as defined in config.yaml."""
 
     dir_path = os.path.dirname(os.path.realpath(__file__))
@@ -47,24 +47,27 @@ def get_juju_settings() -> list:
     with open(config_yaml, 'r') as config:
         loaded_config = yaml.safe_load(config.read())
 
-    return list(loaded_config['options'].keys())
+    # Load the dict with the default values
+    default_values = {config: value['default'] for (config, value) in loaded_config['options'].items()}
+
+    return default_values
 
 
 # List of all juju settings. Used to clear them between tests
-JUJU_SETTINGS = get_juju_settings()
+JUJU_SETTINGS_DEFAULT = get_juju_settings_default_value()
 
 TEST_JUJU_SETTINGS = {
-    'missing_image_path': {
+    'empty_image_path': {
         'config': {'mm_pd_bot_cfg': 'dummy'},
         'logger': ["ERROR:root:Required setting empty: image_path"],
         'expected': 'Required setting(s) empty: image_path',
     },
-    'missing_mm_pd_bot_cfg': {
+    'empty_mm_pd_bot_cfg': {
         'config': {'image_path': 'mm_pd_bot:devel'},
         'logger': ["ERROR:root:Required setting empty: mm_pd_bot_cfg"],
         'expected': 'Required setting(s) empty: mm_pd_bot_cfg',
     },
-    'missing_all_settings': {
+    'empty_all_settings': {
         'config': {},
         'logger': ["ERROR:root:Required setting empty: image_path", "ERROR:root:Required setting empty: mm_pd_bot_cfg"],
         'expected': 'Required setting(s) empty: image_path, mm_pd_bot_cfg',
@@ -74,17 +77,17 @@ TEST_JUJU_SETTINGS = {
 
 VALIDATE_MM_PD_BOT_CFG = {
     'good_configuration': {
-        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': get_cfg_content("good_configuration"),},
+        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': get_cfg_content("good_configuration")},
         'expected': True,
         'logger': [],
     },
     'bad_formatted_configuration': {
-        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': "[PagerDuty",},
+        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': "[PagerDuty"},
         'expected': "Error while parsing mm_pd_bot_cfg setting",
         'logger': ["ERROR:root:Error while parsing mm_pd_bot_cfg setting"],
     },
     'missing_sections': {
-        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': get_cfg_content('missing_sections'),},
+        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': get_cfg_content('missing_sections')},
         'expected': "Required section(s) missing in bot configuration file: "
         "MattermostBot, Prometheus, httpd, nickname to email",
         'logger': [
@@ -95,7 +98,7 @@ VALIDATE_MM_PD_BOT_CFG = {
         ],
     },
     'missing_options': {
-        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': get_cfg_content('missing_options'),},
+        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': get_cfg_content('missing_options')},
         'expected': "Required option(s) missing in section MattermostBot: bot_team, bot_url, "
         "Required option(s) missing in section PagerDuty: api-token, "
         "Required option(s) missing in section httpd: hostname, listen-ip, listen-port, magic-uuid",
@@ -110,12 +113,12 @@ VALIDATE_MM_PD_BOT_CFG = {
         ],
     },
     'no_valid_authentication': {
-        'config': {'mm_pd_bot_cfg': get_cfg_content('no_valid_authentication'),},
+        'config': {'mm_pd_bot_cfg': get_cfg_content('no_valid_authentication')},
         'expected': "bot_token or bot_login/bot_password in MattermostBot section required",
         'logger': ["ERROR:root:bot_token or bot_login/bot_password in MattermostBot section required"],
     },
     'both_authentication_method': {
-        'config': {'mm_pd_bot_cfg': get_cfg_content('both_authentication_method'),},
+        'config': {'mm_pd_bot_cfg': get_cfg_content('both_authentication_method')},
         'expected': "bot_token and bot_login are both set. Pick one of them",
         'logger': ["ERROR:root:bot_token and bot_login are both set. Pick one of them"],
     },
@@ -123,13 +126,15 @@ VALIDATE_MM_PD_BOT_CFG = {
 
 VALIDATE_POD_SPEC = {
     'basic': {
-        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': get_cfg_content('good_configuration'),},
+        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': get_cfg_content('good_configuration')},
         'pod_spec': {
             'version': 3,  # otherwise resources are ignored
             'containers': [
                 {
                     'name': 'mm-pd-bot',
-                    'imageDetails': {'imagePath': 'mm_pd_bot:devel',},
+                    'imageDetails': {
+                        'imagePath': 'mm_pd_bot:devel',
+                    },
                     'imagePullPolicy': 'Always',
                     'ports': [{'containerPort': 2160, 'protocol': 'TCP'}],
                     'envConfig': {'MM_PD_BOT_CFG': get_cfg_content('good_configuration')},
@@ -149,7 +154,7 @@ VALIDATE_POD_SPEC = {
             'containers': [
                 {
                     'name': 'mm-pd-bot',
-                    'imageDetails': {'imagePath': 'mm_pd_bot:devel', 'username': 'rockity', 'password': 'rock',},
+                    'imageDetails': {'imagePath': 'mm_pd_bot:devel', 'username': 'rockity', 'password': 'rock'},
                     'imagePullPolicy': 'Always',
                     'ports': [{'containerPort': 2160, 'protocol': 'TCP'}],
                     'envConfig': {'MM_PD_BOT_CFG': get_cfg_content('good_configuration')},
@@ -162,13 +167,13 @@ VALIDATE_POD_SPEC = {
 
 VALIDATE_POD_SPEC_AND_INGRESS = {
     'basic': {
-        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': get_cfg_content('good_configuration'),},
+        'config': {'image_path': 'mm_pd_bot:devel', 'mm_pd_bot_cfg': get_cfg_content('good_configuration')},
         'pod_spec': {
             'version': 3,  # otherwise resources are ignored
             'containers': [
                 {
                     'name': 'mm-pd-bot',
-                    'imageDetails': {'imagePath': 'mm_pd_bot:devel',},
+                    'imageDetails': {'imagePath': 'mm_pd_bot:devel'},
                     'imagePullPolicy': 'Always',
                     'ports': [{'containerPort': 2160, 'protocol': 'TCP'}],
                     'envConfig': {'MM_PD_BOT_CFG': get_cfg_content('good_configuration')},
@@ -193,7 +198,7 @@ VALIDATE_POD_SPEC_AND_INGRESS = {
                                 },
                             ],
                         },
-                        'annotations': {'nginx.ingress.kubernetes.io/ssl-redirect': 'false',},
+                        'annotations': {'nginx.ingress.kubernetes.io/ssl-redirect': 'false'},
                     },
                 ],
             },
@@ -211,7 +216,50 @@ VALIDATE_POD_SPEC_AND_INGRESS = {
             'containers': [
                 {
                     'name': 'mm-pd-bot',
-                    'imageDetails': {'imagePath': 'mm_pd_bot:devel',},
+                    'imageDetails': {'imagePath': 'mm_pd_bot:devel'},
+                    'imagePullPolicy': 'Always',
+                    'ports': [{'containerPort': 2160, 'protocol': 'TCP'}],
+                    'envConfig': {'MM_PD_BOT_CFG': get_cfg_content('ssl_configuration')},
+                }
+            ],
+            'kubernetesResources': {
+                'ingressResources': [
+                    {
+                        'name': 'mm-pd-bot-ingress',
+                        'spec': {
+                            'rules': [
+                                {
+                                    'host': 'mm-pd-bot.example.com',
+                                    'http': {
+                                        'paths': [
+                                            {
+                                                'path': '/bdddcacb-ab42-40ac-9106-4275c1db1519/',
+                                                'backend': {'serviceName': 'mm-pd-bot', 'servicePort': 2160},
+                                            },
+                                        ],
+                                    },
+                                },
+                            ],
+                            'tls': [{'hosts': ['mm-pd-bot.example.com'], 'secretName': 'mm_pd_bot_secret'}],
+                        },
+                        'annotations': {'nginx.ingress.kubernetes.io/whitelist-source-range': '10.0.69.0/24'},
+                    },
+                ],
+            },
+        },
+    },
+    'ssl_without_whitelist': {
+        'config': {
+            'image_path': 'mm_pd_bot:devel',
+            'mm_pd_bot_cfg': get_cfg_content('ssl_configuration'),
+            'tls_secret_name': 'mm_pd_bot_secret',
+        },
+        'pod_spec': {
+            'version': 3,  # otherwise resources are ignored
+            'containers': [
+                {
+                    'name': 'mm-pd-bot',
+                    'imageDetails': {'imagePath': 'mm_pd_bot:devel'},
                     'imagePullPolicy': 'Always',
                     'ports': [{'containerPort': 2160, 'protocol': 'TCP'}],
                     'envConfig': {'MM_PD_BOT_CFG': get_cfg_content('ssl_configuration')},
@@ -235,9 +283,8 @@ VALIDATE_POD_SPEC_AND_INGRESS = {
                                     },
                                 },
                             ],
-                            'tls': [{'hosts': ['mm-pd-bot.example.com'], 'secretName': 'mm_pd_bot_secret',},],
+                            'tls': [{'hosts': ['mm-pd-bot.example.com'], 'secretName': 'mm_pd_bot_secret'}],
                         },
-                        'annotations': {'nginx.ingress.kubernetes.io/whitelist-source-range': '10.0.69.0/24',},
                     },
                 ],
             },
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index 30a474f..27bbaf3 100755
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -18,7 +18,7 @@ from ops.model import (
 )
 
 from scenario import (
-    JUJU_SETTINGS,
+    JUJU_SETTINGS_DEFAULT,
     TEST_JUJU_SETTINGS,
     VALIDATE_MM_PD_BOT_CFG,
     VALIDATE_POD_SPEC,
@@ -53,14 +53,12 @@ class TestMmPdBotK8sCharmBlockedStatus(unittest.TestCase):
             with self.subTest(scenario=scenario):
                 with self.assertLogs(level='ERROR') as logger:
                     with self.assertRaises(MmPdBotK8sCharmConfigError) as exc:
+                        self.harness.update_config(JUJU_SETTINGS_DEFAULT)  # Load the default values
                         self.harness.update_config(values['config'])
                         self.harness.charm._check_juju_settings()
                 self.assertEqual(sorted(logger.output), sorted(values['logger']))
                 self.assertEqual(str(exc.exception), values['expected'])
-            # You need to clean the config after each run
-            # See https://github.com/canonical/operator/blob/master/ops/testing.py#L415
-            # The second argument is the list of key to reset
-            self.harness.update_config({}, JUJU_SETTINGS)
+            self.harness.update_config(JUJU_SETTINGS_DEFAULT)  # You need to clean the config after each run
 
     def test_validate_mm_pd_bot_configuration(self):
         """Check the MM_PD_BOT_CFG string is a valid INI."""
@@ -75,7 +73,7 @@ class TestMmPdBotK8sCharmBlockedStatus(unittest.TestCase):
                             self.harness.charm._validate_mm_pd_bot_configuration()
                     self.assertEqual(str(exc.exception), values['expected'])
                     self.assertEqual(sorted(logger.output), sorted(values['logger']))
-            self.harness.update_config({}, JUJU_SETTINGS)  # You need to clean the config after each run
+            self.harness.update_config(JUJU_SETTINGS_DEFAULT)  # You need to clean the config after each run
 
     def test_load_mm_pd_bot_configuration(self):
         """Test the loading of the configuration for the bot."""
@@ -92,20 +90,36 @@ class TestMmPdBotK8sCharmBlockedStatus(unittest.TestCase):
         """Test the pod configuration."""
         mock_event = MagicMock()
 
+        # Good configuration but not leader
         self.harness.update_config(VALIDATE_MM_PD_BOT_CFG['good_configuration']['config'])
         self.harness.set_leader(False)
         self.harness.charm.unit.status = BlockedStatus("Testing")
         self.harness.charm.configure_pod(mock_event)
         self.assertEqual(self.harness.charm.unit.status, ActiveStatus())
-        self.harness.update_config({}, JUJU_SETTINGS)  # You need to clean the config after each run
+        self.harness.update_config(JUJU_SETTINGS_DEFAULT)  # You need to clean the config after each run
 
+        # Good configuration and leader
+        self.harness.update_config(VALIDATE_MM_PD_BOT_CFG['good_configuration']['config'])
+        self.harness.set_leader(True)
+        self.harness.charm.unit.status = BlockedStatus("Testing")
+        self.harness.charm.configure_pod(mock_event)
+        with self.assertLogs(level='INFO') as logger:
+            self.harness.charm.configure_pod(mock_event)
+        self.assertEqual(
+            sorted(logger.output),
+            ["INFO:root:Assembling pod spec", "INFO:root:Setting pod spec"],
+        )
+        self.assertEqual(self.harness.charm.unit.status, ActiveStatus())
+        self.harness.update_config(JUJU_SETTINGS_DEFAULT)  # You need to clean the config after each run
+
+        # Bad configuration and leader
         config = VALIDATE_MM_PD_BOT_CFG['bad_formatted_configuration']['config']
         expected = VALIDATE_MM_PD_BOT_CFG['bad_formatted_configuration']['expected']
         self.harness.update_config(config)
         self.harness.set_leader(True)
         self.harness.charm.configure_pod(mock_event)
         self.assertEqual(self.harness.charm.unit.status, BlockedStatus(expected))
-        self.harness.update_config({}, JUJU_SETTINGS)  # You need to clean the config after each run
+        self.harness.update_config(JUJU_SETTINGS_DEFAULT)  # You need to clean the config after each run
 
     def test_make_pod_spec(self):
         """Check the crafting of the pod spec."""
@@ -116,7 +130,7 @@ class TestMmPdBotK8sCharmBlockedStatus(unittest.TestCase):
                     values['config']['mm_pd_bot_cfg']
                 )
                 self.assertEqual(self.harness.charm._make_pod_spec(), values['pod_spec'])
-                self.harness.update_config({}, JUJU_SETTINGS)  # You need to clean the config after each run
+                self.harness.update_config(JUJU_SETTINGS_DEFAULT)  # You need to clean the config after each run
 
     def test_update_pod_spec_for_k8s_ingress(self):
         """Check the crafting of the ingress part of the pod spec."""
@@ -129,7 +143,7 @@ class TestMmPdBotK8sCharmBlockedStatus(unittest.TestCase):
                 pod_spec = self.harness.charm._make_pod_spec()
                 self.harness.charm._update_pod_spec_for_k8s_ingress(pod_spec)
                 self.assertEqual(pod_spec, values['pod_spec'])
-                self.harness.update_config({}, JUJU_SETTINGS)  # You need to clean the config after each run
+                self.harness.update_config(JUJU_SETTINGS_DEFAULT)  # You need to clean the config after each run
 
 
 if __name__ == '__main__':
diff --git a/tox.ini b/tox.ini
index 77c821d..7e09302 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ deps = -r{toxinidir}/tests/functional/requirements.txt
        -r{toxinidir}/requirements.txt
 
 [testenv:black]
-commands = black --skip-string-normalization --line-length=120 src/ tests/
+commands = black src/ tests/
 deps = black
 
 [testenv:lint]