Merge lp:~mthaddon/charm-haproxy/lp-2030726 into lp:~haproxy-team/charm-haproxy/trunk-old-use-git

[Tom Haddon]

Ensure content of self-signed cert is correctly encoded lp#2030726

Ensure content of self-signed cert is correctly encoded lp#2030726.

If we're not using a self-signed cert the `content` is generated with `base64.b64decode` which returns bytes rather than a string, so make sure content is generated consistently here.

I've tested this by deploying haproxy (with ssl_cert=SELFSIGNED) and pollen and relating them, observing the error mentioned in the bug, and then making this change and confirming it fixes the issue.

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

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

[🤖 Canonical IS Review Bot (canonical-is-reviewbot)]

Proxy approval for barryprice

review: Approve

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

Change successfully merged at revision 161

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2023-08-03 10:42:39 +0000
+++ hooks/hooks.py	2023-08-09 07:23:17 +0000
@@ -347,7 +347,7 @@
         return
     if ssl_cert == "SELFSIGNED":
         log("Using self-signed certificate")
-        content = "".join(get_selfsigned_cert())
+        content = "".join(get_selfsigned_cert()).encode('utf-8')
     else:
         ssl_key = config_data.get("ssl_key")
         if not ssl_key: