Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add build pool size parameter #37

Merged
merged 5 commits into from
Dec 16, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/spring-cloud/azext_spring_cloud/_build_service.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# --------------------------------------------------------------------------------------------
# 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):
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)
2 changes: 1 addition & 1 deletion src/spring-cloud/azext_spring_cloud/_enterprise.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 11 additions & 2 deletions src/spring-cloud/azext_spring_cloud/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -77,6 +78,11 @@ 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',
smile37773 marked this conversation as resolved.
Show resolved Hide resolved
arg_type=get_enum_type(['S1', 'S2', 'S3', 'S4', 'S5']),
validator=validate_build_pool_size,
default='S1',
help='Size of build agent pool.')

with self.argument_context('spring-cloud update') as c:
c.argument('app_insights_key',
Expand All @@ -102,6 +108,9 @@ 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',
smile37773 marked this conversation as resolved.
Show resolved Hide resolved
arg_type=get_enum_type(['S1', 'S2', 'S3', 'S4', 'S5']),
help='Size of build agent pool.')

for scope in ['spring-cloud create', 'spring-cloud update']:
with self.argument_context(scope) as c:
Expand Down Expand Up @@ -236,7 +245,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="The name of builder.", default="default", validator=validate_builder)
yuwzho marked this conversation as resolved.
Show resolved Hide resolved
c.argument(
'target_module', help='Child module to be deployed, required for multiple jar packages built from source code.')
c.argument(
Expand Down
16 changes: 16 additions & 0 deletions src/spring-cloud/azext_spring_cloud/_validators_enterprise.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
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


logger = get_logger(__name__)
Expand Down Expand Up @@ -121,3 +122,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 namespace.sku.name != 'E0':
smile37773 marked this conversation as resolved.
Show resolved Hide resolved
namespace.build_pool_size = None
15 changes: 13 additions & 2 deletions src/spring-cloud/azext_spring_cloud/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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.
Expand Down Expand Up @@ -101,6 +104,10 @@ 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)
if build_pool_size is not None:
_update_default_build_agent_pool(
cmd, client, resource_group, name, build_pool_size)

return poller


Expand All @@ -127,7 +134,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.
Expand All @@ -150,6 +157,10 @@ 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)

if build_pool_size is not None:
_update_default_build_agent_pool(
smile37773 marked this conversation as resolved.
Show resolved Hide resolved
cmd, client, resource_group, name, build_pool_size)

# update service tags
if tags is not None:
updated_resource.tags = tags
Expand Down