Merge pull request #413 from microsoft/microhack-env

fix: challenge env fix

Author: blessing-sanusi

src/App/.env

@@ -54,14 +54,59 @@ set APP_ENV_FILE=%ROOT_DIR%\src\App\.env
 ) > "%APP_ENV_FILE%"
 echo Updated src/App/.env with APP_API_BASE_URL
 
-REM Copy .env to workshop
-set MICROHACK_ENV_FILE=%ROOT_DIR%\workshop\docs\workshop\.env
-copy /Y "%ENV_FILE%" "%MICROHACK_ENV_FILE%"
+@REM REM Copy .env to workshop
+@REM set MICROHACK_ENV_FILE=%ROOT_DIR%\workshop\docs\workshop\.env
+@REM copy /Y "%ENV_FILE%" "%MICROHACK_ENV_FILE%"
+@REM if errorlevel 1 (
+@REM     echo Failed to copy .env to workshop/docs/workshop
+@REM     exit /b 1
+@REM )
+@REM echo Copied .env to workshop/docs/workshop
+
+REM Define paths
+set "SOURCE_ENV_FILE=%ENV_FILE%"
+set "TARGET_ENV_FILE=%ROOT_DIR%\workshop\docs\workshop\.env"
+set "TEMP_MERGED_FILE=%TEMP%\merged_env.tmp"
+
+REM Ensure the source env file exists
+if not exist "%SOURCE_ENV_FILE%" (
+    echo Source .env file not found at %SOURCE_ENV_FILE%
+    exit /b 1
+)
+
+REM Create temporary merged file
+copy /Y "%TARGET_ENV_FILE%" "%TEMP_MERGED_FILE%" >nul 2>&1
+
+REM Read lines from SOURCE_ENV_FILE
+for /f "usebackq tokens=* delims=" %%A in ("%SOURCE_ENV_FILE%") do (
+    set "line=%%A"
+
+    REM Skip empty lines or comments
+    if not "!line!"=="" if not "!line:~0,1!"=="#" (
+
+        REM Extract variable name (text before '=')
+        for /f "tokens=1 delims==" %%B in ("!line!") do (
+            set "var=%%B"
+
+            REM Check if variable already exists in TARGET_ENV_FILE
+            findstr /b /i "%%B=" "%TARGET_ENV_FILE%" >nul
+            if errorlevel 1 (
+                echo !line!>>"%TEMP_MERGED_FILE%"
+            ) else (
+                echo Skipping existing variable: %%B
+            )
+        )
+    )
+)
+
+REM Move merged file back to .env
+move /Y "%TEMP_MERGED_FILE%" "%TARGET_ENV_FILE%" >nul
 if errorlevel 1 (
-    echo Failed to copy .env to workshop/docs/workshop
+    echo Failed to update .env file
     exit /b 1
 )
-echo Copied .env to workshop/docs/workshop
+
+echo Successfully merged .env variables.
 
 REM Authenticate with Azure
 echo Checking Azure login status...

src/start.cmd

@@ -1,11 +1,2 @@
-# All configurations must be filled with valid values.
-# Rename file or create a new file ".env"
-
-AZURE_OPENAI_ENDPOINT=""
 AZURE_OPENAI_API_KEY=""
-AZURE_OPENAI_API_VERSION=""
-AZURE_OPENAI_DEPLOYMENT=""
-AZURE_SUBSCRIPTION_ID=""
-AZURE_RESOURCE_GROUP_NAME=""
-AZURE_PROJECT_NAME=""
-AZURE_API_ENDPOINT=""
+AZURE_AI_SEARCH_API_KEY=""

workshop/docs/workshop/.env.sample

@@ -47,33 +47,37 @@ One of the easiest and most fun changes you can make to the app is updating the
    <img src={AppLogo} alt="Logo" style={{ width: '30px' }} />
    ```
 
-
+---
 
 ### Step 3: Run the App
 
 1. Go to the [Azure Portal](https://portal.azure.com).
 2. In the **search bar**, type the name of the **Resource Group** you created during **Challenge 1**.
-3. Within the resource group, look for the **API App Service**.  
-   It will have a name similar to:  kms2lspvbjwagg-api
+3. Within the resource group, look for the **API App Service** ending in -api.  
 4. In the App Service, navigate to **Settings > Environment variables**.
    ![Azure Portal Settings > Configuration](../img/portal-app-api-env.png)
 5. Locate the following environment variables:
    - `AZURE_AI_SEARCH_API_KEY`
    - `AZURE_OPENAI_API_KEY`
-6. Copy their values and paste them into your local `.env` file.
-7. Open a terminal or command prompt.
-8. Navigate to the project directory where `start.cmd` is located:
+6. Copy their values and paste them into your local `\workshop\docs\workshop\.env.sample` file:
+   `AZURE_AI_SEARCH_API_KEY=your-key-from-portal`
+   `AZURE_OPENAI_API_KEY=your-other-key-from-portal`
+7. Rename the .env.sample file to .env
+8. Open a terminal or command prompt.
+9. Navigate to the project directory where `start.cmd` is located:
 
    ```bash
       cd src/
    ```
-9. Start the application:
+10. Make sure your Python virtual environment is activated, as done in the Challenge 1 deployment steps.
+
+11. Start the application:
 
    ```bash
     ./start.cmd
    ```
-10. Two terminal windows will open — one for the backend and one for the frontend.
+12. Two terminal windows will open — one for the backend and one for the frontend.
 
-Once the app starts, you should see your new logo and working backend in action!
+Once the app starts, you should see your new logo!