Merge pull request #245237 from Netyyyy/myao/consumption

Update consumption plan for deploy web app

Author: v-regandowner

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

@@ -3,7 +3,7 @@ author: KarlErickson
 ms.author: xiada
 ms.service: spring-apps
 ms.topic: include
-ms.date: 07/11/2023
+ms.date: 08/31/2023
 ---
 
 <!--
@@ -25,7 +25,7 @@ You can delete the Azure resource group, which includes all the resources in the
 
 ### [Azure Developer CLI](#tab/Azure-Developer-CLI)
 
-Use the following command to delete all the Azure resources used in this sample application.
+Use the following command to delete all the Azure resources used in this sample application:
 
 ```bash
 azd down
@@ -34,12 +34,11 @@ azd down
 The following list describes the command interactions:
 
 - **Total resources to delete: \<resources-total>, are you sure you want to continue?**: Press <kbd>y</kbd>.
-- **Would you like to permanently delete these resources instead, allowing their names to be reused?**: Press <kbd>y</kbd>. Press <kbd>n</kbd> if you want to reuse the Key Vault.
 
 The console outputs messages similar to the following example:
 
 ```output
-SUCCESS: Your Azure resources have been deleted.
+SUCCESS: Your application was removed from Azure in xx minutes xx seconds.
 ```
 
 ---

articles/spring-apps/includes/quickstart-deploy-web-app/deploy-consumption-plan.md

@@ -3,7 +3,7 @@ author: KarlErickson
 ms.author: xiada
 ms.service: spring-apps
 ms.topic: include
-ms.date: 07/11/2023
+ms.date: 08/31/2023
 ---
 
 <!--
@@ -19,7 +19,7 @@ First, prepare the Spring project to run locally.
 
 ### [Azure portal](#tab/Azure-portal)
 
-Although you use the Azure portal in later steps, you must use the Bash command line to prepare the project locally. Use the following steps to clone and run the app locally. These steps use the 
+Although you use the Azure portal in later steps, you must use the Bash command line to prepare the project locally. Use the following steps to clone and run the app locally:
 
 1. Use the following command to clone the sample project from GitHub:
 
@@ -46,8 +46,9 @@ Although you use the Azure portal in later steps, you must use the Bash command
 
 Use the following steps to initialize the web application from the Azure Developer CLI templates:
 
-1. Open a terminal, create a new empty folder, and then change directory to it.
-2. Run the following command to initialize the project:
+1. Open a terminal, create a new folder, and then change directory into it.
+
+1. Use the following command to initialize the project:
 
    ```bash
    azd init --template https://github.com/Azure-Samples/ASA-Samples-Web-Application
@@ -65,7 +66,7 @@ Use the following steps to initialize the web application from the Azure Develop
    (✓) Done: Initialized git repository
    (✓) Done: Downloading template code to: <your-local-path>
 
-     Please enter a new environment name: <your-env-name>
+   Please enter a new environment name: <your-env-name>
 
    SUCCESS: New project initialized!
    You can view the template code in your directory: <your-local-path>
@@ -92,7 +93,7 @@ Use the following steps to create a service instance:
 
 1. Select **Compute** > **Azure Spring Apps**.
 
-   :::image type="content" source="../../media/quickstart-deploy-web-app/create-service-instance.png" alt-text="Screenshot of the Azure portal showing the Create a resource page with Azure Spring Apps highlighted." lightbox="../../media/quickstart-deploy-web-app/create-service-instance.png":::
+   :::image type="content" source="../../media/quickstart-deploy-web-app/create-service-instance.png" alt-text="Screenshot of the Azure portal that shows the Create a resource page with Azure Spring Apps highlighted." lightbox="../../media/quickstart-deploy-web-app/create-service-instance.png":::
 
 1. Fill out the **Basics** form with the following information:
 
@@ -105,13 +106,13 @@ Use the following steps to create a service instance:
    | **Region**         | The region closest to your users | The location that is closest to your users.                                                                                                                                                                                                                                                        |
    | **Zone Redundant** | Unchecked                        | Whether to create your Azure Spring Apps service in an Azure availability zone. Currently, this feature is supported only in some regions.                                                                                                                                                         |
 
-   :::image type="content" source="../../media/quickstart-deploy-web-app/create-basics.png" alt-text="Screenshot of the Azure portal showing the Create Azure Spring Apps page." lightbox="../../media/quickstart-deploy-web-app/create-basics.png":::
+   :::image type="content" source="../../media/quickstart-deploy-web-app/create-basics.png" alt-text="Screenshot of the Azure portal that shows the Create Azure Spring Apps page." lightbox="../../media/quickstart-deploy-web-app/create-basics.png":::
 
 1. Select **Review and Create** to review your selections. Select **Create** to provision the Azure Spring Apps instance.
 
 1. On the toolbar, select the **Notifications** icon (a bell) to monitor the deployment process. Once the deployment is done, you can select **Pin to dashboard**, which creates a tile for this service on your Azure portal dashboard as a shortcut to the service's **Overview** page. Select **Go to resource** to open the service's **Overview** page.
 
-   :::image type="content" source="../../media/quickstart-deploy-web-app/notifications.png" alt-text="Screenshot of the Azure portal showing the Overview page with the Notifications pane open." lightbox="../../media/quickstart-deploy-web-app/notifications.png":::
+   :::image type="content" source="../../media/quickstart-deploy-web-app/notifications.png" alt-text="Screenshot of the Azure portal that shows the Overview page with the Notifications pane open." lightbox="../../media/quickstart-deploy-web-app/notifications.png":::
 
 ### 3.3. Prepare the PostgreSQL instance
 
@@ -127,13 +128,13 @@ Use the following steps to connect your service instances:
 
 1. On the **Create App** page, fill in the app name and select *Java 17* as the runtime platform.
 
-   :::image type="content" source="../../media/quickstart-deploy-web-app/create-app.png" alt-text="Screenshot of the Azure portal showing the Create app pane." lightbox="../../media/quickstart-deploy-web-app/create-app.png":::
+   :::image type="content" source="../../media/quickstart-deploy-web-app/create-app.png" alt-text="Screenshot of the Azure portal that shows the Create app pane." lightbox="../../media/quickstart-deploy-web-app/create-app.png":::
 
 1. Select **Create** to finish the app creation and select the app to view details.
 
 1. Select **Service Connector** from the navigation pane to create a new service connection.
 
-   :::image type="content" source="../../media/quickstart-deploy-web-app/app-service-connector.png" alt-text="Screenshot of the Azure portal showing the Service Connector page with the Create button highlighted." lightbox="../../media/quickstart-deploy-web-app/app-service-connector.png":::
+   :::image type="content" source="../../media/quickstart-deploy-web-app/app-service-connector.png" alt-text="Screenshot of the Azure portal that shows the Service Connector page with the Create button highlighted." lightbox="../../media/quickstart-deploy-web-app/app-service-connector.png":::
 
 1. Fill out the **Basics** tab with the following information:
 
@@ -144,7 +145,7 @@ Use the following steps to connect your service instances:
    - **PostgreSQL database**: *todo*
    - **Client type**: **SpringBoot**
 
-   :::image type="content" source="../../media/quickstart-deploy-web-app/app-service-connector-basics.png" alt-text="Screenshot of the Azure portal showing the Basics tab of the Create connection pane for connecting to PostgreSQL." lightbox="../../media/quickstart-deploy-web-app/app-service-connector-basics.png":::
+   :::image type="content" source="../../media/quickstart-deploy-web-app/app-service-connector-basics.png" alt-text="Screenshot of the Azure portal that shows the Basics tab of the Create connection pane for connecting to PostgreSQL." lightbox="../../media/quickstart-deploy-web-app/app-service-connector-basics.png":::
 
 1. Configure the **Authentication** tab with the following information:
 
@@ -153,13 +154,13 @@ Use the following steps to connect your service instances:
    - **Username**: *myadmin*
    - **Password**: Enter your password.
 
