Add soft-deleted resources option to Developer CLI

Author: simonkurtz-MSFT

shared/python/show_soft_deleted_resources.py

@@ -4,10 +4,15 @@
 """
 
 import sys
+import io
 import argparse
 from datetime import datetime
 from pathlib import Path
 
+# Configure UTF-8 encoding for console output
+if sys.stdout.encoding != 'utf-8':
+    sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
+
 # APIM Samples imports
 import azure_resources as az
 

start.ps1

@@ -116,11 +116,12 @@ while ($true) {
     Write-Host "  1) Complete environment setup"
     Write-Host "  2) Verify local setup"
     Write-Host "  3) Show Azure account info"
+    Write-Host "  4) Show soft-deleted resources"
     Write-Host ""
     Write-Host "Tests" -ForegroundColor Yellow
-    Write-Host "  4) Run pylint"
-    Write-Host "  5) Run tests"
-    Write-Host "  6) Run full Python checks"
+    Write-Host "  5) Run pylint"
+    Write-Host "  6) Run tests"
+    Write-Host "  7) Run full Python checks"
     Write-Host ""
     Write-Host "Misc" -ForegroundColor Yellow
     Write-Host "  0) Exit"
@@ -139,12 +140,15 @@ while ($true) {
             Invoke-Pause-Menu
         }
         '4' {
-            if (Invoke-Cmd "$RepoRoot/tests/python/run_pylint.ps1") { Invoke-Pause-Menu }
+            if (Invoke-Cmd (Get-Python) "$RepoRoot/shared/python/show_soft_deleted_resources.py") { Invoke-Pause-Menu }
         }
         '5' {
-            if (Invoke-Cmd "$RepoRoot/tests/python/run_tests.ps1") { Invoke-Pause-Menu }
+            if (Invoke-Cmd "$RepoRoot/tests/python/run_pylint.ps1") { Invoke-Pause-Menu }
         }
         '6' {
+            if (Invoke-Cmd "$RepoRoot/tests/python/run_tests.ps1") { Invoke-Pause-Menu }
+        }
+        '7' {
             if (Invoke-Cmd "$RepoRoot/tests/python/check_python.ps1") { Invoke-Pause-Menu }
         }
         '0' {

start.sh

@@ -79,11 +79,12 @@ while true; do
   echo "  1) Complete environment setup"
   echo "  2) Verify local setup"
   echo "  3) Show Azure account info"
+  echo "  4) Show soft-deleted resources"
   echo ""
   echo "Tests"
-  echo "  4) Run pylint"
-  echo "  5) Run tests"
-  echo "  6) Run full Python checks"
+  echo "  5) Run pylint"
+  echo "  6) Run tests"
+  echo "  7) Run full Python checks"
   echo ""
   echo "Misc"
   echo "  0) Exit"
@@ -102,14 +103,18 @@ while true; do
       if show_account; then pause_prompt; fi
       ;;
     4)
-      run_cmd "${REPO_ROOT}/tests/python/run_pylint.sh"
+      run_cmd "$(find_python)" "${REPO_ROOT}/shared/python/show_soft_deleted_resources.py"
       pause_prompt
       ;;
     5)
-      run_cmd "${REPO_ROOT}/tests/python/run_tests.sh"
+      run_cmd "${REPO_ROOT}/tests/python/run_pylint.sh"
       pause_prompt
       ;;
     6)
+      run_cmd "${REPO_ROOT}/tests/python/run_tests.sh"
+      pause_prompt
+      ;;
+    7)
       run_cmd "${REPO_ROOT}/tests/python/check_python.sh"
       pause_prompt
       ;;