sync with latest

Author: john0isaac

Diff for: .github/workflows/tests.yml

@@ -54,14 +54,14 @@ jobs:
             python3 -m flask --app src.flaskapp db upgrade --directory src/flaskapp/migrations
             python3 -m flask --app src.flaskapp seed --filename src/seed_data.json
           env:
-            MYSQL_HOST: localhost
+            MYSQL_HOST: 127.0.0.1
             MYSQL_USER: root
             MYSQL_PASS: mysql
             MYSQL_DATABASE: relecloud
         - name: Run tests 
           run: python3 -m pytest
           env:
-            MYSQL_HOST: localhost
+            MYSQL_HOST: 127.0.0.1
             MYSQL_USER: root
             MYSQL_PASS: mysql
             MYSQL_DATABASE: relecloud

Diff for: README.md

@@ -30,7 +30,7 @@ If you're *not* using one of those options for opening the project, then you'll
 1. Start up a local MySQL server, create a database for the app, and set the following environment variables according to your database configuration.
 
     ```shell
-    export MYSQL_HOST=localhost
+    export MYSQL_HOST=127.0.0.1
     export MYSQL_PORT=3306
     export MYSQL_DATABASE=<YOUR DATABASE>
     export MYSQL_USER=<YOUR USERNAME>

Diff for: infra/web.bicep

@@ -43,10 +43,10 @@ module web 'core/host/appservice.bicep' = {
     appSettings: {
       APPLICATIONINSIGHTS_CONNECTION_STRING: applicationInsights.properties.ConnectionString
       RUNNING_IN_PRODUCTION: 'true'
-      AZURE_MYSQL_HOST: dbserverDomainName
-      AZURE_MYSQL_USER: dbserverUser
-      AZURE_MYSQL_NAME: dbserverDatabaseName
-      AZURE_MYSQL_PASSWORD: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=DBSERVERPASSWORD)'
+      MYSQL_HOST: dbserverDomainName
+      MYSQL_USER: dbserverUser
+      MYSQL_NAME: dbserverDatabaseName
+      MYSQL_PASS: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=DBSERVERPASSWORD)'
       SECRET_KEY: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=SECRETKEY)'
     }
   }

Diff for: src/flaskapp/config/production.py

@@ -9,10 +9,10 @@
     ALLOWED_HOSTS = []
 
 
-dbuser = os.environ["AZURE_MYSQL_USER"]
-dbpass = os.environ["AZURE_MYSQL_PASSWORD"]
-dbhost = os.environ["AZURE_MYSQL_HOST"]
-dbname = os.environ["AZURE_MYSQL_NAME"]
+dbuser = os.environ["MYSQL_USER"]
+dbpass = os.environ["MYSQL_PASS"]
+dbhost = os.environ["MYSQL_HOST"]
+dbname = os.environ["MYSQL_NAME"]
 dbport = os.environ.get("MYSQL_PORT", 3306)
 
 DATABASE_URI = f"mysql+mysqlconnector://{dbuser}:{dbpass}@{dbhost}:{dbport}/{dbname}"