From 90263e2c46109216aeca830b0c3abe291c4ecd5d Mon Sep 17 00:00:00 2001 From: Mangesh Sangapu Date: Wed, 22 Jul 2026 20:06:53 +0000 Subject: [PATCH 1/4] Azure Managed Redis updates --- .env | 2 +- README.md | 2 +- infra/resources.bicep | 25 +++++++++++++++---------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.env b/.env index 7e893174c..70e264891 100644 --- a/.env +++ b/.env @@ -2,5 +2,5 @@ DBNAME=app DBHOST=localhost DBUSER=app_user DBPASS=app_password -CACHELOCATION=redis://redis:6379/0 +CACHELOCATION=redis://redis:10000/0 SECRET_KEY=secret_key diff --git a/README.md b/README.md index 260d41e42..b6b36ec52 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ description: This is a Python web app using the Django framework and the Azure D This is a Python web app using the Django framework and the Azure Database for PostgreSQL relational database service. The Django app is hosted in a fully managed Azure App Service. This app is designed to be be run locally and then deployed to Azure. You can either deploy this project by following the tutorial [*Deploy a Python (Django or Flask) web app with PostgreSQL in Azure*](https://docs.microsoft.com/azure/app-service/tutorial-python-postgresql-app) or by using the [Azure Developer CLI (azd)](https://learn.microsoft.com/azure/developer/azure-developer-cli/overview) according to the instructions below. -Additionally, the sample application demonstrates Azure Redis Cache access by caching the restaurant details page for 60 seconds. You can add the Azure Redis Cache integration in the [secure-by-default web app + database creation wizard](https://portal.azure.com/?feature.customportal=false#create/Microsoft.AppServiceWebAppDatabaseV3), and it's also included in the [AZD template](https://github.com/Azure-Samples/python-app-service-postgresql-infra). +Additionally, the sample application demonstrates Azure Managed Redis access by caching the restaurant details page for 60 seconds. You can add the Azure Managed Redis integration in the [secure-by-default web app + database creation wizard](https://portal.azure.com/?feature.customportal=false#create/Microsoft.AppServiceWebAppDatabaseV3), and it's also included in the [AZD template](https://github.com/Azure-Samples/python-app-service-postgresql-infra). ## Requirements diff --git a/infra/resources.bicep b/infra/resources.bicep index f5fba55f0..8b0ab66d5 100644 --- a/infra/resources.bicep +++ b/infra/resources.bicep @@ -275,20 +275,25 @@ resource dbserver 'Microsoft.DBforPostgreSQL/flexibleServers@2022-01-20-preview' } // The Redis cache is configured to the minimum pricing tier -resource redisCache 'Microsoft.Cache/redis@2024-11-01' = { +resource redisCache 'Microsoft.Cache/redisEnterprise@2026-05-01-preview' = { name: '${appName}-cache' location: location + sku: { + name: 'Balanced_B0' + } properties: { - sku: { - name: 'Basic' - family: 'C' - capacity: 0 - } - redisConfiguration: {} - enableNonSslPort: false - redisVersion: '6' + minimumTlsVersion: '1.2' publicNetworkAccess: 'Disabled' } + + // Azure Managed Redis authentication + resource redisDatabase 'databases@2026-05-01-preview' = { + name: 'default' + properties: { + accessKeysAuthentication: 'Enabled' + } + } + } // The App Service plan is configured to the B1 pricing tier @@ -430,7 +435,7 @@ resource cacheConnector 'Microsoft.ServiceLinker/linkers@2024-04-01' = { clientType: 'python' targetService: { type: 'AzureResource' - id: resourceId('Microsoft.Cache/Redis/Databases', redisCache.name, '0') + id: redisCache::redisDatabase.id } authInfo: { authType: 'accessKey' From 7be41aae338a786f041b01992585fed005ec8237 Mon Sep 17 00:00:00 2001 From: Mangesh Sangapu Date: Thu, 23 Jul 2026 04:07:53 +0000 Subject: [PATCH 2/4] Align sample with Azure Managed Redis Enterprise Update infrastructure to use Azure Managed Redis Enterprise conventions. Switch private endpoint group to redisEnterprise and DNS zone to privatelink.redis.azure.net. Add Redis Enterprise encryption block and update linker target to database resource ID. Refresh README wording to remove legacy Redis Cache phrasing. --- README.md | 2 +- infra/resources.bicep | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index b6b36ec52..f523972fa 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ The [requirements.txt](./requirements.txt) has the following packages, all used | [pyscopg2-binary](https://pypi.org/project/psycopg-binary/) | PostgreSQL database adapter for Python. | | [python-dotenv](https://pypi.org/project/python-dotenv/) | Read key-value pairs from .env file and set them as environment variables. In this sample app, those variables describe how to connect to the database locally.

