Skip to content

Commit 633e4d8

Browse files
committed
edits
1 parent 67ed970 commit 633e4d8

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

articles/spring-apps/includes/quickstart-deploy-restful-api-app/deploy-restful-api-app-with-consumption-plan.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ For clarity of structure, a separate markdown file is used to describe how to de
1717

1818
To deploy the RESTful API app, the first step is to prepare the Spring project to run locally.
1919

20-
#### [Azure portal](#tab/Azure-portal)
20+
### [Azure portal](#tab/Azure-portal)
2121

2222
Use the following steps to clone and run the app locally.
2323

@@ -34,7 +34,7 @@ Use the following steps to clone and run the app locally.
3434
./mvnw spring-boot:run
3535
```
3636

37-
#### [Azure Developer CLI](#tab/Azure-Developer-CLI)
37+
### [Azure Developer CLI](#tab/Azure-Developer-CLI)
3838

3939
Use the following steps to initialize the web application from Azure Developer CLI templates:
4040

@@ -258,7 +258,7 @@ spring:
258258
259259
Now, you can deploy the app to Azure Spring Apps.
260260
261-
#### [Azure portal](#tab/Azure-portal)
261+
### [Azure portal](#tab/Azure-portal)
262262
263263
Use the [Maven plugin for Azure Spring Apps](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Spring-Apps) to deploy.
264264
@@ -299,7 +299,7 @@ Use the [Maven plugin for Azure Spring Apps](https://github.com/microsoft/azure-
299299

300300
The output **Application url** is the base endpoint to access the ToDo API application.
301301

302-
#### [Azure Developer CLI](#tab/Azure-Developer-CLI)
302+
### [Azure Developer CLI](#tab/Azure-Developer-CLI)
303303

304304
Use Azure Developer CLI to package the app, provision the Azure resources required by the web application, and then deploy to Azure Spring Apps.
305305

articles/spring-apps/includes/quickstart-deploy-restful-api-app/quickstart-tool-introduction.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Use the following line at the end of the heading Prerequisites, with blank lines
1212
[!INCLUDE [quickstart-tool-introduction](includes/quickstart-deploy-restful-api-app/quickstart-tool-introduction.md)]
1313
-->
1414

15-
The following list describes the different options to create resources and deploy applications in Azure Spring Apps:
15+
The following list describes the different options of creating resources and deploying applications in Azure Spring Apps:
1616

17-
- Azure portal: Use the Azure portal to create resources and deploy applications step by step. The Azure portal is suitable for developers who are using the Azure Cloud Services for the first time.
18-
- Azure Developer CLI: Use the Azure Developer CLI to create resources and deploy applications through simple commands, and to cover application code and infrastructure as code files needed to provision the Azure resources. The Azure Developer CLI is suitable for developers who are familiar with the Azure Cloud Services.
17+
- Azure portal: Use the Azure portal to create resources and deploy applications step by step. The Azure portal is suitable for developers who are using Azure Cloud Services for the first time.
18+
- Azure Developer CLI: Use the Azure Developer CLI to create resources and deploy applications through simple commands, and to cover application code and infrastructure as code files needed to provision the Azure resources. The Azure Developer CLI is suitable for developers who are familiar with Azure Cloud Services.

articles/spring-apps/quickstart-deploy-restful-api-app.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ The following diagram shows the architecture of the system:
4444
- An Azure subscription. If you don't have a subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
4545
- [Git](https://git-scm.com/downloads).
4646
- [Java Development Kit (JDK)](/java/azure/jdk/), version 17.
47-
- A Microsoft Entra ID tenant. For instructions on creating one, see [Quickstart: Create a new tenant in Azure AD](../active-directory/fundamentals/create-new-tenant.md).
47+
- A Microsoft Entra ID tenant. For instructions on creating one, see [Quickstart: Create a new tenant in Microsoft Entra ID](../active-directory/fundamentals/create-new-tenant.md).
4848
- [curl](https://curl.se/download.html).
4949

5050
### [Azure Developer CLI](#tab/Azure-Developer-CLI)
5151

5252
- An Azure subscription. If you don't have a subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
5353
- [Git](https://git-scm.com/downloads).
5454
- [Java Development Kit (JDK)](/java/azure/jdk/), version 17.
55-
- A Microsoft Entra ID tenant. For instructions on creating one, see [Quickstart: Create a new tenant in Azure AD](../active-directory/fundamentals/create-new-tenant.md).
55+
- A Microsoft Entra ID tenant. For instructions on creating one, see [Quickstart: Create a new tenant in Microsoft Entra ID](../active-directory/fundamentals/create-new-tenant.md).
5656
- [Azure Developer CLI (AZD)](https://aka.ms/azd-install), version 1.0.2 or higher.
5757
- [curl](https://curl.se/download.html).
5858

@@ -76,7 +76,7 @@ Use the following steps to register an application in Microsoft Entra ID, which
7676

7777
1. If you have access to multiple tenants, use the **Directory + subscription** filter (:::image type="icon" source="media/quickstart-deploy-restful-api-app/portal-directory-subscription-filter.png" border="false":::) to select the tenant in which you want to register an application.
7878

79-
1. Search for and select **Azure Active Directory**.
79+
1. Search for and select **Microsoft Entra ID**.
8080

8181
1. Under **Manage**, select **App registrations** > **New registration**.
8282

@@ -88,15 +88,15 @@ Use the following steps to register an application in Microsoft Entra ID, which
8888

8989
1. On the app **Overview** page, look for the **Application (client) ID** value, and then record it for later use. You need it to acquire access token.
9090

91-
1. Select **API permissions** > **Add a permission** > **My APIs**. Select the **ToDo** application that you registered earlier, and then select the permissions **ToDo.Read**, **ToDo.Write**, and **ToDo.Delete**. Select **Add permissions**.
91+
1. Select **API permissions** > **Add a permission** > **My APIs**. Select the `ToDo` application that you registered earlier, and then select the permissions **ToDo.Read**, **ToDo.Write**, and **ToDo.Delete**. Select **Add permissions**.
9292

9393
1. Select **Grant admin consent for {your-tenant-name}** to grant admin consent for the permissions you added.
9494

9595
:::image type="content" source="media/quickstart-deploy-restful-api-app/api-permissions.png" alt-text="Image that shows the API permissions of a web application." lightbox="media/quickstart-deploy-restful-api-app/api-permissions.png":::
9696

9797
#### Add user to access the RESTful APIs
9898

99-
Use the following steps to create a member user in your Microsoft Entra ID, then the user can manage the data of the ToDo application through RESTful APIs.
99+
Use the following steps to create a member user in your Microsoft Entra ID, then the user can manage the data of the `ToDo` application through RESTful APIs.
100100

101101
1. Under **Manage**, select **Users** > **New user** > **Create new user**.
102102

@@ -109,7 +109,7 @@ Use the following steps to create a member user in your Microsoft Entra ID, then
109109
> [!NOTE]
110110
>
111111
> - New users must complete the first login authentication and update their passwords, otherwise, you receive an `AADSTS50055: The password is expired` error when you get the access token.
112-
> - When a new user logs in, they will receive an **Action Required** prompt. You may choose to **Ask later** to skip the validation.
112+
> - When a new user logs in, they will receive an **Action Required** prompt. You may choose **Ask later** to skip the validation.
113113
114114
1. Select **Review + create** to review your selections. Select **Create** to create the user.
115115

@@ -119,11 +119,11 @@ Use the following steps to update the OAuth2 configuration for Swagger UI author
119119

120120
1. Open the Azure Spring Apps instance in the Azure portal.
121121

122-
1. Open your **Azure Active Directory** tenant in the Azure portal, go to the registered app `ToDoWeb`.
122+
1. Open your **Microsoft Entra ID** tenant in the Azure portal, and go to the registered app `ToDoWeb`.
123123

124124
1. Under **Manage**, select **Authentication**, select **Add a platform**, and then select **Single-page application**.
125125

126-
1. Use this format `<your-app-exposed-application-url-or-endpoint>/swagger-ui/oauth2-redirect.html` as the OAuth2 redirect url in the **Redirect URIs** field, such as `https://simple-todo-api.xxxxxxxx-xxxxxxxx.xxxxxx.azurecontainerapps.io/swagger-ui/oauth2-redirect.html`, and then select **Configure**.
126+
1. Use the format `<your-app-exposed-application-url-or-endpoint>/swagger-ui/oauth2-redirect.html` as the OAuth2 redirect url in the **Redirect URIs** field, such as `https://simple-todo-api.xxxxxxxx-xxxxxxxx.xxxxxx.azurecontainerapps.io/swagger-ui/oauth2-redirect.html`, and then select **Configure**.
127127

128128
:::image type="content" source="media/quickstart-deploy-restful-api-app/aad-spa-auth.png" alt-text="Image that shows the SPA authentication in Microsoft Entra ID." lightbox="media/quickstart-deploy-restful-api-app/aad-spa-auth.png":::
129129

@@ -133,21 +133,21 @@ Use the following steps to use [OAuth 2.0 authorization code flow](../active-dir
133133

134134
1. Open the URL exposed by the app, then select **Authorize** to prepare the OAuth2 authentication.
135135

136-
1. In the **Available authorizations** window, enter the client ID of the app `ToDoWeb` in the **client_id** field, and select all the scopes for **Scopes** field, ignore the **client_secret** field, then select **Authorize** to redirect to the Microsoft Entra ID login page.
136+
1. In the **Available authorizations** window, enter the client ID of the app `ToDoWeb` in the **client_id** field, select all the scopes for **Scopes** field, ignore the **client_secret** field, and then select **Authorize** to redirect to the Microsoft Entra ID login page.
137137

138138
1. After completing the login with the previous user, you'll return to the following pop-up window:
139139

140-
:::image type="content" source="media/quickstart-deploy-restful-api-app/swagger-ui-logged.png" alt-text="Image that shows the logged of Swagger UI authorization." lightbox="media/quickstart-deploy-restful-api-app/swagger-ui-logged.png":::
140+
:::image type="content" source="media/quickstart-deploy-restful-api-app/swagger-ui-logged.png" alt-text="Image that shows the logged in window of Swagger UI authorization." lightbox="media/quickstart-deploy-restful-api-app/swagger-ui-logged.png":::
141141

142142
### Access the RESTful APIs
143143

144144
Use the following steps to access the RESTful APIs of the app `ToDo` in Swagger UI.
145145

146-
1. Select the API **POST /api/simple-todo/lists** and select **Try it out**. Enter the following request body, then select **Execute** to create a ToDo list.
146+
1. Select the API **POST /api/simple-todo/lists** and select **Try it out**. Enter the following request body, and then select **Execute** to create a ToDo list.
147147

148148
```json
149149
{
150-
"name": "My List"
150+
"name": "My List"
151151
}
152152
```
153153

@@ -160,8 +160,8 @@ Use the following steps to access the RESTful APIs of the app `ToDo` in Swagger
160160
"description": null
161161
}
162162
```
163-
164-
1. Select the API **POST /api/simple-todo/lists/{listId}/items** and select **Try it out**. Enter the ToDo list ID you created in previous step for **listId** field, enter the following request body, then select **Execute** to create a ToDo item.
163+
164+
1. Select the API **POST /api/simple-todo/lists/{listId}/items** and select **Try it out**. For **listId**, enter the ToDo list ID you created previously, enter the following request body, and then select **Execute** to create a ToDo item.
165165

166166
```json
167167
{
@@ -170,8 +170,8 @@ Use the following steps to access the RESTful APIs of the app `ToDo` in Swagger
170170
"state": "todo"
171171
}
172172
```
173-
174-
Return the ToDo item:
173+
174+
Enter the following command to return the ToDo item:
175175

176176
```json
177177
{
@@ -187,7 +187,7 @@ Use the following steps to access the RESTful APIs of the app `ToDo` in Swagger
187187

188188
1. Select the API **GET /api/simple-todo/lists** and select **Execute** to query ToDo lists.
189189

190-
Return the ToDo lists:
190+
Enter the following command to return the ToDo lists:
191191

192192
```json
193193
[
@@ -199,9 +199,9 @@ Use the following steps to access the RESTful APIs of the app `ToDo` in Swagger
199199
]
200200
```
201201

202-
1. Select the API **GET /api/simple-todo/lists/{listId}/items** and select **Try it out**. Enter the ToDo list ID you created in previous step for **listId** field, then select **Execute** to query ToDo items.
202+
1. Select the API **GET /api/simple-todo/lists/{listId}/items** and select **Try it out**. For **listId**, enter the ToDo list ID you created previously, and then select **Execute** to query ToDo items.
203203

204-
Return the ToDo item:
204+
Enter the following command to return the ToDo item:
205205

206206
```json
207207
[
@@ -217,7 +217,7 @@ Use the following steps to access the RESTful APIs of the app `ToDo` in Swagger
217217
]
218218
```
219219

220-
1. Select the API **PUT /api/simple-todo/lists/{listId}/items/{itemId}** and select **Try it out**. Enter the ToDo list ID for **listId** field and ToDo item ID for **itemId** field, enter the following request body, and then select **Execute** to update the ToDo item.
220+
1. Select the API **PUT /api/simple-todo/lists/{listId}/items/{itemId}** and select **Try it out**. For **listId**, enter the ToDo list ID. For **itemId**, enter the ToDo item ID, enter the following request body, and then select **Execute** to update the ToDo item.
221221

222222
```json
223223
{
@@ -230,7 +230,7 @@ Use the following steps to access the RESTful APIs of the app `ToDo` in Swagger
230230
}
231231
```
232232

233-
Return the new ToDo item:
233+
Enter the following command to return the new ToDo item:
234234

235235
```json
236236
{
@@ -244,7 +244,7 @@ Use the following steps to access the RESTful APIs of the app `ToDo` in Swagger
244244
}
245245
```
246246

247-
1. Select the API **DELETE /api/simple-todo/lists/{listId}/items/{itemId}** and select **Try it out**. Enter the ToDo list ID for **listId** field and ToDo item ID for **itemId** field, then select **Execute** to delete the ToDo item. You should see that the server response code is `204`.
247+
1. Select the API **DELETE /api/simple-todo/lists/{listId}/items/{itemId}** and select **Try it out**. For **listId**, enter the ToDo list ID. For **itemId**, enter the ToDo item ID, and then select **Execute** to delete the ToDo item. You should see that the server response code is `204`.
248248

249249
[!INCLUDE [clean-up-resources](includes/quickstart-deploy-restful-api-app/clean-up-resources.md)]
250250

articles/spring-apps/quickstart-deploy-web-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ The following diagram shows the architecture of the system:
3636

3737
::: zone pivot="sc-consumption-plan,sc-standard"
3838

39-
The following list describes the different options to create resources and deploy applications in Azure Spring Apps:
39+
The following list describes the different options of creating resources and deploying applications in Azure Spring Apps:
4040

41-
- Azure portal: Use the Azure portal to create resources and deploy applications step by step. The Azure portal is suitable for developers who are using the Azure Cloud Services for the first time.
42-
- Azure Developer CLI: Use the Azure Developer CLI to create resources and deploy applications through simple commands, and to cover application code and infrastructure as code files needed to provision the Azure resources. The Azure Developer CLI is suitable for developers who are familiar with the Azure Cloud Services.
41+
- Azure portal: Use the Azure portal to create resources and deploy applications step by step. The Azure portal is suitable for developers who are using Azure Cloud Services for the first time.
42+
- Azure Developer CLI: Use the Azure Developer CLI to create resources and deploy applications through simple commands, and to cover application code and infrastructure as code files needed to provision the Azure resources. The Azure Developer CLI is suitable for developers who are familiar with Azure Cloud Services.
4343

4444
::: zone-end
4545

0 commit comments

Comments
 (0)