Merge pull request #231428 from KarlErickson/consumption_plan_quickstart

Release PR for "Update quickstart.md #228459"

Author: denrea

articles/spring-apps/media/quickstart/app-welcome-page.png

@@ -2,10 +2,10 @@
 title: "Quickstart - Deploy your first application to Azure Spring Apps"
 description: Describes how to deploy an application to Azure Spring Apps.
 author: karlerickson
+ms.author: karler
 ms.service: spring-apps
 ms.topic: quickstart
-ms.date: 08/22/2022
-ms.author: karler
+ms.date: 03/21/2022
 ms.custom: devx-track-java, devx-track-azurecli, mode-other, event-tier1-build-2022, engagement-fy23
 ---
 
@@ -17,11 +17,11 @@ ms.custom: devx-track-java, devx-track-azurecli, mode-other, event-tier1-build-2
 > [!NOTE]
 > Azure Spring Apps is the new name for the Azure Spring Cloud service. Although the service has a new name, you'll see the old name in some places for a while as we work to update assets such as screenshots, videos, and diagrams.
 
-**This article applies to:** ✔️ Basic/Standard tier ✔️ Enterprise tier
+**This article applies to:** ✔️ Standard consumption (Preview) ✔️ Basic/Standard ✔️ Enterprise
 
-This quickstart explains how to deploy a small application to run on Azure Spring Apps.
+This article explains how to deploy a small application to run on Azure Spring Apps.
 
-The application code used in this tutorial is a simple app. When you've completed this example, the application will be accessible online, and you can manage it through the Azure portal.
+The application code used in this tutorial is a simple app. When you've completed this example, the application is accessible online, and you can manage it through the Azure portal.
 
 This quickstart explains how to:
 
@@ -32,27 +32,28 @@ This quickstart explains how to:
 > - Build and deploy an app with a public endpoint.
 > - Clean up the resources.
 
-At the end of this quickstart, you'll have a working spring app running on Azure Spring Apps.
+At the end of this quickstart, you have a working spring app running on Azure Spring Apps.
 
 ## [Azure CLI](#tab/Azure-CLI)
 
 ## Prerequisites
 
 - An Azure subscription. If you don't have a subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
+- [Apache Maven](https://maven.apache.org/download.cgi)
 - [Azure CLI](/cli/azure/install-azure-cli). Install the Azure Spring Apps extension with the following command: `az extension add --name spring`
 - If you're deploying Azure Spring Apps Enterprise tier for the first time in the target subscription, see the [Prerequisites](./how-to-enterprise-marketplace-offer.md#prerequisites) section of [View Azure Spring Apps Enterprise tier offering in Azure Marketplace](./how-to-enterprise-marketplace-offer.md).
 
 ## Provision an instance of Azure Spring Apps
 
-Use the following steps to provision a service instance.
+Use the following steps to create an Azure Spring Apps service instance.
 
-1. Select **Try It** and sign in to your Azure account in [Azure Cloud Shell](../cloud-shell/overview.md).
+1. Select **Open Cloudshell** and sign in to your Azure account in [Azure Cloud Shell](../cloud-shell/overview.md).
 
    ```azurecli-interactive
    az account show
    ```
 
-1. Azure Cloud Shell workspaces are temporary. On initial start, the shell prompts you to associate an [Azure Storage](../storage/common/storage-introduction.md) instance with your subscription to persist files across sessions.
+1. Azure Cloud Shell workspaces are temporary. When first started, the shell prompts you to select an [Azure Storage](../storage/common/storage-introduction.md) instance with your subscription to persist files across sessions.
 
    :::image type="content" source="media/quickstart/azure-storage-subscription.png" alt-text="Screenshot of Azure Storage subscription." lightbox="media/quickstart/azure-storage-subscription.png":::
 
@@ -62,7 +63,7 @@ Use the following steps to provision a service instance.
    az account list --output table
    ```
 
-1. Use the following command to choose and link to your subscription.
+1. Use the following command to set your default subscription.
 
    ```azurecli-interactive
    az account set --subscription <subscription-id>
@@ -81,19 +82,23 @@ Use the following steps to provision a service instance.
    ```azurecli-interactive
    az spring create \
        --resource-group <name-of-resource-group> \
-       --name <service-instance-name>
+       --name <Azure-Spring-Apps-instance-name>
    ```
 
-1. Choose **Y** to install the Azure Spring Apps extension and run it.
+1. Select **Y** to install the Azure Spring Apps extension and run it.
 
 ## Create an app in your Azure Spring Apps instance
 
-Use the following command to specify the app name on Azure Spring Apps as *hellospring*.
+An [*App*](concept-understand-app-and-deployment.md) is an abstraction of one business app. Apps run in an Azure Spring Apps service instance, as shown in the following diagram.
+
+:::image type="content" source="media/spring-cloud-app-and-deployment/app-deployment-rev.png" alt-text="Diagram showing the relationship between apps and an Azure Spring Apps service instance.":::
+
+Use the following command to specify the app name on Azure Spring Apps as *hello spring*.
 
 ```azurecli-interactive
 az spring app create \
     --resource-group <name-of-resource-group> \
-    --service <service-instance-name> \
+    --service <Azure-Spring-Apps-instance-name> \
     --name hellospring \
     --assign-endpoint true
 ```
@@ -127,13 +132,170 @@ Use the following command to deploy the *.jar* file for the app (*target/spring-
 ```azurecli-interactive
 az spring app deploy \
     --resource-group <name-of-resource-group> \
-    --service <service-instance-name> \
+    --service <Azure-Spring-Apps-instance-name> \
     --name hellospring \
     --artifact-path target/spring-boot-complete-0.0.1-SNAPSHOT.jar
 ```
 
 Deploying the application can take a few minutes.
 
+## [Standard consumption plan](#tab/Consumption-Plan)
+
+## Prerequisites
+
+- An Azure subscription. If you don't have a subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
+- [Apache Maven](https://maven.apache.org/download.cgi)
+- [Azure CLI](/cli/azure/install-azure-cli). Install the spring extension for `StandardGen2` Azure Spring Apps by using the following command.
+
+  ```shell
+  az extension add --upgrade --name spring
+  ```
+
+- Use the following commands to install the Azure Container Apps extension for the Azure CLI and register these namespaces: `Microsoft.App`, `Microsoft.OperationalInsights`, and `Microsoft.AppPlatform`
+
+  ```shell
+  az extension add --name containerapp --upgrade
+  az provider register --namespace Microsoft.App
+  az provider register --namespace Microsoft.OperationalInsights
+  az provider register --namespace Microsoft.AppPlatform
+  ```
+
+## Provision an instance of Azure Spring Apps
+
+Use the following steps to create an Azure Spring Apps service instance.
+
+1. Select **Open Cloudshell** and sign in to your Azure account in [Azure Cloud Shell](../cloud-shell/overview.md).
+
+   ```azurecli-interactive
+   az account show
+   ```
+
+1. Azure Cloud Shell workspaces are temporary. When first started, the shell prompts you to associate an [Azure Storage](../storage/common/storage-introduction.md) instance with your subscription to persist files across sessions.
+
+   :::image type="content" source="media/quickstart/azure-storage-subscription.png" alt-text="Screenshot of Azure Storage subscription." lightbox="media/quickstart/azure-storage-subscription.png":::
+
+1. After you sign in successfully, use the following command to display a list of your subscriptions.
+
+   ```azurecli-interactive
+   az account list --output table
+   ```
+
+1. Use the following command to set your default subscription.
+
+   ```azurecli-interactive
+   az account set --subscription <subscription-id>
+   ```
+
+1. Define variables for this quickstart with the names of your resources and desired settings.
+
+   ```azurecli-interactive
+   LOCATION="<region>"
+   RESOURCE_GROUP="<resource-group-name>"
+   MANAGED_ENVIRONMENT="<Azure-Container-Apps-environment-name>"
+   SERVICE_NAME="<Azure-Spring-Apps-instance-name>"
+   APP_NAME="<Spring-app-name>"
+   ```
+
+1. Use the following command to create a resource group.
+
+   ```azurecli-interactive
+   az group create \
+       --resource-group ${RESOURCE_GROUP} \
+       --location ${LOCATION}
+   ```
+
+1. An Azure Container App environment creates a secure boundary around a group of applications. Apps deployed to the same environment are deployed in the same virtual network and write logs to the same [Log Analytics workspace](/azure/azure-monitor/logs/log-analytics-workspace-overview). To create the environment, run the following command:
+
+   ```azurecli-interactive
+   az containerapp env create \
+       --name ${MANAGED_ENVIRONMENT} \
+       --resource-group ${RESOURCE_GROUP} \
+       --location ${LOCATION}
+   ```
+
+1. Use the following command to create a variable to store the environment resource ID:
+
+   ```azurecli-interactive
+   MANAGED_ENV_RESOURCE_ID=$(az containerapp env show \
+       --name ${MANAGED_ENVIRONMENT} \
+       --resource-group ${RESOURCE_GROUP} \
+       --query id \
+       --output tsv)
+   ```
+
+1. Use the following command to create an Azure Spring Apps service instance. The `StandardGen2` Azure Spring Apps instance is built on top of the Azure Container Apps environment. Create your Azure Spring Apps instance by specifying the resource ID of the environment you created.
+
+   ```azurecli-interactive
+   az spring create \
+       --resource-group ${RESOURCE_GROUP} \
+       --name ${SERVICE_NAME} \
+       --managed-environment ${MANAGED_ENV_RESOURCE_ID} \
+       --sku standardGen2 \
+       --location ${LOCATION}
+   ```
+
+## Create an app in your Azure Spring Apps instance
+
+An [*App*](/azure/spring-apps/concept-understand-app-and-deployment) is an abstraction of one business app. Apps run in an Azure Spring Apps service instance, or simply service instance, as shown in the following diagram.
+
+:::image type="content" source="media/spring-cloud-app-and-deployment/app-deployment-rev.png" alt-text="Diagram showing the relationship between apps and an Azure Spring Apps service instance.":::
+
+Use the following command to specify the app name on Azure Spring Apps and to allocate required resources:
+
+```azurecli-interactive
+az spring app create \
+    --resource-group ${RESOURCE_GROUP} \
+    --service ${SERVICE_NAME} \
+    --name ${APP_NAME} \
+    --cpu 1 \
+    --memory 2Gi \
+    --instance-count 2 \
+    --assign-endpoint true
+```
+
+Azure Spring Apps creates an empty welcome application and provides its URL in the field named `properties.url`.
+
+:::image type="content" source="media/quickstart/app-welcome-page.png" alt-text="Screenshot of the welcome page." lightbox="media/quickstart/app-welcome-page.png":::
+
+## Clone and build the Spring Boot sample project
+
+Use the following steps to clone the Spring Boot sample project.
+
+1. Use the following command to clone the [Spring Boot sample project](https://github.com/spring-guides/gs-spring-boot.git) from GitHub.
+
+   ```azurecli-interactive
+   git clone -b boot-2.7 https://github.com/spring-guides/gs-spring-boot.git
+   ```
+
+1. Use the following command to move to the project folder.
+
+   ```azurecli-interactive
+   cd gs-spring-boot/complete
+   ```
+
+1. Use the following [Maven](https://maven.apache.org/what-is-maven.html) command to build the project.
+
+   ```azurecli-interactive
+   mvn clean package -DskipTests
+   ```
+
+## Deploy the local app to Azure Spring Apps
+
+Use the following command to deploy the *.jar* file for the app.
+
+```azurecli-interactive
+az spring app deploy \
+    --resource-group ${RESOURCE_GROUP} \
+    --service ${SERVICE_NAME} \
+    --name ${APP_NAME} \
+    --artifact-path target/spring-boot-complete-0.0.1-SNAPSHOT.jar \
+    --env testEnvKey=testEnvValue \
+    --runtime-version Java_11 \
+    --jvm-options '-Xms1024m -Xmx2048m'
+```
+
+Deploying the application can take a few minutes.
+
 ## [IntelliJ](#tab/IntelliJ)
 
 ## Prerequisites
@@ -149,37 +311,36 @@ Use the following steps to create the project:
 
 1. Use [Spring Initializr](https://start.spring.io/#!type=maven-project&language=java&platformVersion=2.6.10&packaging=jar&jvmVersion=11&groupId=com.example&artifactId=hellospring&name=hellospring&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.hellospring&dependencies=web,cloud-eureka,actuator,cloud-config-client) to generate a sample project with recommended dependencies for Azure Spring Apps. The following URL provides default settings for you.
 
-```url
-https://start.spring.io/#!type=maven-project&language=java&platformVersion=2.6.10&packaging=jar&jvmVersion=11&groupId=com.example&artifactId=hellospring&name=hellospring&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.hellospring&dependencies=web,cloud-eureka,actuator,cloud-config-client
-```
+   ```url
+   https://start.spring.io/#!type=maven-project&language=java&platformVersion=2.6.10&packaging=jar&jvmVersion=11&groupId=com.example&artifactId=hellospring&name=hellospring&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.hellospring&dependencies=web,cloud-eureka,actuator,cloud-config-client
+   ```
 
-The following image shows the recommended Initializr settings for the *hellospring* sample project.
+   The following image shows the recommended Initializr settings for the *hellospring* sample project.
 
-This example uses Java version 11.  To use a different Java version, change the Java version setting under **Project Metadata**.
+   This example uses Java version 11.  To use a different Java version, change the Java version setting under **Project Metadata**.
 
-:::image type="content" source="media/quickstart/initializr-page.png" alt-text="Screenshot of Spring Initializr page." lightbox="media/quickstart/initializr-page.png":::
+   :::image type="content" source="media/quickstart/initializr-page.png" alt-text="Screenshot of Spring Initializr page." lightbox="media/quickstart/initializr-page.png":::
 
 1. When all dependencies are set, select **Generate**.
 1. Download and unpack the package, and then create a web controller for your web application by adding the file *src/main/java/com/example/hellospring/HelloController.java* with the following contents:
 
-    ```java
-    package com.example.hellospring;
+   ```java
+   package com.example.hellospring;
 
-    import org.springframework.web.bind.annotation.RestController;
-    import org.springframework.web.bind.annotation.RequestMapping;
+   import org.springframework.web.bind.annotation.RestController;
+   import org.springframework.web.bind.annotation.RequestMapping;
 
-    @RestController
-    public class HelloController {
+   @RestController
+   public class HelloController {
 
-        @RequestMapping("/")
-        public String index() {
-            return "Greetings from Azure Spring Apps!";
+       @RequestMapping("/")
+       public String index() {
+           return "Greetings from Azure Spring Apps!";
         }
+   }
+   ```
 
-    }
-    ```
-
-## Provision an instance of Azure Spring Apps
+## Create an instance of Azure Spring Apps
 
 Use the following steps to create an instance of Azure Spring Apps using the Azure portal.
 
@@ -195,11 +356,11 @@ Use the following steps to create an instance of Azure Spring Apps using the Azu
 
    :::image type="content" source="media/quickstart/spring-apps-create.png" alt-text="Screenshot of Azure portal showing Azure Spring Apps resource with Create button highlighted." lightbox="media/quickstart/spring-apps-create.png":::
 
-1. Fill out the form on the Azure Spring Apps **Create** page.  Consider the following guidelines:
+1. Fill out the form on the Azure Spring Apps **Create** page. Consider the following guidelines:
 
    - **Subscription**: Select the subscription you want to be billed for this resource.
    - **Resource group**: Creating new resource groups for new resources is a best practice.
-   - **Service Name**: Specify the service instance name. You'll use this name later in this article where the *\<service-instance-name\>* placeholder appears. The name must be between 4 and 32 characters long and can contain only lowercase letters, numbers, and hyphens. The first character of the service name must be a letter and the last character must be either a letter or a number.
+   - **Service Name**: Specify the service instance name. You use this name later in this article where the *\<Azure-Spring-Apps-instance-name\>* placeholder appears. The name must be between 4 and 32 characters long and can contain only lowercase letters, numbers, and hyphens. The first character of the service name must be a letter and the last character must be either a letter or a number.
    - **Region**: Select the region for your service instance.
 
    :::image type="content" source="media/quickstart/portal-start.png" alt-text="Screenshot of Azure portal showing Azure Spring Apps Create page." lightbox="media/quickstart/portal-start.png":::
@@ -280,9 +441,9 @@ echo "Press [ENTER] to continue ..."
 
 ## Next steps
 
-In this quickstart, you learned how to generate a basic Spring project, provision a service instance, build and deploy an app with a public endpoint, and clean up the resources.
+In this quickstart, you learned how to build and deploy a Spring app in an Azure Spring Apps service instance. You also learned how to deploy an app with a public endpoint, and how to clean up resources.
 
-You also have access to powerful logs, metrics, and distributed tracing capability from the Azure portal. For more information, see [Quickstart: Monitoring Azure Spring Apps apps with logs, metrics, and tracing](./quickstart-logs-metrics-tracing.md).
+You have access to powerful logs, metrics, and distributed tracing capability from the Azure portal. For more information, see [Quickstart: Monitoring Azure Spring Apps apps with logs, metrics, and tracing](./quickstart-logs-metrics-tracing.md).
 
 To learn how to use more Azure Spring capabilities, advance to the quickstart series that deploys a sample application to Azure Spring Apps: