Merge lp:~mthaddon/charm-haproxy/self-signed-write into lp:charm-haproxy

[Tom Haddon]

Fix writing self-signed cert for python3

Fix writing self-signed cert for python3

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

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

[lp:~mthaddon/charm-haproxy/self-signed-write]

161. By Tom Haddon on 2023-08-03

Include data directory so self-signed cert can be created, and encode ssl_cert when reading it

[Fabian Bertetto (fbertetto)]

LGTM

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

Change successfully merged at revision 160

=== modified file 'charmcraft.yaml'
--- charmcraft.yaml	2023-07-13 09:58:25 +0000
+++ charmcraft.yaml	2023-08-03 10:46:15 +0000
@@ -20,6 +20,7 @@
     stage:
      - '*'
     prime:
+      - data
       - files
       - hooks
       - templates

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2023-08-02 10:03:05 +0000
+++ hooks/hooks.py	2023-08-03 10:46:15 +0000
@@ -845,7 +845,7 @@
             full_path = os.path.join(path, "%d.pem" % i)
             write_ssl_pem(full_path, content)
             with open(full_path, 'w') as f:
-                f.write(content)
+                f.write(content.decode('utf-8'))
 
         if not os.path.exists(default_haproxy_service_config_dir):
             os.mkdir(default_haproxy_service_config_dir, 0o600)
@@ -1099,7 +1099,7 @@
     config_data = config_get()
     ssl_cert = config_data.get("ssl_cert")
     if ssl_cert == "SELFSIGNED":
-        ssl_cert = base64.b64encode(get_selfsigned_cert()[0])
+        ssl_cert = base64.b64encode(get_selfsigned_cert()[0].encode('utf-8'))
     relation_settings = {
         "public-address": unit_get("public-address"),
         "ssl_cert": ssl_cert,