Merge branch 'ci-bugfix-add-secret-key' into 'staging'

Replace the randomized secret key with a static key

See merge request !30

.gitignore

@@ -139,4 +139,6 @@ cython_debug/
 
 package-lock.json
 
-TODO.txt
+TODO.txt
\ No newline at end of file
+
+config/
\ No newline at end of file

.gitlab-ci.yml

@@ -95,6 +95,7 @@ staging:
     name: staging
   image: google/cloud-sdk:alpine
   script:
+  - mv $CONFIG_VARS ./config/config.py
   - echo $SERVICE_ACCOUNT > /tmp/$CI_PIPELINE_ID.json
   - gcloud auth activate-service-account --key-file /tmp/$CI_PIPELINE_ID.json
   - gcloud --quiet --project $PROJECT_ID app deploy app-staging.yaml
@@ -104,13 +105,13 @@ staging:
     - staging
 
 
-
 deploy:
   stage: deploy
   environment:
     name: production
   image: google/cloud-sdk:alpine
   script:
+  - mv $CONFIG_VARS ./config/config.py
   - echo $SERVICE_ACCOUNT > /tmp/$CI_PIPELINE_ID.json
   - gcloud auth activate-service-account --key-file /tmp/$CI_PIPELINE_ID.json
   - gcloud --quiet --project $PROJECT_ID app deploy app.yaml

config.py

-import os
-
-class Config(object):
-    DEBUG = False
-    TESTING = False
-
-class ProductionConfig(Config):
-    pass
-
-class DevConfig(Config):
-    DEBUG = True
-    FLASK_ENV = os.getenv("DEV")
-    DATASTORE_EMULATOR_HOST = os.getenv("DATASTORE_EMULATOR_HOST")
-    DATASTORE_EMULATOR_HOST_PATH = os.getenv("DATASTORE_EMULATOR_HOST_PATH")
-
-class TestingConfig(Config):
-    TESTING = True
-    FLASK_ENV = os.getenv("DEV")
-    DATASTORE_EMULATOR_HOST = os.getenv("DATASTORE_EMULATOR_HOST")
-    DATASTORE_EMULATOR_HOST_PATH = os.getenv("DATASTORE_EMULATOR_HOST_PATH")
\ No newline at end of file

main.py

@@ -12,18 +12,22 @@ from opencensus.trace.tracer import Tracer
 from opencensus.ext.flask.flask_middleware import FlaskMiddleware
 from opencensus.trace.samplers import ProbabilitySampler
 
+app = Flask(__name__)
 
-depl_env = os.getenv("DEPLOYMENT_ENVIRONMENT")
-
-if depl_env == 'production' or depl_env == 'staging':
+if os.getenv('GAE_ENV', '').startswith('standard'):
     client = google.cloud.logging.Client()
     handler = CloudLoggingHandler(client)
     setup_logging(handler)
 
 logging.getLogger().setLevel(logging.DEBUG)
 
-app = Flask(__name__)
-app.secret_key = os.environ.get("SECRET_KEY") or os.urandom(24)
+if os.getenv('GAE_ENV', '').startswith('standard'):
+    logging.info("Loading app configuration from file")
+    app.config.from_pyfile('config/config.py')
+
+if not app.secret_key:
+    logging.info("Generating a random secret key")
+    app.secret_key = os.urandom(16)
 
 def main():
     sde = StackdriverExporter(