Skip to content

Commit 9b39b73

Browse files
committed
prmerger feedback
1 parent ef9e890 commit 9b39b73

File tree

3 files changed

+16
-29
lines changed

3 files changed

+16
-29
lines changed

articles/app-service/tutorial-dotnetcore-sqldb-app.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Having issues? Check the [Troubleshooting section](#troubleshooting).
112112

113113
::: zone pivot="azure-portal"
114114

115-
## 1. Create App Service, database, and cache
115+
## 2. Create App Service, database, and cache
116116

117117
In this step, you create the Azure resources. The steps used in this tutorial create a set of secure-by-default resources that include App Service, Azure SQL Database, and Azure Cache. For the creation process, you'll specify:
118118

@@ -181,7 +181,7 @@ The creation wizard generated the connectivity string for you already as [.NET c
181181
182182
:::row:::
183183
:::column span="2":::
184-
**Step 1:** In the App Service page,
184+
**Step 1:** In the App Service page:
185185
1. In the left menu, select **Settings > Environment variables > Connection strings**.
186186
1. Select **AZURE_SQL_CONNECTIONSTRING**.
187187
1. In **Add/Edit connection string**, in the **Value** field, find the *Password=* part at the end of the string.
@@ -291,7 +291,7 @@ The creation wizard generated the connectivity string for you already as [.NET c
291291
:::column-end:::
292292
:::row-end:::
293293

294-
## 3. Deploy sample code
294+
## 4. Deploy sample code
295295

296296
In this step, you configure GitHub deployment using GitHub Actions. It's just one of many ways to deploy to App Service, but also a great way to have continuous integration in your deployment process. By default, every `git push` to your GitHub repository kicks off the build and deploy action.
297297

@@ -410,7 +410,7 @@ In this step, you configure GitHub deployment using GitHub Actions. It's just on
410410
:::column-end:::
411411
:::row-end:::
412412

413-
## 4. Generate database schema
413+
## 5. Generate database schema
414414

415415
With the SQL Database protected by the virtual network, the easiest way to run [dotnet database migrations](/ef/core/managing-schemas/migrations/?tabs=dotnet-core-cli) is in an SSH session with the App Service container.
416416

@@ -437,7 +437,7 @@ In the SSH session, only changes to files in `/home` can persist beyond app rest
437437

438438
Having issues? Check the [Troubleshooting section](#troubleshooting).
439439

440-
## 5. Browse to the app
440+
## 6. Browse to the app
441441

442442
:::row:::
443443
:::column span="2":::
@@ -462,7 +462,7 @@ Having issues? Check the [Troubleshooting section](#troubleshooting).
462462
> [!TIP]
463463
> The sample application implements the [cache-aside](/azure/architecture/patterns/cache-aside) pattern. When you visit a data view for the second time, or reload the same page after making data changes, **Processing time** in the webpage shows a much faster time because it's loading the data from the cache instead of the database.
464464
465-
## 6. Stream diagnostic logs
465+
## 7. Stream diagnostic logs
466466

467467
Azure App Service captures all messages logged to the console to assist you in diagnosing issues with your application. The sample app outputs console log messages in each of its endpoints to demonstrate this capability.
468468

@@ -485,7 +485,7 @@ Azure App Service captures all messages logged to the console to assist you in d
485485
:::column-end:::
486486
:::row-end:::
487487

488-
## 7. Clean up resources
488+
## 8. Clean up resources
489489

490490
When you're finished, you can delete all of the resources from your Azure subscription by deleting the resource group.
491491

@@ -554,7 +554,7 @@ The dev container already has the [Azure Developer CLI](/azure/developer/azure-d
554554
azd up
555555
```
556556

557-
The `azd up` command takes about 15 minutes to complete (the Redis cache take the most time). It also compiles and deploys your application code, but you'll modify your code later to work with App Service. While it's running, the command provides messages about the provisioning and deployment process, including a link to the deployment in Azure. When it finishes, the command also displays a link to the deploy application.
557+
The `azd up` command takes about 15 minutes to complete (the Redis cache takes the most time). It also compiles and deploys your application code, but you'll modify your code later to work with App Service. While it's running, the command provides messages about the provisioning and deployment process, including a link to the deployment in Azure. When it finishes, the command also displays a link to the deploy application.
558558

559559
This AZD template contains files (*azure.yaml* and the *infra* directory) that generate a secure-by-default architecture with the following Azure resources:
560560

@@ -636,7 +636,7 @@ Before you deploy these changes, you still need to generate a migration bundle.
636636
637637
Having issues? Check the [Troubleshooting section](#troubleshooting).
638638
639-
## 4. Generate database schema
639+
## 5. Generate database schema
640640
641641
With the SQL Database protected by the virtual network, the easiest way to run database migrations is in an SSH session with the App Service container. However, the App Service Linux containers don't have the .NET SDK, so the easiest way to run database migrations is to upload a self-contained migrations bundle.
642642

articles/app-service/tutorial-java-spring-cosmosdb.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ The creation wizard generated the connectivity string for you already as an [app
173173

174174
:::row:::
175175
:::column span="2":::
176-
**Step 1:** In the App Service page,
176+
**Step 1:** In the App Service page:
177177
1. In the left menu, select **Settings > Environment variables**.
178178
1. Next to **AZURE_COSMOS_CONNECTIONSTRING**, select **Show value**.
179179
This connection string lets you connect to the Cosmos DB database secured behind a private endpoint. However, the secret is saved directly in the App Service app, which isn't the best. You'll change this.
@@ -322,7 +322,7 @@ Like the Tomcat convention, if you want to deploy to the root context of Tomcat,
322322
:::column span="2":::
323323
**Step 5 (Option 1: with GitHub Copilot):**
324324
1. Start a new chat session by selecting the **Chat** view, then selecting **+**.
325-
1. Ask, "*@workspace why do i get the error in GitHub actions: The string 'java21' is not valid SemVer notation for a Java version.*" Copilot might give you an explanation and even give you the link to the workflow file that you need to fix.
325+
1. Ask, "*@workspace Why do I get the error in GitHub actions: The string 'java21' is not valid SemVer notation for a Java version.*" Copilot might give you an explanation and even give you the link to the workflow file that you need to fix.
326326
1. Open *.github/workflows/starter-no-infra_msdocs-spring-cosmosdb-123.yaml* in the explorer and make the suggested fix.
327327
GitHub Copilot doesn't give you the same response every time, you might need to ask more questions to fine-tune its response. For tips, see [What can I do with GitHub Copilot in my codespace?](#what-can-i-do-with-github-copilot-in-my-codespace).
328328
:::column-end:::
@@ -498,7 +498,7 @@ The dev container already has the [Azure Developer CLI](/azure/developer/azure-d
498498
azd up
499499
```
500500

501-
The `azd up` command takes about 15 minutes to complete (the Redis cache take the most time). It also compiles and deploys your application code, but you'll modify your code later to work with App Service. While it's running, the command provides messages about the provisioning and deployment process, including a link to the deployment in Azure. When it finishes, the command also displays a link to the deploy application.
501+
The `azd up` command takes about 15 minutes to complete (the Redis cache takes the most time). It also compiles and deploys your application code, but you'll modify your code later to work with App Service. While it's running, the command provides messages about the provisioning and deployment process, including a link to the deployment in Azure. When it finishes, the command also displays a link to the deploy application.
502502

503503
This AZD template contains files (*azure.yaml* and the *infra* directory) that generate a secure-by-default architecture with the following Azure resources:
504504

articles/app-service/tutorial-java-tomcat-mysql-app.md

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ The creation wizard generated the connectivity string for you already as an [app
162162

163163
:::row:::
164164
:::column span="2":::
165-
**Step 1:** In the App Service page,
165+
**Step 1:** In the App Service page:
166166
1. In the left menu, select **Settings > Environment variables**.
167167
1. Select **AZURE_MYSQL_CONNECTIONSTRING**. It contains a JDBC connection string. If you add an app setting that contains a valid Oracle, SQL Server, PostgreSQL, or MySQL connection string, App Service injects it as a Java Naming and Directory Interface (JNDI) data source in the Tomcat server's *context.xml* file.
168168
1. In **Add/Edit application setting**, in the **Value** field, find the *password=* part at the end of the string.
@@ -203,7 +203,7 @@ The creation wizard generated the connectivity string for you already as an [app
203203
1. Select **Review + create**, then select **Create**. Wait for the key vault deployment to finish. You should see "Your deployment is complete."
204204
:::column-end:::
205205
:::column:::
206-
:::image type="content" source="./media/tutorial-java-tomcat-mysql-app/azure-portal-secure-connection-secrets-3.png" alt-text="A screenshot showing how secure a key vault with a private endpoint." lightbox="./media/tutorial-java-tomcat-mysql-app/azure-portal-secure-connection-secrets-3.png":::
206+
:::image type="content" source="./media/tutorial-java-tomcat-mysql-app/azure-portal-secure-connection-secrets-3.png" alt-text="A screenshot showing how to secure a key vault with a private endpoint." lightbox="./media/tutorial-java-tomcat-mysql-app/azure-portal-secure-connection-secrets-3.png":::
207207
:::column-end:::
208208
:::row-end:::
209209
:::row:::
@@ -258,26 +258,13 @@ The creation wizard generated the connectivity string for you already as an [app
258258

259259
Having issues? Check the [Troubleshooting section](#troubleshooting).
260260

261-
:::row:::
262-
:::column span="2":::
263-
**Step 2:**
264-
1. In the **Application settings** tab of the **Configuration** page, find the app setting `AZURE_MYSQL_CONNECTIONSTRING`. The creation wizard created it for you.
265-
1. If you want, you can select the **Edit** button to the right of each setting and see or copy its value, or select **Add** to add a variable to inject into your Tomcat container.
266-
:::column-end:::
267-
:::column:::
268-
:::image type="content" source="./media/tutorial-java-tomcat-mysql-app/azure-portal-get-connection-string-2.png" alt-text="A screenshot showing how to see the autogenerated connection string." lightbox="./media/tutorial-java-tomcat-mysql-app/azure-portal-get-connection-string-2.png":::
269-
:::column-end:::
270-
:::row-end:::
271-
272-
Having issues? Check the [Troubleshooting section](#troubleshooting).
273-
274261
## 4. Confirm JNDI data source
275262

276263
If you add an app setting that contains a valid JDBC connection string for Oracle, SQL Server, PostgreSQL, or MySQL, App Service adds a Java Naming and Directory Interface (JNDI) data source for it in the Tomcat server's *context.xml* file. In this step, you use the SSH connection to the app container to verify the JNDI data source. In the process, you learn how to access the SSH shell for the Tomcat container.
277264

278265
:::row:::
279266
:::column span="2":::
280-
**Step 1:** Back in the App Service page,
267+
**Step 1:** Back in the App Service page:
281268
1. In the left menu, select **SSH**.
282269
1. Select **Go**.
283270
:::column-end:::
@@ -521,7 +508,7 @@ The dev container already has the [Azure Developer CLI](/azure/developer/azure-d
521508
azd up
522509
```
523510

524-
The `azd up` command takes about 15 minutes to complete (the Redis cache take the most time). It also compiles and deploys your application code, but you'll modify your code later to work with App Service. While it's running, the command provides messages about the provisioning and deployment process, including a link to the deployment in Azure. When it finishes, the command also displays a link to the deploy application.
511+
The `azd up` command takes about 15 minutes to complete (the Redis cache takes the most time). It also compiles and deploys your application code, but you'll modify your code later to work with App Service. While it's running, the command provides messages about the provisioning and deployment process, including a link to the deployment in Azure. When it finishes, the command also displays a link to the deploy application.
525512

526513
This AZD template contains files (*azure.yaml* and the *infra* directory) that generate a secure-by-default architecture with the following Azure resources:
527514

0 commit comments

Comments
 (0)