Fixing up configs

appspec.yml

@@ -1,7 +1,7 @@
 ---
 files:
   -
-    destination: /home/ubuntu/notifications-api
+    destination: /home/notify-app/notifications-api
     source: /
 hooks:
   AfterInstall:

aws_run_celery.py

@@ -3,19 +3,8 @@ from app import notify_celery, create_app
 from credstash import getAllSecrets
 import os
 
-default_env_file = '/home/ubuntu/environment'
-environment = 'live'
-
-if os.path.isfile(default_env_file):
-    with open(default_env_file, 'r') as environment_file:
-        environment = environment_file.readline().strip()
-
 # on aws get secrets and export to env
 os.environ.update(getAllSecrets(region="eu-west-1"))
 
-from config import configs
-
-os.environ['NOTIFY_API_ENVIRONMENT'] = configs[environment]
-
 application = create_app()
 application.app_context().push()

config.py

@@ -126,10 +126,19 @@ class Test(Development):
     CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload'
 
 
+class Staging(Config):
+   CSV_UPLOAD_BUCKET_NAME = 'staging-notifications-csv-upload'
+
+
+class Live(Config):
+    CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
+    STATSD_ENABLED = True
+   
+
 configs = {
     'development': 'config.Development',
     'test': 'config.Test',
-    'live': 'config_live.Live',
-    'staging': 'config_staging.Staging',
+    'live': 'config.Live',
+    'staging': 'config.Staging',
     'preview': 'config.Preview'
 }

config_live.py

@@ -1,30 +0,0 @@
-import os
-from config import Config
-
-
-class Live(Config):
-    ADMIN_BASE_URL = os.environ['LIVE_ADMIN_BASE_URL']
-    API_HOST_NAME = os.environ['LIVE_API_HOST_NAME']
-    ADMIN_CLIENT_SECRET = os.environ['LIVE_ADMIN_CLIENT_SECRET']
-    DANGEROUS_SALT = os.environ['LIVE_DANGEROUS_SALT']
-    NOTIFICATION_QUEUE_PREFIX = os.environ['LIVE_NOTIFICATION_QUEUE_PREFIX']
-    NOTIFY_JOB_QUEUE = os.environ['LIVE_NOTIFY_JOB_QUEUE']
-    SECRET_KEY = os.environ['LIVE_SECRET_KEY']
-    SQLALCHEMY_DATABASE_URI = os.environ['LIVE_SQLALCHEMY_DATABASE_URI']
-    VERIFY_CODE_FROM_EMAIL_ADDRESS = os.environ['LIVE_VERIFY_CODE_FROM_EMAIL_ADDRESS']
-    NOTIFY_EMAIL_DOMAIN = os.environ['LIVE_NOTIFY_EMAIL_DOMAIN']
-    FIRETEXT_API_KEY = os.getenv("LIVE_FIRETEXT_API_KEY")
-    MMG_API_KEY = os.environ['LIVE_MMG_API_KEY']
-    CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
-    STATSD_ENABLED = True
-    STATSD_HOST = os.getenv('LIVE_STATSD_HOST')
-    STATSD_PORT = os.getenv('LIVE_STATSD_PORT')
-    STATSD_PREFIX = os.getenv('LIVE_STATSD_PREFIX')
-    FROM_NUMBER = os.getenv('LIVE_FROM_NUMBER')
-
-    BROKER_TRANSPORT_OPTIONS = {
-        'region': 'eu-west-1',
-        'polling_interval': 1,  # 1 second
-        'visibility_timeout': 14410,  # 60 seconds
-        'queue_name_prefix': os.environ['LIVE_NOTIFICATION_QUEUE_PREFIX'] + '-'
-    }

config_staging.py

@@ -1,26 +0,0 @@
-import os
-from config import Config
-
-
-class Staging(Config):
-    ADMIN_BASE_URL = os.environ['STAGING_ADMIN_BASE_URL']
-    API_HOST_NAME = os.environ['STAGING_API_HOST_NAME']
-    ADMIN_CLIENT_SECRET = os.environ['STAGING_ADMIN_CLIENT_SECRET']
-    DANGEROUS_SALT = os.environ['STAGING_DANGEROUS_SALT']
-    NOTIFICATION_QUEUE_PREFIX = os.environ['STAGING_NOTIFICATION_QUEUE_PREFIX']
-    NOTIFY_JOB_QUEUE = os.environ['STAGING_NOTIFY_JOB_QUEUE']
-    SECRET_KEY = os.environ['STAGING_SECRET_KEY']
-    SQLALCHEMY_DATABASE_URI = os.environ['STAGING_SQLALCHEMY_DATABASE_URI']
-    VERIFY_CODE_FROM_EMAIL_ADDRESS = os.environ['STAGING_VERIFY_CODE_FROM_EMAIL_ADDRESS']
-    NOTIFY_EMAIL_DOMAIN = os.environ['STAGING_NOTIFY_EMAIL_DOMAIN']
-    FIRETEXT_API_KEY = os.getenv("STAGING_FIRETEXT_API_KEY")
-    MMG_API_KEY = os.environ['STAGING_MMG_API_KEY']
-    CSV_UPLOAD_BUCKET_NAME = 'staging-notifications-csv-upload'
-    FROM_NUMBER = os.getenv('STAGING_FROM_NUMBER')
-
-    BROKER_TRANSPORT_OPTIONS = {
-        'region': 'eu-west-1',
-        'polling_interval': 1,  # 1 second
-        'visibility_timeout': 14410,  # 60 seconds
-        'queue_name_prefix': os.environ['STAGING_NOTIFICATION_QUEUE_PREFIX'] + '-'
-    }

wsgi.py

@@ -4,20 +4,9 @@ from app import create_app
 from credstash import getAllSecrets
 
 
-default_env_file = '/home/ubuntu/environment'
-environment = 'live'
-
-if os.path.isfile(default_env_file):
-    with open(default_env_file, 'r') as environment_file:
-        environment = environment_file.readline().strip()
-
 # on aws get secrets and export to env
 os.environ.update(getAllSecrets(region="eu-west-1"))
 
-from config import configs
-
-os.environ['NOTIFY_API_ENVIRONMENT'] = configs[environment]
-
 application = create_app()
 
 if __name__ == "__main__":