revert start-interception calls

Author: DrisDary

run-samples.sh

@@ -121,17 +121,17 @@ if [ -n "${AZURE_CONFIG_DIR:-}" ]; then
   mkdir -p "$AZURE_CONFIG_DIR"
 fi
 
-if command -v az >/dev/null 2>&1; then
-  echo "[DEBUG] az command found, attempting login..."
-  az login || true
-  echo "[DEBUG] Starting az interception..."
-  az start-interception
+if command -v azlocal >/dev/null 2>&1; then
+  echo "[DEBUG] azlocal command found, attempting login..."
+  azlocal login || true
+  echo "[DEBUG] Starting azlocal interception..."
+  azlocal start-interception
   echo "[DEBUG] Setting default subscription..."
-  az account set --subscription "00000000-0000-0000-0000-000000000000" || true
-  echo "[DEBUG] Checking az account status..."
-  az account show --query "{Environment:environmentName, Subscription:id}" --output json 2>&1 || echo "[DEBUG] az account show failed"
+  azlocal account set --subscription "00000000-0000-0000-0000-000000000000" || true
+  echo "[DEBUG] Checking azlocal account status..."
+  azlocal account show --query "{Environment:environmentName, Subscription:id}" --output json 2>&1 || echo "[DEBUG] azlocal account show failed"
 else
-  echo "[DEBUG] az not found, using standard az login with service principal..."
+  echo "[DEBUG] azlocal not found, using standard az login with service principal..."
   az login --service-principal -u any-app -p any-pass --tenant any-tenant || true
   echo "[DEBUG] Checking az account status..."
   az account show --query "{Environment:environmentName, Subscription:id}" --output json 2>&1 || echo "[DEBUG] az account show failed"
@@ -188,13 +188,13 @@ for (( i=START; i<START+COUNT; i++ )); do
 
   # Clean up Azure resources to prevent state pollution between tests
   echo "Cleaning up Azure resources in LocalStack..."
-  if command -v az >/dev/null 2>&1; then
-    RG_LIST=$(az group list --query "[].name" -o tsv 2>/dev/null || echo "")
+  if command -v azlocal >/dev/null 2>&1; then
+    RG_LIST=$(azlocal group list --query "[].name" -o tsv 2>/dev/null || echo "")
     if [[ -n "$RG_LIST" ]]; then
       echo "$RG_LIST" | while read -r rg; do
         if [[ -n "$rg" ]]; then
           echo "  - Deleting resource group: $rg"
-          az group delete --name "$rg" --yes --no-wait 2>/dev/null || true
+          azlocal group delete --name "$rg" --yes --no-wait 2>/dev/null || true
         fi
       done
       sleep 2

samples/function-app-front-door/python/scripts/cleanup_all.sh

@@ -27,6 +27,7 @@ Usage: $(basename "$0") [--env-file PATH] [--resource-group NAME] [--use-localst
 Options:
   --env-file PATH         Env file produced by deploy_all.sh (e.g., scripts/.last_deploy_all.env)
   -g, --resource-group    Resource group name to delete
+      --use-localstack    Use azlocal interception to target LocalStack emulator
   -h, --help              Show this help
 EOF
 }
@@ -58,8 +59,8 @@ fi
 INTERCEPTION_STARTED="false"
 AZURE_CONFIG_DIR_CREATED="false"
 finish() {
-  if [[ "$INTERCEPTION_STARTED" == "true" ]] && command -v az >/dev/null 2>&1; then
-    set +e; az stop-interception >/dev/null 2>&1 || true; set -e
+  if [[ "$INTERCEPTION_STARTED" == "true" ]] && command -v azlocal >/dev/null 2>&1; then
+    set +e; azlocal stop-interception >/dev/null 2>&1 || true; set -e
   fi
   if [[ "$AZURE_CONFIG_DIR_CREATED" == "true" && -n "${AZURE_CONFIG_DIR:-}" && -d "$AZURE_CONFIG_DIR" ]]; then
     rm -rf "$AZURE_CONFIG_DIR"
@@ -68,17 +69,17 @@ finish() {
 trap finish EXIT
 
 if [[ "$USE_LOCALSTACK" == "true" ]]; then
-  if command -v mktemp >/dev/null 2>&1; then AZ_TEMP_CONFIG_DIR="$(mktemp -d)"; else AZ_TEMP_CONFIG_DIR="$(pwd)/.az_config_$$"; mkdir -p "$AZ_TEMP_CONFIG_DIR"; fi
+  if command -v mktemp >/dev/null 2>&1; then AZ_TEMP_CONFIG_DIR="$(mktemp -d)"; else AZ_TEMP_CONFIG_DIR="$(pwd)/.azlocal_config_$$"; mkdir -p "$AZ_TEMP_CONFIG_DIR"; fi
   export AZURE_CONFIG_DIR="$AZ_TEMP_CONFIG_DIR"; AZURE_CONFIG_DIR_CREATED="true"
   echo "Using isolated AZURE_CONFIG_DIR at: $AZURE_CONFIG_DIR"
-  if ! command -v az >/dev/null 2>&1; then
-    echo "Error: --use-localstack specified but 'az' was not found in PATH." >&2
+  if ! command -v azlocal >/dev/null 2>&1; then
+    echo "Error: --use-localstack specified but 'azlocal' was not found in PATH." >&2
     exit 1
   fi
-  if az start-interception; then
+  if azlocal start-interception; then
     INTERCEPTION_STARTED="true"; echo "LocalStack interception started."
   else
-    echo "Error: az failed to start interception. Ensure LocalStack is running and az is configured correctly." >&2
+    echo "Error: azlocal failed to start interception. Ensure LocalStack is running and azlocal is configured correctly." >&2
     exit 1
   fi
 fi

samples/function-app-front-door/python/scripts/deploy_all.sh

@@ -154,8 +154,8 @@ finish() {
   [[ -f "$ZIP_MAIN" ]] && rm -f "$ZIP_MAIN"
   [[ -f "$ZIP_A" ]] && rm -f "$ZIP_A"
   [[ -f "$ZIP_B" ]] && rm -f "$ZIP_B"
-  if [[ "$INTERCEPTION_STARTED" == "true" ]] && command -v az >/dev/null 2>&1; then
-    az stop-interception >/dev/null 2>&1 || true
+  if [[ "$INTERCEPTION_STARTED" == "true" ]] && command -v azlocal >/dev/null 2>&1; then
+    azlocal stop-interception >/dev/null 2>&1 || true
   fi
   if [[ "$AZURE_CONFIG_DIR_CREATED" == "true" && -n "${AZURE_CONFIG_DIR:-}" && -d "$AZURE_CONFIG_DIR" ]]; then
     rm -rf "$AZURE_CONFIG_DIR"
@@ -176,7 +176,7 @@ if [[ "$USE_LOCALSTACK" == "true" ]]; then
     echo "Error: --use-localstack specified but 'azlocal' not found in PATH." >&2
     exit 1
   fi
-  if az start-interception; then
+  if azlocal start-interception; then
     INTERCEPTION_STARTED="true"; echo "LocalStack interception started."
   else
     echo "Error: azlocal failed to start interception. Ensure LocalStack is running." >&2