Merge branch 'main' into patch-4

Author: taoxu0903

articles/spring-apps/how-to-custom-persistent-storage-with-standard-consumption.md

@@ -29,7 +29,7 @@ You can also mount your own persistent storage not only to Azure Spring Apps but
 ## Prerequisites
 
 - An Azure subscription. If you don't have a subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
-- [Azure CLI](/cli/azure/install-azure-cli) version 2.28.0 or higher.
+- [Azure CLI](/cli/azure/install-azure-cli) version 2.45.0 or higher.
 - An Azure Spring Apps Standard consumption plan service instance. For more information, see [Quickstart: Provision an Azure Spring Apps Standard consumption plan service instance](quickstart-provision-standard-consumption-service-instance.md).
 - A Spring app deployed to Azure Spring Apps. For more information, see [Quickstart: Build and deploy apps to Azure Spring Apps](quickstart-deploy-apps.md).
 

articles/spring-apps/how-to-custom-persistent-storage.md

@@ -27,7 +27,7 @@ When you use your own persistent storage, artifacts generated by your applicatio
 ## Prerequisites
 
 - An existing Azure Storage Account and a pre-created Azure File Share. If you need to create a storage account and file share in Azure, see [Create an SMB Azure file share](../storage/files/storage-how-to-create-file-share.md).
-- [Azure CLI](/cli/azure/install-azure-cli), version 2.0.67 or higher.
+- [Azure CLI](/cli/azure/install-azure-cli), version 2.45.0 or higher.
 
 > [!IMPORTANT]
 > If you deployed your Azure Spring Apps in your own virtual network and you want the storage account to be accessed only from the virtual network, see [Use private endpoints for Azure Storage](../storage/common/storage-private-endpoints.md) and the [Grant access from a virtual network](../storage/common/storage-network-security.md#grant-access-from-a-virtual-network) section of [Configure Azure Storage firewalls and virtual networks](../storage/common/storage-network-security.md).

articles/spring-apps/how-to-enable-system-assigned-managed-identity.md

@@ -29,15 +29,15 @@ If you're unfamiliar with managed identities for Azure resources, see the [Manag
 ::: zone pivot="sc-enterprise"
 
 - An already provisioned Azure Spring Apps Enterprise tier instance. For more information, see [Quickstart: Build and deploy apps to Azure Spring Apps using the Enterprise tier](quickstart-deploy-apps-enterprise.md).
-- [Azure CLI version 2.30.0 or higher](/cli/azure/install-azure-cli).
+- [Azure CLI version 2.45.0 or higher](/cli/azure/install-azure-cli).
 - [!INCLUDE [install-app-user-identity-extension](includes/install-app-user-identity-extension.md)]
 
 ::: zone-end
 
 ::: zone pivot="sc-standard"
 
 - An already provisioned Azure Spring Apps instance. For more information, see [Quickstart: Deploy your first application to Azure Spring Apps](./quickstart.md).
-- [Azure CLI version 2.30.0 or higher](/cli/azure/install-azure-cli).
+- [Azure CLI version 2.45.0 or higher](/cli/azure/install-azure-cli).
 - [!INCLUDE [install-app-user-identity-extension](includes/install-app-user-identity-extension.md)]
 
 ::: zone-end

articles/spring-apps/how-to-enterprise-deploy-polyglot-apps.md

@@ -21,7 +21,7 @@ This article shows you how to deploy polyglot apps in Azure Spring Apps Enterpri
 ## Prerequisites
 
 - An already provisioned Azure Spring Apps Enterprise tier instance. For more information, see [Quickstart: Build and deploy apps to Azure Spring Apps using the Enterprise tier](quickstart-deploy-apps-enterprise.md).
-- [Azure CLI](/cli/azure/install-azure-cli), version 2.43.0 or higher.
+- [Azure CLI](/cli/azure/install-azure-cli), version 2.45.0 or higher.
 
 ## Deploy a polyglot application
 

articles/spring-apps/how-to-enterprise-deploy-static-file.md

@@ -23,7 +23,7 @@ This article shows you how to deploy your static files to Azure Spring Apps Ente
 
 - An already provisioned Azure Spring Apps Enterprise tier instance. For more information, see [Quickstart: Build and deploy apps to Azure Spring Apps using the Enterprise tier](quickstart-deploy-apps-enterprise.md).
 - One or more applications running in Azure Spring Apps. For more information on creating apps, see [How to Deploy Spring Boot applications from Azure CLI](./how-to-launch-from-source.md).
-- [Azure CLI](/cli/azure/install-azure-cli), version 2.0.67 or higher.
+- [Azure CLI](/cli/azure/install-azure-cli), version 2.45.0 or higher.
 - Your static files or dynamic front-end application (e.g. react app).
 
 ## Deploy your static files

articles/spring-apps/how-to-manage-user-assigned-managed-identities.md

@@ -28,7 +28,7 @@ Managed identities for Azure resources provide an automatically managed identity
 ::: zone pivot="sc-enterprise"
 
 - An already provisioned Azure Spring Apps Enterprise tier instance. For more information, see [Quickstart: Build and deploy apps to Azure Spring Apps using the Enterprise tier](quickstart-deploy-apps-enterprise.md).
-- [Azure CLI version 2.30.0 or higher](/cli/azure/install-azure-cli).
+- [Azure CLI version 2.45.0 or higher](/cli/azure/install-azure-cli).
 - [!INCLUDE [install-app-user-identity-extension](includes/install-app-user-identity-extension.md)]
 - At least one already provisioned user-assigned managed identity. For more information, see [Manage user-assigned managed identities](../active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities.md).
 
@@ -37,7 +37,7 @@ Managed identities for Azure resources provide an automatically managed identity
 ::: zone pivot="sc-standard"
 
 - An already provisioned Azure Spring Apps instance. For more information, see [Quickstart: Deploy your first application to Azure Spring Apps](./quickstart.md).
-- [Azure CLI version 2.30.0 or higher](/cli/azure/install-azure-cli).
+- [Azure CLI version 2.45.0 or higher](/cli/azure/install-azure-cli).
 - [!INCLUDE [install-app-user-identity-extension](includes/install-app-user-identity-extension.md)]
 - At least one already provisioned user-assigned managed identity. For more information, see [Manage user-assigned managed identities](../active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities.md).
 

articles/spring-apps/how-to-maven-deploy-apps.md

@@ -27,7 +27,7 @@ This article shows you how to use the Azure Spring Apps Maven plugin to configur
 * An already provisioned Azure Spring Apps instance.
 * [JDK 8 or JDK 11](/azure/developer/java/fundamentals/java-jdk-install)
 * [Apache Maven](https://maven.apache.org/download.cgi)
-* [Azure CLI version 2.0.67 or higher](/cli/azure/install-azure-cli) with the Azure Spring Apps extension. You can install the extension by using the following command: `az extension add --name spring`
+* [Azure CLI version 2.45.0 or higher](/cli/azure/install-azure-cli) with the Azure Spring Apps extension. You can install the extension by using the following command: `az extension add --name spring`
 
 ## Generate a Spring project
 

articles/spring-apps/how-to-migrate-standard-tier-to-enterprise-tier.md

@@ -72,7 +72,7 @@ It takes about 5 minutes to finish the resource provisioning.
 1. Update Azure CLI with the Azure Spring Apps extension by using the following command:
 
    ```azurecli
-   az extension update --name spring-cloud
+   az extension add --upgrade --name spring
    ```
 
 1. Sign in to the Azure CLI and choose your active subscription by using the following command:
@@ -96,7 +96,7 @@ It takes about 5 minutes to finish the resource provisioning.
 
    ```azurecli
    az group create --name <resource-group-name>
-   az spring-cloud create \
+   az spring create \
        --resource-group <resource-group-name> \
        --name <service-instance-name> \
        --sku enterprise
@@ -107,7 +107,7 @@ It takes about 5 minutes to finish the resource provisioning.
 1. Set your default resource group name and Spring Cloud service name using the following command:
 
    ```azurecli
-   az config set defaults.group=<resource-group-name> defaults.spring-cloud=<service-instance-name>
+   az config set defaults.group=<resource-group-name> defaults.spring=<service-instance-name>
    ```
 
 ---
@@ -120,14 +120,14 @@ The app creation steps are the same as Standard Tier.
 
    ```azurecli
    az account set --subscription=<your-subscription-id>
-   az configure --defaults group=<your-resource-group-name> spring-cloud=<your-service-name>
+   az configure --defaults group=<your-resource-group-name> spring=<your-service-name>
    ```
 
 1. To create the two core applications for PetClinic, `api-gateway` and `customers-service`, use the following commands:
 
    ```azurecli
-   az spring-cloud app create --name api-gateway --instance-count 1 --memory 2Gi --assign-endpoint
-   az spring-cloud app create --name customers-service --instance-count 1 --memory 2Gi
+   az spring app create --name api-gateway --instance-count 1 --memory 2Gi --assign-endpoint
+   az spring app create --name customers-service --instance-count 1 --memory 2Gi
    ```
 
 ## Use Application Configuration Service for external configuration
@@ -170,7 +170,7 @@ Follow these steps to use Application Configuration Service for Tanzu as a centr
 To set the default repository, use the following command:
 
 ```azurecli
-az spring-cloud application-configuration-service git repo add \
+az spring application-configuration-service git repo add \
     --name default \
     --patterns api-gateway,customers-service \
     --uri https://github.com/Azure-Samples/spring-petclinic-microservices-config.git \
@@ -200,8 +200,8 @@ The list under **App name** will show the apps bound with Application Configurat
 To bind apps to Application Configuration Service for VMware Tanzu® and VMware Tanzu® Service Registry, use the following commands:
 
 ```azurecli
-az spring-cloud application-configuration-service bind --app api-gateway
-az spring-cloud application-configuration-service bind --app customers-service
+az spring application-configuration-service bind --app api-gateway
+az spring application-configuration-service bind --app customers-service
 ```
 
 ---
@@ -237,8 +237,8 @@ The list under **App name** shows the apps bound with Tanzu Service Registry.
 To bind apps to Application Configuration Service for VMware Tanzu® and VMware Tanzu® Service Registry, use the following commands:
 
 ```azurecli
-az spring-cloud service-registry bind --app api-gateway
-az spring-cloud service-registry bind --app customers-service
+az spring service-registry bind --app api-gateway
+az spring service-registry bind --app customers-service
 ```
 
 ---
@@ -275,11 +275,11 @@ To build locally, use the following steps:
 1. Deploy the JAR files built in the previous step using the following commands:
 
    ```azurecli
-   az spring-cloud app deploy \
+   az spring app deploy \
        --name api-gateway \
        --artifact-path spring-petclinic-api-gateway/target/spring-petclinic-api-gateway-2.3.6.jar \
        --config-file-patterns api-gateway
-   az spring-cloud app deploy \
+   az spring app deploy \
        --name customers-service \
        --artifact-path spring-petclinic-customers-service/target/spring-petclinic-customers-service-2.3.6.jar \
        --config-file-patterns customers-service
@@ -288,7 +288,7 @@ To build locally, use the following steps:
 1. Query the application status after deployment by using the following command:
 
    ```azurecli
-   az spring-cloud app list --output table
+   az spring app list --output table
    ```
 
    This command produces output similar to the following example:
@@ -326,7 +326,7 @@ To check or update the current settings in Application Insights, use the followi
 To create an Application Insights buildpack binding, use the following command:
 
 ```azurecli
-az spring-cloud build-service builder buildpack-binding create \
+az spring build-service builder buildpack-binding create \
     --resource-group <your-resource-group-name> \
     --service <your-service-instance-name> \
     --name <your-binding-name> \
@@ -339,7 +339,7 @@ az spring-cloud build-service builder buildpack-binding create \
 To list all buildpack bindings, and find Application Insights bindings for the type `ApplicationInsights`, use the following command:
 
 ```azurecli
-az spring-cloud build-service builder buildpack-binding list \
+az spring build-service builder buildpack-binding list \
     --resource-group <your-resource-group-name> \
     --service <your-service-resource-name> \
     --builder-name <your-builder-name>
@@ -348,7 +348,7 @@ az spring-cloud build-service builder buildpack-binding list \
 To replace an Application Insights buildpack binding, use the following command:
 
 ```azurecli
-az spring-cloud build-service builder buildpack-binding set \
+az spring build-service builder buildpack-binding set \
     --resource-group <your-resource-group-name> \
     --service <your-service-instance-name> \
     --name <your-binding-name> \
@@ -361,7 +361,7 @@ az spring-cloud build-service builder buildpack-binding set \
 To get an Application Insights buildpack binding, use the following command:
 
 ```azurecli
-az spring-cloud build-service builder buildpack-binding show \
+az spring build-service builder buildpack-binding show \
     --resource-group <your-resource-group-name> \
     --service <your-service-instance-name> \
     --name <your-binding-name> \
@@ -371,7 +371,7 @@ az spring-cloud build-service builder buildpack-binding show \
 To delete an Application Insights buildpack binding, use the following command:
 
 ```azurecli
-az spring-cloud build-service builder buildpack-binding delete \
+az spring build-service builder buildpack-binding delete \
     --resource-group <your-resource-group-name> \
     --service <your-service-instance-name> \
     --name <your-binding-name> \

articles/spring-apps/includes/install-enterprise-extension.md

@@ -14,10 +14,9 @@ Use the following line at the end of the Prerequisites section, where relevant.
 
 -->
 
-The Azure Spring Apps Enterprise tier extension (3.0.0 or later). Use the following command to remove previous versions and install the latest Enterprise tier extension. If you previously installed the `spring-cloud` extension, uninstall it to avoid configuration and version mismatches.
+The Azure Spring Apps Enterprise tier extension. Use the following command to remove previous versions and install the latest Enterprise tier extension. If you previously installed the `spring-cloud` extension, uninstall it to avoid configuration and version mismatches.
 
    ```azurecli
-   az extension remove --name spring
-   az extension add --name spring
+   az extension add --upgrade --name spring
    az extension remove --name spring-cloud
    ```

articles/spring-apps/quickstart-automate-deployments-github-actions-enterprise.md

@@ -23,7 +23,7 @@ This quickstart shows you how to automate deployments to Azure Spring Apps Enter
 
 - An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
 - Understand and fulfill the [Requirements](how-to-enterprise-marketplace-offer.md#requirements) section of [Enterprise Tier in Azure Marketplace](how-to-enterprise-marketplace-offer.md).
-- [The Azure CLI version 2.0.67 or higher](/cli/azure/install-azure-cli).
+- [The Azure CLI version 2.45.0 or higher](/cli/azure/install-azure-cli).
 - [Git](https://git-scm.com/).
 - [jq](https://stedolan.github.io/jq/download/)
 - [!INCLUDE [install-enterprise-extension](includes/install-enterprise-extension.md)]