Merge branch 'main' of https://github.com/pamelafox/msdocs-flask-postgresql-sample-app-azd

Author: pamelafox

.devcontainer/devcontainer.json

@@ -3,52 +3,53 @@
 "dockerComposeFile": "docker-compose.yml",
 "service": "app",
 "workspaceFolder": "/workspace",
-"settings":{
-"sqltools.connections": [
-{
-"name": "Container database",
-"driver": "PostgreSQL",
-"previewLimit": 50,
-"server": "localhost",
-"port": 5432,
-"database": "app",
-"username": "app_user",
-"password": "app_password"
+"features":{
+ },
+"customizations":{
+"vscode":{
+// Add the IDs of extensions you want installed when the container is created.
+"extensions": [
+"ms-azuretools.azure-dev",
+"ms-python.python",
+"ms-python.vscode-pylance",
+"mtxr.sqltools",
+"mtxr.sqltools-driver-pg"
+ ],
+"settings":{
+"sqltools.connections": [
+{
+"name": "Container database",
+"driver": "PostgreSQL",
+"previewLimit": 50,
+"server": "localhost",
+"port": 5432,
+"database": "app",
+"username": "app_user",
+"password": "app_password"
+ }
+ ],
+"python.pythonPath": "/usr/local/bin/python",
+"python.languageServer": "Pylance",
+"python.linting.enabled": true,
+"python.linting.mypyEnabled": true,
+"python.testing.pytestEnabled": true,
+"python.formatting.provider": "black",
+"python.formatting.blackArgs": [
+"--line-length=80"
+ ],
+"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
+"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
+"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
+"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
+"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
+"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
+"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
+"python.testing.pytestPath": "/usr/local/py-utils/bin/pytest"
  }
- ],
-"python.pythonPath": "/usr/local/bin/python",
-"python.languageServer": "Pylance",
-"python.linting.enabled": true,
-"python.linting.mypyEnabled": true,
-"python.testing.pytestEnabled": true,
-"python.formatting.provider": "black",
-"python.formatting.blackArgs": [
-"--line-length=80"
- ],
-"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
-"python.testing.pytestPath": "/usr/local/py-utils/bin/pytest"
+ }
  },
-"features":{
-"ghcr.io/devcontainers/features/github-cli:1":{
-"version": "latest"
- }
- },
-// Add the IDs of extensions you want installed when the container is created.
-"extensions": [
-"ms-azuretools.azure-dev",
-"ms-python.python",
-"ms-python.vscode-pylance",
-"mtxr.sqltools",
-"mtxr.sqltools-driver-pg"
- ],
 // Use 'forwardPorts' to make a list of ports inside the container available locally.
 "forwardPorts": [
 5000, 5432

.devcontainer/docker-compose.yml

@@ -7,7 +7,7 @@ services:
 dockerfile: .devcontainer/Dockerfile
 args:
 # [Choice] Python version: 3, 3.8, 3.7, 3.6
-VARIANT: 3.9
+VARIANT: "3.10"
 # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
 USER_UID: 1000
 USER_GID: 1000

README.md

@@ -1,6 +1,6 @@
 # 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/en-us/azure/app-service/tutorial-python-postgresql-app) or by using the [Azure Developer CLI (azd)](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/overview) according to the instructions below.
+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.
 
 ## Requirements
 
@@ -16,41 +16,40 @@ The [requirements.txt](./requirements.txt) has the following packages:
 |[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. <br><br> Flask's [dotenv support](https://flask.palletsprojects.com/en/2.1.x/cli/#environment-variables-from-dotenv) sets environment variables automatically from an `.env` file. |
 |[flask_wtf](https://pypi.org/project/Flask-WTF/)| Form rendering, validation, and CSRF protection for Flask with WTForms. Uses CSRFProtect extension. |
 
-
 ## Using this project with the Azure Developer CLI (azd)
 
-This project is designed to work well with the [Azure Developer CLI](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/overview),
+This project is designed to work well with the [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/overview),
 which makes it easier to develop apps locally, deploy them to Azure, and monitor them.
 
 ### Local development
 
-This project has devcontainer support, so you can open it in Github Codespaces or local VS Code with the Dev Containers extension.
+This project has devcontainer support, so you can open it in Github Codespaces or local VS Code with the Dev Containers extension.
 
 🎥 [Watch a screencast of running the app in Github Codespaces.](https://www.youtube.com/watch?v=r6Hnp9RXUpY)
 
-Steps for running the server:
+Steps for running the server:
 
 1. (Optional) If you're unable to open the devcontainer, [create a Python virtual environment](https://docs.python.org/3/tutorial/venv.html#creating-virtual-environments) and activate that.
 
 2. Install the requirements:
 
-```shell
-pip install -r requirements.txt
-```
+```shell
+ python3 -m pip install -r requirements.txt
+```
 
 3. Create an `.env` file using `.env.sample` as a guide. Set the value of `DBNAME` to the name of an existing database in your local PostgreSQL instance. Set the values of `DBHOST`, `DBUSER`, and `DBPASS` as appropriate foryour local PostgreSQL instance. If you'rein the devcontainer, copy the values from `.env.sample.devcontainer`.
 
 4. Run the migrations:
 
-```shell
-flask db upgrade
-```
+```shell
+ python3 -m flask db upgrade
+```
 
 5. Run the local server: (or use VS Code "Run" button and select"Run server")
 
-```shell
-flask run
-```
+```shell
+ python3 -m flask run
+```
 
 ### Deployment
 
@@ -64,21 +63,21 @@ Steps for deployment:
 2. Install the [Azure Dev CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/install-azd). (If you opened this repository in a devcontainer, that part will be done for you.)
 3. Provision and deploy all the resources:
 
-```shell
-azd up
-```
+```shell
+azd up
+```
 
-It will prompt you to login and to provide a name (like "flask-app") and location (like "eastus"). Then it will provision the resources in your account and deploy the latest code. If you get an error with deployment, changing the location (like to "centralus") can help, as there are availability constraints for some of the resources.
+It will prompt you to login and to provide a name (like "flask-app") and location (like "eastus"). Then it will provision the resources in your account and deploy the latest code. If you get an error with deployment, changing the location (like to "centralus") can help, as there are availability constraints for some of the resources.
 
 4. When `azd` has finished deploying, you'll see an endpoint URI in the command output. Visit that URI, and you should see the front page of the restaurant review app! 🎉 If you see an error, open the Azure Portal from the URL in the command output, navigate to the App Service, select Logstream, and check the logs for any errors.
 
-![Screenshot of Flask restaurants website](screenshot_website.png)
+![Screenshot of Flask restaurants website](screenshot_website.png)
 
 5. When you've made any changes to the app code, you can just run:
 
-```shell
-azd deploy
-```
+```shell
+azd deploy
+```
 
 ### CI/CD pipeline
 
@@ -101,4 +100,4 @@ azd monitor --overview
 
 ## Getting help
 
-If you're working with this project and running into issues, please post in [Discussions](/discussions). 
+If you're working with this project and running into issues, please post in [Issues](/issues).

azureproject/production.py

@@ -6,11 +6,14 @@
 ALLOWED_HOSTS= [os.environ['WEBSITE_HOSTNAME']] if'WEBSITE_HOSTNAME'inos.environelse []
 CSRF_TRUSTED_ORIGINS= ['https://'+os.environ['WEBSITE_HOSTNAME']] if'WEBSITE_HOSTNAME'inos.environelse []
 
-# Configure Postgres database; the full username for PostgreSQL flexible server is
-# username (not @sever-name).
+# Configure Postgres database based on connection string of the libpq Keyword/Value form
+# https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
+conn_str=os.environ['AZURE_POSTGRESQL_CONNECTIONSTRING']
+conn_str_params={pair.split('=')[0]: pair.split('=')[1] forpairinconn_str.split(' ')}
+
 DATABASE_URI='postgresql+psycopg2://{dbuser}:{dbpass}@{dbhost}/{dbname}'.format(
-dbuser=os.environ['DBUSER'],
-dbpass=os.environ['DBPASS'],
-dbhost=os.environ['DBHOST'] +".postgres.database.azure.com",
-dbname=os.environ['DBNAME']
+dbuser=conn_str_params['user'],
+dbpass=conn_str_params['password'],
+dbhost=conn_str_params['host'],
+dbname=conn_str_params['dbname']
 )

infra/resources.bicep

@@ -92,7 +92,7 @@ resource web 'Microsoft.Web/sites@2022-03-01' ={
 serverFarmId: appServicePlan.id
 siteConfig:{
 alwaysOn: true
-linuxFxVersion: 'PYTHON|3.9'
+linuxFxVersion: 'PYTHON|3.10'
 ftpsState: 'Disabled'
 appCommandLine: 'startup.sh'
  }
@@ -106,10 +106,7 @@ resource web 'Microsoft.Web/sites@2022-03-01' ={
 name: 'appsettings'
 properties:{
 SCM_DO_BUILD_DURING_DEPLOYMENT: 'true'
-DBHOST: postgresServer.name
-DBNAME: flaskDatabase.name
-DBUSER: postgresServer.properties.administratorLogin
-DBPASS: databasePassword
+AZURE_POSTGRESQL_CONNECTIONSTRING: 'dbname=${flaskDatabase.name} host=${postgresServer.name}.postgres.database.azure.com port=5432 sslmode=require user=${postgresServer.properties.administratorLogin} password=${databasePassword}'
 SECRET_KEY: secretKey
 FLASK_DEBUG: 'False'
  }

models.py

@@ -29,4 +29,4 @@ def validate_rating(self, key, value):
 returnvalue
 
 def__str__(self):
-returnf"{self.restaurant.name} ({self.review.date:%x})"
+returnf"{self.user_name}: {self.review_date:%x}"