Merge lp:~mitchburton/landscape-charm/reorder_additional_config into lp:landscape-charm

[Mitch Burton]

do additional config override at start of config-changed

[Kevin Nasto (silverdrake11)]

LGTM +1

review: Approve

=== modified file 'src/charm.py'
--- src/charm.py	2023-03-10 23:21:07 +0000
+++ src/charm.py	2023-03-13 21:38:50 +0000
@@ -148,6 +148,16 @@
     def _on_config_changed(self, _) -> None:
         prev_status = self.unit.status
 
+        # Update additional configuration
+        deployment_mode = self.model.config.get("deployment_mode")
+        update_service_conf({"global": {"deployment-mode": deployment_mode}})
+
+        configure_for_deployment_mode(deployment_mode)
+
+        additional_config = self.model.config.get("additional_service_config")
+        if additional_config:
+            merge_service_conf(additional_config)
+
         # Write the config-provided SSL certificate, if it exists.
         config_ssl_cert = self.model.config["ssl_cert"]
 
@@ -217,16 +227,6 @@
         if isinstance(prev_status, BlockedStatus):
             self.unit.status = prev_status
 
-        # Update additional configuration
-        deployment_mode = self.model.config.get("deployment_mode")
-        update_service_conf({"global": {"deployment-mode": deployment_mode}})
-
-        configure_for_deployment_mode(deployment_mode)
-
-        additional_config = self.model.config.get("additional_service_config")
-        if additional_config:
-            merge_service_conf(additional_config)
-
         self._update_ready_status(restart_services=True)
 
     def _on_install(self, event: InstallEvent) -> None:
 
=== modified file 'tests/test_charm.py'
--- tests/test_charm.py	2023-03-10 23:21:07 +0000
+++ tests/test_charm.py	2023-03-13 21:38:50 +0000
@@ -480,7 +480,8 @@
             ),
         )
 
-    def test_on_manual_db_config_change_block_if_error(self):
+    @patch("charm.update_service_conf")
+    def test_on_manual_db_config_change_block_if_error(self, _):
         """
         If the schema migration doesn't go through on a manual config change,
         then block unit status