script to prepare the lab environment, subscription / extension / azure-resource (#176)

## Purpose

1. add prepare tools to accelerate the time costs
2. more regional adjustments

## 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)
[ ] Documentation content changes
[x] Other... Please describe:
```

---------

Co-authored-by: Tycen Hopkins <[email protected]>

Author: sonwan2020

.devcontainer/funcs.sh

@@ -2,11 +2,8 @@
 
 DEV_ENV_FILE="$HOME/.dev-environment"
 
-function saveenv() {
-    declare -p | grep "declare \(--\|-x\)" | grep -v "^declare \(--\|-x\) \(PS[0-9]\|BASH_.*\|PATH\|PWD\|LS_COLORS\)=" > "$DEV_ENV_FILE"
-}
+alias saveenv='declare -p | grep "declare \(--\|-x\)" | grep -v "^declare \(--\|-x\) \(PS[0-9]\|_.*\|SDKMAN_.*\|sdkman_.*\|IFS\|VSCODE_.*\|HIST.*\|GITHUB_.*\|BASH_.*\|COMP_WORDBREAKS\|PATH\|OLDPWD\|PWD\|LS_COLORS\)=" > "$DEV_ENV_FILE"'
 
-function clearenv() {
-    rm -f "$DEV_ENV_FILE"
-}
+alias loadenv='source "$DEV_ENV_FILE"'
 
+alias clearenv='rm -f "$DEV_ENV_FILE"'

.devcontainer/postCreateCommand.sh

@@ -1,24 +1,18 @@
 #!/usr/bin/env bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "$DIR/funcs.sh"
 
 azd config set alpha.deployment.stacks on
 
-grep saveenv "$HOME/.bashrc" > /dev/null 2>&1
+grep JAVA_AI_FUNC "$HOME/.bashrc" > /dev/null 2>&1
 if [[ $? -ne 0 ]]; then
 
     cat <<EOT >> "$HOME/.bashrc"
+JAVA_AI_FUNC="$DIR"
+[ -f "\$JAVA_AI_FUNC/funcs.sh" ] && \. "\$JAVA_AI_FUNC/funcs.sh"
 
-DEV_ENV_FILE="\$HOME/.dev-environment"
-
-# auto load
-if [[ -f "\$DEV_ENV_FILE" ]]; then
-    source "\$DEV_ENV_FILE"
-fi
+loadenv
 
 EOT
 
-    declare -f saveenv clearenv >> "$HOME/.bashrc"
-
 fi

.devcontainer/saveenv.sh

@@ -7,36 +7,16 @@ parent: 'Lab 2: Deploy applications to Azure Container Apps'
 
 # Collect user information
 
-First, you’ll need to sign your lab environment in to Azure and configure it to access the lab subscription. Then you’ll store your user info for use in subsequent steps.
+Before performing any additional actions, you'll need to store your user info as an environment variable that you can use in subsequent steps. 
+
+{: .note }
+We already collected your subscription information as part of the [preparing your subscription]({% link install.md %}#preparing-your-subscription) instructions. Make sure you've completed this process and and any other [installation steps]({% link install.md %}) are complete before proceeding.
 
 ## Step-by-step guidance
 
 {: .note }
 We'll be using Bash commands to complete this lab. You can use any compatible command-line environment, such as the Windows Subsystem for Linux, Git Bash, or the Visual Studio Code Bash terminal. To avoid potential errors, **do not** run these commands in a PowerShell session.
 
-1.  In your lab environment, open a command-line environment and sign in to your Azure subscription with the following command:
-
-    ```bash
-    az login
-    ```
-
-    {: .note }
-    > If you’re running this lab in GitHub Codespaces, use az login --use-device-code.
-
-    When you execute the command, it automatically opens a web browser window and requires that you authenticate. When prompted, sign in with the user account (with the Owner role) in the Azure subscription that you have for this lab and then close the browser window.
-
-1.  Make sure that you’re signed in to the lab subscription:
-
-    ```bash
-    az account list -o table
-    ```
-
-    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):
-
-    ```bash
-    az account set --subscription <subscription-id>
-    ```
-
 1.  Collect your user info, and then store it for future use.
     - Store your username in an environment variable:
 

docs/02_lab_launch/0201.md

@@ -14,10 +14,8 @@ The following image should reflect your application architecture after a success
 ![lab 2 overview](../../images/acalab2.png)
 
 {: .important }
-> 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.
+> The work you did in this lab is fundamental to both this lab and the next several labs you’ll be working through, so please do not delete any of the Azure resources you've created here.
 >
->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.
+> As we mentioned in the [Install instructions]({% link install.md %}#preparing-your-subscription), you can use both the `saveenv` and `loadenv` commands to manually save and load your environment variables at any time.
 >
-> 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.
->
-> You can also manually load the saved variables with the command `source ~/.dev-environment`.
+>You've done a lot in this lab, so now is a good time to run `saveenv` to make sure your current environment variables will be there if you have to start a new bash session.  

docs/02_lab_launch/0209.md

@@ -18,12 +18,18 @@ The following step-by-step guidance will show you how to create an Azure OpenAI
 
 1. To create an Azure OpenAI account, run the following commands. Note that the account name you use here must be globally unique, so adjust it accordingly if the randomly generated name is already in use.
 
+   Azure OpenAI Service is not supported in all regions, you may refer to [Azure OpenAI global standard model availability](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models?tabs=global-standard%2Cstandard-chat-completions#models-by-deployment-type) for more details.
+
+   You may use these regions for your lab: **australiaeast**, **brazilsouth**, **southindia**, **japaneast**, **swedencentral**, **eastus**, **eastus2** and **westus**.
+
    ```bash
+   AI_LOCATION=<ai-location>
+
    OPEN_AI_SERVICE_NAME=open-ai-account-$UNIQUEID
    az cognitiveservices account create \
       --resource-group $RESOURCE_GROUP \
       --name $OPEN_AI_SERVICE_NAME \
-      --location $LOCATION \
+      --location $AI_LOCATION \
       --kind OpenAI \
       --sku s0 \
       --custom-domain $OPEN_AI_SERVICE_NAME

docs/03_lab_openai/0301.md

@@ -29,8 +29,6 @@ For additional information on how this works, review:
 1.  Your first step is to create an Application Insights resource. Execute this statement in your command-line environment:
 
     ```bash
-    az extension add -n application-insights --upgrade --yes
-
     APP_INSIGHTS_NAME=app-insights-$APPNAME-$UNIQUEID
     az monitor app-insights component create \
         --resource-group $RESOURCE_GROUP \

docs/04_lab_monitor/0403.md

@@ -18,16 +18,20 @@ If you’d like to learn more about how Azure Managed Grafana helps visualize ex
 
 ## Step-by-step guidance
 
-1.  Provision Azure Manage Grafana. In your command-line environment, create an Azure Managed Grafana instance:
+1.  Provision Azure Managed Grafana. In your command-line environment, create an Azure Managed Grafana instance:
+
+    Azure Managed Grafana is not supported in all regions. You can refer to the [Azure OpenAI global standard model availability](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models?tabs=global-standard%2Cstandard-chat-completions#models-by-deployment-type) documentation for more details if you'd like.
+
+    However, for the purposes of this lab, we recommend using one of the following regions when creating an Azure Managed Grafana instance: **australiaeast**, **brazilsouth**, **centralindia**, **japaneast**, **swedencentral**, **eastus**, **eastus2** and **westus**.
 
     ```bash
-    az extension add --name amg --upgrade -y
+    GRAFANA_LOCATION=<grafana-location>
 
     GRAFANA_NAME=amg-$UNIQUEID
     az deployment group create \
         --resource-group $RESOURCE_GROUP \
         --template-file ../infra/bicep/modules/grafana/grafana-dashboard.bicep \
-        --parameters grafanaName=$GRAFANA_NAME
+        --parameters grafanaName=$GRAFANA_NAME location=$GRAFANA_LOCATION
     ```
 
 1.  Grant yourself the Grafana Admin role. You’ll need this role to manage your Grafana dashboard. Use the following Azure CLI command to add the role assignment:

docs/04_lab_monitor/0405.md

@@ -13,12 +13,6 @@ For more information about connecting resources to Azure Service Connector, refe
 
 ## Step-by-step guidance
 
-1.  Add the serviceconnector-passwordless extension to your Azure CLI instance:
-
-    ```bash
-    az extension add --name serviceconnector-passwordless --upgrade -y
-    ```
-
 1.  Get the account and resource information to create a Service Connector, and store them as environment variables for later use:
 
     ```bash

docs/05_lab_secrets/0503.md

@@ -76,8 +76,3 @@ Check the failures, fix the problems and rerun `azd up` to continue the automati
 
    `az account set -s <subscription>`
 
- - Check the az extension
-
-    Run command `az extension list -o table`, you should see both extension **containerapps** and **serviceconnector-passwordless** installed. If not, install with 
-
-    `az extension add -n <name>`

docs/06_lab_automation/0603.md

@@ -37,16 +37,19 @@ To run this lab, you’ll need:
 2.  This lab also uses [Azure Database for MySQL - Flexible Server](https://learn.microsoft.com/azure/mysql/flexible-server/overview). Before deploying or selecting a region, be sure to [verify the service is available](https://learn.microsoft.com/en-us/azure/mysql/flexible-server/overview#azure-regions) in that region.
 
     {: .note }
-    > At the time of publishing (January 2025), we recommend using any of the following regions to help ensure that required features are available: **West US**, **West US 2**, **East US 2**, **North Central US**, **Sweden Central**.
+    > - At the time of publishing (January 2025), we recommend using any of the following regions to help ensure that required features are available: **East Asia**, **Australia East**, **Brazil South**, **South India**, **Japan East**, **Sweden Central**, **East US 2** and **West US**.
+    > - If you encounter SKU or quota issues when attempting to create resources during any of these labs, feel free to create the resource in another one of these recommended regions.
 
 ### Installation
 
 Before running this lab, be sure that all the required tooling is available. We’ve provided three options:
 
-* [Use GitHub Codespaces (preferred)]({% link install.md %}#using-a-github-codespace), which will create a cloud-based development environment with the required tools installed and configured.
+* [Use GitHub Codespaces (preferred)]({% link install.md %}#use-github-codespaces-strongly-recommended), which will create a cloud-based development environment with the required tools installed and configured.
 * [Use Visual Studio Code with remote containers option]({% link install.md %}#using-visual-studio-code-with-remote-containers), which will create a Docker container on your local machine with the required tools preconfigured.
-* [Install all the tools on your local machine]({% link install.md %}#install-all-the-tools-on-your-local-machine).
+* [Install all the tools on your local machine]({% link install.md %}#install-all-the-tools-on-your-local-machine-not-recommended).
 
-We’ve tested this lab using GitHub Codespaces, which is the preferred option for running it.
+We’ve tested this lab using GitHub Codespaces, which is the recommended option for running it.
+
+After the tooling is set up, you'll need to perform some steps to [prepare your subscription]({% link install.md %}#preparing-your-subscription) before continuing with the labs.
 
 You can find the full installation guidance and the options for running this lab in the [Installation]({% link install.md %}) instructions.

index.md

@@ -7,6 +7,15 @@ param environmentName string
 
 @minLength(2)
 @description('Primary location for all resources.')
+@allowed([
+  'australiaeast'
+  'brazilsouth'
+  'eastus2'
+  'japaneast'
+  'southindia'
+  'swedencentral'
+  'westus'
+])
 param location string
 
 @description('Name of the the resource group. Default: rg-{environmentName}')

infra/bicep/main.bicep

@@ -3,6 +3,9 @@ targetScope = 'resourceGroup'
 @description('Required. Name of your Azure Managed Grafana resource.')
 param grafanaName string
 
+@description('Required. Location of your Azure Managed Grafana resource.')
+param location string
+
 @description('Optional. Tags of the resource.')
 param tags object = {}
 
@@ -11,6 +14,7 @@ module azureManagedGrafana 'azure-managed-grafana.bicep' = {
   scope: resourceGroup()
   params: {
     grafanaName: grafanaName
+    location: location
     tags: tags
   }
 }