Merge ~brad-marshall/charm-grafana/+git/grafana-charm-dashboard-action:action-fix-detail into ~prometheus-charmers/charm-grafana:master

[Brad Marshall]

Add extra detail to final json decode stanza, fix it to use except rather than else.

[Stuart Bishop (stub)]

Almost every use of a bare except: is a bug in modern Python, and you should use except Exception: here.

I tend to do the following, preserving traceback and ensuring it ends up in the logs via print. It makes diagnosing failures easier:

    except Exception:
        hookenv.action_fail('Unhandled exception')
        tb = traceback.format_exc()
        hookenv.action_set(dict(traceback=tb))
        hookenv.log('Unhandled exception in action {}'.format(action))
        print(tb)

[Stuart Bishop (stub)]

Approve since this is less busted than before :)

review: Approve

diff --git a/actions/import-dashboard b/actions/import-dashboard
index d61ff5f..2f0854f 100755
--- a/actions/import-dashboard
+++ b/actions/import-dashboard
@@ -4,15 +4,19 @@
 import requests
 import json
 import base64
+import traceback
 from charmhelpers.core.hookenv import (
     action_fail,
     action_set,
     action_get,
     config,
+    log,
 )
 
 from charmhelpers.core import unitdata
 
+action = "import-dashboard"
+
 kv = unitdata.kv()
 if kv.get('grafana.admin_password'):
     # print('Admin password: {}'.format(kv.get('grafana.admin_password')))
@@ -35,9 +39,12 @@ except base64.binascii.Error:
 except json.JSONDecodeError as e:
     action_fail("Fail to json decode the dashboard: %s" % (e.msg))
     exit(0)
-else:
-    action_fail("Unknown error dealing with dashboard!")
-    exit(0)
+except Exception:
+    action_fail('Unhandled exception')
+    tb = traceback.format_exc()
+    action_set(dict(traceback=tb))
+    log('Unhandled exception in action {}'.format(action))
+    print(tb)
 
 # Needs to be the format:
 # { "dashboard": { dashboard },