Improve ret handling across cherrypy/tornado

this seems to do the right thing in more scenarios.

Author: mattp-

pepper/cli.py

@@ -580,12 +580,16 @@ def poll_for_returns(self, api, load):
                 },
             }])
 
-            responded = set(jid_ret['return'][0].keys()) ^ set(ret_nodes)
+            inner_ret = jid_ret['return'][0]
+            # sometimes ret is nested in data
+            if 'data' in inner_ret:
+                inner_ret = inner_ret['data']
+
+            responded = set(inner_ret.keys()) ^ set(ret_nodes)
+
             for node in responded:
-                yield None, "{{{}: {}}}".format(
-                    node,
-                    jid_ret['return'][0][node])
-            ret_nodes = list(jid_ret['return'][0].keys())
+                yield None, [{node: inner_ret[node]}]
+            ret_nodes = list(inner_ret.keys())
 
             if set(ret_nodes) == set(nodes):
                 exit_code = 0
@@ -594,8 +598,9 @@ def poll_for_returns(self, api, load):
                 time.sleep(self.seconds_to_wait)
 
         exit_code = exit_code if self.options.fail_if_minions_dont_respond else 0
-        yield exit_code, "{{Failed: {}}}".format(
-            list(set(ret_nodes) ^ set(nodes)))
+        failed = list(set(ret_nodes) ^ set(nodes))
+        if failed:
+            yield exit_code, {'Failed': failed}
 
     def login(self, api):
         if self.options.mktoken:
@@ -628,6 +633,7 @@ def login(self, api):
         self.auth = auth
         return auth
 
+
     def low(self, api, load):
         path = '/run' if self.options.userun else '/'
 

pepper/script.py

@@ -50,13 +50,29 @@ def output(self):
     def __call__(self):
         try:
             for exit_code, result in self.cli.run():
-                if HAS_SALT and not self.cli.options.userun and self.opts:
-                    logger.info('Use Salt outputters')
-                    for ret in json.loads(result)['return']:
+                if HAS_SALT and self.opts:
+                    logger.debug('Use Salt outputters')
+                    result = json.loads(result)
+
+                    if 'return' in result:
+                        result = result['return']
+
+                    for ret in result:
                         if isinstance(ret, dict):
-                            if self.cli.options.client == 'local':
+                            if self.cli.options.client.startswith('local'):
                                 for minionid, minionret in ret.items():
-                                    if isinstance(minionret, dict) and 'ret' in minionret:
+                                    # rest_tornado doesnt return full_return directly
+                                    # it will always be from get_event, so the output differs slightly
+                                    logger.error(minionret)
+                                    if isinstance(minionret, dict) and 'return' in minionret:
+                                        # version >= 2017.7
+                                        salt.output.display_output(
+                                            {minionid: minionret['return']},
+                                            self.cli.options.output or minionret.get('out', None) or 'nested',
+                                            opts=self.opts
+                                        )
+                                    # cherrypy returns with ret via full_return
+                                    elif isinstance(minionret, dict) and 'ret' in minionret:
                                         # version >= 2017.7
                                         salt.output.display_output(
                                             {minionid: minionret['ret']},
@@ -95,7 +111,7 @@ def __call__(self):
                         print(result)
                 if exit_code is not None:
                     if exit_code == 0:
-                        return PepperRetcode().validate(self.cli.options, json.loads(result)['return'])
+                        return PepperRetcode().validate(self.cli.options, result)
                     return exit_code
         except (PepperException, PepperAuthException, PepperArgumentsException) as exc:
             print('Pepper error: {0}'.format(exc), file=sys.stderr)