This package is used in the [manage.py](./manage.py) file to load environment variables. | | [whitenoise](https://pypi.org/project/whitenoise/) | Static file serving for WSGI applications, used in the deployed app.

This package is used in the [azureproject/production.py](./azureproject/production.py) file, which configures production settings. | -| [django-redis](https://pypi.org/project/django-redis/) | Redis cache backend for Django. | +| [django-redis](https://pypi.org/project/django-redis/) | Django integration for Azure Managed Redis and Redis-compatible caching backends. | ## Run the sample diff --git a/infra/resources.bicep b/infra/resources.bicep index 8b0ab66d5..438ae2d69 100644 --- a/infra/resources.bicep +++ b/infra/resources.bicep @@ -148,7 +148,7 @@ resource privateDnsZoneDB 'Microsoft.Network/privateDnsZones@2024-06-01' = { } } -// Resources needed to secure Redis Cache behind a private endpoint +// Resources needed to secure Azure Managed Redis behind a private endpoint resource cachePrivateEndpoint 'Microsoft.Network/privateEndpoints@2024-03-01' = { name: '${appName}-cache-privateEndpoint' location: location @@ -161,7 +161,7 @@ resource cachePrivateEndpoint 'Microsoft.Network/privateEndpoints@2024-03-01' = name: '${appName}-cache-privateEndpoint' properties: { privateLinkServiceId: redisCache.id - groupIds: ['redisCache'] + groupIds: ['redisEnterprise'] } } ] @@ -181,7 +181,7 @@ resource cachePrivateEndpoint 'Microsoft.Network/privateEndpoints@2024-03-01' = } } resource privateDnsZoneCache 'Microsoft.Network/privateDnsZones@2024-06-01' = { - name: 'privatelink.redis.cache.windows.net' + name: 'privatelink.redis.azure.net' location: 'global' dependsOn: [ virtualNetwork @@ -274,7 +274,7 @@ resource dbserver 'Microsoft.DBforPostgreSQL/flexibleServers@2022-01-20-preview' ] } -// The Redis cache is configured to the minimum pricing tier +// Azure Managed Redis is configured to the minimum pricing tier resource redisCache 'Microsoft.Cache/redisEnterprise@2026-05-01-preview' = { name: '${appName}-cache' location: location @@ -282,18 +282,16 @@ resource redisCache 'Microsoft.Cache/redisEnterprise@2026-05-01-preview' = { name: 'Balanced_B0' } properties: { + encryption: {} minimumTlsVersion: '1.2' publicNetworkAccess: 'Disabled' } +} - // Azure Managed Redis authentication - resource redisDatabase 'databases@2026-05-01-preview' = { - name: 'default' - properties: { - accessKeysAuthentication: 'Enabled' - } - } - +// The default Redis Enterprise database is platform-managed; reference it by ID. +resource redisDatabase 'Microsoft.Cache/redisEnterprise/databases@2026-05-01-preview' existing = { + parent: redisCache + name: 'default' } // The App Service plan is configured to the B1 pricing tier @@ -435,7 +433,7 @@ resource cacheConnector 'Microsoft.ServiceLinker/linkers@2024-04-01' = { clientType: 'python' targetService: { type: 'AzureResource' - id: redisCache::redisDatabase.id + id: redisDatabase.id } authInfo: { authType: 'accessKey' From 4315f59c4d894780573bf5c7aef30558fc20a47b Mon Sep 17 00:00:00 2001 From: Mangesh Sangapu Date: Wed, 22 Jul 2026 23:58:39 -0500 Subject: [PATCH 3/4] Refactor docker-compose.yml for service dependencies Updated PostgreSQL and Redis images to specific versions and added health checks for the database service. --- .devcontainer/docker-compose.yml | 38 ++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 218553667..c00e9e7c6 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3" - services: app: build: @@ -9,28 +7,50 @@ services: volumes: - ..:/workspace:cached - # Overrides default command so things don't shut down after the process ends. + # Keep the development container running. command: sleep infinity - # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function. - network_mode: service:db + # Start supporting services before the app container. + depends_on: + db: + condition: service_healthy + redis: + condition: service_started + + networks: + - app-network db: - image: postgres:latest + image: postgres:17 restart: unless-stopped + volumes: - postgres-data:/var/lib/postgresql/data + environment: POSTGRES_DB: app POSTGRES_USER: app_user POSTGRES_PASSWORD: app_password - # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally. - # (Adding the "ports" property to this file will not forward from a Codespace.) + healthcheck: + test: ["CMD-SHELL", "pg_isready -U app_user -d app"] + interval: 5s + timeout: 5s + retries: 10 + + networks: + - app-network redis: - image: redis + image: redis:7-alpine restart: unless-stopped + networks: + - app-network + volumes: postgres-data: + +networks: + app-network: + driver: bridge From e8aad2a0f8656de7563c24affb4510704b098fc0 Mon Sep 17 00:00:00 2001 From: Mangesh Sangapu Date: Thu, 23 Jul 2026 09:18:04 -0500 Subject: [PATCH 4/4] Keep minimal devcontainer improvements and restore original app networking --- .devcontainer/docker-compose.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index c00e9e7c6..b05ce65ee 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -17,8 +17,7 @@ services: redis: condition: service_started - networks: - - app-network + network_mode: service:db db: image: postgres:17 @@ -38,19 +37,9 @@ services: timeout: 5s retries: 10 - networks: - - app-network - redis: image: redis:7-alpine restart: unless-stopped - networks: - - app-network - volumes: postgres-data: - -networks: - app-network: - driver: bridge