support acs gen2 #6402

leonard520 · 2023-06-14T05:58:03Z

This checklist is used to make sure that common guidelines for a pull request are followed.

Related command

General Guidelines

Have you run azdev style <YOUR_EXT> locally? (pip install azdev required)
Have you run python scripts/ci/test_index.py -q locally?

For new extensions:

My extension description/summary conforms to the Extension Summary Guidelines.

About Extension Publish

There is a pipeline to automatically build, upload and publish extension wheels.
Once your pull request is merged into main branch, a new pull request will be created to update src/index.json automatically.
You only need to update the version information in file setup.py and historical information in file HISTORY.rst in your PR but do not modify src/index.json.

azure-client-tools-bot-prd · 2023-06-14T05:58:05Z

Hi @leonard520,
Please write the description of changes which can be perceived by customers into HISTORY.rst.
If you want to release a new extension version, please update the version in setup.py as well.

yonzhan · 2023-06-14T05:58:16Z

Thank you for your contribution! We will review the pull request and get back to you soon.

yanzhudd · 2023-06-19T05:54:20Z

Please fix the CI

yanzhudd · 2023-06-19T06:05:45Z

src/spring/HISTORY.md

+* Add new command -- `az spring application-configuration-service create --generation` to support create Application Configuration Service with different generation
+* Add new command -- `az spring application-configuration-service update --generation` to support update Application Configuration Service to different generation
+* Add new command -- `az spring application-configuration-service git repo add --ca-cert-name` to support bind certificate to Application Configuration Service Gen2


Suggested change

* Add new command -- `az spring application-configuration-service create --generation` to support create Application Configuration Service with different generation

* Add new command -- `az spring application-configuration-service update --generation` to support update Application Configuration Service to different generation

* Add new command -- `az spring application-configuration-service git repo add --ca-cert-name` to support bind certificate to Application Configuration Service Gen2

* Add new command -- `az spring application-configuration-service create --generation` to support creating Application Configuration Service with different generation

* Add new command -- `az spring application-configuration-service update --generation` to support updating Application Configuration Service to different generation

* Add new command -- `az spring application-configuration-service git repo add --ca-cert-name` to support binding certificate to Application Configuration Service Gen2

yanzhudd · 2023-06-19T06:13:41Z

src/spring/azext_spring/_params.py

