Tweaks for deployment/style

Author: pamelafox

.gitignore

@@ -127,3 +127,5 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+.azure

app.py

@@ -32,19 +32,18 @@
 # Create databases, if databases exists doesn't issue create
 # For schema changes, run "flask db migrate"
 from models import Restaurant, Review
-db.create_all()
-db.session.commit()
+
+with app.app_context():
+    db.create_all()
 
 @app.route('/', methods=['GET'])
 def index():
-    from models import Restaurant
     print('Request for index page received')
     restaurants = Restaurant.query.all()    
     return render_template('index.html', restaurants=restaurants)
 
 @app.route('/<int:id>', methods=['GET'])
 def details(id):
-    from models import Restaurant, Review
     restaurant = Restaurant.query.where(Restaurant.id == id).first()
     reviews = Review.query.where(Review.restaurant==id)
     return render_template('details.html', restaurant=restaurant, reviews=reviews)
@@ -57,7 +56,6 @@ def create_restaurant():
 @app.route('/add', methods=['POST'])
 @csrf.exempt
 def add_restaurant():
-    from models import Restaurant
     try:
         name = request.values.get('restaurant_name')
         street_address = request.values.get('street_address')
@@ -80,7 +78,6 @@ def add_restaurant():
 @app.route('/review/<int:id>', methods=['POST'])
 @csrf.exempt
 def add_review(id):
-    from models import Review
     try:
         user_name = request.values.get('user_name')
         rating = request.values.get('rating')

azureproject/development.py

@@ -4,8 +4,6 @@
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-DEBUG = True
-
 DATABASE_URI = 'postgresql+psycopg2://{dbuser}:{dbpass}@{dbhost}/{dbname}'.format(
     dbuser=os.environ['DBUSER'],
     dbpass=os.environ['DBPASS'],

azureproject/production.py

@@ -3,7 +3,6 @@
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = os.getenv('SECRET_KEY', 'flask-insecure-7ppocbnx@w71dcuinn*t^_mzal(t@o01v3fee27g%rg18fc5d@')
 
-DEBUG = False
 ALLOWED_HOSTS = [os.environ['WEBSITE_HOSTNAME']] if 'WEBSITE_HOSTNAME' in os.environ else []
 CSRF_TRUSTED_ORIGINS = ['https://'+ os.environ['WEBSITE_HOSTNAME']] if 'WEBSITE_HOSTNAME' in os.environ else []
 

infra/resources.bicep

@@ -105,12 +105,13 @@ resource web 'Microsoft.Web/sites@2022-03-01' = {
   resource appSettings 'config' = {
     name: 'appsettings'
     properties: {
+      SCM_DO_BUILD_DURING_DEPLOYMENT: 'true'
       DBHOST: postgresServer.name
       DBNAME: flaskDatabase.name
       DBUSER: postgresServer.properties.administratorLogin
       DBPASS: databasePassword
-      SCM_DO_BUILD_DURING_DEPLOYMENT: 'true'
       SECRET_KEY: secretKey
+      FLASK_DEBUG: 'False'
     }
   }
 
@@ -197,7 +198,7 @@ resource postgresServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-01-20-pr
   }
   properties: {
     version: '13'
-    administratorLogin: 'postgres-admin'
+    administratorLogin: 'postgresadmin'
     administratorLoginPassword: databasePassword
     storage: {
       storageSizeGB: 128
@@ -232,14 +233,5 @@ resource flaskDatabase 'Microsoft.DBforPostgreSQL/flexibleServers/databases@2022
   name: 'flask'
 }
 
-resource postgresServer_AllowAllWindowsAzureIps 'Microsoft.DBforPostgreSQL/flexibleServers/firewallRules@2022-01-20-preview' = {
-  parent: postgresServer
-  name: 'AllowAllWindowsAzureIps'
-  properties: {
-    startIpAddress: '0.0.0.0'
-    endIpAddress: '0.0.0.0'
-  }
-}
-
 output WEB_URI string = 'https://${web.properties.defaultHostName}'
-output APPLICATIONINSIGHTS_CONNECTION_STRING string = applicationInsightsResources.outputs.APPLICATIONINSIGHTS_CONNECTION_STRING
+output APPLICATIONINSIGHTS_CONNECTION_STRING string = applicationInsightsResources.outputs.APPLICATIONINSIGHTS_CONNECTION_STRING