Adding output format for export template

Author: davidcho23

src/azure-cli/azure/cli/command_modules/resource/_params.py

@@ -535,6 +535,7 @@ def load_arguments(self, _):
         c.argument('skip_resource_name_params', action='store_true')
         c.argument('skip_all_params', action='store_true')
         c.argument('resource_ids', nargs='+', options_list='--resource-ids')
+        c.argument('output_format', options_list='--output-format')
 
     with self.argument_context('group create') as c:
         c.argument('rg_name', options_list=['--name', '--resource-group', '-n', '-g'],

src/azure-cli/azure/cli/command_modules/resource/custom.py

@@ -1667,7 +1667,7 @@ def update_resource_group(instance, tags=None):
 
 
 def export_group_as_template(
-        cmd, resource_group_name, include_comments=False, include_parameter_default_value=False, resource_ids=None, skip_resource_name_params=False, skip_all_params=False):
+        cmd, resource_group_name, include_comments=False, include_parameter_default_value=False, resource_ids=None, skip_resource_name_params=False, skip_all_params=False, output_format=None):
     """Captures a resource group as a template.
     :param str resource_group_name: the name of the resource group.
     :param resource_ids: space-separated resource ids to filter the export by. To export all resources, do not specify this argument or supply "*".
@@ -1701,16 +1701,33 @@ def export_group_as_template(
     options = ','.join(export_options) if export_options else None
 
     ExportTemplateRequest = cmd.get_models('ExportTemplateRequest')
-    export_template_request = ExportTemplateRequest(resources=resources, options=options)
 
+    if output_format is None or output_format.lower() == "json" or output_format.lower() == "arm":
+        export_template_request = ExportTemplateRequest(resources=resources, options=options, output_format="Json")
+    
+    elif output_format.lower() == "bicep":
+        export_template_request = ExportTemplateRequest(resources=resources, options=options, output_format="Bicep")
+
+    else:
+        raise CLIError('az resource: error: argument --output_format: invalid OutputFormat value: \'%s\'' % output_format)
+    
     # Exporting a resource group as a template is async since API version 2019-08-01.
     if cmd.supported_api_version(min_api='2019-08-01'):
-        result_poller = rcf.resource_groups.begin_export_template(resource_group_name,
-                                                                  parameters=export_template_request)
+        if cmd.supported_api_version(min_api='2024-11-01'):
+            print("api version is 2024-11-01")
+            result_poller = rcf.resource_groups.begin_export_template(resource_group_name,
+                                                                parameters=export_template_request,
+                                                                api_version='2024-11-01')
+        else:
+            if output_format.lower() == "bicep":
+                raise CLIError("Bicep export is not supported in API version < 2024-11-01")
+            else:
+                result_poller = rcf.resource_groups.begin_export_template(resource_group_name,
+                                                                parameters=export_template_request)
         result = LongRunningOperation(cmd.cli_ctx)(result_poller)
     else:
         result = rcf.resource_groups.begin_export_template(resource_group_name,
-                                                           parameters=export_template_request)
+                                                        parameters=export_template_request)
 
     # pylint: disable=no-member
     # On error, server still returns 200, with details in the error attribute
@@ -1722,8 +1739,11 @@ def export_group_as_template(
             logger.warning(str(error))
         for detail in getattr(error, 'details', None) or []:
             logger.error(detail.message)
-
-    return result.template
+    
+    if output_format is None or output_format.lower() == "json" or output_format.lower() == "arm":
+        return result.template
+    elif output_format.lower() == "bicep":
+        return result.output
 
 
 def create_application(cmd, resource_group_name,