+        c.argument('application_configuration_service_generation',
+                   arg_group="Application Configuration Service",
+                   type=ConfigurationServiceGeneration,
+                   options_list=['--application-configuration-service-generation', '--acs-gen'],
+                   validator=validate_acs_create,
+                   help='(Enterprise Tier Only) Application Configuration Service Generation to enable. Allowed values are: ' + ', '.join(list(ConfigurationServiceGeneration)))
        c.argument('enable_application_live_view',


If this parameter has limited values, please add arg_type=get_enum_type(ConfigurationServiceGeneration) for the parameter and it is not necessay to specify the avaiable values manually in help.

Suggested change

c.argument('application_configuration_service_generation',

arg_group="Application Configuration Service",

type=ConfigurationServiceGeneration,

options_list=['--application-configuration-service-generation', '--acs-gen'],

validator=validate_acs_create,

help='(Enterprise Tier Only) Application Configuration Service Generation to enable. Allowed values are: ' + ', '.join(list(ConfigurationServiceGeneration)))

c.argument('enable_application_live_view',

c.argument('application_configuration_service_generation',

arg_group="Application Configuration Service",

arg_type=get_enum_type(ConfigurationServiceGeneration),

options_list=['--application-configuration-service-generation', '--acs-gen'],

validator=validate_acs_create,

help='(Enterprise Tier Only) Application Configuration Service Generation to enable.)

c.argument('enable_application_live_view',

Thanks! updated

yanzhudd · 2023-06-19T06:14:19Z

src/spring/azext_spring/_params.py

@@ -810,6 +817,10 @@ def prepare_logs_argument(c):
        with self.argument_context('spring application-configuration-service {}'.format(scope)) as c:
            c.argument('app', app_name_type, help='Name of app.', validator=validate_app_name)

+    for scope in ['create', 'update']:
+        with self.argument_context('spring application-configuration-service {}'.format(scope)) as c:
+            c.argument('generation', type=ConfigurationServiceGeneration, help='Generation. Allowed values are: ' + ', '.join(list(ConfigurationServiceGeneration)))


Same as above

yanzhudd · 2023-06-19T06:15:22Z

src/spring/azext_spring/_validators_enterprise.py

+def validate_acs_create(namespace):
+    if namespace.application_configuration_service_generation is not None:
+        if namespace.enable_application_configuration_service is False:
+            raise ArgumentUsageError("--application_configuration_service_generation can only be set when enable application configuration service.")


Suggested change

raise ArgumentUsageError("--application_configuration_service_generation can only be set when enable application configuration service.")

raise ArgumentUsageError("--application-configuration-service-generation can only be set when enable application configuration service.")

yanzhudd · 2023-06-19T06:17:38Z

src/spring/azext_spring/_validators_enterprise.py

+    if namespace.generation is None:
+        return
+    if (namespace.generation not in list(ConfigurationServiceGeneration)):
+        raise InvalidArgumentValueError("Allowed generation are: " + ', '.join(list(ConfigurationServiceGeneration)))


After adding arg_type=get_enum_type() to the parameter, it is not necessary to valid the input values manually.

yanzhudd · 2023-06-19T06:20:18Z

If there is new command added, please add test for the command.

yanzhudd · 2023-06-20T05:24:57Z

src/spring/azext_spring/_validators.py

@@ -106,6 +106,8 @@ def _check_tanzu_components_not_enable(cmd, namespace):
        raise ArgumentUsageError('--enable-application-live-view {}'.format(suffix))
    if namespace.enable_application_accelerator:
        raise ArgumentUsageError('--enable-application-accelerator {}'.format(suffix))
+    if namespace.application_configuration_service_generation:
+        raise ArgumentUsageError('--application_configuration_service_generation {}'.format(suffix))


Suggested change

raise ArgumentUsageError('--application_configuration_service_generation {}'.format(suffix))

raise ArgumentUsageError('--application-configuration-service-generation {}'.format(suffix))

yanzhudd · 2023-06-20T05:35:33Z

Do you want to release a new extension version? If so, please add the version to setup.py.

src/spring/HISTORY.md

zhoxing-ms · 2023-06-20T08:48:40Z

src/spring/azext_spring/_params.py

@@ -810,6 +817,10 @@ def prepare_logs_argument(c):
        with self.argument_context('spring application-configuration-service {}'.format(scope)) as c:
            c.argument('app', app_name_type, help='Name of app.', validator=validate_app_name)

+    for scope in ['create', 'update']:
+        with self.argument_context('spring application-configuration-service {}'.format(scope)) as c:
+            c.argument('generation', arg_type=get_enum_type(ConfigurationServiceGeneration), help='Generation.')


help='Generation.'

Could you please provide the more specific and understandable help message?

Co-authored-by: Xing Zhou <[email protected]>

azclibot · 2023-06-21T04:03:17Z

[Release] Update index.json for extension [ spring ] : https://dev.azure.com/azclitools/internal/_build/results?buildId=65801&view=results

Xiaoyun Ding added 2 commits June 14, 2023 13:47

support acs gen2

9f9e4d8

fix

3cb3c4f

azure-client-tools-bot-prd bot added this to the June 2023 (2023-07-04) milestone Jun 14, 2023

ghost requested review from zhoxing-ms and yanzhudd June 14, 2023 05:58

ghost assigned zhoxing-ms Jun 14, 2023

ghost added the Auto-Assign Auto assign by bot label Jun 14, 2023

ghost requested review from yonzhan and FumingZhang June 14, 2023 05:58

ghost added the AKS label Jun 14, 2023

Xiaoyun Ding added 2 commits June 14, 2023 14:06

add history

fc3ae4c

Merge branch 'main' into acs2

1f6244d

zhoxing-ms assigned yanzhudd Jun 19, 2023

yanzhudd reviewed Jun 19, 2023

View reviewed changes

Xiaoyun Ding added 2 commits June 19, 2023 22:23

address comment

23de20a

Merge branch 'main' into acs2

108699d

yanzhudd reviewed Jun 20, 2023

View reviewed changes

address comment

f34e553

yanzhudd approved these changes Jun 20, 2023

View reviewed changes

zhoxing-ms reviewed Jun 20, 2023

View reviewed changes

src/spring/HISTORY.md Outdated Show resolved Hide resolved

zhoxing-ms reviewed Jun 20, 2023

View reviewed changes

src/spring/HISTORY.md Outdated Show resolved Hide resolved

zhoxing-ms reviewed Jun 20, 2023

View reviewed changes

leonard520 and others added 3 commits June 20, 2023 19:14

Update src/spring/HISTORY.md

c3332fb

Co-authored-by: Xing Zhou <[email protected]>

Update src/spring/HISTORY.md

4839f41

Co-authored-by: Xing Zhou <[email protected]>

Update _params.py

52a5fe2

yanzhudd approved these changes Jun 21, 2023

View reviewed changes

zhoxing-ms approved these changes Jun 21, 2023

View reviewed changes

yanzhudd merged commit b8ae47b into Azure:main Jun 21, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

support acs gen2 #6402

support acs gen2 #6402

leonard520 commented Jun 14, 2023

azure-client-tools-bot-prd bot commented Jun 14, 2023

yonzhan commented Jun 14, 2023

yanzhudd commented Jun 19, 2023

yanzhudd Jun 19, 2023

leonard520 Jun 20, 2023

yanzhudd Jun 19, 2023

leonard520 Jun 20, 2023

yanzhudd Jun 19, 2023

leonard520 Jun 20, 2023

yanzhudd Jun 19, 2023

leonard520 Jun 20, 2023

yanzhudd Jun 19, 2023

leonard520 Jun 20, 2023

yanzhudd commented Jun 19, 2023

yanzhudd Jun 20, 2023

yanzhudd commented Jun 20, 2023

zhoxing-ms Jun 20, 2023

azclibot commented Jun 21, 2023

	raise ArgumentUsageError("--application_configuration_service_generation can only be set when enable application configuration service.")
	raise ArgumentUsageError("--application-configuration-service-generation can only be set when enable application configuration service.")

	raise ArgumentUsageError('--application_configuration_service_generation {}'.format(suffix))
	raise ArgumentUsageError('--application-configuration-service-generation {}'.format(suffix))

support acs gen2 #6402

support acs gen2 #6402

Conversation

leonard520 commented Jun 14, 2023

Related command

General Guidelines

About Extension Publish

azure-client-tools-bot-prd bot commented Jun 14, 2023

yonzhan commented Jun 14, 2023

yanzhudd commented Jun 19, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yanzhudd commented Jun 19, 2023

Choose a reason for hiding this comment

yanzhudd commented Jun 20, 2023

Choose a reason for hiding this comment

azclibot commented Jun 21, 2023