Don't break the DB abstraction and use persistance class to query for

the model in question.

Also only retrieve fields we need for the masking operation.

Author: Kami

st2common/st2common/models/db/rule.py

@@ -116,36 +116,42 @@ def mask_secrets(self, value):
         :rtype: ``dict``
         """
         result = copy.deepcopy(value)
-        if('action' not in result):
+
+        action_ref = result.get('action', {}).get('ref', None)
+
+        if not action_ref:
             return result
-        action_db = self._get_referenced_models(rule=result)
 
-        secret_parameters = get_secret_parameters(parameters=action_db['parameters'])
+        action_db = self._get_referenced_action_model(action_ref=action_ref)
+
+        if not action_db:
+            return result
+
+        secret_parameters = get_secret_parameters(parameters=action_db.parameters)
         result['action']['parameters'] = mask_secret_parameters(
             parameters=result['action']['parameters'],
             secret_parameters=secret_parameters)
 
         return result
 
-    def _get_referenced_models(self, rule):
+    def _get_referenced_action_model(self, action_ref):
         """
+        Return Action object for the action referenced in a rule.
         Return the action model referenced from rule.
 
         :type rule: ``dict``
         :param rule: rule
 
         :rtype: ``ActionDB``
         """
-        action_ref = rule['action']['ref']
-
-        def ref_query_args(ref):
-            return {'ref': ref}
+        # NOTE: We need to retrieve pack and name since that's needed for the PK
+        action_dbs = Action.query(only_fields=['pack', 'ref', 'name', 'parameters'],
+                                  ref=action_ref, limit=1)
 
-        action_db = self._get_entity(model_persistence=Action,
-                                     ref=action_ref,
-                                     query_args=ref_query_args)
+        if action_dbs:
+            return action_dbs[0]
 
-        return action_db
+        return None
 
     def _get_entity(self, model_persistence, ref, query_args):
         q = Q(**query_args(ref))