Skip to content

Commit f577949

Browse files
committed
edits
1 parent 92b8235 commit f577949

8 files changed

+136
-116
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.topic: include
66
ms.date: 05/24/2022
77
---
88

9-
<!--
9+
<!--
1010
For clarity of structure, a separate markdown file is used to describe how to clean up resources using Azure Portal or AZD.
1111
1212
[!INCLUDE [clean-up-resources-portal-or-azd](includes/quickstart-deploy-microservice-apps/clean-up-resources.md)]
@@ -41,4 +41,4 @@ The console outputs messages similar to the following example:
4141
SUCCESS: Your application was removed from Azure in xx minutes xx seconds.
4242
```
4343

44-
---
44+
---

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

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

9-
<!--
9+
<!--
1010
For clarity of structure, a separate markdown file is used to describe how to deploy to Azure Spring Apps with Basic/Standard plan.
1111
1212
[!INCLUDE [deploy-microservice-apps-with-basic-standard-plan](includes/quickstart-deploy-microservice-apps/deploy-microservice-apps-with-basic-standard-plan.md)]
@@ -39,11 +39,11 @@ Use the following steps to initialize the Pet Clinic application using Azure Dev
3939

4040
```output
4141
Initializing a new project (azd init)
42-
42+
4343
Downloading template code to: <your-local-path>
4444
(✓) Done: Initialized git repository
4545
Enter a new environment name: <your-env-name>
46-
46+
4747
SUCCESS: New project initialized!
4848
You can view the template code in your directory: <your-local-path>
4949
Learn more about running 3rd party code on our DevHub: https://aka.ms/azd-third-party-code-notice
@@ -225,23 +225,23 @@ Use the following steps to package the app, provision the Azure resources requir
225225

226226
```output
227227
Deploying services (azd deploy)
228-
228+
229229
(✓) Done: Deploying service admin-server
230230
- Endpoint: https://<your-Azure-Spring-Apps-instance-name>-admin-server.azuremicroservices.io
231-
231+
232232
(✓) Done: Deploying service api-gateway
233233
- Endpoint: https://<your-Azure-Spring-Apps-instance-name>-api-gateway.azuremicroservices.io
234-
234+
235235
(✓) Done: Deploying service customers-service
236236
- No endpoints were found
237-
237+
238238
(✓) Done: Deploying service vets-service
239239
- No endpoints were found
240-
240+
241241
(✓) Done: Deploying service visits-service
242242
- No endpoints were found
243-
244-
243+
244+
245245
SUCCESS: Your application was deployed to Azure in xx minutes xx seconds.
246246
You can view the resources created under the resource group rg-<your-environment-name> in Azure Portal:
247247
https://portal.azure.com/#@/resource/subscriptions/<your-subscription-id>/resourceGroups/rg-<your-environment-name>/overview

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

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

9-
<!--
9+
<!--
1010
For clarity of structure, a separate markdown file is used to describe how to deploy to Azure Spring Apps with Enterprise plan.
1111
1212
[!INCLUDE [deploy-microservice-apps-with-enterprise-plan](includes/quickstart-deploy-microservice-apps/deploy-microservice-apps-with-enterprise-plan.md)]
@@ -23,50 +23,50 @@ The **Deploy to Azure** button in the next section launches an Azure portal expe
2323

2424
Use the following steps to prepare the project and run the sample locally:
2525

26-
1. Use the following command to clone the [Pet Clinic application](https://github.com/Azure-Samples/spring-petclinic-microservices.git) from GitHub.
26+
1. Use the following command to clone the [Pet Clinic application](https://github.com/Azure-Samples/spring-petclinic-microservices.git) from GitHub:
2727

2828
```bash
2929
git clone https://github.com/Azure-Samples/spring-petclinic-microservices.git
3030
```
3131

3232
1. Enter the project root directory and use the following command to build the project:
3333

34-
```shell
34+
```bash
3535
./mvnw clean package -DskipTests
3636
```
3737

38-
If you don't want to run the application locally, you can skip the following steps.
38+
Use the following steps if you want to run the application locally. Otherwise, you can skip these steps.
3939

4040
1. Open a terminal and use the following command to start Config Server:
4141

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

4646
1. Open a terminal and use the following command to start Discovery Server:
4747

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

52-
1. For 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, Veterinarians, Visits, and Spring Cloud Gateway services, open new terminal and use the following commands to start the services:
5353

54-
```shell
54+
```bash
5555
./mvnw spring-boot:run -pl spring-petclinic-customers-service
5656
./mvnw spring-boot:run -pl spring-petclinic-vets-service
5757
./mvnw spring-boot:run -pl spring-petclinic-visits-service
5858
./mvnw spring-boot:run -Dspring-boot.run.profiles=default,development \
59-
-pl spring-petclinic-api-gateway
59+
-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 sample application:
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:
6363

64-
```shell
64+
```bash
6565
npm install
6666
npm run start
6767
````
6868

69-
1. Go to `http://localhost:8080` in your browser to access the application.
69+
1. After the script completes successfully, go to `http://localhost:8080` in your browser to access the PetClinic application.
7070

7171
---
7272

@@ -122,7 +122,7 @@ The **Deploy to Azure** button in the previous section launches an Azure portal
122122
123123
[!INCLUDE [deploy-spring-apps-maven-plugin](microservice-spring-apps-maven-plugin.md)]
124124
125-
2. Use the following command to deploy the application:
125+
2. Use the following command to deploy the back end applications:
126126
127127
```bash
128128
./mvnw azure-spring-apps:deploy
@@ -135,28 +135,32 @@ The **Deploy to Azure** button in the previous section launches an Azure portal
135135
[INFO] Artifact(customers-service-3.0.1.jar) is successfully deployed to deployment(default) of app(customers-service).
136136
[INFO] Starting Spring App after deploying artifacts...
137137
[INFO] Deployment Status: Running
138-
138+
139139
...
140-
140+
141141
[INFO] Start deploying artifact(vets-service-3.0.1.jar) to deployment(default) of app(vets-service)...
142142
[INFO] Artifact(vets-service-3.0.1.jar) is successfully deployed to deployment(default) of app(vets-service).
143143
[INFO] Starting Spring App after deploying artifacts...
144144
[INFO] Deployment Status: Running
145-
145+
146146
...
147-
147+
148148
[INFO] Start deploying artifact(visits-service-3.0.1.jar) to deployment(default) of app(visits-service)...
149149
[INFO] Artifact(visits-service-3.0.1.jar) is successfully deployed to deployment(default) of app(visits-service).
150150
[INFO] Starting Spring App after deploying artifacts...
151151
[INFO] Deployment Status: Running
152152
```
153153
154-
2. Use the following Azure CLI command to deploy the application:
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:
155155

156-
```bash
157-
az spring app deploy --resource-group ${RESOURCE_GROUP} --name ${APP_FRONTEND} \
158-
--service ${SPRING_APPS_NAME} --source-path spring-petclinic-frontend \
159-
--build-env BP_WEB_SERVER=nginx --builder ${APP_FRONTEND}
156+
```azurecli
157+
az spring app deploy \
158+
--resource-group ${RESOURCE_GROUP} \
159+
--service ${SPRING_APPS_NAME} \
160+
--name ${APP_FRONTEND} \
161+
--source-path spring-petclinic-frontend \
162+
--build-env BP_WEB_SERVER=nginx \
163+
--builder ${APP_FRONTEND}
160164
```
161165

162166
After the command is executed, you can see from the following log messages that the deployment was successful:

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
@@ -4,10 +4,10 @@ ms.author: v-shilichen
44
ms.service: spring-apps
55
ms.custom: event-tier1-build-2022
66
ms.topic: include
7-
ms.date: 11/06/2023
7+
ms.date: 01/03/2024
88
---
99

10-
<!--
10+
<!--
1111
Use the following line at the end of the heading Prerequisites, with blank lines before and after. App deployments with Spring Apps Maven plugin.
1212
1313
[!INCLUDE [microservice-spring-apps-maven-plugin](includes/quickstart-deploy-microservice-apps/microservice-spring-apps-maven-plugin.md)]
@@ -28,4 +28,3 @@ Use the following steps to deploy using the [Maven plugin for Azure Spring Apps]
2828
- **Use existing Azure Spring Apps in Azure**: Press <kbd>y</kbd> to use the existing Azure Spring Apps instance.
2929
- **Select apps to expose public access**: Press <kbd>Enter</kbd> to select none.
3030
- **Confirm to save all the above configurations**: Press <kbd>y</kbd>. If you press <kbd>n</kbd>, the configuration isn't saved in the POM files.
31-

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

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

9-
<!--
9+
<!--
1010
For clarity of structure, a separate markdown file is used to describe how to prepare project locally.
1111
1212
[!INCLUDE [prepare-spring-project](includes/quickstart-deploy-microservice-apps/prepare-spring-project.md)]
@@ -21,10 +21,11 @@ Use the following steps to prepare the sample locally:
2121
git clone https://github.com/Azure-Samples/spring-petclinic-microservices.git
2222
```
2323

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

2626
```bash
27+
cd spring-petclinic-microservices
2728
bash ./scripts/run_all_without_infra.sh
2829
```
2930

30-
1. Go to `http://localhost:8080` in your browser to access the application.
31+
1. After the script completes successfully, go to `http://localhost:8080` in your browser to access the PetClinic application.

0 commit comments

Comments
 (0)