Merge changes from main

Author: cephalin

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.10
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.12
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends postgresql-client \

.devcontainer/README.md

@@ -5,6 +5,7 @@ This `.devcontainer` directory contains the configuration for a [dev container](
 The dev container configuration lets you open the repository in a [GitHub codespace](https://docs.github.com/codespaces/overview) or a dev container in Visual Studio Code. For your convenience, the dev container is configured with the following:
 
 - Python
+- Running `pip install -r requirements.txt` from the project at container start.
 - PostgreSQL
 - Redis
 - [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/overview) (so you can run `azd` commands directly).

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 	"name": "python-app-service-postgresql-redis-infra",
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "app",
-	"workspaceFolder": "/workspace",
+	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 	"features": {
 		"ghcr.io/azure/azure-dev/azd:latest": {}
     },
@@ -29,7 +29,6 @@
 						"password": "app_password"
 					}
 				],
-				"python.pythonPath": "/usr/local/bin/python",
 				"python.languageServer": "Pylance",
 				"python.linting.enabled": true,
 				"python.linting.mypyEnabled": true,
@@ -51,12 +50,10 @@
 			}
 		}
 	},
-	// Use 'forwardPorts' to make a list of ports inside the container available locally. 5000 is for Flask, 8000 is for Django, and 5432 is for PostgreSQL.
-	"forwardPorts": [
-		8000, 5000, 5432
-	],
+	// Use 'forwardPorts' to make a list of ports inside the container available locally. 
+	// "forwardPorts": [],
 	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "",
+	"postCreateCommand": "pip install -r requirements.txt",
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode"
 }

.env.sample.devcontainer .env.env.sample.devcontainer renamed to .env

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.env.sample

@@ -0,0 +1,35 @@
+name: Validate AZD template
+on:
+  push:
+    branches: 
+      - main
+    paths:
+      - "infra/**"
+  pull_request:
+    branches: 
+      - main
+    paths:
+      - "infra/**"
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run Microsoft Security DevOps Analysis
+        uses: microsoft/security-devops-action@preview
+        id: msdo
+        continue-on-error: true
+        with:
+          tools: templateanalyzer
+
+      - name: Upload alerts to Security tab
+        uses: github/codeql-action/upload-sarif@v3
+        if: github.repository_owner == 'Azure-Samples'
+        with:
+          sarif_file: ${{ steps.msdo.outputs.sarifFile }}

.github/dependabot.yaml

@@ -25,9 +25,9 @@ jobs:
         # needed because the postgres container does not provide a healthcheck
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Setup python
-          uses: actions/setup-python@v2
+          uses: actions/setup-python@v5
           with:
             python-version: ${{ matrix.python_version }}
             architecture: x64

.github/workflows/bicep-audit.yml

@@ -1,3 +1,21 @@
+---
+page_type: sample
+languages:
+- azdeveloper
+- python
+- bicep
+- html
+products:
+- azure
+- azure-app-service
+- azure-database-postgresql
+- azure-virtual-network
+urlFragment: msdocs-flask-postgresql-sample-app
+name: Deploy a Python (Flask) web app with PostgreSQL in Azure
+description: This is a Python web app using the Flask framework and the Azure Database for PostgreSQL relational database service. 
+---
+<!-- YAML front-matter schema: https://review.learn.microsoft.com/en-us/help/contribute/samples/process/onboarding?branch=main#supported-metadata-fields-for-readmemd -->
+
 # Deploy a Python (Flask) web app with PostgreSQL in Azure
 
 This is a Python web app using the Flask framework and the Azure Database for PostgreSQL relational database service. The Flask 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.

.github/workflows/python-test.yaml

@@ -1,13 +1,8 @@
 import os
 
-# Configure Postgres database based on connection string of the libpq Keyword/Value form
-# https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
-# Uncomment the following lines for App Service
-# conn_str = os.environ['AZURE_POSTGRESQL_CONNECTIONSTRING']
-# conn_str_params = {pair.split('=')[0]: pair.split('=')[1] for pair in conn_str.split(' ')}
 # DATABASE_URI = 'postgresql+psycopg2://{dbuser}:{dbpass}@{dbhost}/{dbname}'.format(
-#     dbuser=conn_str_params['user'],
-#     dbpass=conn_str_params['password'],
-#     dbhost=conn_str_params['host'],
-#     dbname=conn_str_params['dbname']
-# )
+#     dbuser=os.getenv('AZURE_POSTGRESQL_USER'),
+#     dbpass=os.getenv('AZURE_POSTGRESQL_PASSWORD'),
+#     dbhost=os.getenv('AZURE_POSTGRESQL_HOST'),
+#     dbname=os.getenv('AZURE_POSTGRESQL_NAME')
+# )