Merge lp:~chad.smith/charms/trusty/landscape-client/landscape-client-scrub-whitespace into lp:charms/trusty/landscape-client

[Chad Smith]

landscape-client charm now strips leading and trailing whitespace from any provided service config settings provided by juju set X=""" Y """. Helps with include-file:// juju-deployer directives that may contain newlines.

landscape-client charm now strips leading and trailing whitespace from any provided service config settings provided by juju.

For dev testing:
juju switch local
juju bootstrap

# setup a landscape account with freshdata
# set account registration key to asdfasdf (example IP of local 'OPL': 192.168.2.11)
echo -e "asdfasdf\n" > /tmp/my-regkey

Use a bundle something like the following:

local-client:
    series: trusty
    services:
        ubuntu:
            charm: cs:trusty/ubuntu-1
            num_units: 1
        landscape-client:
            branch: lp:~chad.smith/charms/trusty/landscape-client/landscape-client-scrub-whitespace
            num_units: 0
            options:
                account-name: onward
                url: http://192.168.2.11:8080/message-system
                ping-url: http://192.168.2.11:8081/ping
                registration-key: include-file:///tmp/my-regkey
    relations:
        - [ubuntu, landscape-client]

# client should register despite the newline in the /tmp/my-regkey
# juju ssh ubuntu/0 'sudo cat /etc/landscape/client.conf'
# ensure registration-key does not contain a newline, like the following:
registration_key = """asdfasdf
"""

[Adam Collard (adam-collard)]

Looks good! +1

review: Approve

[Bogdana Vereha (bogdana)]

+1

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-09-25 07:00:05 +0000
+++ hooks/hooks.py	2016-03-30 20:48:35 +0000
@@ -46,7 +46,7 @@
     service_config = juju_broker.get_service_config()
     # Only update client config with service configs that have been set
     service_config = dict(
-        (key, value) for key, value in service_config.iteritems()
+        (key, value.strip()) for key, value in service_config.iteritems()
         if value is not None)
     relation_data.update(service_config)
     if relation_data.get("ssl-public-key", "").startswith("base64:"):

=== modified file 'hooks/test_hooks.py'
--- hooks/test_hooks.py	2014-09-25 07:00:05 +0000
+++ hooks/test_hooks.py	2016-03-30 20:48:35 +0000
@@ -410,6 +410,27 @@
         with open(hooks.CERT_FILE) as fh:
             self.assertEqual("foo", fh.read())
 
+    def test_whitespace_removed_from_config_settings(self):
+        """Leading and trailing whitespace is removed from config settings"""
+        self.juju_broker.commands["config-get"] = {
+            "ssl-public-key": " base64:%s" % "foo".encode("base64"),
+            "account-name": " standalone\t",
+            "registration-key": " mykey\n",
+            "ping-url": " \thttp://127.0.0.1\n "}
+        hooks.config_changed(juju_broker=self.juju_broker,
+                             landscape_broker=self.landscape_broker)
+        self.assertEqual(
+            hooks.CERT_FILE, self.landscape_broker.config.ssl_public_key)
+        with open(hooks.CERT_FILE) as fh:
+            self.assertEqual("foo", fh.read())
+        self.assertEqual(
+            "standalone", self.landscape_broker.config.account_name)
+        self.assertEqual(
+            "mykey", self.landscape_broker.config.registration_key)
+        self.assertEqual(
+            "http://127.0.0.1", self.landscape_broker.config.ping_url)
+        
+
 
 class RegistrationRelationJoinedTest(HookTestCase):
     """Test for the registration-relation-joined hook."""