Merge branch 'main' into aci-terraform-kv-addition

Author: DrisDary

README.md

@@ -35,7 +35,7 @@ This repository contains comprehensive sample projects demonstrating how to deve
 | [Web App and Managed Identities](./samples/web-app-managed-identity/python/README.md) | Azure Web App using Managed Identities |
 | [Web App and SQL Database ](./samples/web-app-sql-database/python/README.md) | Azure Web App using SQL Database |
 | [ACI and Blob Storage](./samples/aci-blob-storage/python/README.md) | Azure Container Instances with ACR, Key Vault, and Blob Storage |
-| [Azure Service Bus with Spring Boot](./samples/servicebus/README.md) | Azure Service Bus used by a Spring Boot application |
+| [Azure Service Bus with Spring Boot](./samples/servicebus/java/README.md) | Azure Service Bus used by a Spring Boot application |
 
 ## Sample Structure
 

run-samples.sh

@@ -30,7 +30,7 @@ fi
 # 1. Define Samples (placed before tool checks so --list works without dependencies)
 SAMPLES=(
   "samples/servicebus/java|bash scripts/deploy.sh"
-  "samples/function-app-front-door/python|bash scripts/deploy_all.sh --name-prefix testafd --use-localstack|"
+  "samples/function-app-front-door/python|bash scripts/deploy_all.sh --name-prefix testafd|"
   "samples/function-app-managed-identity/python|bash scripts/user-managed-identity.sh|bash scripts/validate.sh && bash scripts/test.sh"
   "samples/function-app-service-bus/dotnet|bash scripts/deploy.sh|bash scripts/validate.sh && bash scripts/call-http-trigger.sh"
   "samples/function-app-storage-http/dotnet|bash scripts/deploy.sh|bash scripts/validate.sh && bash scripts/call-http-triggers.sh"

samples/aci-blob-storage/python/scripts/cleanup.sh

@@ -16,13 +16,6 @@ KEY_VAULT_NAME="${PREFIX}acikv"
 ACR_NAME="${PREFIX}aciacr"
 STORAGE_ACCOUNT_NAME="${PREFIX}acistorage"
 
-# Choose the appropriate CLI based on the environment
-if [[ $ENVIRONMENT == "LocalStack" ]]; then
-	AZ="azlocal"
-else
-	AZ="az"
-fi
-
 echo "============================================================"
 echo "Cleaning up ACI Vacation Planner Resources"
 echo "============================================================"

samples/aci-blob-storage/python/scripts/validate.sh

@@ -19,13 +19,6 @@ ACI_GROUP_NAME="${PREFIX}-aci-planner"
 PASS_COUNT=0
 FAIL_COUNT=0
 
-# Choose the appropriate CLI based on the environment
-if [[ $ENVIRONMENT == "LocalStack" ]]; then
-	AZ="azlocal"
-else
-	AZ="az"
-fi
-
 check() {
 	local description="$1"
 	local command="$2"

samples/aci-blob-storage/python/terraform/deploy.sh

@@ -11,15 +11,6 @@ CURRENT_DIR="$(cd "$(dirname "$0")" && pwd)"
 # Change the current directory to the script's directory
 cd "$CURRENT_DIR" || exit
 
-# Choose the appropriate CLI based on the environment
-if [[ $ENVIRONMENT == "LocalStack" ]]; then
-	echo "Using azlocal for LocalStack emulator environment."
-	AZ="azlocal"
-else
-	echo "Using standard terraform and az for AzureCloud environment."
-	AZ="az"
-fi
-
 # =============================================================================
 # Build and push the Docker image before Terraform deployment
 # (Terraform references the pre-created ACR as a data source)

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

@@ -8,26 +8,23 @@ set -euo pipefail
 #
 # Usage examples:
 #   # Using the env file written by deploy_all.sh
-#   bash ./scripts/cleanup_all.sh --env-file ./scripts/.last_deploy_all.env --use-localstack
+#   bash ./scripts/cleanup_all.sh --env-file ./scripts/.last_deploy_all.env
 #
-#   # Passing the RG directly (works for Azure or LocalStack)
+#   # Passing the RG directly
 #   bash ./scripts/cleanup_all.sh --resource-group rg-funcafdall-12345
 #
 # Requirements: az CLI
-# Optional: azlocal (LocalStack Azure CLI helper) when cleaning emulator resources
 
 RESOURCE_GROUP=""
 ENV_FILE=""
-USE_LOCALSTACK="false"
 
 print_usage() {
   cat <<EOF
-Usage: $(basename "$0") [--env-file PATH] [--resource-group NAME] [--use-localstack]
+Usage: $(basename "$0") [--env-file PATH] [--resource-group NAME]
 
 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
 }
@@ -37,7 +34,6 @@ while [[ $# -gt 0 ]]; do
   case "$1" in
     --env-file) ENV_FILE=${2:-}; shift 2;;
     -g|--resource-group) RESOURCE_GROUP=${2:-}; shift 2;;
-    --use-localstack) USE_LOCALSTACK="true"; shift;;
     -h|--help) print_usage; exit 0;;
     *) echo "Unknown option: $1" >&2; print_usage; exit 1;;
   esac
