Merge pull request #2770 from StackStorm/revert-2766-v1.5_user_scoped_params_as_jinja

Revert "Render user params (jinja) in API"

Author: lakshmi-kannan

CHANGELOG.rst

@@ -78,9 +78,6 @@ in development
   When this flag is provided, all triggers contained within a pack triggers directory are
   registered, consistent with the behavior of sensors, actions, etc. This feature allows users
   to register trigger types outside the scope of the sensors. (new-feature) [Cody A. Ray]
-* Allow user scoped variables to be used as values for parameters in action execution API call.
-  This also means you can use user scoped variables as values for parameters when you run actions
-  from CLI or UI. For example, you can now use ``st2 run core.local date='{{user.date_cmd}}'``. (bug-fix)
 
 1.4.0 - April 18, 2016
 ----------------------

st2common/st2common/util/param.py

@@ -20,10 +20,8 @@
 from st2common import log as logging
 from st2common.constants.action import ACTION_CONTEXT_KV_PREFIX
 from st2common.constants.keyvalue import SYSTEM_SCOPE
-from st2common.constants.keyvalue import USER_SCOPE
 from st2common.exceptions.param import ParamException
 from st2common.services.keyvalues import KeyValueLookup
-from st2common.services.keyvalues import UserKeyValueLookup
 from st2common.util.casts import get_cast
 from st2common.util.compat import to_unicode
 from st2common.util import jinja as jinja_utils
@@ -77,10 +75,6 @@ def _create_graph(action_context):
     '''
     G = nx.DiGraph()
     G.add_node(SYSTEM_SCOPE, value=KeyValueLookup(scope=SYSTEM_SCOPE))
-    user = action_context.get('user', None)
-    LOG.debug('User is: %s', user)
-    if user:
-        G.add_node(USER_SCOPE, value=UserKeyValueLookup(user=user, scope=USER_SCOPE))
     G.add_node(ACTION_CONTEXT_KV_PREFIX, value=action_context)
     return G
 

st2common/tests/unit/test_param_utils.py

@@ -32,11 +32,7 @@
 FIXTURES_PACK = 'generic'
 
 TEST_MODELS = {
-    'actions': [
-        'action_4_action_context_param.yaml',
-        'action_system_default.yaml',
-        'action_user_default.yaml'
-    ],
+    'actions': ['action_4_action_context_param.yaml', 'action_system_default.yaml'],
     'runners': ['testrunner1.yaml']
 }
 
@@ -48,7 +44,6 @@
 class ParamsUtilsTest(DbTestCase):
     action_db = FIXTURES['actions']['action_4_action_context_param.yaml']
     action_system_default_db = FIXTURES['actions']['action_system_default.yaml']
-    action_user_default_db = FIXTURES['actions']['action_user_default.yaml']
     runnertype_db = FIXTURES['runners']['testrunner1.yaml']
 
     def test_get_finalized_params(self):
@@ -119,23 +114,6 @@ def test_get_finalized_params_system_values(self):
         self.assertEqual(action_params.get('actionstr'), 'foo')
         self.assertEqual(action_params.get('actionnumber'), 1.0)
 
-    def test_get_finalized_params_user_values(self):
-        KeyValuePair.add_or_update(KeyValuePairDB(name='stanley:foo', value='kabaali',
-                                                  scope='user'))
-        params = {
-            'runnerint': 555
-        }
-        liveaction_db = self._get_liveaction_model(params)
-        liveaction_db.context['user'] = 'stanley'
-
-        runner_params, action_params = param_utils.get_finalized_params(
-            ParamsUtilsTest.runnertype_db.runner_parameters,
-            ParamsUtilsTest.action_user_default_db.parameters,
-            liveaction_db.parameters,
-            liveaction_db.context)
-
-        self.assertEqual(action_params.get('actionstr'), 'kabaali')
-
     def test_get_finalized_params_action_immutable(self):
         params = {
             'actionstr': 'foo',