@@ -1688,29 +1688,27 @@ def export_group_as_template(
16881688
16891689 if output_format is None or output_format .lower () == "json" or output_format .lower () == "arm" :
16901690 export_template_request = ExportTemplateRequest (resources = resources , options = options , output_format = "Json" )
1691-
16921691 elif output_format .lower () == "bicep" :
16931692 export_template_request = ExportTemplateRequest (resources = resources , options = options , output_format = "Bicep" )
1694-
16951693 else :
16961694 raise CLIError ('az resource: error: argument --output-format: invalid OutputFormat value: \' %s\' ' % output_format )
1697-
1695+
16981696 # Exporting a resource group as a template is async since API version 2019-08-01.
16991697 if cmd .supported_api_version (min_api = '2019-08-01' ):
17001698 if cmd .supported_api_version (min_api = '2024-11-01' ):
17011699 result_poller = rcf .resource_groups .begin_export_template (resource_group_name ,
1702- parameters = export_template_request ,
1703- api_version = '2024-11-01' )
1700+ parameters = export_template_request ,
1701+ api_version = '2024-11-01' )
17041702 else :
17051703 if output_format .lower () == "bicep" :
17061704 raise CLIError ("Bicep export is not supported in API version < 2024-11-01" )
1707- else :
1708- result_poller = rcf .resource_groups .begin_export_template (resource_group_name ,
1709- parameters = export_template_request )
1705+
1706+ result_poller = rcf .resource_groups .begin_export_template (resource_group_name ,
1707+ parameters = export_template_request )
17101708 result = LongRunningOperation (cmd .cli_ctx )(result_poller )
17111709 else :
17121710 result = rcf .resource_groups .begin_export_template (resource_group_name ,
1713- parameters = export_template_request )
1711+ parameters = export_template_request )
17141712
17151713 # pylint: disable=no-member
17161714 # On error, server still returns 200, with details in the error attribute
@@ -1722,11 +1720,11 @@ def export_group_as_template(
17221720 logger .warning (str (error ))
17231721 for detail in getattr (error , 'details' , None ) or []:
17241722 logger .error (detail .message )
1725-
1726- if output_format is None or output_format .lower () == "json" or output_format .lower () == "arm" :
1727- return result .template
1728- elif output_format .lower () == "bicep" :
1723+
1724+ if output_format .lower () == "bicep" :
17291725 return result .output
1726+ else :
1727+ return result .template
17301728
17311729
17321730def create_application (cmd , resource_group_name ,
0 commit comments