@@ -56,33 +52,5 @@ if [[ -z "$RESOURCE_GROUP" ]]; then
   exit 1
 fi
 
-INTERCEPTION_STARTED="false"
-AZURE_CONFIG_DIR_CREATED="false"
-finish() {
-  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"
-  fi
-}
-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)/.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 azlocal >/dev/null 2>&1; then
-    echo "Error: --use-localstack specified but 'azlocal' was not found in PATH." >&2
-    exit 1
-  fi
-  if azlocal start-interception; then
-    INTERCEPTION_STARTED="true"; echo "LocalStack interception started."
-  else
-    echo "Error: azlocal failed to start interception. Ensure LocalStack is running and azlocal is configured correctly." >&2
-    exit 1
-  fi
-fi
-
 az group delete -n "$RESOURCE_GROUP" --yes --no-wait
 echo "Delete requested for resource group '$RESOURCE_GROUP'."

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

@@ -10,29 +10,24 @@ set -euo pipefail
 #   4) Rules Engine demo via Rule Set + Rule (ep-rules)
 #   5) Endpoint enabled/disabled state toggle (ep-state)
 #
-# It supports deploying to real Azure or to LocalStack’s Azure emulator via azlocal interception.
 # By default, all scenarios are deployed. You can selectively skip scenarios via flags.
 #
 # Requirements
 #   - az CLI
 #   - bash, zip
-#   - Optional for LocalStack mode: azlocal (CLI interceptor), Azure Functions Core Tools ('func')
+#   - Optional: Azure Functions Core Tools (‘func’)
 #
 # Examples
 #   # Real Azure (eastus by default)
 #   bash ./scripts/deploy_all.sh --name-prefix demo
 #
-#   # LocalStack emulator
-#   bash ./scripts/deploy_all.sh --name-prefix demo --use-localstack
-#
 
 # -------------------------------
 # Defaults (overridable via flags)
 # -------------------------------
 NAME_PREFIX="funcafdall"
 LOCATION="eastus"
 RESOURCE_GROUP=""
-USE_LOCALSTACK="false"
 PYTHON_VERSION="3.11"
 
 # Scenario toggles
@@ -51,7 +46,6 @@ Options:
   -l, --location STR          Azure region (default: eastus)
   -g, --resource-group STR    Resource group name (auto-generated if omitted)
       --python-version STR    Python runtime for Function App(s) (default: 3.11)
-      --use-localstack        Use azlocal for LocalStack emulator
 
   # Scenario toggles (all enabled by default)
       --no-basic              Skip basic single-origin scenario
@@ -70,7 +64,6 @@ while [[ $# -gt 0 ]]; do
     -l|--location) LOCATION=${2:-}; shift 2;;
     -g|--resource-group) RESOURCE_GROUP=${2:-}; shift 2;;
     --python-version) PYTHON_VERSION=${2:-}; shift 2;;
-    --use-localstack) USE_LOCALSTACK="true"; shift;;
     --no-basic) DO_BASIC="false"; shift;;
     --no-multi) DO_MULTI="false"; shift;;
     --no-spec) DO_SPEC="false"; shift;;
@@ -145,45 +138,17 @@ ruleSetName="rs${prefix}${suffix}"
 ruleName="ruleAddHeader"
 
 # -------------------------------
-# LocalStack interception lifecycle (optional)
+# Cleanup on exit
 # -------------------------------
