Modify Samples to Call Function App and Web App Samples via Default Hostname (#76)

* Added azlocal start-interception to all README files

* Fix Web App + SQL Sample

* Change secret name to be compliant with validate.sh

* updated runner

* skip if already exists

* remove the pre-existing microsoft-prod.list

* upgraded azurerm provider

* Modify Samples to Call Function App and Web App Samples via Default Hostname

* Fixed resource group name

---------

Co-authored-by: Dris.S <idrissardary@outlook.com>

Author: paolosalvatori

samples/function-app-managed-identity/python/README.md

@@ -86,7 +86,7 @@ All deployment methods have been fully tested with both user-assigned and system
 
 ## Test
 
-Once the resources and serverless application have been deployed, you can use the `test.sh` script below to copy a sample file to the `input` container and monitor whether the Azure Functions App processes the input blob file and generates a result file in the `output` container. 
+Once the resources and serverless application have been deployed, you can use the [test.sh](./scripts/test.sh) script below to copy a sample file to the `input` container and monitor whether the Azure Functions App processes the input blob file and generates a result file in the `output` container. 
 
 ```bash
 #!/bin/bash

samples/function-app-service-bus/dotnet/README.md

@@ -105,7 +105,7 @@ Getting IP address for container [ls-local-func-test-tdkqjh]...
 IP address [172.17.0.7] retrieved successfully for container [ls-local-func-test-tdkqjh]
 Getting the host port mapped to internal port 80 in container [ls-local-func-test-tdkqjh]...
 Mapped host port [42330] retrieved successfully for container [ls-local-func-test-tdkqjh]
-Calling HTTP trigger function to retrieve the last [10] greetings via emulator...
+Calling HTTP trigger function to retrieve the last [100] greetings via hostname [babo-func-test.azurewebsites.azure.localhost.localstack.cloud:4566]...
 {
   "requester": {
     "sent": [

samples/function-app-service-bus/dotnet/scripts/call-http-trigger.sh

@@ -117,7 +117,7 @@ call_http_trigger_function() {
 	# Get the container IP address
 	echo "Getting IP address for container [$container_name]..."
 	container_ip=$(get_docker_container_ip_address_by_name "$container_name")
-	greeting_count=10
+	greeting_count=100
 
 	if [ $? -eq 0 ] && [ -n "$container_ip" ]; then
 		echo "IP address [$container_ip] retrieved successfully for container [$container_name]"
@@ -137,15 +137,12 @@ call_http_trigger_function() {
 		exit 1
 	fi
 
-	# Retrieve LocalStack proxy port
-	proxy_port=$(curl http://localhost:4566/_localstack/proxy -s | jq '.proxy_port')
-
-	if [ -n "$proxy_port" ]; then
-		# Call the GetGreetings HTTP trigger function to retrieve the last greetings via emulator
-		echo "Calling HTTP trigger function to retrieve the last [$greeting_count] greetings via emulator..."
-		curl --proxy "http://localhost:$proxy_port/" -s "http://$function_host_name/api/greetings?count=$greeting_count" | jq
+	if [ -n "$function_host_name" ]; then
+		# Call the GetGreetings HTTP trigger function to retrieve the last greetings via the function hostname
+		echo "Calling HTTP trigger function to retrieve the last [$greeting_count] greetings via function hostname [$function_host_name]..."
+		curl -s "http://$function_host_name/api/greetings?count=$greeting_count" | jq
 	else
-		echo "Failed to retrieve LocalStack proxy port"
+		echo "Failed to retrieve function hostname"
 	fi
 
 	if [ -n "$container_ip" ]; then

samples/function-app-service-bus/dotnet/scripts/deploy.sh

@@ -49,10 +49,23 @@ PE_NAMES=(
 	"${PREFIX}-queue-storage-pe-${SUFFIX}"
 	"${PREFIX}-table-storage-pe-${SUFFIX}"
 )
-PE_GROUP_IDS=("namespace" "blob" "queue" "table")
-PE_CONNECTION_NAMES=("servicebus-connection" "blob-connection" "queue-connection" "table-connection")
-PE_DNS_ZONES=("privatelink.servicebus.windows.net" "privatelink.blob.core.windows.net" "privatelink.queue.core.windows.net" "privatelink.table.core.windows.net")
-PE_DNS_ZONE_LABELS=("servicebus-zone" "blob-zone" "queue-zone" "table-zone")
+PE_GROUP_IDS=(
+	"namespace" 
+	"blob" "queue" 
+	"table"
+)
+PE_CONNECTION_NAMES=(
+	"servicebus-connection"
+	"blob-connection"
+	"queue-connection"
+	"table-connection"
+)
+PE_DNS_ZONES=(
+	"privatelink.servicebus.windows.net"
+	"privatelink.blob.core.windows.net"
+	"privatelink.queue.core.windows.net"
+	"privatelink.table.core.windows.net"
+)
 
 # Change the current directory to the script's directory
 cd "$CURRENT_DIR" || exit
@@ -640,7 +653,6 @@ for i in "${!PE_NAMES[@]}"; do
 	PE_RESOURCE_ID="${PE_RESOURCE_IDS[$i]}"
 	PE_CONNECTION="${PE_CONNECTION_NAMES[$i]}"
 	PE_DNS_ZONE="${PE_DNS_ZONES[$i]}"
-	PE_DNS_ZONE_LABEL="${PE_DNS_ZONE_LABELS[$i]}"
 
 	# Check if the private endpoint already exists
 	echo "Checking if private endpoint [$PE_NAME] exists in the [$RESOURCE_GROUP_NAME] resource group..."
@@ -679,15 +691,15 @@ for i in "${!PE_NAMES[@]}"; do
 
 	# Check if the private DNS zone group is already created
 	echo "Checking if the private DNS zone group [$PRIVATE_DNS_ZONE_GROUP_NAME] for the [$PE_NAME] private endpoint already exists..."
-	az network private-endpoint dns-zone-group show \
+	NAME=$(az network private-endpoint dns-zone-group show \
 		--resource-group "$RESOURCE_GROUP_NAME" \
 		--endpoint-name "$PE_NAME" \
 		--name "$PRIVATE_DNS_ZONE_GROUP_NAME" \
 		--query name \
 		--output tsv \
-		--only-show-errors &>/dev/null
+		--only-show-errors) 
 
-	if [[ $? != 0 ]]; then
+	if [[ -z $NAME ]]; then
 		echo "No private DNS zone group [$PRIVATE_DNS_ZONE_GROUP_NAME] for the [$PE_NAME] private endpoint actually exists"
 		echo "Creating private DNS zone group [$PRIVATE_DNS_ZONE_GROUP_NAME] for the [$PE_NAME] private endpoint..."
 
@@ -697,7 +709,7 @@ for i in "${!PE_NAMES[@]}"; do
 			--resource-group "$RESOURCE_GROUP_NAME" \
 			--endpoint-name "$PE_NAME" \
 			--private-dns-zone "$PE_DNS_ZONE" \
-			--zone-name "$PE_DNS_ZONE_LABEL" \
+			--zone-name "$PE_DNS_ZONE" \
 			--only-show-errors 1>/dev/null
 
 		if [[ $? == 0 ]]; then
@@ -716,26 +728,6 @@ if [ $DEPLOY -eq 0 ]; then
 	exit 0
 fi
 
-# Check if the application insights az extension is already installed
-echo "Checking if [application-insights] az extension is already installed..."
-az extension show --name application-insights &>/dev/null
-
-if [[ $? == 0 ]]; then
-	echo "[application-insights] az extension is already installed"
-else
-	echo "[application-insights] az extension is not installed. Installing..."
-
-	# Install application-insights az extension
-	az extension add --name application-insights 1>/dev/null
-
-	if [[ $? == 0 ]]; then
-		echo "[application-insights] az extension successfully installed"
-	else
-		echo "Failed to install [application-insights] az extension"
-		exit
-	fi
-fi
-
 # Check if the application insights component already exists
 echo "Checking if [$APPLICATION_INSIGHTS_NAME] Application Insights component exists in the [$RESOURCE_GROUP_NAME] resource group..."
 az monitor app-insights component show \
@@ -1061,7 +1053,7 @@ if ! az appservice plan show \
 		--name $APP_SERVICE_PLAN_NAME \
 		--resource-group $RESOURCE_GROUP_NAME \
 		--location $LOCATION \
-		--sku B1 \
+		--sku S1 \
 		--is-linux \
 		--tags $TAGS \
 		--only-show-errors 1>/dev/null; then
@@ -1162,6 +1154,7 @@ az functionapp config appsettings set \
 	--name $FUNCTION_APP_NAME \
 	--resource-group $RESOURCE_GROUP_NAME \
 	--settings \
+	APPLICATIONINSIGHTS_AUTHENTICATION_STRING="ClientId=${CLIENT_ID};Authorization=AAD" \
 	AZURE_CLIENT_ID="$CLIENT_ID" \
 	SCM_DO_BUILD_DURING_DEPLOYMENT=false \
 	FUNCTIONS_WORKER_RUNTIME=${RUNTIME,,} \
@@ -1457,4 +1450,4 @@ fi
 
 # Print the list of resources in the resource group
 echo "Listing resources in resource group [$RESOURCE_GROUP_NAME]..."
-az resource list --resource-group "$RESOURCE_GROUP_NAME" --output table 
+az resource list --resource-group "$RESOURCE_GROUP_NAME" --output table 

samples/function-app-storage-http/dotnet/README.md

@@ -163,194 +163,10 @@ All deployment methods have been fully tested against Azure and the LocalStack f
 
 Use the [call-http-triggers.sh](./scripts/call-http-triggers.sh) script to quickly test the sample's HTTP-triggered Azure Functions and verify player status or game session details. The script below demonstrates three methods for calling HTTP-triggered functions:
 
-1. **Through the LocalStack for Azure emulator**: Call the function app via the emulator using its default host name. The emulator acts as a proxy to the function app.
+1. **Via the default hostname**: Call the function app via the default hostname `<function-app-name>.azurewebsites.azure.localhost.localstack.cloud:4566`.
 2. **Via localhost and host port mapped to the container's port**: Use `127.0.0.1` with the host port mapped to the container's port `80`.
 3. **Via container IP address**: Use the app container's IP address on port `80`. This technique is only available when accessing the function app from the Docker host machine.
 
-```bash
-#!/bin/bash
-
-get_docker_container_name_by_prefix() {
-	local app_prefix="$1"
-	local container_name
-
-	# Check if Docker is running
-	if ! docker info >/dev/null 2>&1; then
-		echo "Error: Docker is not running" >&2
-		return 1
-	fi
-
-	echo "Looking for containers with names starting with [$app_prefix]..." >&2
-
-	# Find the container using grep
-	container_name=$(docker ps --format "{{.Names}}" | grep "^${app_prefix}" | head -1)
-
-	if [ -z "$container_name" ]; then
-		echo "Error: No running container found with name starting with [$app_prefix]" >&2
-		return 1
-	fi
-
-	echo "Found matching container [$container_name]" >&2
-	echo "$container_name"
-}
-
-get_docker_container_ip_address_by_name() {
-	local container_name="$1"
-	local ip_address
-
-	if [ -z "$container_name" ]; then
-		echo "Error: Container name is required" >&2
-		return 1
-	fi
-
-	# Get IP address
-	ip_address=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$container_name")
-
-	if [ -z "$ip_address" ]; then
-		echo "Error: Container [$container_name] has no IP address assigned" >&2
-		return 1
-	fi
-
-	echo "$ip_address"
-}
-
-get_docker_container_port_mapping() {
-	local container_name="$1"
-	local container_port="$2"
-	local host_port
-
-	if [ -z "$container_name" ] || [ -z "$container_port" ]; then
-		echo "Error: Container name and container port are required" >&2
-		return 1
-	fi
-
-	# Get host port mapping
-	host_port=$(docker inspect -f "{{(index (index .NetworkSettings.Ports \"${container_port}/tcp\") 0).HostPort}}" "$container_name")
-
-	if [ -z "$host_port" ]; then
-		echo "Error: No host port mapping found for container [$container_name] port [$container_port]" >&2
-		return 1
-	fi
-
-	echo "$host_port"
-}
-
-call_http_trigger_functions() {
-	# Get the function app name
-	echo "Getting function app name..."
-	function_app_name=$(azlocal functionapp list --query '[0].name' --output tsv)
-
-	if [ -n "$function_app_name" ]; then
-		echo "Function app [$function_app_name] successfully retrieved."
-	else
-		echo "Error: No function app found"
-		exit 1
-	fi
-
-	# Get the resource group name
-	echo "Getting resource group name for function app [$function_app_name]..."
-	resource_group_name=$(azlocal functionapp list --query '[0].resourceGroup' --output tsv)
-
-	if [ -n "$resource_group_name" ]; then
-		echo "Resource group [$resource_group_name] successfully retrieved."
-	else
-		echo "Error: No resource group found for function app [$function_app_name]"
-		exit 1
-	fi
-
-	# Get the the default host name of the function app
-	echo "Getting the default host name of the function app [$function_app_name]..."
-	function_host_name=$(azlocal functionapp show \
-		--name "$function_app_name" \
-		--resource-group "$resource_group_name" \
-		--query 'defaultHostName' \
-		--output tsv)
-
-	if [ -n "$function_host_name" ]; then
-		echo "Function app default host name [$function_host_name] successfully retrieved."
-	else
-		echo "Error: No function app default host name found"
-		exit 1
-	fi
-
-	# Get the Docker container name
-	echo "Finding container name with prefix [ls-$function_app_name]..."
-	container_name=$(get_docker_container_name_by_prefix "ls-$function_app_name")
-
-	if [ $? -eq 0 ] && [ -n "$container_name" ]; then
-		echo "Container [$container_name] found successfully"
-	else
-		echo "Failed to get container name"
-		exit 1
-	fi
-
-	# Get the container IP address
-	echo "Getting IP address for container [$container_name]..."
-	container_ip=$(get_docker_container_ip_address_by_name "$container_name")
-	player_name='Leo'
-	game_session='1'
-
-	if [ $? -eq 0 ] && [ -n "$container_ip" ]; then
-		echo "IP address [$container_ip] retrieved successfully for container [$container_name]"
-	else
-		echo "Failed to get container IP address"
-		exit 1
-	fi
-
-	# Get the mapped host port for function app HTTP trigger (internal port 80)
-	echo "Getting the host port mapped to internal port 80 in container [$container_name]..."
-	host_port=$(get_docker_container_port_mapping "$container_name" "80")
-	
-	if [ $? -eq 0 ] && [ -n "$host_port" ]; then
-		echo "Mapped host port [$host_port] retrieved successfully for container [$container_name]"
-	else
-		echo "Failed to get mapped host port for container [$container_name]"
-		exit 1
-	fi
-
-	# Retrieve LocalStack proxy port
-	proxy_port=$(curl http://localhost:4566/_localstack/proxy -s | jq '.proxy_port')
-
-	if [ -n "$proxy_port" ]; then
-		# Call the GET HTTP trigger function that returns a player status in a specified game session via emulator
-		echo "Calling HTTP trigger function to retrieve player [$player_name] status in game session [$game_session] via emulator..."
-		curl  --proxy "http://localhost:$proxy_port/" -s "http://$function_host_name/api/player/$game_session/$player_name/status" | jq
-
-		# Call the POST HTTP trigger function that returns the game session details via emulator
-		echo "Calling HTTP trigger function to retrieve game session [$game_session] details via emulator..."
-		curl --proxy "http://localhost:$proxy_port/" -s -X POST -H "Content-Type: application/json" -d "{\"gameId\": $game_session}" "http://$function_host_name/api/game/session" | jq
-	else
-		echo "Failed to retrieve LocalStack proxy port"
-	fi
-	
-	if [ -n "$container_ip" ]; then
-		# Call the GET HTTP trigger function that returns a player status in a specified game session via the container IP address
-		echo "Calling HTTP trigger function to retrieve player [$player_name] status in game session [$game_session] via container IP address [$container_ip]..."
-		curl -s "http://$container_ip/api/player/$game_session/$player_name/status" | jq
-
-		# Call the POST HTTP trigger function that returns the game session details via the container IP address
-		echo "Calling HTTP trigger function to retrieve game session [$game_session] details via container IP address [$container_ip]..."
-		curl -s -X POST -H "Content-Type: application/json" -d "{\"gameId\": $game_session}" "http://$container_ip/api/game/session" | jq
-	else
-		echo "Failed to retrieve container IP address"
-	fi
-
-	if [ -n "$host_port" ]; then
-		# Call the GET HTTP trigger function that returns a player status in a specified game session via the host port
-		echo "Calling HTTP trigger function to retrieve player [$player_name] status in game session [$game_session] via host port [$host_port]..."
-		curl -s "http://localhost:$host_port/api/player/$game_session/$player_name/status" | jq
-
-		# Call the POST HTTP trigger function that returns the game session details via the host port
-		echo "Calling HTTP trigger function to retrieve game session [$game_session] details via host port [$host_port]..."
-		curl -s -X POST -H "Content-Type: application/json" -d "{\"gameId\": $game_session}" "http://localhost:$host_port/api/game/session" | jq
-	else
-		echo "Failed to retrieve container IP address"
-	fi
-}
-
-call_http_trigger_functions
-```
-
 ## Storage Contents
 
 You can use [Azure Storage Explorer](https://learn.microsoft.com/en-us/azure/storage/storage-explorer/vs-azure-tools-storage-manage-with-storage-explorer) to confirm that your Azure Function app creates the expected storage entities in the emulated storage account. To do this:

samples/function-app-storage-http/dotnet/scripts/call-http-triggers.sh

@@ -138,19 +138,16 @@ call_http_trigger_functions() {
 		exit 1
 	fi
 
-	# Retrieve LocalStack proxy port
-	proxy_port=$(curl http://localhost:4566/_localstack/proxy -s | jq '.proxy_port')
-
-	if [ -n "$proxy_port" ]; then
-		# Call the GET HTTP trigger function that returns a player status in a specified game session via emulator
-		echo "Calling HTTP trigger function to retrieve player [$player_name] status in game session [$game_session] via emulator..."
-		curl  --proxy "http://localhost:$proxy_port/" -s "http://$function_host_name/api/player/$game_session/$player_name/status" | jq
+	if [ -n "$function_host_name" ]; then
+		# Call the GET HTTP trigger function that returns a player status in a specified game session via the function hostname
+		echo "Calling HTTP trigger function to retrieve player [$player_name] status in game session [$game_session] via function hostname [$function_host_name]..."
+		curl  -s "http://$function_host_name/api/player/$game_session/$player_name/status" | jq
 
-		# Call the POST HTTP trigger function that returns the game session details via emulator
-		echo "Calling HTTP trigger function to retrieve game session [$game_session] details via emulator..."
-		curl --proxy "http://localhost:$proxy_port/" -s -X POST -H "Content-Type: application/json" -d "{\"gameId\": $game_session}" "http://$function_host_name/api/game/session" | jq
+		# Call the POST HTTP trigger function that returns the game session details via the function hostname
+		echo "Calling HTTP trigger function to retrieve game session [$game_session] details via function hostname [$function_host_name]..."
+		curl -s -X POST -H "Content-Type: application/json" -d "{\"gameId\": $game_session}" "http://$function_host_name/api/game/session" | jq
 	else
-		echo "Failed to retrieve LocalStack proxy port"
+		echo "Failed to retrieve function hostname"
 	fi
 
 	if [ -n "$container_ip" ]; then
@@ -174,7 +171,7 @@ call_http_trigger_functions() {
 		echo "Calling HTTP trigger function to retrieve game session [$game_session] details via host port [$host_port]..."
 		curl -s -X POST -H "Content-Type: application/json" -d "{\"gameId\": $game_session}" "http://localhost:$host_port/api/game/session" | jq
 	else
-		echo "Failed to retrieve container IP address"
+		echo "Failed to retrieve host port"
 	fi
 }