fix detail route appending to get actions

Author: lampwins

actions/base_get_action.py

@@ -14,6 +14,13 @@ def run(self, endpoint_uri, **kwargs):
         endpoint_uri is pased from metadata file
         """
 
+        if kwargs.get('id', False):
+            # modify the `endpoint_uri` to use the detail route
+            endpoint_uri = '{}{}/'.format(endpoint_uri, str(kwargs.pop('id')))
+            self.logger.debug(
+                'endpoint_uri transformed to {} because id was passed'.format(endpoint_uri)
+            )
+
         if kwargs.get('save_in_key_store') and not kwargs.get('save_in_key_store_key_name'):
             return (False, 'save_in_key_store_key_name MUST be used with save_in_key_store!')
 
@@ -28,4 +35,4 @@ def run(self, endpoint_uri, **kwargs):
 
             return (True, "Result stored in st2 key {}".format(key_name))
 
-        return self.get(endpoint_uri, **kwargs)
+        return result

actions/lib/action.py

@@ -24,13 +24,6 @@ def _make_request(self, endpoint_uri, http_action, **kwargs):
         else:
             url = 'http://'
 
-        if kwargs.get('id', False):
-            # modify the `endpoint_uri` to use the detail route
-            endpoint_uri = '{}{}/'.format(endpoint_uri, str(kwargs.pop('id')))
-            self.logger.debug(
-                'endpoint_uri transformed to {} because id was passed'.format(endpoint_uri)
-            )
-
         url = url + self.config['hostname'] + endpoint_uri
 
         headers = {