-   :::image type="content" source="../../media/quickstart-deploy-web-app/app-service-connector-authentication.png" alt-text="Screenshot of the Azure portal showing the Authentication tab of the Create connection pane with the Connection string option highlighted." lightbox="../../media/quickstart-deploy-web-app/app-service-connector-authentication.png":::
+   :::image type="content" source="../../media/quickstart-deploy-web-app/app-service-connector-authentication.png" alt-text="Screenshot of the Azure portal that shows the Authentication tab of the Create connection pane with the Connection string option highlighted." lightbox="../../media/quickstart-deploy-web-app/app-service-connector-authentication.png":::
 
 1. Select **Review and Create** to review your selections, then select **Create** to create the connection.
 
 ### [Azure Developer CLI](#tab/Azure-Developer-CLI)
 
-1. Run 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 Azure with OAuth2. Ignore this step if you've already logged in.
 
    ```bash
    azd auth login
@@ -171,7 +172,13 @@ Use the following steps to connect your service instances:
    azd config set alpha.springapp on
    ```
 
-1. Run the following command to provision the template's infrastructure to Azure:
+1. Use the following command to set the template with the **standard** plan:
+
+   ```bash
+   azd env set PLAN standard
+   ```
+
+1. Use the following command to provision the template's infrastructure to Azure:
 
    ```bash
    azd provision
@@ -182,6 +189,17 @@ Use the following steps to connect your service instances:
    - **Please select an Azure Subscription to use**: Use arrows to move, type to filter, then press <kbd>ENTER</kbd>.
    - **Please select an Azure location to use**: Use arrows to move, type to filter, then press <kbd>ENTER</kbd>.
 
+   The console outputs messages similar to the following example:
+
+   ```output
+   SUCCESS: Your application was provisioned in 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/<your-resource-group>/overview
+   ```
+
+   > [!NOTE]
+   > This command may take a while to complete. You see a progress indicator as it provisions Azure resources.
+
 ---
 
 ## 4. Deploy the app to Azure Spring Apps
@@ -195,12 +213,12 @@ Use the following steps to deploy using the [Maven plugin for Azure Spring Apps]
 1. Navigate to the sample project directory and 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:
 
-   - **Select Maven child module**: Select the module to configure, then enter the number for the web module.
+   - **Select child modules to configure**: Select the module to configure, then enter the number of the *SimpleTodo Web* module.
    - **OAuth2 login**: Authorize the login to Azure based on the OAuth2 protocol.
    - **Select subscription**: Select the subscription list number of the Azure Spring Apps instance you created, which defaults to the first subscription in the list. If you use the default number, press <kbd>ENTER</kbd> directly.
    - **Select Azure Spring Apps**: Select the number of the Azure Spring Apps instance you created. If you use the default number, press <kbd>ENTER</kbd> directly.
@@ -210,7 +228,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:
@@ -232,13 +250,13 @@ Use the following steps to deploy using the [Maven plugin for Azure Spring Apps]
 
 Use the following steps to package the app, provision the Azure resources required by the web application, and then deploy to Azure Spring Apps:
 
-1. Run the following command to package a deployable copy of your application:
+1. Use the following command to package a deployable copy of your application:
 
    ```bash
    azd package
    ```
 
-1. Run the following command to deploy the application code to those newly provisioned resources:
+1. Use the following command to deploy the application code to those newly provisioned resources:
 
    ```bash
    azd deploy
@@ -247,13 +265,17 @@ Use the following steps to package the app, provision the Azure resources requir
    The console outputs messages similar to the following example:
 
    ```output
-   |       | Deploying service simple-todo-webExecuting prepackage hook => /var/folders/m1/twqn055s7ll1bw0sstvkc0j40000gn/T/azd-prepackage-708945870.sh
+   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.
+
    (✓) Done: Deploying service simple-todo-web
-   - Endpoint: https://asa-2jqpw3tejrxdi-simple-todo-web.azuremicroservices.io/
+   - Endpoint: https://<your-Azure-Spring-Apps-instance-name>-demo.azuremicroservices.io/
 
-   SUCCESS: Your Azure app has been deployed!
-   You can view the resources created under the resource group rg-<your-environment-name>-<a-random-string> in Azure Portal:
-   https://portal.azure.com/#@/resource/subscriptions/<>your-subscription-id/resourceGroups/rg-<your-environment-name>-<a-random-string>/overview
+   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
    ```
 
    The output **Endpoint** is the endpoint to access the `todo` application.

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

@@ -3,7 +3,7 @@ author: KarlErickson
 ms.author: xiada
 ms.service: spring-apps
 ms.topic: include
-ms.date: 07/11/2023
+ms.date: 08/31/2023
 ---
 
 <!--
@@ -17,13 +17,9 @@ Use the following steps to create an Azure Database for PostgreSQL server:
 
 1. In the Azure portal, select **Create a resource**.
 
-1. Select **Databases** > **Azure Database for PostgreSQL**.
+1. Select **Databases** > **Azure Database for PostgreSQL Flexible Server**.
 
-   :::image type="content" source="../../media/quickstart-deploy-web-app/postgresql-create-server.png" alt-text="Screenshot of the Azure portal showing the Create a resource page with Azure Database for PostgreSQL highlighted." lightbox="../../media/quickstart-deploy-web-app/postgresql-create-server.png":::
-
-1. Select the **Flexible server** deployment option.
-
-   :::image type="content" source="../../media/quickstart-deploy-web-app/postgresql-select-deployment-option.png" alt-text="Screenshot of the Azure portal showing the Select Azure Database for PostgreSQL deployment option page." lightbox="../../media/quickstart-deploy-web-app/postgresql-select-deployment-option.png":::
+   :::image type="content" source="../../media/quickstart-deploy-web-app/postgresql-create-flexible-server.png" alt-text="Screenshot of the Azure portal that shows the Create a resource page with Azure Database for PostgreSQL highlighted." lightbox="../../media/quickstart-deploy-web-app/postgresql-create-flexible-server.png":::
 
 1. Fill out the **Basics** tab with the following information:
 
@@ -36,19 +32,19 @@ Use the following steps to create an Azure Database for PostgreSQL server:
    - **Admin username**: *myadmin*
    - **Password** and **Confirm password**: Enter a password.
 
-   :::image type="content" source="../../media/quickstart-deploy-web-app/postgresql-create-server-basics.png" alt-text="Screenshot of the Azure portal showing the Server details page." lightbox="../../media/quickstart-deploy-web-app/postgresql-create-server-basics.png":::
+   :::image type="content" source="../../media/quickstart-deploy-web-app/postgresql-create-server-basics.png" alt-text="Screenshot of the Azure portal that shows the Server details page." lightbox="../../media/quickstart-deploy-web-app/postgresql-create-server-basics.png":::
 
 1. Configure the **Networking** tab using the following information:
 
    - **Connectivity method**: **Public access (allowed IP addresses)**
    - **Allow public access from any Azure service within Azure to this server**: selected
 
-   :::image type="content" source="../../media/quickstart-deploy-web-app/postgresql-create-server-networking.png" alt-text="Screenshot of the Azure portal showing the Networking tab." lightbox="../../media/quickstart-deploy-web-app/postgresql-create-server-networking.png":::
+   :::image type="content" source="../../media/quickstart-deploy-web-app/postgresql-create-server-networking.png" alt-text="Screenshot of the Azure portal that shows the Networking tab." lightbox="../../media/quickstart-deploy-web-app/postgresql-create-server-networking.png":::
 
 1. Select **Review + create** to review your selections, then select **Create** to provision the server. This operation may take a few minutes.
 
 1. Go to your PostgreSQL server in the Azure portal.
 
 1. Select **Databases** from the navigation pane to create a database.
 
-   :::image type="content" source="../../media/quickstart-deploy-web-app/postgresql-create-database.png" alt-text="Screenshot of the Azure portal showing the Databases page with the Create Database pane open." lightbox="../../media/quickstart-deploy-web-app/postgresql-create-database.png":::
+   :::image type="content" source="../../media/quickstart-deploy-web-app/postgresql-create-database.png" alt-text="Screenshot of the Azure portal that shows the Databases page with the Create Database pane open." lightbox="../../media/quickstart-deploy-web-app/postgresql-create-database.png":::