From 1e06b936995a62103c0a348c494df39aa64fc826 Mon Sep 17 00:00:00 2001 From: Qingyi Liu Date: Tue, 24 May 2022 16:17:52 +0800 Subject: [PATCH 1/4] remove preview tags for enterprise tier GA --- src/spring/azext_spring/_params.py | 2 +- src/spring/azext_spring/commands.py | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/spring/azext_spring/_params.py b/src/spring/azext_spring/_params.py index 9d1a2f7fa77..af5f3338227 100644 --- a/src/spring/azext_spring/_params.py +++ b/src/spring/azext_spring/_params.py @@ -357,7 +357,7 @@ def prepare_logs_argument(c): c.argument( 'disable_validation', arg_type=get_three_state_flag(), help='If true, disable jar validation.') - c.argument('builder', help='(Enterprise Tier Only) Build service builder used to build the executable.', default='default', is_preview=True) + c.argument('builder', help='(Enterprise Tier Only) Build service builder used to build the executable.', default='default') c.argument( 'main_entry', options_list=[ '--main-entry', '-m'], help="A string containing the path to the .NET executable relative to zip root.") diff --git a/src/spring/azext_spring/commands.py b/src/spring/azext_spring/commands.py index 713d1dd04d3..bb5424d34af 100644 --- a/src/spring/azext_spring/commands.py +++ b/src/spring/azext_spring/commands.py @@ -224,8 +224,7 @@ def load_command_table(self, _): with self.command_group('spring service-registry', custom_command_type=service_registry_cmd_group, - exception_handler=handle_asc_exception, - is_preview=True) as g: + exception_handler=handle_asc_exception) as g: g.custom_show_command('show', 'service_registry_show', table_transformer=transform_service_registry_output) g.custom_command('bind', 'service_registry_bind') @@ -233,8 +232,7 @@ def load_command_table(self, _): with self.command_group('spring application-configuration-service', custom_command_type=application_configuration_service_cmd_group, - exception_handler=handle_asc_exception, - is_preview=True) as g: + exception_handler=handle_asc_exception) as g: g.custom_command('clear', 'application_configuration_service_clear') g.custom_show_command('show', 'application_configuration_service_show', table_transformer=transform_application_configuration_service_output) @@ -251,8 +249,7 @@ def load_command_table(self, _): with self.command_group('spring gateway', custom_command_type=gateway_cmd_group, - exception_handler=handle_asc_exception, - is_preview=True) as g: + exception_handler=handle_asc_exception) as g: g.custom_show_command('show', 'gateway_show', table_transformer=transform_spring_cloud_gateway_output) g.custom_command('update', 'gateway_update', validator=validate_gateway_update, supports_no_wait=True) g.custom_command('clear', 'gateway_clear', supports_no_wait=True) @@ -298,7 +295,7 @@ def load_command_table(self, _): with self.command_group('spring build-service builder', custom_command_type=builder_cmd_group, - exception_handler=handle_asc_exception, is_preview=True) as g: + exception_handler=handle_asc_exception) as g: g.custom_command('create', 'create_or_update_builder', supports_no_wait=True) g.custom_command('update', 'create_or_update_builder', supports_no_wait=True) g.custom_show_command('show', 'builder_show') @@ -306,14 +303,14 @@ def load_command_table(self, _): with self.command_group('spring build-service builder buildpack-binding', custom_command_type=buildpack_binding_cmd_group, - exception_handler=handle_asc_exception, is_preview=True) as g: + exception_handler=handle_asc_exception) as g: g.custom_command('create', 'create_or_update_buildpack_binding') g.custom_command('set', 'create_or_update_buildpack_binding') g.custom_show_command('show', 'buildpack_binding_show') g.custom_command('list', 'buildpack_binding_list') g.custom_command('delete', 'buildpack_binding_delete', confirmation=True) - with self.command_group('spring build-service', exception_handler=handle_asc_exception, is_preview=True): + with self.command_group('spring build-service', exception_handler=handle_asc_exception): pass with self.command_group('spring', exception_handler=handle_asc_exception): From 85f17ebe7120a0e581f755f187bd7ae7f1d59d27 Mon Sep 17 00:00:00 2001 From: Qingyi Liu Date: Tue, 24 May 2022 16:24:38 +0800 Subject: [PATCH 2/4] remove preview tags --- src/spring/azext_spring/_params.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/spring/azext_spring/_params.py b/src/spring/azext_spring/_params.py index af5f3338227..97f73562d56 100644 --- a/src/spring/azext_spring/_params.py +++ b/src/spring/azext_spring/_params.py @@ -117,39 +117,32 @@ def load_arguments(self, _): c.argument('build_pool_size', arg_type=get_enum_type(['S1', 'S2', 'S3', 'S4', 'S5']), validator=validate_build_pool_size, - is_preview=True, help='(Enterprise Tier Only) Size of build agent pool. See https://aka.ms/azure-spring-cloud-build-service-docs for size info.') c.argument('enable_application_configuration_service', action='store_true', - is_preview=True, options_list=['--enable-application-configuration-service', '--enable-acs'], help='(Enterprise Tier Only) Enable Application Configuration Service.') c.argument('enable_service_registry', action='store_true', - is_preview=True, options_list=['--enable-service-registry', '--enable-sr'], help='(Enterprise Tier Only) Enable Service Registry.') c.argument('enable_gateway', arg_group="Spring Cloud Gateway", action='store_true', - is_preview=True, help='(Enterprise Tier Only) Enable Spring Cloud Gateway.') c.argument('gateway_instance_count', arg_group="Spring Cloud Gateway", type=int, validator=validate_gateway_instance_count, - is_preview=True, help='(Enterprise Tier Only) Number of Spring Cloud Gateway instances.') c.argument('enable_api_portal', arg_group="API portal", action='store_true', - is_preview=True, help='(Enterprise Tier Only) Enable API portal.') c.argument('api_portal_instance_count', arg_group="API portal", type=int, validator=validate_api_portal_instance_count, - is_preview=True, options_list=['--api-portal-instance-count', '--ap-instance'], help='(Enterprise Tier Only) Number of API portal instances.') @@ -184,7 +177,6 @@ def load_arguments(self, _): hide=True)) c.argument('build_pool_size', arg_type=get_enum_type(['S1', 'S2', 'S3', 'S4', 'S5']), - is_preview=True, help='(Enterprise Tier Only) Size of build agent pool. See https://aka.ms/azure-spring-cloud-build-service-docs for size info.') for scope in ['spring create', 'spring update']: From 562551d958f32ae1572a2bbd5a0aa8c00d685a0d Mon Sep 17 00:00:00 2001 From: Qingyi Liu Date: Tue, 24 May 2022 16:31:37 +0800 Subject: [PATCH 3/4] remove preview tags --- src/spring/azext_spring/_params.py | 6 +++++- src/spring/azext_spring/commands.py | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/spring/azext_spring/_params.py b/src/spring/azext_spring/_params.py index 97f73562d56..a1744158776 100644 --- a/src/spring/azext_spring/_params.py +++ b/src/spring/azext_spring/_params.py @@ -129,21 +129,25 @@ def load_arguments(self, _): c.argument('enable_gateway', arg_group="Spring Cloud Gateway", action='store_true', + is_preview=True, help='(Enterprise Tier Only) Enable Spring Cloud Gateway.') c.argument('gateway_instance_count', arg_group="Spring Cloud Gateway", type=int, validator=validate_gateway_instance_count, + is_preview=True, help='(Enterprise Tier Only) Number of Spring Cloud Gateway instances.') c.argument('enable_api_portal', arg_group="API portal", action='store_true', + is_preview=True, help='(Enterprise Tier Only) Enable API portal.') c.argument('api_portal_instance_count', arg_group="API portal", type=int, validator=validate_api_portal_instance_count, options_list=['--api-portal-instance-count', '--ap-instance'], + is_preview=True, help='(Enterprise Tier Only) Number of API portal instances.') with self.argument_context('spring update') as c: @@ -332,7 +336,7 @@ def prepare_logs_argument(c): c.argument('config_file_patterns', help="(Enterprise Tier Only) Config file patterns separated with \',\' to decide which patterns " "of Application Configuration Service will be used. Use '\"\"' to clear existing configurations.", - validator=validate_config_file_patterns, is_preview=True) + validator=validate_config_file_patterns) with self.argument_context('spring app scale') as c: c.argument('cpu', arg_type=cpu_type) diff --git a/src/spring/azext_spring/commands.py b/src/spring/azext_spring/commands.py index bb5424d34af..4ca1680f2f1 100644 --- a/src/spring/azext_spring/commands.py +++ b/src/spring/azext_spring/commands.py @@ -249,7 +249,8 @@ def load_command_table(self, _): with self.command_group('spring gateway', custom_command_type=gateway_cmd_group, - exception_handler=handle_asc_exception) as g: + exception_handler=handle_asc_exception, + is_preview=True) as g: g.custom_show_command('show', 'gateway_show', table_transformer=transform_spring_cloud_gateway_output) g.custom_command('update', 'gateway_update', validator=validate_gateway_update, supports_no_wait=True) g.custom_command('clear', 'gateway_clear', supports_no_wait=True) From ecc8956c2f20ca00f807a64d93af1ebbadcd2624 Mon Sep 17 00:00:00 2001 From: Qingyi Liu Date: Tue, 24 May 2022 16:34:37 +0800 Subject: [PATCH 4/4] remove preview tags --- src/spring/azext_spring/_params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spring/azext_spring/_params.py b/src/spring/azext_spring/_params.py index a1744158776..ced0f787aa7 100644 --- a/src/spring/azext_spring/_params.py +++ b/src/spring/azext_spring/_params.py @@ -146,8 +146,8 @@ def load_arguments(self, _): arg_group="API portal", type=int, validator=validate_api_portal_instance_count, - options_list=['--api-portal-instance-count', '--ap-instance'], is_preview=True, + options_list=['--api-portal-instance-count', '--ap-instance'], help='(Enterprise Tier Only) Number of API portal instances.') with self.argument_context('spring update') as c: