You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: articles/spring-apps/includes/quickstart-deploy-restful-api-app/deploy-restful-api-app-with-consumption-plan.md
+25-25Lines changed: 25 additions & 25 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -19,15 +19,15 @@ To deploy the RESTful API app, the first step is to prepare the Spring project t
19
19
20
20
### [Azure portal](#tab/Azure-portal)
21
21
22
-
Use the following steps to clone and run the app locally.
22
+
Use the following steps to clone and run the app locally:
23
23
24
24
1. Use the following command to clone the sample project from GitHub:
1. If you want to run the app locally, complete the steps in the [Expose RESTful APIs](#expose-restful-apis) and [Update the application configuration](#update-the-application-configuration) sections first, and then use the following command to run the sample application with Maven.
30
+
1. If you want to run the app locally, complete the steps in the [Expose RESTful APIs](#expose-restful-apis) and [Update the application configuration](#update-the-application-configuration) sections first, and then use the following command to run the sample application with Maven:
31
31
32
32
```bash
33
33
cd ASA-Samples-Restful-Application
@@ -49,7 +49,7 @@ Use the following steps to initialize the web application from Azure Developer C
49
49
The following list describes the command interactions:
50
50
51
51
-**OAuth2 login**: You need to authorize the login to Azure based on the OAuth2 protocol.
52
-
-**Please enter a new environment name**: Provide an environment name. This name is used as a suffix for the resource group that is created to hold all the Azure resources. This name should be unique within your Azure subscription.
52
+
-**Please enter a new environment name**: Provide an environment name. This name is used as a suffix for the resource group that's created to hold all the Azure resources. This name should be unique within your Azure subscription.
53
53
54
54
The console outputs messages similar to the following example:
55
55
@@ -95,8 +95,8 @@ Use the following steps to create a service instance:
95
95
|**Subscription**| Your subscription name. | The Azure subscription that you want to use for your server. If you have multiple subscriptions, choose the subscription in which you'd like to be billed for the resource. |
96
96
|**Resource group**|*myresourcegroup*| A new resource group name or an existing one from your subscription. |
97
97
|**Name**|*myasa*| A unique name that identifies your Azure Spring Apps service. 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. |
98
-
|**Plan**|**Standard consumption & dedicated (preview)**| The pricing plan determines the resource and cost associated with your instance.|
99
-
|**Region**| The region closest to your users. | The location that is closest to your users. |
98
+
|**Plan**|**Standard consumption & dedicated (preview)**| The pricing plan determines the resources and cost associated with your instance. |
99
+
|**Region**| The region closest to your users. | The location that's closest to your users.|
100
100
|**Container Apps Environment**|*myenvironment*| Select which Container Apps environment instance to share the same virtual network with other services and resources. |
101
101
102
102
:::image type="content" source="../../media/quickstart-deploy-restful-api-app/create-consumption-service-basics.png" alt-text="Screenshot of the Azure portal showing the Create Azure Spring Apps consumption plan page." lightbox="../../media/quickstart-deploy-restful-api-app/create-consumption-service-basics.png":::
@@ -106,7 +106,7 @@ Use the following steps to create a service instance:
|**Environment name**|*myenvironment*| A unique name that identifies your Azure Container Apps Environment service. |
109
-
|**Plan**|**Consumption**| The pricing plan determines the resource and cost associated with your instance.|
109
+
|**Plan**|**Consumption**| The pricing plan determines the resources and cost associated with your instance. |
110
110
|**Zone Redundant**| Disabled | Whether to create your Container Apps Environment service in an Azure availability zone. |
111
111
112
112
:::image type="content" source="../../media/quickstart-deploy-restful-api-app/create-apps-container-env-basics.png" alt-text="Screenshot of the Azure portal that shows the Create Azure Container Apps page." lightbox="../../media/quickstart-deploy-restful-api-app/create-apps-container-env-basics.png":::
@@ -120,7 +120,7 @@ Use the following steps to create a service instance:
120
120
:::image type="content" source="../../media/quickstart-deploy-restful-api-app/notifications.png" alt-text="Screenshot of the Azure portal that shows the Overview page with the Notifications page open." lightbox="../../media/quickstart-deploy-restful-api-app/notifications.png":::
121
121
122
122
> [!IMPORTANT]
123
-
> The Consumption workload profile has a pay-as-you-go billing model, with no starting cost. You're billed for the dedicated workload profile based on the provisioned resources. For more information, see [Workload profiles in Consumption + Dedicated plan structure environments in Azure Container Apps (preview)](../../../container-apps/workload-profiles-overview.md) and [Azure Spring Apps pricing](https://azure.microsoft.com/pricing/details/spring-apps/).
123
+
> The Consumption workload profile has a pay-as-you-go billing model, with no starting cost. You're billed for the dedicated workload profile based on the provisioned resources. For more information, see [Workload profiles in Azure Container Apps](../../../container-apps/workload-profiles-overview.md) and [Azure Spring Apps pricing](https://azure.microsoft.com/pricing/details/spring-apps/).
124
124
125
125
### 3.3. Prepare the PostgreSQL instance
126
126
@@ -142,7 +142,7 @@ Use the following steps to connect your service instances:
142
142
143
143
1. Go to the created app, expand **Settings** and select **Configuration** from the navigation menu, and then select **Environment variables** to set the environment variables.
144
144
145
-
1. Add the following environment variables for the PostgreSQL connection, and then select **Save** to finish the app configuration update. Be sure to replace the placeholders with your own values you created previously.
145
+
1. Add the following environment variables for the PostgreSQL connection, and then select **Save** to finish the app configuration update. Be sure to replace the placeholders with your own values that you created previously.
@@ -166,7 +166,7 @@ Use the following steps to connect your service instances:
166
166
azd config set alpha.springapp on
167
167
```
168
168
169
-
1. Run the following command to package a deployable copy of your application, provision the template's infrastructure to Azure, and also deploy the application code to those newly provisioned resources:
169
+
1. Run the following command to package a deployable copy of your application, provision the template's infrastructure to Azure, and deploy the application code to those newly provisioned resources:
170
170
171
171
```bash
172
172
azd provision
@@ -186,13 +186,13 @@ Use the following steps to connect your service instances:
186
186
```
187
187
188
188
> [!NOTE]
189
-
> This command may take a while to complete. You'll see a progress indicator as it provisions Azure resources.
189
+
> This command might take a while to complete. You see a progress indicator as it provisions Azure resources.
190
190
191
191
---
192
192
193
193
### Expose RESTful APIs
194
194
195
-
Use the following steps to expose your RESTful APIs in Microsoft Entra ID.
195
+
Use the following steps to expose your RESTful APIs in Microsoft Entra ID:
196
196
197
197
1. Sign in to the [Azure portal](https://portal.azure.com/).
198
198
@@ -220,7 +220,7 @@ Use the following steps to expose your RESTful APIs in Microsoft Entra ID.
220
220
- For **Who can consent**, select **Admins only**.
221
221
- For **Admin consent display name**, enter *Read the ToDo data*.
222
222
- For **Admin consent description**, enter *Allows authenticated users to read the ToDo data.*.
223
-
- For **State**, keep **Enabled**.
223
+
- For **State**, keep it enabled.
224
224
- Select **Add scope**.
225
225
226
226
1. Repeat the previous step to add the two other scopes: *ToDo.Write* and *ToDo.Delete*.
@@ -229,7 +229,7 @@ Use the following steps to expose your RESTful APIs in Microsoft Entra ID.
229
229
230
230
### Update the application configuration
231
231
232
-
Use the following steps to update the YAML file to use with your Microsoft Entra ID registered application information to establish a relationship with the RESTful API application:
232
+
Use the following steps to update the YAML file to use your Microsoft Entra ID registered application information to establish a relationship with the RESTful API application:
233
233
234
234
1. Use the following YAML to update the `spring.cloud.azure.active-directory` configuration in the configuration file. Be sure to replace the placeholders with your own values that you created previously.
235
235
@@ -239,7 +239,7 @@ Use the following steps to update the YAML file to use with your Microsoft Entra
239
239
azure:
240
240
active-directory:
241
241
profile:
242
-
tenant-id: <your-Azure-AD-tenant-ID>
242
+
tenant-id: <your-Microsoft-Entra-ID-tenant-ID>
243
243
credential:
244
244
client-id: <your-application-ID-of-ToDo>
245
245
app-id-uri: <your-application-ID-URI-of-ToDo>
@@ -260,7 +260,7 @@ Now, you can deploy the app to Azure Spring Apps.
260
260
261
261
### [Azure portal](#tab/Azure-portal)
262
262
263
-
Use the [Maven plugin for Azure Spring Apps](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Spring-Apps) to deploy.
263
+
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):
264
264
265
265
1. Navigate to the sample project directory and run the following command to configure the app in Azure Spring Apps:
266
266
@@ -270,12 +270,12 @@ Use the [Maven plugin for Azure Spring Apps](https://github.com/microsoft/azure-
270
270
271
271
The following list describes the command interactions:
272
272
273
-
-**OAuth2 login**: You need to authorize the login to Azure based on the OAuth2 protocol.
274
-
-**Select subscription**: Select the subscription list number of the Azure Spring Apps instance you created, which defaults to the first subscription in the list. If you use the default number, press <kbd>Enter</kbd> directly.
275
-
-**Select Azure Spring Apps for deployment**: Select the number of the Azure Spring Apps instance you created. If you use the default number, press <kbd>Enter</kbd> directly.
276
-
-**Input the app name(simple-todo-api)**: Input a name for your application deployment on Azure Spring Apps. If you use the default name, press <kbd>Enter</kbd> directly.
277
-
-**Expose public access for this app (RESTful API for SimpleTodo)?**: Enter *y*.
278
-
-**Confirm to save all the above configurations (Y/n)**: Enter *y*. If you Enter *n*, the configuration won't be saved.
273
+
-**OAuth2 login**: You need to authorize the login to Azure based on the OAuth2 protocol.
274
+
-**Select subscription**: Select the subscription list number of the Azure Spring Apps instance you created, which defaults to the first subscription in the list. If you use the default number, press <kbd>Enter</kbd> directly.
275
+
-**Select Azure Spring Apps for deployment**: Select the number of the Azure Spring Apps instance you created. If you use the default number, press <kbd>Enter</kbd> directly.
276
+
-**Input the app name(simple-todo-api)**: Input a name for your application deployment on Azure Spring Apps. If you use the default name, press <kbd>Enter</kbd> directly.
277
+
-**Expose public access for this app (RESTful API for SimpleTodo)?**: Press <kbd>y</kbd>.
278
+
-**Confirm to save all the above configurations (Y/n)**: Press <kbd>y</kbd>. If you press <kbd>n</kbd>, the configuration won't be saved.
279
279
280
280
1. Use the following command to deploy the app:
281
281
@@ -285,9 +285,9 @@ Use the [Maven plugin for Azure Spring Apps](https://github.com/microsoft/azure-
285
285
286
286
The following list describes the command interaction:
287
287
288
-
-**OAuth2 login**: You need to authorize the login to Azure based on the OAuth2 protocol.
288
+
-**OAuth2 login**: You need to authorize the login to Azure based on the OAuth2 protocol.
289
289
290
-
After the command is executed, you can see the following log signs that the deployment was successful.
290
+
After the command is executed, you can see the following log output, indicating that the deployment was successful.
291
291
292
292
```output
293
293
[INFO] App(simple-todo-api) is successfully updated.
@@ -301,7 +301,7 @@ Use the [Maven plugin for Azure Spring Apps](https://github.com/microsoft/azure-
Use Azure Developer CLI to package the app, provision the Azure resources required by the web application, and then deploy to Azure Spring Apps.
304
+
Use the following steps to package the app, provision the Azure resources required by the web application, and then deploy to Azure Spring Apps.
305
305
306
306
1. Run the following command to package a deployable copy of your application:
307
307
@@ -337,6 +337,6 @@ Use Azure Developer CLI to package the app, provision the Azure resources requir
337
337
The output **Endpoint** is the base endpoint to access the ToDo API application.
338
338
339
339
> [!NOTE]
340
-
> You can also use `azd up` to combine the previous three commands: `azd package` (packages a deployable copy of your application), `azd provision` (provisions Azure resources), and `azd deploy` (deploys application code). For more information, see [Azure-Samples/ASA-Samples-API-Application](https://github.com/Azure-Samples/ASA-Samples-API-Application).
340
+
> You can also use `azd up` to combine the previous three commands: `azd provision` (provisions Azure resources), `azd package` (packages a deployable copy of your application), and `azd deploy` (deploys application code). For more information, see [Azure-Samples/ASA-Samples-API-Application](https://github.com/Azure-Samples/ASA-Samples-API-Application).
Copy file name to clipboardExpand all lines: articles/spring-apps/includes/quickstart-deploy-restful-api-app/provision-postgresql.md
+5-5Lines changed: 5 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -13,7 +13,7 @@ For clarity of structure, a separate markdown file is used to describe how to pr
13
13
14
14
-->
15
15
16
-
Use the following steps to create an Azure Database for the PostgreSQL server:
16
+
Use the following steps to create an Azure Database for PostgreSQL server:
17
17
18
18
1. Go to the Azure portal and select **Create a resource**.
19
19
@@ -38,17 +38,17 @@ Use the following steps to create an Azure Database for the PostgreSQL server:
38
38
39
39
:::image type="content" source="../../media/quickstart-deploy-restful-api-app/postgresql-create-server-basics.png" alt-text="Screenshot of the Azure portal that shows the Server details page." lightbox="../../media/quickstart-deploy-restful-api-app/postgresql-create-server-basics.png":::
40
40
41
-
1. Use the following example to configure the **Networking** tab:
41
+
1. Use the following information to configure the **Networking** tab:
42
42
43
43
-**Connectivity method**: **Public access (allowed IP addresses)**
44
44
-**Allow public access from any Azure service within Azure to this server**: selected
45
45
46
46
:::image type="content" source="../../media/quickstart-deploy-restful-api-app/postgresql-create-server-networking.png" alt-text="Screenshot of the Azure portal that shows the Networking tab." lightbox="../../media/quickstart-deploy-restful-api-app/postgresql-create-server-networking.png":::
47
47
48
-
1. Select **Review + create** to review your selections, and select **Create** to provision the server. This operation may take a few minutes.
48
+
1. Select **Review + create** to review your selections, and select **Create** to provision the server. This operation might take a few minutes.
49
49
50
-
1. Go to your PostgreSQL server in the Azure portal. On the **Overview** page, look for the **Server name** value, and then record it for later use. You need it to configure environment variables for app in Azure Spring Apps.
50
+
1. Go to your PostgreSQL server in the Azure portal. On the **Overview** page, look for the **Server name** value, and then record it for later use. You need it to configure the environment variables for the app in Azure Spring Apps.
51
51
52
52
1. Select **Databases** from the navigation menu to create a database.
53
53
54
-
:::image type="content" source="../../media/quickstart-deploy-restful-api-app/postgresql-create-database.png" alt-text="Screenshot of the Azure portal that shows the Databases page with the Create Database menu open." lightbox="../../media/quickstart-deploy-restful-api-app/postgresql-create-database.png":::
54
+
:::image type="content" source="../../media/quickstart-deploy-restful-api-app/postgresql-create-database.png" alt-text="Screenshot of the Azure portal that shows the Databases page with the Create Database pane open." lightbox="../../media/quickstart-deploy-restful-api-app/postgresql-create-database.png":::
0 commit comments