Merge lp:~mthaddon/juju-deployer/lp-1892423 into lp:juju-deployer

[Tom Haddon]

Update diff to deal correctly with include files lp#1892423

[Tom Haddon (mthaddon)]

To confirm the functionality of this branch (in addition to running tests) I've tested with apache2:

https://pastebin.ubuntu.com/p/2SP5mTjrYM/

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

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

[Benjamin Allot (ballot)]

LGTM

review: Approve

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

Change successfully merged at revision 223

=== modified file 'deployer/deployment.py'
--- deployer/deployment.py	2020-10-16 07:29:31 +0000
+++ deployer/deployment.py	2021-09-17 13:14:57 +0000
@@ -5,6 +5,7 @@
 import logging
 import pprint
 import os
+import textwrap
 import yaml
 
 import six
@@ -268,8 +269,10 @@
             with open(ip, 'rb') as fh:
                 v = fh.read()
                 if include_type == "base64":
-                    v = b64encode(v)
-                return v
+                    # Follow Juju's approach of wrapping at 76 characters.
+                    return "\n".join(textwrap.wrap(b64encode(v).decode(), 76))
+                else:
+                    return v.strip().decode()
         if feedback:
             return feedback
 

=== modified file 'deployer/tests/test_data/blog.snippet'
--- deployer/tests/test_data/blog.snippet	2013-07-22 15:29:31 +0000
+++ deployer/tests/test_data/blog.snippet	2021-09-17 13:14:57 +0000
@@ -1,1 +1,2 @@
-HelloWorld
\ No newline at end of file
+This content needs to be long enough to require it to be wrapped onto two
+lines when we convert it to base64.

=== modified file 'deployer/tests/test_deployment.py'
--- deployer/tests/test_deployment.py	2016-10-31 14:12:44 +0000
+++ deployer/tests/test_deployment.py	2021-09-17 13:14:57 +0000
@@ -67,9 +67,13 @@
         self.assertEqual(d.get_service('newrelic').config, {'key': 'abc'})
         self.assertEqual(
             base64.b64decode(d.get_service('blog').config['wp-content']),
-            b"HelloWorld")
+            b"This content needs to be long enough to require it to be wrapped onto two\n"
+            b"lines when we convert it to base64.\n")
 
-        # TODO verify include-file
+        # Verify include-file (we'll just verify the first part of it)
+        self.assertEqual(
+            d.get_service('haproxy').config['services'][:20],
+            '- service_name: blog')
 
         # Verify relations
         self.assertEqual(