diff --git a/app/cloudfoundry_config.py b/app/cloudfoundry_config.py index c11c8a82c..3b5029495 100644 --- a/app/cloudfoundry_config.py +++ b/app/cloudfoundry_config.py @@ -42,6 +42,7 @@ def extract_notify_config(notify_config): os.environ['ADMIN_CLIENT_SECRET'] = notify_config['credentials']['admin_client_secret'] os.environ['SECRET_KEY'] = notify_config['credentials']['secret_key'] os.environ['DANGEROUS_SALT'] = notify_config['credentials']['dangerous_salt'] + os.environ['PERFORMANCE_PLATFORM_TOKEN'] = notify_config['credentials'].get('performance_platform_token') def extract_notify_aws_config(aws_config): diff --git a/app/config.py b/app/config.py index a39a3b956..cf1288cbe 100644 --- a/app/config.py +++ b/app/config.py @@ -52,7 +52,7 @@ class Config(object): EXPIRE_CACHE_IN_SECONDS = 600 # Performance platform - PERFORMANCE_PLATFORM_ENABLED = os.getenv('PERFORMANCE_PLATFORM_ENABLED') == '1' + PERFORMANCE_PLATFORM_ENABLED = False PERFORMANCE_PLATFORM_URL = 'https://www.performance.service.gov.uk/data/govuk-notify/notifications' PERFORMANCE_PLATFORM_TOKEN = os.getenv('PERFORMANCE_PLATFORM_TOKEN') @@ -129,7 +129,7 @@ class Config(object): }, 'send-daily-performance-platform-stats': { 'task': 'send-daily-performance-platform-stats', - 'schedule': crontab(minute=30, hour=0), # 00:30 + 'schedule': crontab(minute=0, hour=4), # 04:00 'options': {'queue': 'periodic'} }, 'switch-current-sms-provider-on-slow-delivery': { @@ -244,6 +244,7 @@ class Live(Config): FROM_NUMBER = '40604' FUNCTIONAL_TEST_PROVIDER_SERVICE_ID = '6c1d81bb-dae2-4ee9-80b0-89a4aae9f649' FUNCTIONAL_TEST_PROVIDER_SMS_TEMPLATE_ID = 'ba9e1789-a804-40b8-871f-cc60d4c1286f' + PERFORMANCE_PLATFORM_ENABLED = True class CloudFoundryConfig(Config): diff --git a/tests/app/test_cloudfoundry_config.py b/tests/app/test_cloudfoundry_config.py index bc039b832..f1a8bf34e 100644 --- a/tests/app/test_cloudfoundry_config.py +++ b/tests/app/test_cloudfoundry_config.py @@ -16,6 +16,7 @@ def notify_config(): 'admin_client_secret': 'admin client secret', 'secret_key': 'secret key', 'dangerous_salt': 'dangerous salt', + 'performance_platform_token': 'performance platform token' } } @@ -146,6 +147,7 @@ def test_notify_config(): assert os.environ['ADMIN_CLIENT_SECRET'] == 'admin client secret' assert os.environ['SECRET_KEY'] == 'secret key' assert os.environ['DANGEROUS_SALT'] == 'dangerous salt' + assert os.environ['PERFORMANCE_PLATFORM_TOKEN'] == 'performance platform token' @pytest.mark.usefixtures('os_environ', 'cloudfoundry_environ')