[Spring Cloud] Integrate tanzu components with service and app #4300

ninpan-ms · 2022-01-06T07:43:04Z

The pr is part of main...VSChina:enterprise.

Integrate Tanzu components creation with service create commands.
Add --config-file-pattern parameter to app deploy/update/deployment create

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 PR is merged into master branch, a new PR will be created to update src/index.json automatically.
The precondition is to put your code inside this repo and upgrade the version in the PR but do not modify src/index.json.

ninpan-ms · 2022-01-06T07:45:09Z

#4294

src/spring-cloud/azext_spring_cloud/_tanzu_component.py

src/spring-cloud/azext_spring_cloud/spring_cloud_instance.py

yuwzho · 2022-01-06T07:53:47Z

src/spring-cloud/azext_spring_cloud/spring_cloud_instance.py

@@ -76,8 +80,13 @@ def before_create(self, **_):
        pass

    def after_create(self, no_wait=None, **kwargs):
+        service = self.client.services.get(self.resource_group, self.name)


sku is already in the kwargs. Don't need to get from remote.

yuwzho · 2022-01-06T07:54:45Z

src/spring-cloud/azext_spring_cloud/_tanzu_component.py

+        logger.warning(" - Creating Application Configuration Service ..")
+        acs_resource = models.ConfigurationServiceResource()
+        return client.configuration_services.begin_create_or_update(resource_group, service, DEFAULT_NAME, acs_resource)
+    return


redundant return?

yuwzho · 2022-01-06T07:55:03Z

src/spring-cloud/azext_spring_cloud/_tanzu_component.py

+def create_service_registry(cmd, client, resource_group, service, enable_service_registry):
+    if enable_service_registry:
+        logger.warning(" - Creating Service Registry ..")
+        return client.service_registries.begin_create_or_update(resource_group, service, DEFAULT_NAME)


There is no service registry body, is this on purpose?

Yes, it's expected

src/spring-cloud/azext_spring_cloud/_deployment_factory.py

yonzhan · 2022-01-06T09:29:57Z

Spring Cloud

wangzelin007

May I ask you to add some tests for those new commands?

zhoxing-ms · 2022-01-10T05:11:21Z

src/spring-cloud/azext_spring_cloud/_params.py

+        c.argument('enable_application_configuration_service',
+                   arg_type=get_three_state_flag(),
+                   default=False,
+                   is_preview=True,
+                   options_list=['--enable-application-configuration-service', '--enable-acs'],
+                   help='(Enterprise Tier Only) Enable Application Configuration Service.')
+        c.argument('enable_service_registry',
+                   arg_type=get_three_state_flag(),
+                   default=False,
+                   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",
+                   arg_type=get_three_state_flag(),
+                   default=False,
+                   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",
+                   arg_type=get_three_state_flag(),
+                   default=False,
+                   is_preview=True,
+                   help='(Enterprise Tier Only) Enable API portal.')


Could we consider using action='store_true' instead of get_three_state_flag() ?

Updated, thanks for suggestion!

zhoxing-ms · 2022-01-10T05:18:48Z

src/spring-cloud/azext_spring_cloud/_params.py

@@ -219,6 +257,13 @@ def prepare_logs_argument(c):
            c.argument('env', env_type)
            c.argument('disable_probe', arg_type=get_three_state_flag(), help='If true, disable the liveness and readiness probe.')

+    for scope in ['update', 'deployment create', 'deploy']:
+        with self.argument_context('spring-cloud app {}'.format(scope)) as c:
+            c.argument('config_file_patterns', type=str,


type=str is the default setting, so we don't need an explicit declaration

zhoxing-ms · 2022-01-10T05:24:23Z

src/spring-cloud/azext_spring_cloud/_validators.py

+    if namespace.enable_application_configuration_service:
+        raise InvalidArgumentValueError('--enable-application-configuration-service {}'.format(suffix))
+    if namespace.enable_service_registry:
+        raise InvalidArgumentValueError('--enable-service-registry {}'.format(suffix))
+    if namespace.enable_gateway:
+        raise InvalidArgumentValueError('--enable-gateway {}'.format(suffix))
+    if namespace.enable_api_portal:
+        raise InvalidArgumentValueError('--enable-api-portal {}'.format(suffix))


ArgumentUsageError may be the more appropriate error type, right?

zhoxing-ms · 2022-01-10T05:29:27Z

src/spring-cloud/azext_spring_cloud/_validators_enterprise.py

+        if namespace.enable_gateway is False:
+            raise InvalidArgumentValueError("--gateway-instance-count can only be set when enable gateway.")
        if namespace.gateway_instance_count < 1:
            raise InvalidArgumentValueError("--gateway-instance-count must be greater than 0")


 def validate_api_portal_instance_count(namespace):
    if namespace.api_portal_instance_count is not None:
+        if namespace.enable_api_portal is False:
+            raise InvalidArgumentValueError("--api-portal-instance-count can only be set when enable API portal.")


Same as above

Co-authored-by: Yuwei Zhou <yuwzho@microsoft.com>

ninpan-ms changed the title ~~Integrate tanzu components with service and app~~ [Spring Cloud] Integrate tanzu components with service and app Jan 6, 2022

yuwzho reviewed Jan 6, 2022

View reviewed changes

src/spring-cloud/azext_spring_cloud/_deployment_factory.py Outdated Show resolved Hide resolved

yonzhan requested review from zhoxing-ms and wangzelin007 January 6, 2022 09:29

yonzhan assigned zhoxing-ms Jan 6, 2022

yonzhan added this to the Jan 2022 (2022-02-08) milestone Jan 6, 2022

wangzelin007 reviewed Jan 7, 2022

View reviewed changes

yuwzho approved these changes Jan 7, 2022

View reviewed changes

ninpan-ms closed this Jan 7, 2022

ninpan-ms reopened this Jan 7, 2022

ninpan-ms closed this Jan 7, 2022

ninpan-ms reopened this Jan 7, 2022

zhoxing-ms reviewed Jan 10, 2022

View reviewed changes

ninpan-ms force-pushed the ninpan/integrate-tanzu branch 2 times, most recently from 90c1fbd to 168448b Compare January 11, 2022 04:59

ninpan-ms and others added 9 commits January 11, 2022 15:09

resolve conflict

3f64063

Update config_file_patterns None

a66ff47

Co-authored-by: Yuwei Zhou <yuwzho@microsoft.com>

Update kwargs

062c22b

Co-authored-by: Yuwei Zhou <yuwzho@microsoft.com>

Update kwargs

5846335

Co-authored-by: Yuwei Zhou <yuwzho@microsoft.com>

linter check

e7fa510

fix test

e045ccb

Add test

cad1a4d

Add validate for parameters

772dda8

fix

9114b07

ninpan-ms added 7 commits January 11, 2022 15:10

fix test

fc32551

fix

5488c18

fix comment

13d724a

fix test

56bc967

Add warning when clear patterns

99b0722

fix transformer

3b6f231

fix type of properties

4238246

ninpan-ms force-pushed the ninpan/integrate-tanzu branch from 168448b to 4238246 Compare January 11, 2022 07:13

fix lint

baaccba

zhoxing-ms approved these changes Jan 11, 2022

View reviewed changes

wangzelin007 approved these changes Jan 11, 2022

View reviewed changes

zhoxing-ms merged commit 44ce91b into Azure:main Jan 11, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Spring Cloud] Integrate tanzu components with service and app #4300

[Spring Cloud] Integrate tanzu components with service and app #4300

ninpan-ms commented Jan 6, 2022

ninpan-ms commented Jan 6, 2022

yuwzho Jan 6, 2022

ninpan-ms Jan 6, 2022

yuwzho Jan 6, 2022

ninpan-ms Jan 6, 2022

yuwzho Jan 6, 2022

ninpan-ms Jan 6, 2022

yonzhan commented Jan 6, 2022

wangzelin007 left a comment

zhoxing-ms Jan 10, 2022 •

edited

Loading

ninpan-ms Jan 10, 2022

zhoxing-ms Jan 10, 2022

ninpan-ms Jan 10, 2022

zhoxing-ms Jan 10, 2022

ninpan-ms Jan 10, 2022

zhoxing-ms Jan 10, 2022

[Spring Cloud] Integrate tanzu components with service and app #4300

[Spring Cloud] Integrate tanzu components with service and app #4300

Conversation

ninpan-ms commented Jan 6, 2022

General Guidelines

About Extension Publish

ninpan-ms commented Jan 6, 2022

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

yonzhan commented Jan 6, 2022

wangzelin007 left a comment

Choose a reason for hiding this comment

zhoxing-ms Jan 10, 2022 • edited Loading

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

zhoxing-ms Jan 10, 2022 •

edited

Loading