RD-6446 Add --evaluate-functions (#1454)

I'm a bit tired of having to use the restclient to do this :)

Also, node-instances list don't have this feature. Only nodes get,
nodes list, NI get.

Author: tehasdf

cloudify_cli/cli/cfy.py

@@ -1906,6 +1906,14 @@ def __init__(self):
             help=helptexts.SECRET_PROVIDER_NAME,
         )
 
+        self.evaluate_functions = click.option(
+            '--evaluate-functions',
+            is_flag=True,
+            default=False,
+            required=False,
+            help=helptexts.EVALUATE_FUNCTIONS,
+        )
+
     def common_options(self, f):
         """A shorthand for applying commonly used arguments.
 

cloudify_cli/cli/helptexts.py

@@ -616,3 +616,4 @@
 SECRET_PROVIDER_CONNECTION_PARAMETERS = """
     Secret Provider's connection parameters in stringify JSON format
     """
+EVALUATE_FUNCTIONS = "Evaluate functions in returned nodes and node instances"

cloudify_cli/commands/node_instances.py

@@ -56,18 +56,22 @@ def node_instances():
 @cfy.options.common_options
 @cfy.options.tenant_name(
     required=False, resource_name_for_help='node-instance')
+@cfy.options.evaluate_functions
 @cfy.pass_logger
 @cfy.pass_client()
 @cfy.options.extended_view
-def get(node_instance_id, logger, client, tenant_name):
+def get(node_instance_id, evaluate_functions, logger, client, tenant_name):
     """Retrieve information for a specific node-instance
 
     `NODE_INSTANCE_ID` is the id of the node-instance to get information on.
     """
     utils.explicit_tenant_name_message(tenant_name, logger)
-    logger.info('Retrieving node instance {0}'.format(node_instance_id))
+    logger.info('Retrieving node instance %s', node_instance_id)
     try:
-        node_instance = client.node_instances.get(node_instance_id)
+        node_instance = client.node_instances.get(
+            node_instance_id,
+            evaluate_functions=evaluate_functions,
+        )
     except CloudifyClientError as e:
         if e.status_code != 404:
             raise

cloudify_cli/commands/nodes.py

@@ -60,10 +60,18 @@ def nodes():
 @cfy.options.deployment_id(required=True)
 @cfy.options.common_options
 @cfy.options.tenant_name(required=False, resource_name_for_help='node')
+@cfy.options.evaluate_functions
 @cfy.pass_logger
 @cfy.pass_client()
 @cfy.options.extended_view
-def get(node_id, deployment_id, logger, client, tenant_name):
+def get(
+    node_id,
+    deployment_id,
+    evaluate_functions,
+    client,
+    logger,
+    tenant_name,
+):
     """Retrieve information for a specific node of a specific deployment
 
     `NODE_ID` is the node id to get information on.
@@ -72,7 +80,11 @@ def get(node_id, deployment_id, logger, client, tenant_name):
     logger.info('Retrieving node {0} for deployment {1}'.format(
         node_id, deployment_id))
     try:
-        node = client.nodes.get(deployment_id, node_id)
+        node = client.nodes.get(
+            deployment_id,
+            node_id,
+            evaluate_functions=evaluate_functions,
+        )
     except CloudifyClientError as e:
         if e.status_code != 404:
             raise
@@ -157,6 +169,7 @@ def _run_node_checks(deployment_id, logger, client):
 @cfy.options.pagination_offset
 @cfy.options.pagination_size
 @cfy.options.common_options
+@cfy.options.evaluate_functions
 @cfy.pass_logger
 @cfy.pass_client()
 @cfy.options.extended_view
@@ -170,6 +183,7 @@ def nodes_list(
     search,
     pagination_offset,
     pagination_size,
+    evaluate_functions,
     logger,
     client
 ):
@@ -195,6 +209,7 @@ def nodes_list(
             deployment_id=deployment_id,
             sort=sort_by,
             is_descending=descending,
+            evaluate_functions=evaluate_functions,
             _all_tenants=all_tenants,
             _search=search,
             _offset=pagination_offset,