Some minor fixes (#183)

## Purpose


## 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". -->
```
[x] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Documentation content changes
[ ] Other... Please describe:
```

Author: sonwan2020

.devcontainer/funcs.sh

@@ -4,6 +4,6 @@ DEV_ENV_FILE="$HOME/.dev-environment"
 
 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"'
 
-alias loadenv='source "$DEV_ENV_FILE"'
+alias loadenv='[ -f $DEV_ENV_FILE ] && source "$DEV_ENV_FILE"'
 
 alias clearenv='rm -f "$DEV_ENV_FILE"'

docs/02_lab_launch/0202.md

@@ -34,7 +34,7 @@ This involves three things:
     ```
 
     {: .note }
-    > 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).
+    > 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 index.md %}#region-availability).
 
     {: .note }
     > 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/03_lab_openai/03_openai.md

@@ -34,7 +34,7 @@ Your first step in this process is to create a new Spring Boot application:
 
     You’ll also need to provide additional settings, such as project type, Java code details, and naming to match the structure of the existing Spring Petclinic application.
 
-    To create the new Spring Boot  application using these settings, in your command-line window, go to the `src` folder of your local code repo and run the following command:
+    To create the new Spring Boot  application using these settings, in your command-line window, go to the `spring-petclinic-microservices` folder of your local code repo and run the following command:
 
     ```bash
     mkdir spring-petclinic-chat-service

docs/03_lab_openai/03_openai_existing.md

@@ -4,7 +4,7 @@ layout: default
 nav_order: 5
 nav_exclude: true
 search_exclude: true
-parent: 'Lab 3: Integrate Azure OpenAI Service with your apps'
+parent: 'Lab 3: Integrate Azure OpenAI Service with your apps (exclude)'
 ---
 
 # Integrate AI into your existing project
@@ -376,4 +376,4 @@ Start from a simple spring boot application, we will add AI components to the pr
 
    ![lab 5 eureka client](../../images/open-ai-eureka-client.png)
 
-</details>
+</details>

install.md

@@ -11,10 +11,10 @@ nav_order: 2
 
 Before you begin working through the lab, you’ll need to make sure that you have all the required tools installed and configured in your development environment, and that your Azure subscription is ready for the labs. Please complete the following steps before proceeding:
 
-1. **[Set up your development environment using GitHub Codespaces](#use-github-codespaces-strongly-recommended).** This will give you a fully configured development environment without requiring any software installation or configuration on your local workstation. This environment will also contain a cloned copy of the example Spring Petclinic workload code from the GitHub repo. 
+1. **[Set up your development environment using GitHub Codespaces](#use-github-codespaces-strongly-recommended).** This will give you a fully configured development environment without requiring any software installation or configuration on your local workstation. This environment will also contain a cloned copy of the example Spring Petclinic workload code from the GitHub repo.
 2. **[Configure your subscription and deploy prerequisite Azure resources](#configure-your-subscription-and-deploy-prerequisite-azure-resources).** Once you've set up your dev environment, you'll need to run a couple scripts that will automate some required subscription configuration and resources deployment tasks.
 
-These setup tasks can take several minutes to complete, so we suggest starting this process as soon as possible. 
+These setup tasks can take several minutes to complete, so we suggest starting this process as soon as possible.
 
 ### Alternative development environment options
 
@@ -24,7 +24,7 @@ If you are unable to use a Codespace, there's two alternative ways to set up a d
 - [Install all the tools on your local machine (not recommended)](#optional-install-all-the-tools-on-your-local-machine-not-recommended)
 
 {: .important }
-> We’ve tested all the steps of this lab in [GitHub Codespaces](#use-github-codespaces), which is the simplest way to get going and the preferred option for running the lab. Support for these alternative options during the lab may be limited. Use a Codespace if at all possible. 
+> We’ve tested all the steps of this lab in [Use GitHub Codespaces](#use-github-codespaces), which is the simplest way to get going and the preferred option for running the lab. Support for these alternative options during the lab may be limited. Use a Codespace if at all possible.
 
 
 ## Use GitHub Codespaces (strongly recommended)
@@ -92,7 +92,7 @@ Now you'll run the script `prepare.sh` to register the required resources provid
     ./tools/prepare.sh
     ```
 
-    This process should take less than 10 minutes to complete. 
+    This process should take less than 10 minutes to complete.
 
 1. Once the `prepare.sh` script finishes, close your current terminal window and start a new terminal session to ensure you're accessing a fully prepared lab environment.
 
@@ -105,7 +105,7 @@ You'll now run the script `create-azure-resource.sh`, which will create several
     - `UNIQUEID` - Create a unique ID string and paste that in the code editor. You can use the following command generate an acceptable value: `openssl rand -hex 3`
     - `SUBSCRIPTION` - Enter the ID of the subscription you're going to work in. To quickly find this id, use the following command: `az account show --query id`
     - `REGION` -  Enter the default Azure region you want to work in. For example `westus` or `southindia`.
-    - `MYSQL_ADMIN_PASSWORD` - enter a strong password string. 
+    - `MYSQL_ADMIN_PASSWORD` - enter a strong password string.
 
     After setting these values, save the updated `azure-resource.profile` file before proceeding.
 
@@ -136,9 +136,9 @@ You'll now run the script `create-azure-resource.sh`, which will create several
 >
 > Before you do anything else, run the command `saveenv` in your open command-line window. This will save all of your currently defined environment variables to the file `~/.dev-environment`. The next time you start a new bash session you will automatically load the saved variables from this file.
 >
-> You can also manually load the saved variables with the command `loadenv`. 
-> 
-> You can use these commands at any time, so feel free to run `saveenv` after creating or updating environment variables when working through the labs, or `loadenv` to reload your saved variables as needed. 
+> You can also manually load the saved variables with the command `loadenv`.
+>
+> You can use these commands at any time, so feel free to run `saveenv` after creating or updating environment variables when working through the labs, or `loadenv` to reload your saved variables as needed.
 
 
 ## (Optional) Use Visual Studio Code with remote containers
@@ -184,7 +184,7 @@ To get started working in the dev container:
     ```bash
     mkdir workspaces
     cd workspaces
-    git clone https://github.com/\<your-github-account\>/java-on-aca.git
+    git clone https://github.com/<your-github-account>/java-on-aca.git
     ```
 
 1.  When prompted to sign in to GitHub, select **Sign in with your browser**. This will automatically open a new tab in the web browser window, prompting you to provide your GitHub username and password.
@@ -197,9 +197,8 @@ To get started working in the dev container:
 1.  Go to the java-on-aca folder where you cloned the project, and open the project with Visual Studio Code.
 
     ```bash
-    mkdir workspaces
-    cd workspaces
-    git clone https://github.com/<your-github-account>/java-on-aca.git
+    cd java-on-aca
+    code .
     ```
 
 1.  With the [Visual Studio Code Remote Containers extension](https://code.visualstudio.com/docs/remote/containers) installed, you can now open the project in a remote container. This will reopen the project in a Docker container with all the tooling installed.

tips.md

@@ -14,15 +14,15 @@ Tips in this section include:
 
 ## Use GitHub Codespaces
 
-As described in the [installation instructions]({% link install.md %}), the best and easiest way to run this lab is to use [GitHub Codespaces](https://github.com/features/codespaces). With the devcontainer.json file provided in the lab's [GitHub repository](https://github.com/Azure-Samples/java-on-aca) you can create a codespace that has the required tools pre-installed and configured for you. The steps in this lab have been thoroughly tested with the codespace configuration included in the repo. 
+As described in the [installation instructions]({% link install.md %}), the best and easiest way to run this lab is to use [GitHub Codespaces](https://github.com/features/codespaces). With the devcontainer.json file provided in the lab's [GitHub repository](https://github.com/Azure-Samples/java-on-aca) you can create a codespace that has the required tools pre-installed and configured for you. The steps in this lab have been thoroughly tested with the codespace configuration included in the repo.
 
-If you're unable to use a codespace, the best alternative is Visual Studio Code with remote containers, which allows you to deploy and work with a preconfigured Docker development environment. 
+If you're unable to use a codespace, the best alternative is Visual Studio Code with remote containers, which allows you to deploy and work with a preconfigured Docker development environment.
 
 If you can't use either of these options, you can complete this lab by installing the required tooling on your local environment. However, since it’s impossible for us to test all lab steps with every possible local configuration, we highly recommend using either GitHub Codespaces or the Visual Studio Code with remote containers.
 
-## Use .azcli files to make command line work easier 
+## Use .azcli files to make command line work easier
 
-If you're using Visual Studio Code, you can record the command-line statements that you execute in a file with the _.azcli_ extension. This extension, combined with the [Azure CLI Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azurecli) extension, gives you extra capabilities, like IntelliSense, and the opportunity to directly run statements from the script file in a terminal window. 
+If you're using Visual Studio Code, you can record the command-line statements that you execute in a file with the _.azcli_ extension. This extension, combined with the [Azure CLI Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azurecli) extension, gives you extra capabilities, like IntelliSense, and the opportunity to directly run statements from the script file in a terminal window.
 
 With this extension, you can keep a record in an .azcli file of all the steps that you executed and quickly execute these statements through the `Ctrl+` shortcut. To save time and effort in this lab, be sure to check out the extension.
 
@@ -39,7 +39,7 @@ There are a couple places in the lab where you can easily to miss steps or incor
 1.	Check the logs for the failing application or service.
 
    ```bash
-   az containerapp logs show -g $RESOURCE_GROUP -n <APP_NAME> 
+   az containerapp logs show -g $RESOURCE_GROUP -n <APP_NAME>
    ```
 
 ### Dealing with code errors

tools/create-azure-resource.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
-source ./azure-resource.profile
-source ./funcs.sh
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+source $DIR/azure-resource.profile
+source $DIR/funcs.sh
 
 # Resource Group
 
@@ -139,4 +141,4 @@ fi
 
 # Save environment variables
 
-saveenv
+saveenv