Merge jenkins-agent-charm:write-default-bug into jenkins-agent-charm:master

[Alexandre Gomes]

Fix template rendering when using default conf

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

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

[Tom Haddon (mthaddon)]

Would be good to test this. How about something like https://paste.ubuntu.com/p/ZNvfmRwfQB/ ?

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

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

Change successfully merged at revision fbb7b371b188e4af787a2b264313684e7308e649

diff --git a/reactive/jenkins_slave.py b/reactive/jenkins_slave.py
index be3b256..314fbd0 100644
--- a/reactive/jenkins_slave.py
+++ b/reactive/jenkins_slave.py
@@ -96,7 +96,7 @@ def configure_jenkins_slave():
         write_default_conf(config.get('master_url'))
     elif kv.get('url'):
         status.maintenance("Using url from relation as 'master_url'")
-        write_default_conf(kv.get('url'), kv.get('secret'))
+        write_default_conf(kv.get('url'), secret=kv.get('secret'))
     else:
         status.maintenance("No 'master_url' set; not configuring slave at this time.")
         status.blocked("requires either slave relation or 'master_url'")
diff --git a/tests/unit/test_jenkins_slave.py b/tests/unit/test_jenkins_slave.py
index a0c1677..1300c73 100644
--- a/tests/unit/test_jenkins_slave.py
+++ b/tests/unit/test_jenkins_slave.py
@@ -222,6 +222,24 @@ class TestSetDefaultConf(unittest.TestCase):
         unitdata_kv.return_value = {'url': 'http://10.22.22.22:8080'}
         jenkins_slave.configure_jenkins_slave()
         self.assertTrue(write_default_conf.called_once_with('http://10.22.22.22:8080'))
+        self.assertEqual(write_default_conf.call_args_list, [mock.call('http://10.22.22.22:8080', secret=None)])
+        self.assertFalse(set_flag.assert_has_calls([mock.call('jenkins-slave.configured')], any_order=True))
+        expected = [mock.call('jenkins-slave.active'), mock.call('nagios-nrpe.configured')]
+        self.assertFalse(clear_flag.assert_has_calls(expected, any_order=True))
+
+    @mock.patch('charms.reactive.clear_flag')
+    @mock.patch('charms.reactive.set_flag')
+    @mock.patch('charmhelpers.core.hookenv.config')
+    @mock.patch('charmhelpers.core.unitdata.kv')
+    @mock.patch('reactive.jenkins_slave.write_default_conf')
+    @mock.patch('reactive.jenkins_slave.file_to_units')
+    def test_configure_jenkins_slave_relation_url_with_secret(
+        self, file_to_units, write_default_conf, unitdata_kv, config, set_flag, clear_flag
+    ):
+        config.return_value = {}
+        unitdata_kv.return_value = {'url': 'http://10.22.22.22:8080', 'secret': 'sekrit'}
+        jenkins_slave.configure_jenkins_slave()
+        self.assertEqual(write_default_conf.call_args_list, [mock.call('http://10.22.22.22:8080', secret='sekrit')])
         self.assertFalse(set_flag.assert_has_calls([mock.call('jenkins-slave.configured')], any_order=True))
         expected = [mock.call('jenkins-slave.active'), mock.call('nagios-nrpe.configured')]
         self.assertFalse(clear_flag.assert_has_calls(expected, any_order=True))