Clean up

Author: simonkurtz-MSFT

.devcontainer/post-start-setup.sh

@@ -13,15 +13,24 @@ echo -e "🚀 APIM Samples environment starting...\n"
 #    CONFIGURATION
 # ------------------------------
 
-echo -e "1/5) Setting environment variables...\n"
+echo -e "1/5) Detecting & setting environment variables...\n"
 
 WORKSPACE_ROOT="/workspaces/Apim-Samples"
 VENV_PATH="$WORKSPACE_ROOT/.venv"
 PYTHON_EXECUTABLE="$VENV_PATH/bin/python"
 
+# Activate virtual environment to get the correct Python version
+source "$VENV_PATH/bin/activate" 2>/dev/null || true
+PYTHON_VERSION=$(python --version)
+
+# Extract Azure CLI version (suppress warnings and get just the version number)
+AZ_CLI_VERSION=$(az --version 2>/dev/null | grep "azure-cli" | awk '{print $2}' | head -1)
+
 echo "   Workspace              : $WORKSPACE_ROOT"
 echo "   Virtual Environment    : $VENV_PATH"
 echo "   Python Executable      : $PYTHON_EXECUTABLE"
+echo "   Python Version         : $PYTHON_VERSION"
+echo "   Azure CLI Version      : $AZ_CLI_VERSION"
 echo ""
 
 # ------------------------------
@@ -37,7 +46,7 @@ if [ -d "$VENV_PATH" ]; then
         echo "   ✅ Python executable available"
         # Activate and verify
         source "$VENV_PATH/bin/activate"
-        echo "   ✅ Python version: $(python --version)"
+        echo "   ✅ Python version     : $PYTHON_VERSION"
         # Commenting out the number of packages installed as this does take some time to run. When the setup was verified, a count of 125 packages was printed.
         # echo "   ✅ Packages installed: $(pip list | wc -l)"
     else
@@ -80,6 +89,9 @@ fi
 
 echo -e "\n4/5) Configuring Azure CLI...\n"
 
+# We need to have a device code-based login experience within Codespaces. Redirect error output to /dev/null to avoid cluttering the output and ensure
+# that the script continues (|| true) even if this command fails.
+echo -e "   \nSetting Azure CLI login experience to device code...(needed for Codespaces)"
 az config set core.login_experience_v2=off 2>/dev/null || true
 
 # Install extensions used by infrastructure samples
@@ -97,40 +109,35 @@ echo "   \n✅ Azure CLI configured"
 
 echo -e "\n5/5) Environment Summary\n"
 echo "      Virtual Environment : $VIRTUAL_ENV"
-echo "      Python              : $(python --version) at $(which python)"
+echo "      Python              : $PYTHON_VERSION at $(which python)"
 # Commenting out the number of packages installed as this does take some time to run. When the setup was verified, a count of 125 packages was printed.
 # echo "      Packages: $(pip list | wc -l) installed"
-echo "      .env File           : $([ -f .env ] && echo "✅" || echo "❌")"
-echo "      Azure CLI           :"
-echo "$(az --version | head -1)"
+echo "      .env File exists?   : $([ -f .env ] && echo "✅" || echo "❌")"
+echo "      Azure CLI Version   : $AZ_CLI_VERSION"
 
 # Verify Jupyter kernel registration
-echo "      Jupyter Kernels: $(jupyter kernelspec list --json | python -c "import sys, json; data=json.load(sys.stdin); print(len(data['kernelspecs'])) if 'kernelspecs' in data else print('0')" 2>/dev/null || echo "unknown")"
+echo "      Jupyter Kernels     : $(jupyter kernelspec list --json | python -c "import sys, json; data=json.load(sys.stdin); print(len(data['kernelspecs'])) if 'kernelspecs' in data else print('0')" 2>/dev/null || echo "unknown")"
+
 if jupyter kernelspec list | grep -q "apim-samples" 2>/dev/null; then
-    echo "      APIM Samples Kernel: ✅"
+    echo "      APIM Samples Kernel : ✅"
 else
-    echo "      APIM Samples Kernel: ❌ (registering...)"
+    echo "      APIM Samples Kernel : ❌ (registering...)"
     python -m ipykernel install --user --name=apim-samples --display-name="APIM Samples Python 3.12" 2>/dev/null && echo "      ✅ Kernel registered successfully" || echo "      ⚠️  Failed to register kernel"
 fi
 
 # Test core imports
 python -c "
 try:
     import requests, jwt, pandas, matplotlib, azure.identity
-    print('   ✅ Core packages working')
+    print(f'   ✅ Core packages working')
 except ImportError as e:
     print(f'   ❌ Package issue: {e}')
 "
 
 # Calculate total duration using Python
 end=$(date +%s.%N)
 duration=$(python3 -c "print(f'{float('$end') - float('$start'):.2f}')")
-printf "   ⏱️  Total duration in %s seconds\n\n" "$duration"
 
 echo "🎉 Environment ready!"
-printf "⏱️  Total setup time: %s seconds\n" "$total_duration"
-echo ""
-echo "💡 The virtual environment is at: $VENV_PATH"
-echo "💡 It should be auto-selected in VS Code"
-echo "💡 All packages are pre-installed and ready to use"
-echo ""
+printf "⏱️  Total setup time: %s seconds\n" "$duration"
+echo -e "\n💡 The virtual environment is at: $VENV_PATH. All requiredments are already pre-installed and ready to use.\n\n"