Fix Web Apps + SQL Server Demo (#75)

* 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

---------

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

Author: paolosalvatori

.github/workflows/run-samples.yml

@@ -70,7 +70,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.setup.outputs.matrix) }}
-    runs-on: github-ubuntu2204-amd64-4
+    runs-on: ubuntu-22.04
 
     env:
       IMAGE_NAME: localstack/localstack-azure-alpha
@@ -163,6 +163,7 @@ jobs:
         # Required for the 'web-app-sql-database' sample which uses 'sqlcmd' to
         # initialize and verify the database schema in the local emulator.
         run: |
+          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
           curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
           curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
           sudo apt-get update

samples/web-app-sql-database/python/bicep/deploy.sh

@@ -5,7 +5,7 @@ PREFIX='local'
 SUFFIX='test'
 TEMPLATE="main.bicep"
 PARAMETERS="main.bicepparam"
-RESOURCE_GROUP_NAME="$PREFIX-webapp-sql-rg"
+RESOURCE_GROUP_NAME="$PREFIX-rg"
 LOCATION="westeurope"
 VALIDATE_TEMPLATE=1
 USE_WHAT_IF=0
@@ -295,7 +295,7 @@ fi
 
 # Create the zip package of the web app
 echo "Creating zip package of the web app..."
-zip -r "$ZIPFILE" app.py activities.py database.py static templates requirements.txt
+zip -r "$ZIPFILE" app.py activities.py certificates.py database.py static templates requirements.txt
 
 # Deploy the web app
 echo "Deploying web app [$WEB_APP_NAME] with zip file [$ZIPFILE]..."

samples/web-app-sql-database/python/bicep/main.bicep

@@ -323,7 +323,7 @@ var sqlServerName = '${prefix}-sqlserver-${suffix}'
 var webAppName = '${prefix}-webapp-${suffix}'
 var appServicePlanName = '${prefix}-app-service-plan-${suffix}'
 var keyVaultName = '${prefix}-kv-${suffix}'
-var sqlConnectionStringSecretName = 'sql-connection-string'
+var sqlConnectionStringSecretName = '${prefix}-secret-${suffix}'
 var identity = {
     type: 'SystemAssigned'
   }
@@ -478,6 +478,7 @@ resource configAppSettings 'Microsoft.Web/sites/config@2024-11-01' = {
     KEY_VAULT_NAME: keyVaultName
     SECRET_NAME: sqlConnectionStringSecretName
     LOGIN_NAME: username
+    KEYVAULT_URI: keyVault.properties.vaultUri
   }
 }
 

samples/web-app-sql-database/python/scripts/validate.sh

@@ -1,44 +1,59 @@
 #!/bin/bash
 
 # Variables
+PREFIX='local'
+SUFFIX='test'
+RESOURCE_GROUP_NAME="${PREFIX}-rg"
+SQL_SERVER_NAME="${PREFIX}-sqlserver-${SUFFIX}"
+SQL_DATABASE_NAME='PlannerDB'
+WEB_APP_NAME="${PREFIX}-webapp-${SUFFIX}"
+KEY_VAULT_NAME="${PREFIX}-kv-${SUFFIX}"
+SECRET_NAME="${PREFIX}-secret-${SUFFIX}"
+
 # Check resource group
+echo -e "[$RESOURCE_GROUP_NAME] resource group:\n"
 az group show \
---name local-rg \
---output table
-
-# List resources
-az resource list \
---resource-group local-rg \
+--name "$RESOURCE_GROUP_NAME" \
 --output table
 
 # Check Azure Web App
+echo -e "\n[$WEB_APP_NAME] web app:\n"
 az webapp show \
---name local-webapp-test \
---resource-group local-rg \
+--name "$WEB_APP_NAME" \
+--resource-group "$RESOURCE_GROUP_NAME" \
+--query "{name:name, state:state, defaultHostName:defaultHostName}" \
 --output table
 
 # Check Azure SQL Server
+echo -e "\n[$SQL_SERVER_NAME] SQL server:\n"
 az sql server show \
---name local-sqlserver-test \
---resource-group local-rg \
+--name "$SQL_SERVER_NAME" \
+--resource-group "$RESOURCE_GROUP_NAME" \
 --output table
 
 # Check Azure SQL Database
+echo -e "\n[$SQL_DATABASE_NAME] SQL database:\n"
 az sql db show \
---name PlannerDB \
---server local-sqlserver-test \
---resource-group local-rg \
+--name "$SQL_DATABASE_NAME" \
+--server "$SQL_SERVER_NAME" \
+--resource-group "$RESOURCE_GROUP_NAME" \
 --output table
 
 # Check Azure Key Vault
+echo -e "\n[$KEY_VAULT_NAME] Key Vault:\n"
 az keyvault show \
---name local-kv-test \
---resource-group local-rg \
+--name "$KEY_VAULT_NAME" \
+--resource-group "$RESOURCE_GROUP_NAME" \
 --output table
 
 # Check Key Vault secret
+echo -e "\n[$SECRET_NAME] Key Vault secret:\n"
 az keyvault secret show \
---vault-name local-kv-test \
---name local-secret-test \
+--vault-name "$KEY_VAULT_NAME" \
+--name "$SECRET_NAME" \
 --query "{name:name, enabled:attributes.enabled, created:attributes.created}" \
---output table
+--output table
+
+# Print the list of resources in the resource group
+echo -e "\nListing resources in resource group [$RESOURCE_GROUP_NAME]...\n"
+az resource list --resource-group "$RESOURCE_GROUP_NAME" --output table 

samples/web-app-sql-database/python/src/requirements.txt

@@ -1,8 +1,8 @@
-Flask==3.1.0
-azure-identity==1.25.1
+Flask==3.1.3
+azure-identity==1.25.3
 pyodbc==5.3.0
-gunicorn==23.0.0
-python-dotenv==1.1.1
-azure-keyvault-secrets
-azure-keyvault-certificates
-cryptography
+gunicorn==25.3.0
+python-dotenv==1.2.2
+azure-keyvault-secrets==4.10.0
+azure-keyvault-certificates==4.10.0
+cryptography==46.0.7

samples/web-app-sql-database/python/terraform/providers.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=4.14.0"
+      version = "=4.25.0"
     }
   }
 }

samples/web-app-sql-database/python/terraform/terraform.tfvars

@@ -1,2 +1,2 @@
 location            = "westeurope"
-python_version      = "3.12"
+python_version      = "3.13"

samples/web-app-sql-database/python/terraform/variables.tf

@@ -281,6 +281,7 @@ variable "python_version" {
 
   validation {
     condition = contains([
+      "3.13",
       "3.12",
       "3.11",
       "3.10",