Merge lp:~simonklb/charm-helpers/include-empty-config-options into lp:charm-helpers

[Simon Kollberg]

See the issue in the commit message which caused this.

It's possible that this could break some charms if they are expect the config not to include the options with empty defaults which now will exist as None. I'm open to a less intrusive change if necessary.

[Charles Butler (lazypower)]

I'm not certain of the impact this has on existing charms which you have called out, but I am +1 to the behavior change proposed here.

I expect the charm-helper config declaration properly translates the None type values to the python None. This should retain all the compatibility required to accept this change, as the inline code expects None's as well in these cases. Typically guarded like so:

if not config('foobar')

or

if config('foobar') is not None:

as two primary examples i've seen historically.

I'll reserve approval pending others perspective on the matter, but as a prelim i'm OK with this change.

[Cory Johns (johnsca)]

+1 from me. I can't see why this wouldn't have been the intended behavior from the get-go.

review: Approve

[Casey Marshall (cmars)]

LGTM

review: Approve

[Charles Butler (lazypower)]

Thanks for the contribution Simon! I've merged this branch into charm-helpers proper as of revision 652.

review: Approve

[Charles Butler (lazypower)]

Thanks for the contribution Simon! I've merged this branch into charm-helpers proper as of revision 652.

review: Approve

=== modified file 'charmhelpers/core/hookenv.py'
--- charmhelpers/core/hookenv.py	2016-09-07 16:37:01 +0000
+++ charmhelpers/core/hookenv.py	2016-10-24 11:40:08 +0000
@@ -332,6 +332,8 @@
     config_cmd_line = ['config-get']
     if scope is not None:
         config_cmd_line.append(scope)
+    else:
+        config_cmd_line.append('--all')
     config_cmd_line.append('--format=json')
     try:
         config_data = json.loads(

=== modified file 'tests/core/test_hookenv.py'
--- tests/core/test_hookenv.py	2016-09-07 00:09:32 +0000
+++ tests/core/test_hookenv.py	2016-10-24 11:40:08 +0000
@@ -351,7 +351,8 @@
 
         self.assertIsInstance(result, hookenv.Config)
         self.assertEqual(result['foo'], 'bar')
-        check_output.assert_called_with(['config-get', '--format=json'])
+        check_output.assert_called_with(['config-get', '--all',
+                                         '--format=json'])
 
     @patch('charmhelpers.core.hookenv.os')
     def test_gets_the_local_unit(self, os_):