Merge pull request #247879 from Netyyyy/myao/consumption-helloapp

Update consumption plan for deploy hello world app

Author: v-regandowner

articles/spring-apps/includes/quickstart/clean-up-resources.md

@@ -15,7 +15,7 @@ For clarity of structure, a separate markdown file is used to describe how to cl
 
 ## 6. Clean up resources
 
-::: zone pivot="sc-consumption-plan,sc-enterprise"
+::: zone pivot="sc-enterprise"
 
 Be sure to delete the resources you created in this article when you no longer need them. To delete the resources, just delete the resource group that contains them. You can delete the resource group using the Azure portal. Alternatively, to delete the resource group by using Azure CLI, use the following command:
 
@@ -25,7 +25,7 @@ az group delete --name ${RESOURCE_GROUP}
 
 ::: zone-end
 
-::: zone pivot="sc-standard"
+::: zone pivot="sc-consumption-plan,sc-standard"
 
 You can delete the Azure resource group, which includes all the resources in the resource group.
 

articles/spring-apps/includes/quickstart/deploy-app-with-basic-standard-plan.md

@@ -4,10 +4,10 @@ ms.author: v-shilichen
 ms.service: spring-apps
 ms.custom: event-tier1-build-2022
 ms.topic: include
-ms.date: 08/09/2023
+ms.date: 08/31/2023
 ---
 
-<!-- 
+<!--
 For clarity of structure, a separate markdown file is used to describe how to deploy to Azure Spring Apps with Basic/Standard plan.
 
 [!INCLUDE [deploy-app-with-basic-standard-plan](includes/quickstart/deploy-app-with-basic-standard-plan.md)]
@@ -18,29 +18,29 @@ For clarity of structure, a separate markdown file is used to describe how to de
 
 ### [Azure portal](#tab/Azure-portal)
 
-[!INCLUDE [prepare-spring-project](../../includes/quickstart/prepare-spring-project.md)]
+[!INCLUDE [prepare-spring-project](prepare-spring-project.md)]
 
 ### [Azure Developer CLI](#tab/Azure-Developer-CLI)
 
 Use the following steps to initialize the application from the Azure Developer CLI templates.
 
-1. Open a terminal window, create a new, empty folder, and change directory into it.
+1. Open a terminal window, create a new folder, and change directory into it.
 1. Use the following command to initialize the project:
 
-    ```bash
-    azd init --template spring-guides/gs-spring-boot-for-azure
-    ```
+   ```bash
+   azd init --template spring-guides/gs-spring-boot-for-azure
+   ```
 
    The following list describes the command interactions:
 
    - **OAuth2 login**: You need to authorize the login to Azure based on the OAuth2 protocol.
    - **Please enter a new environment name**: Provide an environment name, which is used as a suffix for the resource group created to hold all Azure resources. This name should be unique within your Azure subscription.
 
-   The console outputs messages similar the ones in the following example:
+   The console outputs messages similar to the following example:
 
    ```output
    Initializing a new project (azd init)
-   
+
    (✓) Done: Initialized git repository
    (✓) Done: Downloading template code to: <your-local-path>
    Enter a new environment name: <your-env-name>
@@ -63,11 +63,11 @@ Open your web browser and go to the [Azure portal](https://portal.azure.com/). E
 
 ### 3.2. Create an Azure Spring Apps instance
 
-[!INCLUDE [provision-spring-apps](../../includes/quickstart/provision-basic-azure-spring-apps.md)]
+[!INCLUDE [provision-spring-apps](provision-basic-azure-spring-apps.md)]
 
 ### [Azure Developer CLI](#tab/Azure-Developer-CLI)
 
-1. Use the following command to log in Azure with OAuth2. Ignore this step if you've already logged in.
+1. Use the following command to log in to Azure with OAuth2. Ignore this step if you've already logged in.
 
    ```bash
    azd auth login
@@ -117,10 +117,10 @@ This section provides the steps to deploy your application to Azure Spring Apps.
 
 Use the following steps to deploy using the [Maven plugin for Azure Spring Apps](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Spring-Apps):
 
-1. Navigate to the *complete* directory and then run the following command to configure the app in Azure Spring Apps:
+1. Navigate to the *complete* directory, and then run the following command to configure the app in Azure Spring Apps:
 
    ```bash
-   ./mvnw com.microsoft.azure:azure-spring-apps-maven-plugin:1.17.0:config
+   ./mvnw com.microsoft.azure:azure-spring-apps-maven-plugin:1.18.0:config
    ```
 
    The following list describes the command interactions:
@@ -135,7 +135,7 @@ Use the following steps to deploy using the [Maven plugin for Azure Spring Apps]
 1. Use the following command to deploy the app:
 
    ```bash
-   ./mvnw com.microsoft.azure:azure-spring-apps-maven-plugin:1.17.0:deploy
+   ./mvnw com.microsoft.azure:azure-spring-apps-maven-plugin:1.18.0:deploy
    ```
 
    The following list describes the command interactions:
@@ -172,16 +172,15 @@ Use the following steps to package the app, provision the Azure resources requir
 
    ```output
    Deploying services (azd deploy)
-   
+
    WARNING: Feature 'springapp' is in alpha stage.
    To learn more about alpha features and their support, visit https://aka.ms/azd-feature-stages.
-   
+
    ...
-   
+
    Deploying service demo (Fetching endpoints for spring app service)
    - Endpoint: https://<your-Azure-Spring-Apps-instance-name>-demo.azuremicroservices.io/
-   
-   
+
    SUCCESS: Your application was deployed to Azure in xx minutes xx seconds.
    You can view the resources created under the resource group rg-<your-environment-name> in Azure Portal:
    https://portal.azure.com/#@/resource/subscriptions/<your-subscription-id>/resourceGroups/rg-<your-environment-name>/overview

articles/spring-apps/includes/quickstart/deploy-app-with-enterprise-plan.md

@@ -7,7 +7,7 @@ ms.topic: include
 ms.date: 08/09/2023
 ---
 
-<!-- 
+<!--
 For clarity of structure, a separate markdown file is used to describe how to deploy to Azure Spring Apps with Enterprise plan.
 
 [!INCLUDE [deploy-event-driven-app-with-enterprise-plan](includes/quickstart/deploy-app-with-enterprise-plan.md)]
@@ -107,9 +107,9 @@ Use the following steps to create the service instance:
 
    ```azurecli
    az term accept \
-      --publisher vmware-inc \
-      --product azure-spring-cloud-vmware-tanzu-2 \
-      --plan asa-ent-hr-mtr
+       --publisher vmware-inc \
+       --product azure-spring-cloud-vmware-tanzu-2 \
+       --plan asa-ent-hr-mtr
    ```
 
 1. Use the following command to create an Azure Spring Apps service instance: