Skip to content

Commit 5695e6d

Browse files
committed
edits
1 parent f577949 commit 5695e6d

8 files changed

+218
-203
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 05/24/2022
99
<!--
1010
For clarity of structure, a separate markdown file is used to describe how to clean up resources using Azure Portal or AZD.
1111
12-
[!INCLUDE [clean-up-resources-portal-or-azd](includes/quickstart-deploy-microservice-apps/clean-up-resources.md)]
12+
[!INCLUDE [clean-up-resources](includes/quickstart-deploy-microservice-apps/clean-up-resources.md)]
1313
1414
-->
1515

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ author: KarlErickson
33
ms.author: v-shilichen
44
ms.service: spring-apps
55
ms.topic: include
6-
ms.date: 01/03/2024
6+
ms.date: 01/10/2024
77
---
88

99
<!--
@@ -23,7 +23,7 @@ For clarity of structure, a separate markdown file is used to describe how to de
2323

2424
Use the following steps to initialize the Pet Clinic application using Azure Developer CLI templates:
2525

26-
1. Open a terminal, create a new, empty folder, and then navigate to it.
26+
1. In the Bash window, create a new, empty folder and then navigate to it.
2727

2828
1. Use the following command to initialize the project:
2929

@@ -84,7 +84,7 @@ Use the following steps to create the service instance:
8484
| **Name** | *myasa* | A unique name that identifies your Azure Spring Apps instance. 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. |
8585
| **Plan** | **Standard** | The pricing plan determines the resources and cost associated with your instance. |
8686
| **Region** | The region closest to your users. | The location that is closest to your users. |
87-
| **Zone Redundant** | Unchecked | Creates your Azure Spring Apps service in an Azure availability zone. Not currently supported in all regions. |
87+
| **Zone Redundant** | Unselected | Creates your Azure Spring Apps service in an Azure availability zone. Not currently supported in all regions. |
8888

8989
1. Navigate to the **Diagnostic settings** tab on the **Create Azure Spring Apps** page and then select **Create new** to create a new Log Analytics workspaces instance. On the **Create new Log Analytics workspace** page, update the name of the **Log Analytics workspace** as needed, and then select **OK** to confirm the creation.
9090

@@ -104,7 +104,7 @@ Use the following steps to create the service instance:
104104

105105
1. Select **Config Server** in the navigation pane.
106106

107-
1. On the **Config Server** page, for **URI**, enter *`https://github.com/Azure-Samples/spring-petclinic-microservices-config.git`*, and then select **Validate**.
107+
1. On the **Config Server** page, for **URI**, enter *https://github.com/Azure-Samples/spring-petclinic-microservices-config.git* and then select **Validate**.
108108

109109
:::image type="content" source="../../media/quickstart-deploy-microservice-apps/validate-config-server.png" alt-text="Screenshot of the Azure portal that shows the Config Server page with the Default URI and the Validate button highlighted and the Apply button disabled." lightbox="../../media/quickstart-deploy-microservice-apps/validate-config-server.png":::
110110

@@ -122,7 +122,7 @@ Use the following steps to create the required resources:
122122

123123
The console outputs messages similar to the following example:
124124

125-
```text
125+
```output
126126
Logged in to Azure.
127127
```
128128

@@ -158,7 +158,7 @@ You can now deploy the app to Azure Spring Apps.
158158

159159
Use the following steps to deploy the microservice applications using the [Maven plugin for Azure Spring Apps](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Spring-Apps):
160160

161-
1. Navigate to the sample project directory and use the following command to configure the apps for Azure Spring Apps:
161+
1. Navigate to the sample project directory and then use the following command to configure the apps for Azure Spring Apps:
162162

163163
```bash
164164
./mvnw -P spring-apps com.microsoft.azure:azure-spring-apps-maven-plugin:1.17.0:config
@@ -184,7 +184,7 @@ Use the following steps to deploy the microservice applications using the [Maven
184184
> [!NOTE]
185185
> Deployment to Azure Spring Apps can take up to 25 minutes.
186186
187-
After the command is executed, a log displays output similar to the following example, which indicates that all deployments are successful:
187+
After the command runs, a log displays output similar to the following example, which indicates that all deployments are successful:
188188

189189
```output
190190
[INFO] Deployment(default) is successfully updated.

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ author: KarlErickson
33
ms.author: v-shilichen
44
ms.service: spring-apps
55
ms.topic: include
6-
ms.date: 01/03/2024
6+
ms.date: 01/10/2024
77
---
88

99
<!--
@@ -29,27 +29,27 @@ Use the following steps to prepare the project and run the sample locally:
2929
git clone https://github.com/Azure-Samples/spring-petclinic-microservices.git
3030
```
3131

32-
1. Enter the project root directory and use the following command to build the project:
32+
1. Navigate to the project root directory and then use the following command to build the project:
3333

3434
```bash
3535
./mvnw clean package -DskipTests
3636
```
3737

3838
Use the following steps if you want to run the application locally. Otherwise, you can skip these steps.
3939

40-
1. Open a terminal and use the following command to start Config Server:
40+
1. Open a new Bash window and then use the following command to start Config Server:
4141

4242
```bash
4343
./mvnw spring-boot:run -pl spring-petclinic-config-server
4444
```
4545

46-
1. Open a terminal and use the following command to start Discovery Server:
46+
1. Open a new Bash window and then use the following command to start Discovery Server:
4747

4848
```bash
4949
./mvnw spring-boot:run -pl spring-petclinic-discovery-server
5050
```
5151

52-
1. For the Customers, Veterinarians, Visits, and Spring Cloud Gateway services, open new terminal and use the following commands to start the services:
52+
1. For the Customers, Vets, Visits, and Spring Cloud Gateway services, open a new Bash window and use the following commands to start the services:
5353

5454
```bash
5555
./mvnw spring-boot:run -pl spring-petclinic-customers-service
@@ -59,7 +59,7 @@ Use the following steps if you want to run the application locally. Otherwise, y
5959
-pl spring-petclinic-api-gateway
6060
```
6161

62-
1. Open a new terminal and enter the project `spring-petclinic-frontend` directory. Use the following commands to install dependencies and run the front end application:
62+
1. Open a new Bash window and navigate to the project `spring-petclinic-frontend` directory. Use the following commands to install dependencies and run the frontend application:
6363

6464
```bash
6565
npm install
@@ -98,7 +98,7 @@ Use the following steps to create all the Azure resources that the app depends o
9898
| **Resource group** | *myresourcegroup* | A new resource group name or an existing one from your subscription. |
9999
| **Region** | The region closest to your users. | The region is used to create the resource group. |
100100
101-
:::image type="content" source="../../media/quickstart-deploy-microservice-apps/custom-deployment-microservice.png" alt-text="Screenshot of the Azure portal that shows the custom deployment for microservice." lightbox="../../media/quickstart-deploy-microservice-apps/custom-deployment-microservice.png":::
101+
:::image type="content" source="../../media/quickstart-deploy-microservice-apps/custom-deployment-microservice.png" alt-text="Screenshot of the Azure portal that shows the Custom deployment page." lightbox="../../media/quickstart-deploy-microservice-apps/custom-deployment-microservice.png":::
102102
103103
1. Select **Review and Create** to review your selections. Then, select **Create** to deploy the app to Azure Spring Apps.
104104
@@ -120,15 +120,15 @@ The **Deploy to Azure** button in the previous section launches an Azure portal
120120
121121
### [Azure portal + Maven plugin](#tab/Azure-portal-maven-plugin-ent)
122122
123-
[!INCLUDE [deploy-spring-apps-maven-plugin](microservice-spring-apps-maven-plugin.md)]
123+
[!INCLUDE [microservice-spring-apps-maven-plugin](microservice-spring-apps-maven-plugin.md)]
124124
125-
2. Use the following command to deploy the back end applications:
125+
2. Use the following command to deploy the backend applications:
126126
127127
```bash
128128
./mvnw azure-spring-apps:deploy
129129
```
130130
131-
After the command is executed, you can see from the following log messages that the deployment was successful:
131+
After the command runs, you can see from the following log messages that the deployment was successful:
132132
133133
```output
134134
[INFO] Start deploying artifact(customers-service-3.0.1.jar) to deployment(default) of app(customers-service)...
@@ -151,7 +151,7 @@ The **Deploy to Azure** button in the previous section launches an Azure portal
151151
[INFO] Deployment Status: Running
152152
```
153153
154-
2. The Azure portal doesn't support deploying the front end applications, so use the following Azure CLI command to deploy the front end application:
154+
1. The Azure portal doesn't support deploying the frontend applications, so use the following Azure CLI command to deploy the frontend application:
155155

156156
```azurecli
157157
az spring app deploy \
@@ -163,7 +163,7 @@ The **Deploy to Azure** button in the previous section launches an Azure portal
163163
--builder ${APP_FRONTEND}
164164
```
165165

166-
After the command is executed, you can see from the following log messages that the deployment was successful:
166+
After the command runs, you can see from the following log messages that the deployment was successful:
167167

168168
```output
169169
[5/5] Updating deployment in app "frontend" (this operation can take a while to complete)

articles/spring-apps/includes/quickstart-deploy-microservice-apps/microservice-spring-apps-maven-plugin.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
author: karlerickson
33
ms.author: v-shilichen
44
ms.service: spring-apps
5-
ms.custom: event-tier1-build-2022
65
ms.topic: include
7-
ms.date: 01/03/2024
6+
ms.date: 01/10/2024
87
---
98

109
<!--
@@ -15,7 +14,7 @@ Use the following line at the end of the heading Prerequisites, with blank lines
1514

1615
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):
1716

18-
1. Navigate to the project root directory, and then run the following command to configure the apps in Azure Spring Apps:
17+
1. Navigate to the project root directory and then run the following command to configure the apps in Azure Spring Apps:
1918

2019
```bash
2120
./mvnw -P spring-apps-enterprise com.microsoft.azure:azure-spring-apps-maven-plugin:1.19.0:config

articles/spring-apps/includes/quickstart-deploy-microservice-apps/prepare-spring-project.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ author: KarlErickson
33
ms.author: v-shilichen
44
ms.service: spring-apps
55
ms.topic: include
6-
ms.date: 01/03/2024
6+
ms.date: 01/10/2024
77
---
88

99
<!--
@@ -15,16 +15,15 @@ For clarity of structure, a separate markdown file is used to describe how to pr
1515

1616
Use the following steps to prepare the sample locally:
1717

18-
1. The sample project is ready on GitHub. Clone the sample project by using the following command:
18+
1. Clone the sample project by using the following command:
1919

2020
```bash
2121
git clone https://github.com/Azure-Samples/spring-petclinic-microservices.git
2222
```
2323

24-
1. Use the following command to change directory to the sample root path and then run the sample project locally:
24+
1. Navigate to the project root directory and then use the following command to run the sample project locally:
2525

2626
```bash
27-
cd spring-petclinic-microservices
2827
bash ./scripts/run_all_without_infra.sh
2928
```
3029

0 commit comments

Comments
 (0)