From 989713b0f1916053718278aae7e2b88652e93f4e Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Fri, 31 Mar 2017 15:33:41 +0100 Subject: [PATCH 1/4] Update config for daily perf job to start 4am --- app/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config.py b/app/config.py index a39a3b956..9f4bc25ea 100644 --- a/app/config.py +++ b/app/config.py @@ -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': { From c633e193b0602c8c98c465dd0e3484b4fcc4abcb Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Fri, 31 Mar 2017 15:54:29 +0100 Subject: [PATCH 2/4] Update config to enable performance platform --- app/config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/config.py b/app/config.py index 9f4bc25ea..0d59d03ad 100644 --- a/app/config.py +++ b/app/config.py @@ -52,9 +52,7 @@ class Config(object): EXPIRE_CACHE_IN_SECONDS = 600 # Performance platform - PERFORMANCE_PLATFORM_ENABLED = os.getenv('PERFORMANCE_PLATFORM_ENABLED') == '1' - PERFORMANCE_PLATFORM_URL = 'https://www.performance.service.gov.uk/data/govuk-notify/notifications' - PERFORMANCE_PLATFORM_TOKEN = os.getenv('PERFORMANCE_PLATFORM_TOKEN') + PERFORMANCE_PLATFORM_ENABLED = False # Logging DEBUG = False @@ -244,6 +242,9 @@ 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 + PERFORMANCE_PLATFORM_URL = 'https://www.performance.service.gov.uk/data/govuk-notify/notifications' + PERFORMANCE_PLATFORM_TOKEN = os.getenv('PERFORMANCE_PLATFORM_TOKEN') class CloudFoundryConfig(Config): From 316d8fdb0dc6b270033ccc6026c1091a8235bbde Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Fri, 31 Mar 2017 16:37:04 +0100 Subject: [PATCH 3/4] Updated config to cloudfoundry_config --- app/cloudfoundry_config.py | 1 + app/config.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/cloudfoundry_config.py b/app/cloudfoundry_config.py index c11c8a82c..a70766198 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_ENABLED'] = notify_config['credentials']['performance_platform_enabled'] def extract_notify_aws_config(aws_config): diff --git a/app/config.py b/app/config.py index 0d59d03ad..cf1288cbe 100644 --- a/app/config.py +++ b/app/config.py @@ -53,6 +53,8 @@ class Config(object): # Performance platform 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') # Logging DEBUG = False @@ -243,8 +245,6 @@ class Live(Config): 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 - PERFORMANCE_PLATFORM_URL = 'https://www.performance.service.gov.uk/data/govuk-notify/notifications' - PERFORMANCE_PLATFORM_TOKEN = os.getenv('PERFORMANCE_PLATFORM_TOKEN') class CloudFoundryConfig(Config): From d5e8cb3354003326b9edb2e58aff5d1ed2d3cc65 Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Fri, 31 Mar 2017 16:50:30 +0100 Subject: [PATCH 4/4] Updated cf conf unit tests --- app/cloudfoundry_config.py | 2 +- tests/app/test_cloudfoundry_config.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/cloudfoundry_config.py b/app/cloudfoundry_config.py index a70766198..3b5029495 100644 --- a/app/cloudfoundry_config.py +++ b/app/cloudfoundry_config.py @@ -42,7 +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_ENABLED'] = notify_config['credentials']['performance_platform_enabled'] + os.environ['PERFORMANCE_PLATFORM_TOKEN'] = notify_config['credentials'].get('performance_platform_token') def extract_notify_aws_config(aws_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')