From cff9669dc4c6696f5da466d4eb912bd28ea2dfa0 Mon Sep 17 00:00:00 2001 From: Songbo Wang Date: Wed, 25 Sep 2024 13:52:15 +0800 Subject: [PATCH] reorder lab sections (#55) ## Purpose reorder the sections of the doc ## Does this introduce a breaking change? ``` [ ] Yes [x] No ``` ## Pull Request Type What kind of change does this Pull Request introduce? ``` [ ] Bugfix [ ] Feature [ ] Code style update (formatting, local variables) [ ] Refactoring (no functional changes, no api changes) [x] Documentation content changes [ ] Other... Please describe: ``` --- docs/05_lab_openai/{01.md => 0501.md} | 0 docs/05_lab_openai/{02.md => 0502.md} | 0 ...openai_aca.md => 05_openlab_openai_aca.md} | 2 +- .../0801.md => 06_lab_automation/0601.md} | 0 .../0802.md => 06_lab_automation/0602.md} | 0 .../06_openlab_automation.md} | 23 ++++++---- .../0601.md => 07_lab_security/0701.md} | 0 .../0602.md => 07_lab_security/0702.md} | 0 .../0603.md => 07_lab_security/0703.md} | 0 .../0604.md => 07_lab_security/0704.md} | 0 .../0605.md => 07_lab_security/0705.md} | 0 .../0606.md => 07_lab_security/0706.md} | 0 .../0607.md => 07_lab_security/0707.md} | 0 .../0608.md => 07_lab_security/0708.md} | 0 .../07_openlab_security_aca.md} | 6 +-- .../07_openlab_private_endpoints_aca.md | 7 ++-- .../0701.md => 08_lab_private/0801.md} | 0 .../0702.md => 08_lab_private/0802.md} | 0 .../0703.md => 08_lab_private/0803.md} | 0 .../0704.md => 08_lab_private/0804.md} | 0 .../08_openlab_private_endpoints_aca.md | 42 +++++++++++++++++++ 21 files changed, 63 insertions(+), 17 deletions(-) rename docs/05_lab_openai/{01.md => 0501.md} (100%) rename docs/05_lab_openai/{02.md => 0502.md} (100%) rename docs/05_lab_openai/{openlab_openai_aca.md => 05_openlab_openai_aca.md} (97%) rename docs/{08_lab_azd/0801.md => 06_lab_automation/0601.md} (100%) rename docs/{08_lab_azd/0802.md => 06_lab_automation/0602.md} (100%) rename docs/{08_lab_azd/08_openlab_azd_deployments.md => 06_lab_automation/06_openlab_automation.md} (58%) rename docs/{06_lab_security/0601.md => 07_lab_security/0701.md} (100%) rename docs/{06_lab_security/0602.md => 07_lab_security/0702.md} (100%) rename docs/{06_lab_security/0603.md => 07_lab_security/0703.md} (100%) rename docs/{06_lab_security/0604.md => 07_lab_security/0704.md} (100%) rename docs/{06_lab_security/0605.md => 07_lab_security/0705.md} (100%) rename docs/{06_lab_security/0606.md => 07_lab_security/0706.md} (100%) rename docs/{06_lab_security/0607.md => 07_lab_security/0707.md} (100%) rename docs/{06_lab_security/0608.md => 07_lab_security/0708.md} (100%) rename docs/{06_lab_security/06_openlab_security_aca.md => 07_lab_security/07_openlab_security_aca.md} (93%) rename docs/{07_lab_private => 08_lab_private}/07_openlab_private_endpoints_aca.md (90%) rename docs/{07_lab_private/0701.md => 08_lab_private/0801.md} (100%) rename docs/{07_lab_private/0702.md => 08_lab_private/0802.md} (100%) rename docs/{07_lab_private/0703.md => 08_lab_private/0803.md} (100%) rename docs/{07_lab_private/0704.md => 08_lab_private/0804.md} (100%) create mode 100644 docs/08_lab_private/08_openlab_private_endpoints_aca.md diff --git a/docs/05_lab_openai/01.md b/docs/05_lab_openai/0501.md similarity index 100% rename from docs/05_lab_openai/01.md rename to docs/05_lab_openai/0501.md diff --git a/docs/05_lab_openai/02.md b/docs/05_lab_openai/0502.md similarity index 100% rename from docs/05_lab_openai/02.md rename to docs/05_lab_openai/0502.md diff --git a/docs/05_lab_openai/openlab_openai_aca.md b/docs/05_lab_openai/05_openlab_openai_aca.md similarity index 97% rename from docs/05_lab_openai/openlab_openai_aca.md rename to docs/05_lab_openai/05_openlab_openai_aca.md index ca10924..a9aa833 100644 --- a/docs/05_lab_openai/openlab_openai_aca.md +++ b/docs/05_lab_openai/05_openlab_openai_aca.md @@ -5,7 +5,7 @@ nav_order: 7 has_children: true --- -# Lab 05: Integrate with Azure OpenAI. +# Lab 5: Integrate with Azure OpenAI # Student manual diff --git a/docs/08_lab_azd/0801.md b/docs/06_lab_automation/0601.md similarity index 100% rename from docs/08_lab_azd/0801.md rename to docs/06_lab_automation/0601.md diff --git a/docs/08_lab_azd/0802.md b/docs/06_lab_automation/0602.md similarity index 100% rename from docs/08_lab_azd/0802.md rename to docs/06_lab_automation/0602.md diff --git a/docs/08_lab_azd/08_openlab_azd_deployments.md b/docs/06_lab_automation/06_openlab_automation.md similarity index 58% rename from docs/08_lab_azd/08_openlab_azd_deployments.md rename to docs/06_lab_automation/06_openlab_automation.md index d323cd9..3f44e6f 100644 --- a/docs/08_lab_azd/08_openlab_azd_deployments.md +++ b/docs/06_lab_automation/06_openlab_automation.md @@ -1,36 +1,41 @@ --- -title: 'Lab 8: Use Azd to deploy the lab solution' +title: 'Lab 6: Automatically deploy lab solution to Azure Container Apps' layout: default -nav_order: 10 +nav_order: 8 has_children: true --- -# Lab 7: Use Azd to deploy the lab solution to Azure Container App +# Lab 6: Automatically deploy lab solution to Azure Container Apps # Student manual ## Lab scenario -Use [azd](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/) tool to deploy the petclinic solution to Azure Container Apps environment. +In the Lab 2, Lab 3, Lab 4 and Lab 5 we deploy the petclinic microservice solution to Azure Container Apps step by step. +These steps are full of details but time costing. + +In this lab, we import a new tool [azd](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/) to help deploy the solution to Azure with single command. ## Objectives After you complete this lab, you will be able to: -- Deploy the sample solution to new ACA environment. -- Test your setup +- Get familiar with the azd tool. +- Deploy the petclinic solution to new ACA environment. +- Test your setup. ## Lab Duration -- **Estimated Time**: 60 minutes +- **Estimated Time**: 90 minutes ## Instructions During this lab, you will: -- Update the configuration according to you azure environment +- Prepare your azd tools environment. +- Get your Azure Registry ready and fill the configuration files. - Run `azd up` command to deploy the sample soluton to Azure Container Apps. -- Test your setup +- Test your setup. ## Limits diff --git a/docs/06_lab_security/0601.md b/docs/07_lab_security/0701.md similarity index 100% rename from docs/06_lab_security/0601.md rename to docs/07_lab_security/0701.md diff --git a/docs/06_lab_security/0602.md b/docs/07_lab_security/0702.md similarity index 100% rename from docs/06_lab_security/0602.md rename to docs/07_lab_security/0702.md diff --git a/docs/06_lab_security/0603.md b/docs/07_lab_security/0703.md similarity index 100% rename from docs/06_lab_security/0603.md rename to docs/07_lab_security/0703.md diff --git a/docs/06_lab_security/0604.md b/docs/07_lab_security/0704.md similarity index 100% rename from docs/06_lab_security/0604.md rename to docs/07_lab_security/0704.md diff --git a/docs/06_lab_security/0605.md b/docs/07_lab_security/0705.md similarity index 100% rename from docs/06_lab_security/0605.md rename to docs/07_lab_security/0705.md diff --git a/docs/06_lab_security/0606.md b/docs/07_lab_security/0706.md similarity index 100% rename from docs/06_lab_security/0606.md rename to docs/07_lab_security/0706.md diff --git a/docs/06_lab_security/0607.md b/docs/07_lab_security/0707.md similarity index 100% rename from docs/06_lab_security/0607.md rename to docs/07_lab_security/0707.md diff --git a/docs/06_lab_security/0608.md b/docs/07_lab_security/0708.md similarity index 100% rename from docs/06_lab_security/0608.md rename to docs/07_lab_security/0708.md diff --git a/docs/06_lab_security/06_openlab_security_aca.md b/docs/07_lab_security/07_openlab_security_aca.md similarity index 93% rename from docs/06_lab_security/06_openlab_security_aca.md rename to docs/07_lab_security/07_openlab_security_aca.md index 9e1e02f..609af30 100644 --- a/docs/06_lab_security/06_openlab_security_aca.md +++ b/docs/07_lab_security/07_openlab_security_aca.md @@ -1,11 +1,11 @@ --- -title: 'Lab 6: Protect endpoints using Web Application Firewalls' +title: 'Lab 7: Protect endpoints using Web Application Firewalls' layout: default -nav_order: 8 +nav_order: 9 has_children: true --- -# Lab 05: Protect endpoints using Web Application Firewall +# Lab 7: Protect endpoints using Web Application Firewall # Student manual diff --git a/docs/07_lab_private/07_openlab_private_endpoints_aca.md b/docs/08_lab_private/07_openlab_private_endpoints_aca.md similarity index 90% rename from docs/07_lab_private/07_openlab_private_endpoints_aca.md rename to docs/08_lab_private/07_openlab_private_endpoints_aca.md index c11e4a2..50c965b 100644 --- a/docs/07_lab_private/07_openlab_private_endpoints_aca.md +++ b/docs/08_lab_private/07_openlab_private_endpoints_aca.md @@ -1,11 +1,11 @@ --- -title: 'Lab 7: Secure MySQL database and Key Vault using a Private Endpoint' +title: 'Lab 8: Secure MySQL database and Key Vault using a Private Endpoint' layout: default -nav_order: 9 +nav_order: 10 has_children: true --- -# Lab 06: Secure MySQL database and Key Vault using a Private Endpoint +# Lab 8: Secure MySQL database and Key Vault using a Private Endpoint # Student manual @@ -39,4 +39,3 @@ During this lab, you will: {: .note } > The instructions provided in this exercise assume that you successfully completed the previous exercise and are using the same lab environment, including your Git Bash session with the relevant environment variables already set. - diff --git a/docs/07_lab_private/0701.md b/docs/08_lab_private/0801.md similarity index 100% rename from docs/07_lab_private/0701.md rename to docs/08_lab_private/0801.md diff --git a/docs/07_lab_private/0702.md b/docs/08_lab_private/0802.md similarity index 100% rename from docs/07_lab_private/0702.md rename to docs/08_lab_private/0802.md diff --git a/docs/07_lab_private/0703.md b/docs/08_lab_private/0803.md similarity index 100% rename from docs/07_lab_private/0703.md rename to docs/08_lab_private/0803.md diff --git a/docs/07_lab_private/0704.md b/docs/08_lab_private/0804.md similarity index 100% rename from docs/07_lab_private/0704.md rename to docs/08_lab_private/0804.md diff --git a/docs/08_lab_private/08_openlab_private_endpoints_aca.md b/docs/08_lab_private/08_openlab_private_endpoints_aca.md new file mode 100644 index 0000000..fa13001 --- /dev/null +++ b/docs/08_lab_private/08_openlab_private_endpoints_aca.md @@ -0,0 +1,42 @@ +--- +title: 'Lab 7: Secure MySQL database and Key Vault using a Private Endpoint' +layout: default +nav_order: 10 +has_children: true +--- + +# Lab 06: Secure MySQL database and Key Vault using a Private Endpoint + +# Student manual + +## Lab scenario + +You now have your application deployed into a virtual network and the microservices connection requests from the internet must pass through your Application Gateway instance with Web Application Firewall enabled. However, the apps communicate with the backend services, such Azure Database for MySQL Flexible Server and Key Vault via their public endpoints. In this exercise, you will lock them down by implementing a configuration in which they only accept connections that originate from within your virtual network. + +## Objectives + +After you complete this lab, you will be able to: + +- Lock down the Azure Database for MySQL Flexible Server instance by redeploying it in a subnet +- Lock down the Key Vault instance by using a private endpoint +- Test your setup + +The below image illustrates the end state you will be building in this lab. + +![lab 8 overview](../../images/acalab6.png) + +## Lab Duration + +- **Estimated Time**: 60 minutes + +## Instructions + +During this lab, you will: + +- Lock down the Azure Database for MySQL Flexible Server instance by redeploying it in a subnet +- Lock down the Key Vault instance by using a private endpoint +- Test your setup + +{: .note } +> The instructions provided in this exercise assume that you successfully completed the previous exercise and are using the same lab environment, including your Git Bash session with the relevant environment variables already set. +