[Spring-Cloud] Upgrade version

src/spring-cloud/HISTORY.md

@@ -1,5 +1,19 @@
 Release History
 ===============
+3.0.0
+---
+* New preview argument `az spring-cloud create` has new argument "--sku=Enterprise" to support Azure Spring Cloud Enterprise creation.
+* New preview argument `az spring-cloud create` has new argument "--zone-redundant" to support creating Azure Spring Cloud in Azure availability zone.
+* New preview command group `az spring-cloud api-portal` to manage API portal in Azure Spring Cloud Enterprise tier.
+* New preview command group `az spring-cloud application-configuration-service` to manage Application Configuration Service in Azure Spring Cloud Enterprise tier.
+* New preview command group `az spring-cloud gateway` to manage gateway in Azure Spring Cloud Enterprise tier.
+* New preview command group `az spring-cloud service-registry` to mmanage Service Registry in Azure Spring Cloud Enterprise tier. 
+* [BREAKING CHANGE] `az spring-cloud app` command output: Remove "properties.activeDeploymentName", use "properties.activeDeployment.name" instead.
+* [BREAKING CHANGE] `az spring-cloud app` command output: Remove "properties.createdTime", use "systemData.createdAt" instead.
+* [BREAKING CHANGE] `az spring-cloud app` command output: Remove "properties.activeDeployment.properties.deploymentSettings.jvmOptions", use "properties.activeDeployment.properties.source.jvmOptions" instead.
+* [BREAKING CHANGE] `az spring-cloud app` command output: Remove "properties.activeDeployment.properties.deploymentSettings.runtimeVersion", use "properties.activeDeployment.properties.source.runtimeVersion" instead.
+* [BREAKING CHANGE] `az spring-cloud app` command output: Remove "properties.activeDeployment.properties.deploymentSettings.netCoreMainEntryPath", use "properties.activeDeployment.properties.source.netCoreMainEntryPath" instead.
+
 2.12.3
 ---
 * Fix the deploy jar failure.

src/spring-cloud/azext_spring_cloud/_help.py

@@ -589,7 +589,7 @@
 
 helps['spring-cloud service-registry'] = """
     type: group
-    short-summary: (Support Enterprise Tier Only) Commands to manage Service Registry in Azure Spring Cloud.
+    short-summary: (Enterprise Tier Only) Commands to manage Service Registry in Azure Spring Cloud.
 """
 
 helps['spring-cloud service-registry show'] = """
@@ -657,7 +657,7 @@
 
 helps['spring-cloud application-configuration-service'] = """
     type: group
-    short-summary: (Support Enterprise Tier Only) Commands to manage Application Configuration Service in Azure Spring Cloud.
+    short-summary: (Enterprise Tier Only) Commands to manage Application Configuration Service in Azure Spring Cloud.
 """
 
 helps['spring-cloud application-configuration-service show'] = """
@@ -727,7 +727,7 @@
 
 helps['spring-cloud gateway'] = """
     type: group
-    short-summary: (Support Enterprise Tier Only) Commands to manage gateway in Azure Spring Cloud.
+    short-summary: (Enterprise Tier Only) Commands to manage gateway in Azure Spring Cloud.
 """
 
 helps['spring-cloud gateway clear'] = """
@@ -834,7 +834,7 @@
 
 helps['spring-cloud api-portal'] = """
     type: group
-    short-summary: (Support Enterprise Tier Only) Commands to manage API portal in Azure Spring Cloud.
+    short-summary: (Enterprise Tier Only) Commands to manage API portal in Azure Spring Cloud.
 """
 
 helps['spring-cloud api-portal clear'] = """
@@ -896,22 +896,22 @@
 
 helps['spring-cloud build-service'] = """
     type: group
-    short-summary: (Support Enterprise Tier Only) Commands to manage build service in Azure Spring Cloud.
+    short-summary: (Enterprise Tier Only) Commands to manage build service in Azure Spring Cloud.
 """
 
 helps['spring-cloud build-service builder'] = """
     type: group
-    short-summary: (Support Enterprise Tier Only) Commands to manage builder of build service.
+    short-summary: (Enterprise Tier Only) Commands to manage builder of build service.
 """
 
 helps['spring-cloud build-service builder buildpack-binding'] = """
     type: group
-    short-summary: (Support Enterprise Tier Only) Commands to manage buildpack-binding of builder.
+    short-summary: (Enterprise Tier Only) Commands to manage buildpack-binding of builder.
 """
 
 helps['spring-cloud build-service builder buildpack-binding create'] = """
     type: command
-    short-summary: (Support Enterprise Tier Only) Create a buildpack binding.
+    short-summary: (Enterprise Tier Only) Create a buildpack binding.
     examples:
         - name: Create a buildpack binding without properties or secrets.
           text: az spring-cloud build-service builder buildpack-binding create --name first-binding --builder-name first-builder --type ApplicationInsights --service MyCluster --resource-group MyResourceGroup
@@ -925,31 +925,31 @@
 
 helps['spring-cloud build-service builder buildpack-binding set'] = """
     type: command
-    short-summary: (Support Enterprise Tier Only) Set a buildpack binding.
+    short-summary: (Enterprise Tier Only) Set a buildpack binding.
     examples:
         - name: Set a buildpack binding with properties and secrets.
           text: az spring-cloud build-service builder buildpack-binding set --name first-binding --builder-name first-builder --type ApplicationInsights --properties a=b c=d --secrets k1=v1 k2=v2 --service MyCluster --resource-group MyResourceGroup
 """
 
 helps['spring-cloud build-service builder buildpack-binding show'] = """
     type: command
-    short-summary: (Support Enterprise Tier Only) Show a buildpack binding. The secrets will be masked.
+    short-summary: (Enterprise Tier Only) Show a buildpack binding. The secrets will be masked.
     examples:
         - name: Show a buildpack binding.
           text: az spring-cloud build-service builder buildpack-binding show --name first-binding --builder-name first-builder --service MyCluster --resource-group MyResourceGroup
 """
 
 helps['spring-cloud build-service builder buildpack-binding list'] = """
     type: command
-    short-summary: (Support Enterprise Tier Only) List all buildpack binding in a builder. The secrets will be masked.
+    short-summary: (Enterprise Tier Only) List all buildpack binding in a builder. The secrets will be masked.
     examples:
         - name: List all buildpack binding of a builder.
           text: az spring-cloud build-service builder buildpack-binding list --builder-name first-builder --service MyCluster --resource-group MyResourceGroup
 """
 
 helps['spring-cloud build-service builder buildpack-binding delete'] = """
     type: command
-    short-summary: (Support Enterprise Tier Only) Delete a buildpack binding.
+    short-summary: (Enterprise Tier Only) Delete a buildpack binding.
     examples:
         - name: Delete a buildpack binding.
           text: az spring-cloud build-service builder buildpack-binding delete --name first-binding --builder-name first-builder --service MyCluster --resource-group MyResourceGroup

src/spring-cloud/azext_spring_cloud/commands.py

@@ -282,9 +282,6 @@ def load_command_table(self, _):
         g.custom_command('unbind', 'api_portal_custom_domain_unbind')
         g.custom_command('update', 'api_portal_custom_domain_update')
 
-    with self.command_group('spring-cloud', exception_handler=handle_asc_exception):
-        pass
-
     with self.command_group('spring-cloud build-service builder',
                             custom_command_type=builder_cmd_group,
                             exception_handler=handle_asc_exception, is_preview=True) as g:
@@ -301,3 +298,9 @@ def load_command_table(self, _):
         g.custom_show_command('show', 'buildpack_binding_show')
         g.custom_command('list', 'buildpack_binding_list')
         g.custom_command('delete', 'buildpack_binding_delete', confirmation=True)
+
+    with self.command_group('spring-cloud build-service', exception_handler=handle_asc_exception, is_preview=True):
+        pass
+
+    with self.command_group('spring-cloud', exception_handler=handle_asc_exception):
+        pass

src/spring-cloud/setup.py

@@ -16,7 +16,7 @@
 
 # TODO: Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
-VERSION = '2.12.2'
+VERSION = '3.0.0'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers