edits

KarlErickson · KarlErickson · commit 8ceb6ec450ef · 2023-03-20T11:00:45.000-07:00
diff --git a/articles/spring-apps/quickstart-deploy-event-driven-app-standard-consumption.md b/articles/spring-apps/quickstart-deploy-event-driven-app-standard-consumption.md
@@ -51,24 +51,18 @@ Use the following steps to prepare the sample locally.
 
 ## Prepare the cloud environment
 
-The main resources you needto run this sample is an Azure Spring Apps instance and an Azure Service Bus instance. This section provides the steps to create these resources.
+The main resources you need to run this sample is an Azure Spring Apps instance and an Azure Service Bus instance. Use the following steps to create these resources.
 
-### Step 1 - Set names for resources
+1. Use the following commands to create variables for the names of your resources and for other settings as needed. Resource names in Azure must be unique.
 
-Use the following commands to create variables for the names of your resources and for other settings as needed. Resource names in Azure must be unique.
-
-```azurecli
-RESOURCE_GROUP=<event-driven-app-resource-group-name>
-LOCATION=<desired-region>
-SERVICE_BUS_NAME_SPACE=<event-driven-app-service-bus-namespace>
-AZURE_CONTAINER_APPS_ENVIRONMENT=<Azure-Container-Apps-environment-name>
-AZURE_SPRING_APPS_INSTANCE=<Azure-Spring-Apps-instance-name>
-APP_NAME=<event-driven-app-name>
-```
-
-### Step 2 - Create a new resource group
-
-To manage the resources easily, create a resource group to hold these resources. Use the following steps to create a new resource group.
+   ```azurecli
+   RESOURCE_GROUP=<event-driven-app-resource-group-name>
+   LOCATION=<desired-region>
+   SERVICE_BUS_NAME_SPACE=<event-driven-app-service-bus-namespace>
+   AZURE_CONTAINER_APPS_ENVIRONMENT=<Azure-Container-Apps-environment-name>
+   AZURE_SPRING_APPS_INSTANCE=<Azure-Spring-Apps-instance-name>
+   APP_NAME=<event-driven-app-name>
+   ```
 
 1. Sign in to Azure by using the following command:
 
@@ -82,13 +76,13 @@ To manage the resources easily, create a resource group to hold these resources.
    az configure --defaults location=${LOCATION}
    ```
 
-1. Set your default subscription. Firstly, list all available subscriptions:
+1. Set your default subscription. First, list all available subscriptions:
 
    ```azurecli
    az account list --output table
    ```
 
-   Determine the ID of the subscription you want to set and use it with the following command to set your default subscription.
+1. Determine the ID of the subscription you want to set and use it with the following command to set your default subscription.
 
    ```azurecli
    az account set --subscription <subscription-ID>
@@ -106,7 +100,9 @@ To manage the resources easily, create a resource group to hold these resources.
    az configure --defaults group=${RESOURCE_GROUP}
    ```
 
-### Step 3 - Create a Service Bus instance
+## Create a Service Bus instance
+
+Create a Service Bus instance by using the following steps.
 
 1. Use the following command to create a Service Bus namespace.
 
@@ -125,14 +121,12 @@ To manage the resources easily, create a resource group to hold these resources.
        --name upper-case
    ```
 
-### Step 4 - Create an Azure Spring Apps Consumption plan instance
-
-An Azure Spring Apps Consumption plan hosts the Spring event-driven app. This section provides the steps of to create an instance of an Azure Spring Apps Consumption plan and then creates an app inside the plan.
-
-#### Step 4.1 - Create an Azure Container Apps environment
+## Create an Azure Container Apps environment
 
 The Azure Container Apps 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.
 
+Use the following steps to create the environment:
+
 1. Install the Azure Container Apps extension for the CLI by using the following command:
 
    ```azurecli
@@ -157,12 +151,14 @@ The Azure Container Apps environment creates a secure boundary around a group of
    az containerapp env create --name ${AZURE_CONTAINER_APPS_ENVIRONMENT}
    ```
 
-#### Step 4.2 - Create Azure Spring Apps instance
+## Create the Azure Spring Apps instance
+
+An Azure Spring Apps Consumption plan instance hosts the Spring event-driven app. Use the following steps to create the service instance and then create an app inside the instance.
 
-1. Install the Spring extension designed for StandardGen2 Azure Spring Apps.
+1. Install the Spring extension designed for `StandardGen2` Azure Spring Apps by using the following command:
 
    ```azurecli
-   az extension remove -n spring && \
+   az extension remove --name spring && \
    az extension add \
        --source https://ascprivatecli.blob.core.windows.net/cli-extension/spring-1.8.0-py3-none-any.whl \
        --yes
@@ -179,7 +175,8 @@ The Azure Container Apps environment creates a secure boundary around a group of
    ```azurecli
    MANAGED_ENV_RESOURCE_ID=$(az containerapp env show \
        --name ${AZURE_CONTAINER_APPS_ENVIRONMENT} \
-       --query id -o tsv)
+       --query id \
+       --output tsv)
    ```
 
 1. Use the following command to create your Azure Spring Apps instance, specifying the resource ID of the Azure Container Apps environment you created.
@@ -191,66 +188,70 @@ The Azure Container Apps environment creates a secure boundary around a group of
        --sku standardGen2
    ```
 
-#### Step 4.3 - Create an app in Azure Spring Apps
-
-Create an app in the Azure Spring Apps instance by using the following command:
-
-```azurecli
-az spring app create \
-   --service ${AZURE_SPRING_APPS_INSTANCE} \
-   --name ${APP_NAME} \
-   --cpu 1 \
-   --memory 2 \
-   --instance-count 2 \
-   --runtime-version Java_17 \
-   --assign-endpoint true
-```
+1. Create an app in the Azure Spring Apps instance by using the following command:
 
-### Step 5 - Bind Service Bus to Azure Spring Apps
+   ```azurecli
+   az spring app create \
+       --service ${AZURE_SPRING_APPS_INSTANCE} \
+       --name ${APP_NAME} \
+       --cpu 1 \
+       --memory 2 \
+       --instance-count 2 \
+       --runtime-version Java_17 \
+       --assign-endpoint true
+   ```
 
-Now both the Service Bus and the app in Azure Spring Apps have been created. But the app can't connect to the Service Bus. This section provides the steps to enable the app to connect to the Service Bus.
+## Bind the Service Bus to Azure Spring Apps and deploy the app
 
-#### Step 5.1 - Get a connection string
+Now both the Service Bus and the app in Azure Spring Apps have been created, but the app can't connect to the Service Bus. Use the following steps to enable the app to connect to the Service Bus, and then deploy the app.
 
-To enable the app to connect to the Service Bus, get the Service Bus's connection string by using the following command:
+1. Get the Service Bus's connection string by using the following command:
 
-```azurecli
-SERVICE_BUS_CONNECTION_STRING=$(az servicebus namespace authorization-rule keys list \
-    --namespace-name ${SERVICE_BUS_NAME_SPACE} \
-    --name RootManageSharedAccessKey \
-    --query primaryConnectionString \
-    --output tsv)
-```
-
-#### Step 5.2 - Set environment variable in app
-
-Provide the connection string to the app by using the following command to add an environment variable.
+   ```azurecli
+   SERVICE_BUS_CONNECTION_STRING=$(az servicebus namespace authorization-rule keys list \
+       --namespace-name ${SERVICE_BUS_NAME_SPACE} \
+       --name RootManageSharedAccessKey \
+       --query primaryConnectionString \
+       --output tsv)
+   ```
 
-```azurecli
-az spring app update \
-    --service ${AZURE_SPRING_APPS_INSTANCE} \
-    --name ${APP_NAME} \
-    --env SERVICE_BUS_CONNECTION_STRING=${SERVICE_BUS_CONNECTION_STRING}
-```
+1. Use the following command to provide the connection string to the app through an environment variable.
 
-## Deploy the app to Azure Spring Apps
+   ```azurecli
+   az spring app update \
+       --service ${AZURE_SPRING_APPS_INSTANCE} \
+       --name ${APP_NAME} \
+       --env SERVICE_BUS_CONNECTION_STRING=${SERVICE_BUS_CONNECTION_STRING}
+   ```
 
-Now the cloud environment is ready. Deploy the app by using the following command.
+1. Now the cloud environment is ready. Deploy the app by using the following command.
 
-```azurecli
-az spring app deploy \
-    --service ${AZURE_SPRING_APPS_INSTANCE} \
-    --name ${APP_NAME} \
-    --artifact-path target/simple-event-driven-app-0.0.1-SNAPSHOT.jar
-```
+   ```azurecli
+   az spring app deploy \
+       --service ${AZURE_SPRING_APPS_INSTANCE} \
+       --name ${APP_NAME} \
+       --artifact-path target/simple-event-driven-app-0.0.1-SNAPSHOT.jar
+   ```
 
 ## Validate the event-driven app
 
 Use the following steps to confirm that the event-driven app works correctly. You can validate the app by sending a message to the `lower-case` queue, then confirming that there's a message in the `upper-case` queue.
 
 1. Send a message to `lower-case` queue with Service Bus Explorer. For more information, see the [Send a message to a queue or topic](../service-bus-messaging/explorer.md#send-a-message-to-a-queue-or-topic) section of [Use Service Bus Explorer to run data operations on Service Bus](../service-bus-messaging/explorer.md).
+
 1. Confirm that there's a new message sent to the `upper-case` queue. For more information, see the [Peek a message](../service-bus-messaging/explorer.md#peek-a-message) section of [Use Service Bus Explorer to run data operations on Service Bus](../service-bus-messaging/explorer.md).
 
+## Clean up resources
+
+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. Alternately, to delete the resource group by using Azure CLI, use the following commands:
+
+```azurecli
+echo "Enter the Resource Group name:" &&
+read resourceGroupName &&
+az group delete --name $resourceGroupName &&
+echo "Press [ENTER] to continue ..."
+```
+
 ## Next steps
 
 - [Azure Spring Apps Samples](https://github.com/Azure-Samples/Azure-Spring-Cloud-Samples).
