[ASC] [Azure Spring Cloud] Switch api-version from 2019-05-01-preview to 2020-07-01

src/spring-cloud/HISTORY.md

@@ -1,5 +1,9 @@
 Release History
 ===============
+2.0.0
+-----
+* Switch api-version from 2019-05-01-preview to 2020-07-01
+
 1.2.0
 -----
 * Add support for sovereign cloud.

src/spring-cloud/azext_spring_cloud/_client_factory.py

@@ -32,6 +32,10 @@ def cf_bindings(cli_ctx, *_):
     return cf_spring_cloud(cli_ctx).bindings
 
 
+def cf_config_servers(cli_ctx, *_):
+    return cf_spring_cloud(cli_ctx).config_servers
+
+
 def cf_certificates(cli_ctx, *_):
     return cf_spring_cloud(cli_ctx).certificates
 

src/spring-cloud/azext_spring_cloud/_help.py

@@ -21,9 +21,9 @@
       text: az spring-cloud create -n MyService -g MyResourceGroup -l westus --app-insights-key MyInstrumentationKey
     - name: Create a new Azure Spring Cloud with distributed tracing disabled.
       text: az spring-cloud create -n MyService -g MyResourceGroup --disable-distributed-tracing
-    - name: Create a new Azure Spring Cloud with VNet-inected via giving VNet name in current resource group
+    - name: Create a new Azure Spring Cloud with VNet-injected via giving VNet name in current resource group
       text: az spring-cloud create -n MyService -g MyResourceGroup --vnet MyVNet --app-subnet MyAppSubnet --service-runtime-subnet MyServiceRuntimeSubnet
-    - name: Create a new Azure Spring Cloud with VNet-inected via giving subnets resource ID
+    - name: Create a new Azure Spring Cloud with VNet-injected via giving subnets resource ID
       text: az spring-cloud create -n MyService -g MyResourceGroup --app-subnet /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyVnetRg/providers/Microsoft.Network/VirtualNetworks/test-vnet/subnets/app --service-runtime-subnet /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyVnetRg/providers/Microsoft.Network/VirtualNetworks/test-vnet/subnets/svc --reserved-cidr-range 10.0.0.0/16,10.1.0.0/16,10.2.0.1/16
 """
 
@@ -284,22 +284,22 @@
 
 helps['spring-cloud config-server git repo add'] = """
     type: command
-    short-summary: Set add a new repositry of git property of Config Server.
+    short-summary: Add a new repository of git property of Config Server.
 """
 
 helps['spring-cloud config-server git repo remove'] = """
     type: command
-    short-summary: Remove an existing repositry of git property of Config Server.
+    short-summary: Remove an existing repository of git property of Config Server.
 """
 
 helps['spring-cloud config-server git repo update'] = """
     type: command
-    short-summary: Override an existing repositry of git property of Config Server, will totally override the old one.
+    short-summary: Override an existing repository of git property of Config Server, will totally override the old one.
 """
 
 helps['spring-cloud config-server git repo list'] = """
     type: command
-    short-summary: List all repositries of git property of Config Server.
+    short-summary: List all repositories of git property of Config Server.
 """
 
 helps['spring-cloud app binding'] = """

src/spring-cloud/azext_spring_cloud/_params.py

@@ -10,7 +10,8 @@
 from ._validators import (validate_env, validate_cosmos_type, validate_resource_id, validate_location,
                           validate_name, validate_app_name, validate_deployment_name, validate_log_lines,
                           validate_log_limit, validate_log_since, validate_sku, validate_jvm_options,
-                          validate_vnet, validate_vnet_required_parameters, validate_node_resource_group)
+                          validate_vnet, validate_vnet_required_parameters, validate_node_resource_group,
+                          validate_tracing_parameters, validate_instance_count)
 from ._utils import ApiType
 
 from .vendored_sdks.appplatform.models import RuntimeVersion, TestKeyType
@@ -36,7 +37,7 @@ def load_arguments(self, _):
         c.argument('sku', type=str, validator=validate_sku, help='Name of SKU, the value is "Basic" or "Standard"')
         c.argument('reserved_cidr_range', help='Comma-separated list of IP address ranges in CIDR format. The IP ranges are reserved to host underlying Azure Spring Cloud infrastructure, which should be 3 at least /16 unused IP ranges, must not overlap with any Subnet IP ranges.', validator=validate_vnet_required_parameters)
         c.argument('vnet', help='The name or ID of an existing Virtual Network into which to deploy the Spring Cloud instance.', validator=validate_vnet_required_parameters)
-        c.argument('app_subnet', help='The name or ID of an existing subnet in "vnet" into which to deploy the Spring Cloud app. Required when deploying into a Virtual Network.', validator=validate_vnet_required_parameters)
+        c.argument('app_subnet', help='The name or ID of an existing subnet in "vnet" into which to deploy the Spring Cloud app. Required when deploying into a Virtual Network. Smaller subnet sizes are supported, please refer: https://aka.ms/azure-spring-cloud-smaller-subnet-vnet-docs', validator=validate_vnet_required_parameters)
         c.argument('service_runtime_subnet', options_list=['--service-runtime-subnet', '--svc-subnet'], help='The name or ID of an existing subnet in "vnet" into which to deploy the Spring Cloud service runtime. Required when deploying into a Virtual Network.', validator=validate_vnet)
         c.argument('service_runtime_network_resource_group', options_list=['--service-runtime-network-resource-group', '--svc-nrg'], help='The resource group where all network resources for Azure Spring Cloud service runtime will be created in.', validator=validate_node_resource_group)
         c.argument('app_network_resource_group', options_list=['--app-network-resource-group', '--app-nrg'], help='The resource group where all network resources for apps will be created in.', validator=validate_node_resource_group)
@@ -47,12 +48,15 @@ def load_arguments(self, _):
     for scope in ['spring-cloud create', 'spring-cloud update']:
         with self.argument_context(scope) as c:
             c.argument('app_insights_key',
-                       help="Instrumentation key of the existing Application Insights to be added for the distributed tracing")
+                       help="Instrumentation key of the existing Application Insights to be added for the distributed tracing",
+                       validator=validate_tracing_parameters)
             c.argument('app_insights',
-                       help="Name of the existing Application Insights in the same Resource Group. Or Resource ID of the existing Application Insights in a different Resource Group.")
+                       help="Name of the existing Application Insights in the same Resource Group. Or Resource ID of the existing Application Insights in a different Resource Group.",
+                       validator=validate_tracing_parameters)
             c.argument('disable_distributed_tracing',
                        arg_type=get_three_state_flag(),
-                       help="Disable distributed tracing, if not disabled and no existing Application Insights specified with --app-insights-key or --app-insights, will create a new Application Insights instance in the same resource group.")
+                       help="Disable distributed tracing, if not disabled and no existing Application Insights specified with --app-insights-key or --app-insights, will create a new Application Insights instance in the same resource group.",
+                       validator=validate_tracing_parameters)
             c.argument('tags', arg_type=tags_type)
 
     with self.argument_context('spring-cloud test-endpoint renew-key') as c:
@@ -73,7 +77,7 @@ def load_arguments(self, _):
         c.argument('memory', type=int, default=1,
                    help='Number of GB of memory per instance.')
         c.argument('instance_count', type=int,
-                   default=1, help='Number of instance.')
+                   default=1, help='Number of instance.', validator=validate_instance_count)
 
     with self.argument_context('spring-cloud app update') as c:
         c.argument('is_public', arg_type=get_three_state_flag(), help='If true, assign endpoint')
@@ -124,7 +128,7 @@ def load_arguments(self, _):
     with self.argument_context('spring-cloud app scale') as c:
         c.argument('cpu', type=int, help='Number of virtual cpu cores per instance.')
         c.argument('memory', type=int, help='Number of GB of memory per instance.')
-        c.argument('instance_count', type=int, help='Number of instance.')
+        c.argument('instance_count', type=int, help='Number of instance.', validator=validate_instance_count)
 
     for scope in ['spring-cloud app deploy', 'spring-cloud app deployment create']:
         with self.argument_context(scope) as c:
@@ -144,7 +148,7 @@ def load_arguments(self, _):
                    action='store_true')
         c.argument('cpu', type=int, help='Number of virtual cpu cores per instance.')
         c.argument('memory', type=int, help='Number of GB of memory per instance.')
-        c.argument('instance_count', type=int, help='Number of instance.')
+        c.argument('instance_count', type=int, help='Number of instance.', validator=validate_instance_count)
 
     with self.argument_context('spring-cloud app deployment') as c:
         c.argument('app', app_name_type, help='Name of app.',
@@ -207,7 +211,7 @@ def load_arguments(self, _):
 
     for scope in ['spring-cloud config-server git repo add', 'spring-cloud config-server git repo update', 'spring-cloud config-server git repo remove']:
         with self.argument_context(scope) as c:
-            c.argument('repo_name', help='Uri of the repo.')
+            c.argument('repo_name', help='Name of the repo.')
 
     for scope in ['spring-cloud config-server git repo add', 'spring-cloud config-server git repo update']:
         with self.argument_context(scope) as c:

src/spring-cloud/azext_spring_cloud/_transformers.py

@@ -32,7 +32,7 @@ def transform_app_table_output(result):
 
         if 'activeDeployment' in item['properties']:
             isStarted = item['properties']['activeDeployment']['properties']['status'].upper() == "RUNNING"
-            instance_count = item['properties']['activeDeployment']['properties']['deploymentSettings']['instanceCount']
+            instance_count = item['properties']['activeDeployment']['sku']['capacity']
             instances = item['properties']['activeDeployment']['properties']['instances']
             if instances is None:
                 instances = []
@@ -61,7 +61,7 @@ def transform_spring_cloud_deployment_output(result):
 
     for item in result:
         isStarted = item['properties']['status'].upper() == "RUNNING"
-        instance_count = item['properties']['deploymentSettings']['instanceCount']
+        instance_count = item['sku']['capacity']
         instances = item['properties']['instances']
         if instances is None:
             instances = []

src/spring-cloud/azext_spring_cloud/_validators.py

@@ -43,6 +43,12 @@ def validate_sku(namespace):
             raise CLIError("The pricing tier only accepts value [Basic, Standard]")
 
 
+def validate_instance_count(namespace):
+    if namespace.instance_count is not None:
+        if namespace.instance_count < 1:
+            raise CLIError("--instance-count must be greater than 0")
+
+
 def validate_name(namespace):
     namespace.name = namespace.name.lower()
     matchObj = match(r'^[a-z][a-z0-9-]{2,30}[a-z0-9]$', namespace.name)
@@ -145,6 +151,14 @@ def validate_jvm_options(namespace):
         namespace.jvm_options = namespace.jvm_options.strip('\'')
 
 
+def validate_tracing_parameters(namespace):
+    if (namespace.app_insights or namespace.app_insights_key) and namespace.disable_distributed_tracing:
+        raise CLIError("Conflict detected: '--app-insights' or '--app-insights-key'"
+                       "can not be set with '--disable-distributed-tracing'.")
+    if namespace.app_insights and namespace.app_insights_key:
+        raise CLIError("Conflict detected: '--app-insights' and '--app-insights-key' can not be set at the same time.")
+
+
 def validate_vnet(cmd, namespace):
     if not namespace.vnet and not namespace.app_subnet and \
        not namespace.service_runtime_subnet and not namespace.reserved_cidr_range:
@@ -206,14 +220,15 @@ def _validate_subnet(namespace, subnet):
     limit = 32
     if subnet.id.lower() == namespace.app_subnet.lower():
         name = 'app-subnet'
-        limit = 24
+        limit = 28
     elif subnet.id.lower() == namespace.service_runtime_subnet.lower():
         name = 'service-runtime-subnet'
         limit = 28
     else:
         return
     if subnet.route_table:
-        raise CLIError('--{} should not associate with any route table.'.format(name))
+        raise CLIError('--{} with existing route table is not supported. Please remove route table from the subnet,'
+                       ' or select another subnet.'.format(name))
     if subnet.ip_configurations:
         raise CLIError('--{} should not have connected device.'.format(name))
     address = ip_network(subnet.address_prefix, strict=False)