diff --git a/savannaclient/api/shell.py b/savannaclient/api/shell.py
index 3b2e5950..4c329c52 100644
--- a/savannaclient/api/shell.py
+++ b/savannaclient/api/shell.py
@@ -55,6 +55,12 @@ def _show_job_binary_data(data):
     utils.print_list(data, columns)
 
 
+def _show_data_source(source):
+    # TODO(mattf): why are we passing credentials around like this?
+    del source._info['credentials']
+    utils.print_dict(source._info)
+
+
 #
 # Plugins
 # ~~~~~~~
@@ -459,10 +465,7 @@ def do_data_source_list(cs, args):
 # TODO(mattf): --name <name>
 def do_data_source_show(cs, args):
     """Show details of a data source."""
-    source = cs.data_sources.get(args.id)
-    # TODO(mattf): why are we passing credentials around like this?
-    del source._info['credentials']
-    utils.print_dict(source._info)
+    _show_data_source(cs.data_sources.get(args.id))
 
 
 @utils.arg('--id',