Skip to content

Commit 9257aa9

Browse files
sonwan2020sonwan2020
authored
fix some link 404 error and remove trail blanks in files (#171)
## Purpose 1. fix link 404 error in 4 places 2. fix the ident mismatch in yml files 3. remove tail blanks in files ## Does this introduce a breaking change? <!-- Mark one with an "x". --> ``` [ ] Yes [x] No ``` ## Pull Request Type What kind of change does this Pull Request introduce? <!-- Please check the one that applies to this PR using "x". --> ``` [ ] Bugfix [ ] Feature [ ] Code style update (formatting, local variables) [ ] Refactoring (no functional changes, no api changes) [x] Documentation content changes [ ] Other... Please describe: ```
1 parent 444e73a commit 9257aa9

File tree

28 files changed

+107
-109
lines changed

28 files changed

+107
-109
lines changed

‎docs/01_lab_plan/0101.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Your first step is to familiarize yourself with the existing [Spring Petclinic M
1414
To start, you’ll learn about the Spring Petclinic Microservices workload.
1515

1616
1. On your lab computer, open a web browser, go to [GitHub](https://github.com), and sign in to your GitHub account. If you don’t have a GitHub account, create one (go to [Join GitHub](https://github.com/join), and follow the instructions at [Signing up for a new GitHub account](https://docs.github.com/en/get-started/signing-up-for-github/signing-up-for-a-new-github-account)).
17-
1. Go to the [source folder of this lab’s GitHub repo](https://github.com/Azure-Samples/java-on-aca/tree/main/src), and review the **README.md file**.
17+
1. Go to the [source folder of this lab’s GitHub repo](https://github.com/Azure-Samples/java-on-aca/tree/main/src), and review the **README.md file**.
1818
1. Learn how to run the application in dev environments. Pay particular attention to the readme sections that cover [starting services locally without Docker](https://github.com/Azure-Samples/java-on-aca/tree/main/src#starting-services-locally-without-docker), [starting services locally with docker-compose](https://github.com/Azure-Samples/java-on-aca/tree/main/src#starting-services-locally-with-docker-compose), and [starting services locally with docker-compose and Java](https://github.com/Azure-Samples/java-on-aca/tree/main/src#starting-services-locally-with-docker-compose-and-java). After you’ve configured your development environment, if time permits, consider launching the application locally using one of these methods.
1919
1. In the source folder of this lab’s GitHub repo, go to each folder that contains the code of the individual spring-petclinic-\* services and review the content.
2020

‎docs/01_lab_plan/0102.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '2. Understand Azure resources'
3-
layout: default
4-
nav_order: 2
2+
title: '2. Understand Azure resources'
3+
layout: default
4+
nav_order: 2
55
parent: 'Lab 1: Plan your application deployment'
66
---
77

@@ -18,7 +18,7 @@ For this deployment, we’re going to use [Azure Container Apps](https://learn.m
1818
- It supports [Gateway for Spring](https://learn.microsoft.com/azure/container-apps/java-gateway-for-spring), which serves as a key component of our application’s architecture.
1919
- In addition, Azure Container Apps has other features that allow us to deploy and operate our application more securely, including:
2020
- [Managed identity](https://learn.microsoft.com/azure/container-apps/managed-identity)
21-
- Service connections
21+
- [Service connections](https://learn.microsoft.com/en-us/azure/devops/pipelines/library/service-endpoints)
2222

2323
In this lab, we’ll use Azure Container Apps to host the various components that you reviewed in the previous section. Our API gateway application will handle external user requests, routing them to the appropriate back-end applications, which are each running in their own container app.
2424

‎docs/01_lab_plan/0103.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '3. Prepare to work with Azure'
3-
layout: default
4-
nav_order: 3
2+
title: '3. Prepare to work with Azure'
3+
layout: default
4+
nav_order: 3
55
parent: 'Lab 1: Plan your application deployment'
66
---
77

‎docs/02_lab_launch/0201.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '1. Collect user information'
3-
layout: default
4-
nav_order: 1
2+
title: '1. Collect user information'
3+
layout: default
4+
nav_order: 1
55
parent: 'Lab 2: Deploy applications to Azure Container Apps'
66
---
77

@@ -31,7 +31,7 @@ First, you’ll need to sign your lab environment in to Azure and configure it t
3131
If you don't see the correct lab account listed as your default one, use the following command to adjust your Azure CLI session to use the correct subscription (replace \<*subscription-id*\> with the lab subscription’s ID):
3232
3333
```bash
34-
az account set --subscription \<subscription-id\>
34+
az account set --subscription <subscription-id>
3535
```
3636
3737
1. Collect your user info, and then store it for future use.
@@ -48,12 +48,12 @@ First, you’ll need to sign your lab environment in to Azure and configure it t
4848
az ad signed-in-user show --query id --output tsv
4949
```
5050
51-
{: .note }
51+
{: .note }
5252
> If you receive an error, such as “AADSTS530003: Your device is required to be managed to access this resource,” use one of the following options to manually collect the user object ID:
53-
54-
- If you’re using a device managed by your organization, open a command-line environment and run the command az ad signed-in-user show --query id --output tsv.
55-
56-
- Otherwise, in the [Azure portal](http://portal.azure.com/), open [Microsoft Entra ID](https://ms.portal.azure.com/#view/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/~/Overview). In the `Search` box of the Overview page, enter the username that you just collected. In the search results, select the user and then locate the user Object ID.
53+
>
54+
>- If you’re using a device managed by your organization, open a command-line environment and run the command az ad signed-in-user show --query id --output tsv.
55+
>
56+
>- Otherwise, in the [Azure portal](http://portal.azure.com/), open [Microsoft Entra ID](https://ms.portal.azure.com/#view/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/~/Overview). In the `Search` box of the Overview page, enter the username that you just collected. In the search results, select the user and then locate the user Object ID.
5757
5858
- After you get your user object ID, store it as an environment variable for later use:
5959

‎docs/02_lab_launch/0202.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '2. Create Container Apps environment'
3-
layout: default
4-
nav_order: 2
2+
title: '2. Create Container Apps environment'
3+
layout: default
4+
nav_order: 2
55
parent: 'Lab 2: Deploy applications to Azure Container Apps'
66
---
77

@@ -33,7 +33,7 @@ This involves three things:
3333
```
3434

3535
{: .note }
36-
> Not all regions support Azure Container Apps environments and Azure Database for MySQL - Flexible Server instances. For more info, please refer to [Region availability]({% link tips.md %}\#region-availability).
36+
> Not all regions support Azure Container Apps environments and Azure Database for MySQL - Flexible Server instances. For more info, please refer to [Region availability]({% link tips.md %}#region-availability).
3737

3838
{: .note }
3939
> This lab uses quite a few environment variables. If you’re using a codespace to run this lab and the codespace restarts, your environment variables will be lost. For methods to persist these environment variables across codespace sessions, go to the [LabTips]({% link tips.md %}) section.

‎docs/02_lab_launch/0203.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '3. Create MySQL Database'
3-
layout: default
4-
nav_order: 3
2+
title: '3. Create MySQL Database'
3+
layout: default
4+
nav_order: 3
55
parent: 'Lab 2: Deploy applications to Azure Container Apps'
66
---
77

‎docs/02_lab_launch/0204.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '4. Set up config repository'
3-
layout: default
4-
nav_order: 4
2+
title: '4. Set up config repository'
3+
layout: default
4+
nav_order: 4
55
parent: 'Lab 2: Deploy applications to Azure Container Apps'
66
---
77

@@ -27,14 +27,14 @@ Perform the following steps to get the config server to load the proper file:
2727
```yaml
2828
spring:
2929
datasource:
30-
url: jdbc:mysql://${SQL_SERVER}.mysql.database.azure.com:3306/petclinic?useSSL=true
31-
username: ${SQL_USER}
32-
password: ${SQL_PASSWORD}
30+
url: jdbc:mysql://${SQL_SERVER}.mysql.database.azure.com:3306/petclinic?useSSL=true
31+
username: ${SQL_USER}
32+
password: ${SQL_PASSWORD}
3333
sql:
34-
init:
35-
schema-locations: classpath*:db/mysql/schema.sql
36-
data-locations: classpath*:db/mysql/data.sql
37-
mode: ALWAYS
34+
init:
35+
schema-locations: classpath*:db/mysql/schema.sql
36+
data-locations: classpath*:db/mysql/data.sql
37+
mode: ALWAYS
3838
```
3939
4040
- The properties of spring.datasource are used to build connections to the MySQL database.

‎docs/02_lab_launch/0205.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '5. Create Java components'
3-
layout: default
4-
nav_order: 5
2+
title: '5. Create Java components'
3+
layout: default
4+
nav_order: 5
55
parent: 'Lab 2: Deploy applications to Azure Container Apps'
66
---
77

@@ -61,7 +61,7 @@ To learn more about how to configure these applications, refer to:
6161
--max-replicas 1
6262
```
6363

64-
1. Confirm that all three servers were successfully created using the portal.
64+
1. Confirm that all three servers were successfully created using the portal.
6565

6666
In your web browser, go to the [Azure portal](http://portal.azure.com/) and access your Azure Container Apps environment. Then open `Services` \> `Services`, and you should find the components that you just created.
6767

‎docs/02_lab_launch/0206.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '6. Prepare Container Registry and managed identity'
3-
layout: default
4-
nav_order: 6
2+
title: '6. Prepare Container Registry and managed identity'
3+
layout: default
4+
nav_order: 6
55
parent: 'Lab 2: Deploy applications to Azure Container Apps'
66
---
77

‎docs/02_lab_launch/0207.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '7. Deploy component applications'
3-
layout: default
4-
nav_order: 7
2+
title: '7. Deploy component applications'
3+
layout: default
4+
nav_order: 7
55
parent: 'Lab 2: Deploy applications to Azure Container Apps'
66
---
77

‎docs/02_lab_launch/0208.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '8. Test the applications'
3-
layout: default
4-
nav_order: 8
2+
title: '8. Test the applications'
3+
layout: default
4+
nav_order: 8
55
parent: 'Lab 2: Deploy applications to Azure Container Apps'
66
---
77

‎docs/02_lab_launch/0209.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ The following image should reflect your application architecture after a success
1515

1616
{: .important }
1717
> The work you did in this lab is fundamental to the next several labs you’ll be working through, so please do not delete any of the Azure resources you've created here.
18-
>
19-
>In addition to those resources, you also defined some environment variables as part of this lab, and many of these are also required in subsequent labs. To make sure you don't lose these variables after closing your current bash session, you'll want to save them.
20-
>
21-
> Before you move forward, in your open command-line window, go to the `spring-petclinic-microservices` directory and run the command `source ../.devcontainer/saveenv.sh`. This will save the environment variables to the file `~/.dev-environment`, and any new bash sessions you start will automatically load the required variables.
22-
>
18+
>
19+
>In addition to those resources, you also defined some environment variables as part of this lab, and many of these are also required in subsequent labs. To make sure you don't lose these variables after closing your current bash session, you'll want to save them.
20+
>
21+
> Before you move forward, in your open command-line window, go to the `spring-petclinic-microservices` directory and run the command `source ../.devcontainer/saveenv.sh`. This will save the environment variables to the file `~/.dev-environment`, and any new bash sessions you start will automatically load the required variables.
22+
>
2323
> You can also manually load the saved variables with the command `source ~/.dev-environment`.

‎docs/03_lab_monitor/0301.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '1. Inspect in the Azure portal'
3-
layout: default
4-
nav_order: 1
2+
title: '1. Inspect in the Azure portal'
3+
layout: default
4+
nav_order: 1
55
parent: 'Lab 3: Enable monitoring'
66
---
77

‎docs/03_lab_monitor/0302.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '2. Enable Log Analytics'
3-
layout: default
4-
nav_order: 2
2+
title: '2. Enable Log Analytics'
3+
layout: default
4+
nav_order: 2
55
parent: 'Lab 3: Enable monitoring'
66
---
77

‎docs/03_lab_monitor/0303.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '3. Configure Application Insights (Optional)'
3-
layout: default
4-
nav_order: 3
2+
title: '3. Configure Application Insights (Optional)'
3+
layout: default
4+
nav_order: 3
55
parent: 'Lab 3: Enable monitoring'
66
---
77

@@ -22,7 +22,7 @@ For additional information on how this works, review:
2222

2323
- [Enable Azure Monitor OpenTelemetry for .NET, Node.js, Python, and Java applications](https://learn.microsoft.com/en-us/azure/azure-monitor/app/opentelemetry-enable?tabs=java)
2424
- [Spring Boot via Docker entry point](https://learn.microsoft.com/azure/azure-monitor/app/java-spring-boot#spring-boot-via-docker-entry-point)
25-
- [Workspace-based Application Insights resources](https://learn.microsoft.com/azure/azure-monitor/app/create-workspace-resource#create-a-resource-automatically)
25+
- [Workspace-based Application Insights resources](https://learn.microsoft.com/azure/azure-monitor/app/create-workspace-resource)
2626

2727
## Step-by-step guidance
2828

‎docs/03_lab_monitor/0304.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '4. Analyze monitoring data (Optional)'
3-
layout: default
4-
nav_order: 4
2+
title: '4. Analyze monitoring data (Optional)'
3+
layout: default
4+
nav_order: 4
55
parent: 'Lab 3: Enable monitoring'
66
---
77

‎docs/03_lab_monitor/0305.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '5. Azure Managed Grafana (Optional)'
3-
layout: default
4-
nav_order: 5
2+
title: '5. Azure Managed Grafana (Optional)'
3+
layout: default
4+
nav_order: 5
55
parent: 'Lab 3: Enable monitoring'
66
---
77

‎docs/03_lab_monitor/0306.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '6. Review'
3-
layout: default
4-
nav_order: 6
2+
title: '6. Review'
3+
layout: default
4+
nav_order: 6
55
parent: 'Lab 3: Enable monitoring'
66
---
77

‎docs/03_lab_monitor/03_openlab_monitoring_aca.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: 'Lab 3: Enable monitoring'
3-
layout: default
4-
nav_order: 5
2+
title: 'Lab 3: Enable monitoring'
3+
layout: default
4+
nav_order: 5
55
has_children: true
66
---
77

‎docs/04_lab_secrets/0401.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '1. Create a database admin account'
3-
layout: default
4-
nav_order: 1
2+
title: '1. Create a database admin account'
3+
layout: default
4+
nav_order: 1
55
parent: 'Lab 4: Connect to a database with managed identity'
66
---
77

‎docs/04_lab_secrets/0402.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: '2. Update app configuration'
3-
layout: default
4-
nav_order: 2
2+
title: '2. Update app configuration'
3+
layout: default
4+
nav_order: 2
55
parent: 'Lab 4: Connect to a database with managed identity'
66
---
77

88
# Update application configuration to use passwordless connectivity
99

10-
Now, with the database configured, you’ll set up your applications to use a passwordless connection. This doesn't require any changes to your app code, but you do need to include the Azure Service Connector in your application containers, as well as some additional Java dependencies. To make these updates, you’ll simply modify your application configurations and rebuild your apps.
10+
Now, with the database configured, you’ll set up your applications to use a passwordless connection. This doesn't require any changes to your app code, but you do need to include the Azure Service Connector in your application containers, as well as some additional Java dependencies. To make these updates, you’ll simply modify your application configurations and rebuild your apps.
1111

1212
These are the three applications that communicate with your database, so you'll need to update their container configurations:
1313

@@ -17,7 +17,7 @@ These are the three applications that communicate with your database, so you'll
1717

1818
## Step-by-step guidance
1919

20-
1. Update the main POM file.
20+
1. Update the main POM file.
2121

2222
In the main `pom.xml` file, add another property between the `<properties></properties>` element for the Azure Spring Cloud version that we’re going to use:
2323

‎docs/04_lab_secrets/0403.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '3. Connect Container Apps'
3-
layout: default
4-
nav_order: 3
2+
title: '3. Connect Container Apps'
3+
layout: default
4+
nav_order: 3
55
parent: 'Lab 4: Connect to a database with managed identity'
66
---
77

@@ -79,11 +79,11 @@ For more information about connecting resources to Azure Service Connector, refe
7979

8080
```yml
8181
spring:
82-
sql:
83-
init:
84-
schema-locations: classpath*:db/mysql/schema.sql
85-
data-locations: classpath*:db/mysql/data.sql
86-
mode: ALWAYS
82+
sql:
83+
init:
84+
schema-locations: classpath*:db/mysql/schema.sql
85+
data-locations: classpath*:db/mysql/data.sql
86+
mode: ALWAYS
8787
```
8888

8989
When we set the environment variable `SPRING_PROFILES_ACTIVE=passwordless` on each app, they’ll use this new configuration.

‎docs/04_lab_secrets/0404.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: '4. Review'
3-
layout: default
4-
nav_order: 4
2+
title: '4. Review'
3+
layout: default
4+
nav_order: 4
55
parent: 'Lab 4: Connect to a database with managed identity'
66
---
77

‎docs/04_lab_secrets/04_openlab_secrets_aca.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: 'Lab 4: Connect to a database with managed identity'
3-
layout: default
4-
nav_order: 6
3+
layout: default
4+
nav_order: 6
55
has_children: true
66
---
77

@@ -11,9 +11,9 @@ has_children: true
1111

1212
You now have your copy of the Spring Petclinic Microservices workload running in Azure. However, your applications use secrets, such as your database connection string, which depend on passwords that are stored in your configuration repository.
1313

14-
Passwords are insecure. They can be stolen, guessed, or found via brute force attacks, so protecting your passwords can be a major challenge. You want to find a way to connect to your database without having to deal with this potential vulnerability.
14+
Passwords are insecure. They can be stolen, guessed, or found via brute force attacks, so protecting your passwords can be a major challenge. You want to find a way to connect to your database without having to deal with this potential vulnerability.
1515

16-
In this lab, you’ll implement a more secure way to protect your secrets by connecting your applications to your database using managed identities and [Azure Service Connector](https://learn.microsoft.com/azure/service-connector/overview). This approach allows you to implement secure passwordless connectivity without modifying your application code, giving you a ["zero code, zero secrets, and zero trust"](https://learn.microsoft.com/azure/developer/intro/passwordless-overview) solution.
16+
In this lab, you’ll implement a more secure way to protect your secrets by connecting your applications to your database using managed identities and [Azure Service Connector](https://learn.microsoft.com/azure/service-connector/overview). This approach allows you to implement secure passwordless connectivity without modifying your application code, giving you a ["zero code, zero secrets, and zero trust"](https://learn.microsoft.com/azure/developer/intro/passwordless-overview) solution.
1717

1818
## What you’ll cover
1919

0 commit comments

Comments
 (0)