Add Azure Samples Developer CLI

simonkurtz-MSFT · simonkurtz-MSFT · commit 584eb7670510 · 2025-12-19T15:42:04.000-05:00
diff --git a/README.md b/README.md
@@ -76,6 +76,38 @@ These prerequisites apply broadly across all infrastructure and samples. If ther
 
 ### 🛠️ Initialization
 
+#### 🚀 Developer CLI
+
+Use the interactive Developer CLI to verify setup, run tests, and manage your development workflow:
+
+**Windows:**
+```powershell
+.\start.ps1
+```
+
+**macOS / Linux:**
+```bash
+./start.sh
+```
+
+This menu-driven interface provides quick access to:
+- **Setup**: Complete environment setup, verify local setup, show Azure account info
+- **Tests**: Run pylint, run pytest suite, run full Python checks
+- **Misc**: Exit the CLI
+
+Example output from option 2 (Verify local setup):
+```
+🔍 APIM Samples Local Environment Verification
+✅ Virtual environment is active
+✅ All required packages installed
+✅ Shared modules can be imported
+✅ .env file configured
+⚠️  Jupyter kernel not found
+✅ VS Code settings configured
+```
+
+---
+
 #### Using Dev Container (Recommended)
 
 If you're using the dev container (GitHub Codespaces or VS Code Dev Containers):
diff --git a/setup/setup_python_path.py b/setup/setup_python_path.py
@@ -16,16 +16,94 @@
 
 import sys
 import subprocess
+import shutil
 import os
 import json
 from pathlib import Path  # Cross-platform path handling (Windows: \, Unix: /)
+import subprocess  # Ensure subprocess is imported for the new functions
 
 
 DEFAULT_VSCODE_SEARCH_EXCLUDE = {
     "**/.venv": True,
     "**/.venv/**": True,
 }
 
+def check_azure_cli_installed():
+    """Check if Azure CLI is installed."""
+    az_path = shutil.which('az') or shutil.which('az.cmd') or shutil.which('az.bat')
+    if not az_path:
+        print("   ❌ Azure CLI is not installed. Please install from: https://learn.microsoft.com/cli/azure/install-azure-cli")
+        return False
+    try:
+        subprocess.run([az_path, '--version'], capture_output=True, text=True, check=True)
+        print("   ✅ Azure CLI is installed")
+        return True
+    except subprocess.CalledProcessError:
+        print("   ❌ Azure CLI is not installed. Please install from: https://learn.microsoft.com/cli/azure/install-azure-cli")
+        return False
+
+def check_bicep_cli_installed():
+    """Check if Azure Bicep CLI is installed."""
+    az_path = shutil.which('az') or shutil.which('az.cmd') or shutil.which('az.bat')
+    if not az_path:
+        print("   ❌ Azure CLI is not installed. Please install from: https://learn.microsoft.com/cli/azure/install-azure-cli")
+        return False
+
+    try:
+        subprocess.run([az_path, 'bicep', 'version'], capture_output=True, text=True, check=True)
+        print("   ✅ Azure Bicep CLI is installed (via az bicep)")
+        return True
+    except subprocess.CalledProcessError:
+        print("   ❌ Azure Bicep CLI is not installed. Install with: az bicep install")
+        return False
+
+def check_azure_providers_registered():
+    """Check if required Azure resource providers are registered in the current subscription."""
+    az_path = shutil.which('az') or shutil.which('az.cmd') or shutil.which('az.bat')
+    if not az_path:
+        print("   ❌ Azure CLI is not installed. Please install from: https://learn.microsoft.com/cli/azure/install-azure-cli")
+        return False
+    required_providers = [
+        'Microsoft.ApiManagement',
+        'Microsoft.App',
+        'Microsoft.Authorization',
+        'Microsoft.CognitiveServices',
+        'Microsoft.ContainerRegistry',
+        'Microsoft.KeyVault',
+        'Microsoft.Maps',
+        'Microsoft.ManagedIdentity',
+        'Microsoft.Network',
+        'Microsoft.OperationalInsights',
+        'Microsoft.Resources',
+        'Microsoft.Storage'
+    ]
+
+    try:
+        # Get list of registered providers
+        result = subprocess.run(
+            [az_path, 'provider', 'list', '--query', '[].namespace', '-o', 'json'],
+            capture_output=True,
+            text=True,
+            check=True
+        )
+        registered_providers = json.loads(result.stdout)
+
+        missing_providers = [p for p in required_providers if p not in registered_providers]
+
+        if not missing_providers:
+            print("   ✅ All required Azure resource providers are registered")
+            return True
+
+        print(f"   ❌ Missing {len(missing_providers)} Azure provider(s):")
+        for provider in missing_providers:
+            print(f"      • {provider}")
+        print("   Register with: az provider register -n <provider-namespace>")
+        return False
+
+    except (subprocess.CalledProcessError, json.JSONDecodeError, FileNotFoundError):
+        print("   ⚠️  Could not verify Azure provider registrations (Azure CLI may not be configured)")
+        return False
+
 DEFAULT_VSCODE_FILES_WATCHER_EXCLUDE = {
     "**/.venv/**": True,
 }
@@ -549,16 +627,26 @@ def force_kernel_consistency():
 
 def setup_complete_environment():
     """
-    Complete setup: generate .env file, register kernel, and configure VS Code.
+    Complete setup: check Azure prerequisites, generate .env file, register kernel, and configure VS Code.
 
     This provides a one-command setup that makes the local environment
     as easy to use as the dev container.
     """
 
     print("🚀 Setting up complete APIM Samples environment...\n")
 
+    # Step 0: Check Azure prerequisites
+    print("0. Checking Azure prerequisites...")
+    azure_cli_ok = check_azure_cli_installed()
+    bicep_ok = check_bicep_cli_installed()
+    providers_ok = check_azure_providers_registered()
+
+    if not (azure_cli_ok and bicep_ok and providers_ok):
+        print("\n⚠️  Some Azure prerequisites are missing. Please address the issues above and re-run this script.")
+        return
+
     # Step 1: Generate .env file
-    print("1. Generating .env file for Python path configuration...")
+    print("\n1. Generating .env file for Python path configuration...")
     generate_env_file()
 
     # Step 2: Register Jupyter kernel
@@ -576,6 +664,8 @@ def setup_complete_environment():
     # Summary
     print("\n" + "="*50)
     print("📋 Setup Summary:")
+    print("   ✅ Azure CLI and Bicep: Available")
+    print("   ✅ Azure resource providers: Registered")
     print("   ✅ Python path configuration: Complete")
     print(f"   {'✅' if kernel_success else '❌'} Jupyter kernel registration: {'Complete' if kernel_success else 'Failed'}")
     print(f"   {'✅' if vscode_success else '❌'} VS Code settings: {'Complete' if vscode_success else 'Failed'}")
diff --git a/setup/verify_local_setup.py b/setup/verify_local_setup.py
@@ -6,6 +6,8 @@
 - Virtual environment is active
 - Required packages are installed
 - Shared modules can be imported
+- Azure CLI and Bicep CLI are installed
+- Required Azure resource providers are registered
 - Jupyter kernel is registered
 - VS Code settings are configured
 
@@ -16,6 +18,8 @@
 import subprocess
 import os
 import io
+import json
+import shutil
 from pathlib import Path
 
 # Configure UTF-8 encoding for console output
@@ -184,6 +188,92 @@ def check_env_file():
         return False
 
 
+def check_azure_cli():
+    """Check if Azure CLI is installed."""
+    az_path = shutil.which('az') or shutil.which('az.cmd') or shutil.which('az.bat')
+    if not az_path:
+        print_status("Azure CLI is not installed or not in PATH", False)
+        return False
+    try:
+        result = subprocess.run([az_path, '--version'], capture_output=True, text=True, check=True)
+        version_line = (result.stdout.splitlines() or ["unknown version"])[0].strip()
+        print_status(f"Azure CLI is installed ({version_line})")
+        return True
+    except subprocess.CalledProcessError:
+        print_status("Azure CLI is not installed or not in PATH", False)
+        return False
+
+
+def check_bicep_cli():
+    """Check if Azure Bicep CLI is installed."""
+    az_path = shutil.which('az') or shutil.which('az.cmd') or shutil.which('az.bat')
+    if not az_path:
+        print_status("Azure CLI is not installed or not in PATH", False)
+        return False
+
+    try:
+        result = subprocess.run([az_path, 'bicep', 'version'], capture_output=True, text=True, check=True)
+        version_line = (result.stdout.splitlines() or ["unknown version"])[0].strip()
+        print_status(f"Azure Bicep CLI is installed (az bicep version: {version_line})")
+        return True
+    except subprocess.CalledProcessError:
+        print_status("Azure Bicep CLI is not installed. Install with: az bicep install", False)
+        return False
+
+
+def check_azure_providers():
+    """Check if required Azure resource providers are registered in the current subscription."""
+    az_path = shutil.which('az') or shutil.which('az.cmd') or shutil.which('az.bat')
+    if not az_path:
+        print_status("Azure CLI is not installed or not in PATH", False)
+        return False
+    required_providers = [
+        'Microsoft.ApiManagement',
+        'Microsoft.App',
+        'Microsoft.Authorization',
+        'Microsoft.CognitiveServices',
+        'Microsoft.ContainerRegistry',
+        'Microsoft.KeyVault',
+        'Microsoft.Maps',
+        'Microsoft.ManagedIdentity',
+        'Microsoft.Network',
+        'Microsoft.OperationalInsights',
+        'Microsoft.Resources',
+        'Microsoft.Storage'
+    ]
+
+    try:
+        # Get list of registered providers
+        result = subprocess.run(
+            [az_path, 'provider', 'list', '--query', '[].namespace', '-o', 'json'],
+            capture_output=True,
+            text=True,
+            check=True
+        )
+        registered_providers = sorted(set(json.loads(result.stdout)))
+
+        missing_providers = [p for p in required_providers if p not in registered_providers]
+        found_providers = [p for p in required_providers if p in registered_providers]
+
+        print("   Registered providers:")
+        for provider in found_providers:
+            print(f"      - {provider}")
+
+        if not missing_providers:
+            print_status("All required Azure providers are registered")
+            return True
+
+        print_status(f"Missing {len(missing_providers)} provider(s): {', '.join(missing_providers)}", False)
+        print("   Register missing providers with:")
+        for provider in missing_providers:
+            print(f"   az provider register -n {provider}")
+        return False
+
+    except (subprocess.CalledProcessError, json.JSONDecodeError, FileNotFoundError):
+        print_status("Could not verify Azure provider registrations", False)
+        return False
+
+
 def main():
     """Run all verification checks."""
     print("🔍 APIM Samples Local Environment Verification")
@@ -194,6 +284,9 @@ def main():
         ("Required Packages", check_required_packages),
         ("Shared Modules", check_shared_modules),
         ("Environment File", check_env_file),
+        ("Azure CLI", check_azure_cli),
+        ("Azure Bicep CLI", check_bicep_cli),
+        ("Azure Providers", check_azure_providers),
         ("Jupyter Kernel", check_jupyter_kernel),
         ("VS Code Settings", check_vscode_settings)
     ]
diff --git a/shared/python/console.py b/shared/python/console.py
@@ -156,7 +156,8 @@ def _print_log(message: str, prefix: str = '', color: str = '', output: str = ''
 
 def print_command(cmd: str = '') -> None:
     """Print a command message."""
-    _print_log(cmd, '⚙️ ', BOLD_B, blank_above = True, blank_below = True, level = logging.INFO)
+    # Two spaces after the cog as opposed to one elsewhere are intentional for formatting. Please don't change this.
+    _print_log(cmd, '⚙️  ', BOLD_B, blank_above = True, blank_below = True, level = logging.INFO)
 
 def print_error(msg: str, output: str = '', duration: str = '') -> None:
     """Print an error message."""
diff --git a/start.ps1 b/start.ps1
@@ -3,6 +3,15 @@
 Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
+# Set UTF-8 encoding for console output to properly display Unicode characters
+[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
+
+# Enable ANSI escape sequence support in PowerShell 7+
+$PSVersionTable.PSVersion.Major -ge 7 | Out-Null
+if ($PSVersionTable.PSVersion.Major -ge 7) {
+    $env:TERM = "xterm-256color"
+}
+
 $ScriptDir = Split-Path -Path $MyInvocation.MyCommand.Path -Parent
 $RepoRoot = $ScriptDir
 
@@ -34,11 +43,12 @@ function Invoke-Cmd {
 
         $exe = $flatArgs[0]
         $cmdArgs = @()
+
         if ($flatArgs.Count -gt 1) {
             $cmdArgs = @($flatArgs[1..($flatArgs.Count - 1)])
         }
 
-            $output = & $exe @cmdArgs 2>&1
+        & $exe @cmdArgs 2>&1 | Write-Host
         $exitCode = $LASTEXITCODE
     }
     catch {
@@ -54,9 +64,6 @@ function Invoke-Cmd {
 
     if ($exitCode -ne 0) {
         Write-Host ""
-            if (-not $output) {
-                Write-Host "No output was returned from the command." -ForegroundColor Yellow
-            }
         Write-Host "Command exited with code $exitCode" -ForegroundColor Yellow
         Write-Host ""
         Invoke-Pause-Menu
@@ -97,7 +104,7 @@ except Exception as exc:  # pylint: disable=broad-except
 function Invoke-Pause-Menu {
     Write-Host ""
     Write-Host "=========================="
-    Read-Host "Press Enter to return to the APIM Samples Developer CLI menu" | Out-Null
+    Read-Host "Press ENTER to return to the menu" | Out-Null
 }
 
 while ($true) {
@@ -113,7 +120,7 @@ while ($true) {
     Write-Host "Tests" -ForegroundColor Yellow
     Write-Host "  4) Run pylint"
     Write-Host "  5) Run tests"
-    Write-Host "  6) Run full python checks"
+    Write-Host "  6) Run full Python checks"
     Write-Host ""
     Write-Host "Misc" -ForegroundColor Yellow
     Write-Host "  0) Exit"
diff --git a/start.sh b/start.sh
@@ -56,8 +56,8 @@ shared = root / "shared" / "python"
 if str(shared) not in sys.path:
     sys.path.insert(0, str(shared))
 try:
-    import utils
-    info = utils.get_account_info()
+    import azure_resources as az
+    info = az.get_account_info()
     print(json.dumps(info, indent=2))
 except Exception as exc:  # pylint: disable=broad-except
     print(f"Failed to read Azure account info: {exc}")
@@ -67,7 +67,7 @@ PY
 
 pause_prompt() {
   echo
-  read -rp "Press Enter to return to the menu..." _
+  read -rp "Press ENTER to return to the menu..." _
 }
 
 while true; do
@@ -83,7 +83,7 @@ while true; do
   echo "Tests"
   echo "  4) Run pylint"
   echo "  5) Run tests"
-  echo "  6) Run full python checks"
+  echo "  6) Run full Python checks"
   echo ""
   echo "Misc"
   echo "  0) Exit"
diff --git a/tests/python/run_tests.sh b/tests/python/run_tests.sh
