RND-623 Add --recursive for dep & depgroups delete (#1481)

Author: tehasdf

cloudify_cli/cli/cfy.py

@@ -1988,6 +1988,12 @@ def agent_filters(self, f):
             is_flag=True,
             help=helptexts.AGENT_ALL_STATES,
         )
+        self.recursive_delete = click.option(
+            '--recursive',
+            default=False,
+            is_flag=True,
+            help=helptexts.RECURSIVE_DELETE,
+        )
 
         # we add separate --node-instance-id, --node-id and --deployment-id
         # arguments, but only expose a agents_filter = {'node_id': ..} dict

cloudify_cli/cli/helptexts.py

@@ -623,3 +623,5 @@
     Secrets Provider's options in stringify JSON format
     """
 EVALUATE_FUNCTIONS = "Evaluate functions in returned nodes and node instances"
+RECURSIVE_DELETE = 'Recursively delete all service deployments contained in ' \
+                   'this deployment'

cloudify_cli/commands/deployments.py

@@ -698,19 +698,32 @@ def manager_create(
 @cfy.options.common_options
 @cfy.options.with_logs
 @cfy.options.tenant_name(required=False, resource_name_for_help='deployment')
+@cfy.options.recursive_delete
 @cfy.assert_manager_active()
 @cfy.pass_client()
 @cfy.pass_logger
-def manager_delete(deployment_id, force, with_logs, logger, client,
-                   tenant_name):
+def manager_delete(
+    deployment_id,
+    force,
+    with_logs,
+    recursive,
+    logger,
+    client,
+    tenant_name,
+):
     """Delete a deployment from the manager
 
     `DEPLOYMENT_ID` is the id of the deployment to delete.
     """
 
     utils.explicit_tenant_name_message(tenant_name, logger)
     logger.info('Trying to delete deployment %s...', deployment_id)
-    client.deployments.delete(deployment_id, force, with_logs=with_logs)
+    client.deployments.delete(
+        deployment_id,
+        force,
+        with_logs=with_logs,
+        recursive=recursive,
+    )
     try:
         execution = get_deployment_environment_execution(
             client, deployment_id, DELETE_DEP)
@@ -1192,11 +1205,19 @@ def groups_create(deployment_group_name, inputs, default_blueprint,
 @click.argument('deployment-group-name')
 @cfy.options.delete_deployments
 @cfy.options.with_logs
+@cfy.options.recursive_delete
 @cfy.options.force(help=helptexts.FORCE_DELETE_DEPLOYMENT)
 @cfy.pass_client()
 @cfy.pass_logger
-def groups_delete(deployment_group_name, delete_deployments, force, with_logs,
-                  client, logger):
+def groups_delete(
+    deployment_group_name,
+    delete_deployments,
+    force,
+    with_logs,
+    recursive,
+    client,
+    logger,
+):
     """Delete a deployment group
 
     This deletes a deployment group, which by default only removes the
@@ -1208,6 +1229,7 @@ def groups_delete(deployment_group_name, delete_deployments, force, with_logs,
         delete_deployments=delete_deployments,
         force=force,
         with_logs=with_logs,
+        recursive=recursive,
     )
     logger.info('Group %s deleted', deployment_group_name)