Merge ~silverdrake11/landscape-charm:strip_cert into landscape-charm:main

[Kevin Nasto]

Remove b char from haproxy cert

Sometimes landscape server throws an error from base64 improper chars like b' originating from the ha charm config value

[Mitch Burton (mitchburton)]

LGTM. I don't have the luck to be able to regularly reproduce this, but the change is non-disruptive enough that I'm okay with that.

review: Approve

diff --git a/src/charm.py b/src/charm.py
index c5f5c59..addd9bc 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -654,6 +654,10 @@ class LandscapeServerCharm(CharmBase):
         self.unit.status = MaintenanceStatus("Configuring HAProxy")
         haproxy_ssl_cert = event.relation.data[event.unit]["ssl_cert"]
 
+        # Sometimes the data has not been encoded propery in the HA charm
+        if haproxy_ssl_cert.startswith("b'"):
+            haproxy_ssl_cert = haproxy_ssl_cert.strip('b').strip("'")
+
         if haproxy_ssl_cert != "DEFAULT":
             # If DEFAULT, cert is being managed by a third party,
             # possibly a subordinate charm.
diff --git a/tests/test_charm.py b/tests/test_charm.py
index 0b1477d..d904212 100644
--- a/tests/test_charm.py
+++ b/tests/test_charm.py
@@ -809,6 +809,29 @@ class TestCharm(unittest.TestCase):
         self.assertIsInstance(status, WaitingStatus)
         write_cert_mock.assert_called_once_with("FANCYNEWCERT")
 
+    def test_website_relation_changed_strip_b_char(self):
+        self.harness.charm._update_haproxy_connection = Mock()
+        mock_event = Mock()
+        mock_event.relation.data = {
+            mock_event.unit: {"ssl_cert": "b'FANCYNEWCERT'"},
+            self.harness.charm.unit: {
+                "private-address": "test",
+                "public-address": "test2",
+            },
+        }
+
+        with patch.multiple(
+                "charm",
+                write_ssl_cert=DEFAULT,
+                update_service_conf=DEFAULT,
+        ) as mocks:
+            write_cert_mock = mocks["write_ssl_cert"]
+            self.harness.charm._website_relation_changed(mock_event)
+
+        status = self.harness.charm.unit.status
+        self.assertIsInstance(status, WaitingStatus)
+        write_cert_mock.assert_called_once_with("FANCYNEWCERT")
+
     @patch("charm.update_service_conf")
     def test_on_config_changed_no_smtp_change(self, _):
         self.harness.charm._update_ready_status = Mock()