add build pool size parameter (#37)

Author: smile37773

src/spring-cloud/azext_spring_cloud/_build_service.py

@@ -0,0 +1,22 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+# pylint: disable=too-few-public-methods, unused-argument, redefined-builtin
+
+from .vendored_sdks.appplatform.v2022_01_01_preview import models as models_20220101preview
+
+DEFAULT_BUILD_SERVICE_NAME = "default"
+DEFAULT_BUILD_AGENT_POOL_NAME = "default"
+
+
+def _update_default_build_agent_pool(cmd, client, resource_group, name, build_pool_size=None):
+    if build_pool_size is not None:
+        build_properties = models_20220101preview.BuildServiceAgentPoolProperties(
+            pool_size=models_20220101preview.BuildServiceAgentPoolSizeProperties(
+                name=build_pool_size))
+        agent_pool_resource = models_20220101preview.BuildServiceAgentPoolResource(
+            properties=build_properties)
+        client.build_service_agent_pool.begin_update_put(
+            resource_group, name, DEFAULT_BUILD_SERVICE_NAME, DEFAULT_BUILD_AGENT_POOL_NAME, agent_pool_resource)

src/spring-cloud/azext_spring_cloud/_enterprise.py

@@ -274,7 +274,7 @@ def _queue_build(cmd, client, resource_group, service, name, relative_path, buil
     try:
         return client.build_service.create_or_update_build(resource_group,
                                                            service,
-                                                           builder,
+                                                           DEFAULT_BUILD_SERVICE_NAME,
                                                            name,
                                                            build).properties.triggered_build_result.id
     except (AttributeError, CloudError) as e:

src/spring-cloud/azext_spring_cloud/_params.py

@@ -18,7 +18,8 @@
                                      validate_buildpacks_binding_properties,
                                      validate_buildpacks_binding_secrets, only_support_enterprise,
                                      validate_buildpacks_binding_not_exist, validate_buildpacks_binding_exist,
-                                     validate_git_uri, validate_acs_patterns)
+                                     validate_git_uri, validate_acs_patterns, validate_builder,
+                                     validate_build_pool_size)
 from ._app_validator import (fulfill_deployment_param, active_deployment_exist, active_deployment_exist_under_app, ensure_not_active_deployment)
 from ._utils import ApiType
 
@@ -78,6 +79,12 @@ def load_arguments(self, _):
                         "--app-insights-key or --app-insights, "
                         "will create a new Application Insights instance in the same resource group.",
                    validator=validate_tracing_parameters_asc_create)
+        c.argument('build_pool_size',
+                   arg_type=get_enum_type(['S1', 'S2', 'S3', 'S4', 'S5']),
+                   validator=validate_build_pool_size,
+                   default='S1',
+                   is_preview=True,
+                   help='Only support in enterprise tier now. Size of build agent pool.')
 
     with self.argument_context('spring-cloud update') as c:
         c.argument('sku', arg_type=get_enum_type(['Basic', 'Standard', 'Enterprise']), validator=validate_sku, help='Name of SKU.')
@@ -104,6 +111,10 @@ def load_arguments(self, _):
                    deprecate_info=c.deprecate(target='az spring-cloud update --disable-app-insights',
                                               redirect='az spring-cloud app-insights update --disable',
                                               hide=True))
+        c.argument('build_pool_size',
+                   arg_type=get_enum_type(['S1', 'S2', 'S3', 'S4', 'S5']),
+                   is_preview=True,
+                   help='Only support in enterprise tier now. Size of build agent pool.')
 
     for scope in ['spring-cloud create', 'spring-cloud update']:
         with self.argument_context(scope) as c:
@@ -237,7 +248,7 @@ def prepare_logs_argument(c):
                 'main_entry', options_list=[
                     '--main-entry', '-m'], help="A string containing the path to the .NET executable relative to zip root.")
             c.argument(
-                'builder', help="The name of builder.", default="default")
+                'builder', help="Only support in enterprise tier now. The name of builder.", default="default", validator=validate_builder, is_preview=True)
             c.argument(
                 'target_module', help='Child module to be deployed, required for multiple jar packages built from source code.')
             c.argument(

src/spring-cloud/azext_spring_cloud/_validators_enterprise.py

@@ -17,6 +17,8 @@
 from ._util_enterprise import (
     is_enterprise_tier, get_client
 )
+from .vendored_sdks.appplatform.v2022_01_01_preview.models import _app_platform_management_client_enums as AppPlatformEnums
+from ._validators import _parse_sku_name
 
 
 logger = get_logger(__name__)
@@ -121,3 +123,18 @@ def validate_buildpacks_binding_exist(cmd, namespace):
                                   namespace.service,
                                   DEFAULT_BUILD_SERVICE_NAME,
                                   namespace.name)
