From e094dd4bfd00f5dfabf24f4e047c2f01842103f9 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Wed, 23 Oct 2019 11:45:07 +0100 Subject: [PATCH] remove loadtesting from providers we don't use it since we wrote our own provider stubs for performance tests. this removes it from the api - it's still in the DB and will be retrieved by queries, but is set to disabled on prod --- README.md | 1 - app/__init__.py | 5 +---- app/clients/sms/loadtesting.py | 24 ------------------------ app/config.py | 3 --- manifest.yml.j2 | 1 - pytest.ini | 1 - 6 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 app/clients/sms/loadtesting.py diff --git a/README.md b/README.md index 3688dee86..46f51e0a3 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,6 @@ echo " export NOTIFY_ENVIRONMENT='development' export MMG_API_KEY='MMG_API_KEY' -export LOADTESTING_API_KEY='FIRETEXT_SIMULATION_KEY' export FIRETEXT_API_KEY='FIRETEXT_ACTUAL_KEY' export NOTIFICATION_QUEUE_PREFIX='YOUR_OWN_PREFIX' diff --git a/app/__init__.py b/app/__init__.py index 1acefeb52..141e45582 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -20,7 +20,6 @@ from app.clients import Clients from app.clients.document_download import DocumentDownloadClient from app.clients.email.aws_ses import AwsSesClient from app.clients.sms.firetext import FiretextClient -from app.clients.sms.loadtesting import LoadtestingClient from app.clients.sms.mmg import MMGClient from app.clients.performance_platform.performance_platform_client import PerformancePlatformClient from app.encryption import Encryption @@ -46,7 +45,6 @@ migrate = Migrate() ma = Marshmallow() notify_celery = NotifyCelery() firetext_client = FiretextClient() -loadtest_client = LoadtestingClient() mmg_client = MMGClient() aws_ses_client = AwsSesClient() encryption = Encryption() @@ -79,7 +77,6 @@ def create_app(application): statsd_client.init_app(application) logging.init_app(application, statsd_client) firetext_client.init_app(application, statsd_client=statsd_client) - loadtest_client.init_app(application, statsd_client=statsd_client) mmg_client.init_app(application, statsd_client=statsd_client) aws_ses_client.init_app(application.config['AWS_REGION'], statsd_client=statsd_client) notify_celery.init_app(application) @@ -87,7 +84,7 @@ def create_app(application): redis_store.init_app(application) performance_platform_client.init_app(application) document_download_client.init_app(application) - clients.init_app(sms_clients=[firetext_client, mmg_client, loadtest_client], email_clients=[aws_ses_client]) + clients.init_app(sms_clients=[firetext_client, mmg_client], email_clients=[aws_ses_client]) register_blueprint(application) register_v2_blueprints(application) diff --git a/app/clients/sms/loadtesting.py b/app/clients/sms/loadtesting.py deleted file mode 100644 index 429a6d314..000000000 --- a/app/clients/sms/loadtesting.py +++ /dev/null @@ -1,24 +0,0 @@ -import logging - -from flask import current_app - -from app.clients.sms.firetext import ( - FiretextClient -) - -logger = logging.getLogger(__name__) - - -class LoadtestingClient(FiretextClient): - ''' - Loadtest sms client. - ''' - - def init_app(self, config, statsd_client, *args, **kwargs): - super(FiretextClient, self).__init__(*args, **kwargs) - self.current_app = current_app - self.api_key = config.config.get('LOADTESTING_API_KEY') - self.from_number = config.config.get('FROM_NUMBER') - self.name = 'loadtesting' - self.url = "https://www.firetext.co.uk/api/sendsms/json" - self.statsd_client = statsd_client diff --git a/app/config.py b/app/config.py index 9df753e9b..e063ec5c7 100644 --- a/app/config.py +++ b/app/config.py @@ -78,9 +78,6 @@ class Config(object): # Firetext API Key FIRETEXT_API_KEY = os.getenv("FIRETEXT_API_KEY") - # Firetext simluation key - LOADTESTING_API_KEY = os.getenv("LOADTESTING_API_KEY") - # Hosted graphite statsd prefix STATSD_PREFIX = os.getenv('STATSD_PREFIX') diff --git a/manifest.yml.j2 b/manifest.yml.j2 index 4b11094de..2484d9328 100644 --- a/manifest.yml.j2 +++ b/manifest.yml.j2 @@ -99,7 +99,6 @@ applications: FIRETEXT_URL: '{{ FIRETEXT_URL }}' FIRETEXT_API_KEY: '{{ FIRETEXT_API_KEY }}' - LOADTESTING_API_KEY: '{{ LOADTESTING_API_KEY }}' FIRETEXT_INBOUND_SMS_AUTH: '{{ FIRETEXT_INBOUND_SMS_AUTH | tojson }}' REDIS_ENABLED: '{{ REDIS_ENABLED }}' diff --git a/pytest.ini b/pytest.ini index fe4669c8b..3307b49ed 100644 --- a/pytest.ini +++ b/pytest.ini @@ -3,7 +3,6 @@ testpaths = tests env = NOTIFY_ENVIRONMENT=test MMG_API_KEY=mmg-secret-key - LOADTESTING_API_KEY=loadtesting FIRETEXT_API_KEY=Firetext NOTIFICATION_QUEUE_PREFIX=testing addopts = -v -p no:warnings