-INTERCEPTION_STARTED="false"
-AZURE_CONFIG_DIR_CREATED="false"
 finish() {
   set +e
   [[ -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 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"
-  fi
   set -e
 }
 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="$ROOT_DIR/.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: $AZURE_CONFIG_DIR"
-  if ! command -v azlocal >/dev/null 2>&1; then
-    echo "Error: --use-localstack specified but 'azlocal' not found in PATH." >&2
-    exit 1
-  fi
-  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
-    exit 1
-  fi
-fi
-
 echo "Resource Group: $RESOURCE_GROUP"
 
 # -------------------------------
@@ -202,35 +167,14 @@ create_function_app() {
     --runtime python --runtime-version "$PYTHON_VERSION" \
     --functions-version 4 --os-type Linux \
     --storage-account "$storageName" --disable-app-insights -o none
-  if [[ "$USE_LOCALSTACK" != "true" ]]; then
-    az functionapp config appsettings set -g "$RESOURCE_GROUP" -n "$funcName" \
-      --settings WEBSITE_RUN_FROM_PACKAGE=1 FUNCTIONS_WORKER_RUNTIME=python SCM_DO_BUILD_DURING_DEPLOYMENT=false -o none
-  else
-    az functionapp config appsettings set -g "$RESOURCE_GROUP" -n "$funcName" \
-      --settings FUNCTIONS_WORKER_RUNTIME=python WEBSITE_RUN_FROM_PACKAGE=0 -o none
-    local STORAGE_KEY
-    STORAGE_KEY=$(az storage account keys list -g "$RESOURCE_GROUP" -n "$storageName" --query "[0].value" -o tsv)
-    if [[ -z "$STORAGE_KEY" ]]; then echo "Failed to get storage key for $storageName" >&2; exit 1; fi
-    local STORAGE_CONNECTION_STRING
-    STORAGE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=$storageName;AccountKey=$STORAGE_KEY;BlobEndpoint=http://$storageName.blob.localhost.localstack.cloud:4566;QueueEndpoint=http://$storageName.queue.localhost.localstack.cloud:4566;TableEndpoint=http://$storageName.table.localhost.localstack.cloud:4566;FileEndpoint=http://$storageName.file.localhost.localstack.cloud:4566"
-    az functionapp config appsettings set -g "$RESOURCE_GROUP" -n "$funcName" \
-      --settings AzureWebJobsStorage="$STORAGE_CONNECTION_STRING" WEBSITE_CONTENTAZUREFILECONNECTIONSTRING="$STORAGE_CONNECTION_STRING" SCM_RUN_FROM_PACKAGE= -o none
-  fi
+  az functionapp config appsettings set -g "$RESOURCE_GROUP" -n "$funcName" \
+    --settings WEBSITE_RUN_FROM_PACKAGE=1 FUNCTIONS_WORKER_RUNTIME=python SCM_DO_BUILD_DURING_DEPLOYMENT=false -o none
 }
 
 publish_function_code() {
   local funcName="$1"; local zipPath="$2"
-  if [[ "$USE_LOCALSTACK" == "true" ]]; then
-    if ! command -v func >/dev/null 2>&1; then
-      echo "Error: Azure Functions Core Tools ('func') not found in PATH." >&2; exit 1
-    fi
-    pushd "$FUNCTION_SRC" >/dev/null
-    func azure functionapp publish "$funcName" --python --build local #--verbose --debug
-    popd >/dev/null
-  else
-    rm -f "$zipPath"; ( cd "$FUNCTION_SRC" && zip -rq "$zipPath" . )
-    az functionapp deployment source config-zip -g "$RESOURCE_GROUP" -n "$funcName" --src "$zipPath"
-  fi
+  rm -f "$zipPath"; ( cd "$FUNCTION_SRC" && zip -rq "$zipPath" . )
+  az functionapp deployment source config-zip -g "$RESOURCE_GROUP" -n "$funcName" --src "$zipPath"
 }
 
 if [[ "$DO_BASIC" == "true" || "$DO_SPEC" == "true" || "$DO_RULES" == "true" || "$DO_STATE" == "true" ]]; then
@@ -410,11 +354,11 @@ hostBasic=""; hostMulti=""; hostSpec=""; hostRules=""; hostState=""
 [[ "$DO_RULES" == "true" ]] && hostRules=$(resolve_ep_host "$epRules")
 [[ "$DO_STATE" == "true" ]] && hostState=$(resolve_ep_host "$epState")
 
-# Local addresses for emulator
-if [[ "$USE_LOCALSTACK" == "true" ]]; then
-  funcMainLocal="${funcMain}website.localhost.localstack.cloud:4566"
-  funcALocal="${funcA}website.localhost.localstack.cloud:4566"
-  funcBLocal="${funcB}website.localhost.localstack.cloud:4566"
+# Detect LocalStack environment for local URLs
+IS_LOCALSTACK="false"
+ENVIRONMENT=$(az account show --query environmentName --output tsv 2>/dev/null || true)
+if [[ "$ENVIRONMENT" == "LocalStack" ]]; then
+  IS_LOCALSTACK="true"
   epBasicLocal="${epBasic}.afd.localhost.localstack.cloud:4566"
   epMultiLocal="${epMulti}.afd.localhost.localstack.cloud:4566"
   epSpecLocal="${epSpec}.afd.localhost.localstack.cloud:4566"
@@ -446,44 +390,29 @@ echo
 echo "Deployment complete."
 echo "Resource Group: $RESOURCE_GROUP"
 if [[ "$DO_BASIC" == "true" ]]; then
-  if [[ "$USE_LOCALSTACK" == "true" ]]; then
-    echo "[Basic] AFD Local Endpoint:   https://$epBasicLocal/john"
-  else
-    echo "[Basic] AFD Endpoint:         https://$hostBasic/john"
-  fi
+  echo "[Basic] AFD Endpoint:         https://$hostBasic/john"
+  [[ "$IS_LOCALSTACK" == "true" ]] && echo "       Local Endpoint:        http://$epBasicLocal/john"
 fi
 if [[ "$DO_MULTI" == "true" ]]; then
-  if [[ "$USE_LOCALSTACK" == "true" ]]; then
-    echo "[Multi] AFD Local Endpoint:   https://$epMultiLocal/john"
-    echo "       You can inspect responses to see which origin served them (function echoes WEBSITE_HOSTNAME)."
-  else
-    echo "[Multi] AFD Endpoint:         https://$hostMulti/john"
-  fi
+  echo "[Multi] AFD Endpoint:         https://$hostMulti/john"
+  [[ "$IS_LOCALSTACK" == "true" ]] && echo "       Local Endpoint:        http://$epMultiLocal/john"
 fi
 if [[ "$DO_SPEC" == "true" ]]; then
-  if [[ "$USE_LOCALSTACK" == "true" ]]; then
-    echo "[Spec]  AFD Local Endpoint:   https://$epSpecLocal/john  (specific route)"
-    echo "       Also try:              https://$epSpecLocal/jane  (catch-all)"
-  else
-    echo "[Spec]  AFD Endpoint:         https://$hostSpec/john  (specific route)"
-    echo "       Also try:              https://$hostSpec/jane  (catch-all)"
+  echo "[Spec]  AFD Endpoint:         https://$hostSpec/john  (specific route)"
+  echo "       Also try:              https://$hostSpec/jane  (catch-all)"
+  if [[ "$IS_LOCALSTACK" == "true" ]]; then
+    echo "       Local Endpoint:        http://$epSpecLocal/john  (specific route)"
+    echo "       Also try:              http://$epSpecLocal/jane  (catch-all)"
   fi
 fi
 if [[ "$DO_RULES" == "true" ]]; then
-  if [[ "$USE_LOCALSTACK" == "true" ]]; then
-    echo "[Rules] AFD Local Endpoint:   https://$epRulesLocal/john"
-    echo "       Expect response header: X-CDN: MSFT (if rules are supported)."
-  else
-    echo "[Rules] AFD Endpoint:         https://$hostRules/john"
-    echo "       Expect response header: X-CDN: MSFT (once propagation completes)."
-  fi
+  echo "[Rules] AFD Endpoint:         https://$hostRules/john"
+  echo "       Expect response header: X-CDN: MSFT (once propagation completes)."
+  [[ "$IS_LOCALSTACK" == "true" ]] && echo "       Local Endpoint:        http://$epRulesLocal/john"
 fi
 if [[ "$DO_STATE" == "true" ]]; then
-  if [[ "$USE_LOCALSTACK" == "true" ]]; then
-    echo "[State] AFD Local Endpoint:   https://$epStateLocal/john"
-  else
-    echo "[State] AFD Endpoint:         https://$hostState/john"
-  fi
+  echo "[State] AFD Endpoint:         https://$hostState/john"
+  [[ "$IS_LOCALSTACK" == "true" ]] && echo "       Local Endpoint:        http://$epStateLocal/john"
   echo "       To test enabled-state toggle:"
   echo "         az afd endpoint update -g $RESOURCE_GROUP --profile-name $profileName --endpoint-name $epState --enabled-state Disabled"
   echo "         # Then re-enable:"