+
+
+def validate_builder(cmd, namespace):
+    client = get_client(cmd)
+    builder = client.build_service_builder.get(namespace.resource_group,
+                                               namespace.service,
+                                               DEFAULT_BUILD_SERVICE_NAME,
+                                               namespace.builder)
+    if builder.properties.provisioning_state != AppPlatformEnums.BuilderProvisioningState.SUCCEEDED:
+        raise CLIError('The provision state of builder {} is not succeeded, please choose a succeeded builder.'
+                       .format(namespace.builder))
+
+def validate_build_pool_size(namespace):
+    if _parse_sku_name(namespace.sku) != 'enterprise':
+        namespace.build_pool_size = None

src/spring-cloud/azext_spring_cloud/custom.py

@@ -22,6 +22,7 @@
 from .vendored_sdks.appplatform.v2020_11_01_preview import models as models_20201101preview
 from .vendored_sdks.appplatform.v2021_06_01_preview import models as models_20210601preview
 from .vendored_sdks.appplatform.v2021_09_01_preview import models as models_20210901preview
+from .vendored_sdks.appplatform.v2022_01_01_preview import models as models_20220101preview
 from .vendored_sdks.appplatform.v2020_07_01.models import _app_platform_management_client_enums as AppPlatformEnums
 from .vendored_sdks.appplatform.v2020_11_01_preview import (
     AppPlatformManagementClient as AppPlatformManagementClient_20201101preview
@@ -48,6 +49,7 @@
 import json
 import base64
 from collections import defaultdict
+from ._build_service import _update_default_build_agent_pool
 
 logger = get_logger(__name__)
 DEFAULT_DEPLOYMENT_NAME = "default"
@@ -60,13 +62,14 @@
 DELETE_PRODUCTION_DEPLOYMENT_WARNING = "You are going to delete production deployment, the app will be inaccessible after this operation."
 LOG_RUNNING_PROMPT = "This command usually takes minutes to run. Add '--verbose' parameter if needed."
 
+DEFAULT_BUILD_SERVICE_NAME = "default"
 
 def spring_cloud_create(cmd, client, resource_group, name, location=None,
                         vnet=None, service_runtime_subnet=None, app_subnet=None, reserved_cidr_range=None,
                         service_runtime_network_resource_group=None, app_network_resource_group=None,
                         app_insights_key=None, app_insights=None, sampling_rate=None,
                         disable_app_insights=None, enable_java_agent=None,
-                        sku=None, tags=None, no_wait=False):
+                        sku=None, tags=None, build_pool_size=None, no_wait=False):
     """
     If app_insights_key, app_insights and disable_app_insights are all None,
     will still create an application insights and enable application insights.
@@ -101,6 +104,9 @@ def spring_cloud_create(cmd, client, resource_group, name, location=None,
     _update_application_insights_asc_create(cmd, resource_group, name, location,
                                             app_insights_key, app_insights, sampling_rate,
                                             disable_app_insights, no_wait)
+    _update_default_build_agent_pool(
+        cmd, client, resource_group, name, build_pool_size)
+
     return poller
 
 
@@ -127,7 +133,7 @@ def _update_application_insights_asc_create(cmd, resource_group, name, location,
 
 
 def spring_cloud_update(cmd, client, resource_group, name, app_insights_key=None, app_insights=None,
-                        disable_app_insights=None, sku=None, tags=None, no_wait=False):
+                        disable_app_insights=None, sku=None, tags=None, build_pool_size=None, no_wait=False):
     """
     TODO (jiec) app_insights_key, app_insights and disable_app_insights are marked as deprecated.
     Will be decommissioned in future releases.
@@ -149,6 +155,9 @@ def spring_cloud_update(cmd, client, resource_group, name, app_insights_key=None
     _update_application_insights_asc_update(cmd, resource_group, name, location,
                                             app_insights_key, app_insights, disable_app_insights, no_wait)
 
+    _update_default_build_agent_pool(
+        cmd, client, resource_group, name, build_pool_size)
+
     # update service tags
     if tags is not None:
         updated_resource.tags = tags