We’ve sent an email to {{ session['user_details']['email'] }}.
An email has been sent to {{ session['user_details']['email'] }}.
Click the link in the email to continue your registration.
Check your mobile phone number is correct and then resend the confirmation code.
Check your mobile phone number is correct and then resend the security code.
Mobile phone number @@ -21,7 +21,7 @@ Check your mobile number – GOV.UK Notify
- Resend confirmation code + Resend security code
- We’ve sent a code to your new {{ thing }}. + We’ve sent a security code to your new {{ thing }}.
We’ve sent you a security code by text message.
Enter security code diff --git a/app/version.py b/app/version.py.dist similarity index 56% rename from app/version.py rename to app/version.py.dist index fc30d1fca..295df522a 100644 --- a/app/version.py +++ b/app/version.py.dist @@ -1,3 +1,4 @@ __travis_commit__ = "" -__time__ = "2016-07-05:14:44:52" +__time__ = "" __travis_job_number__ = "" +__travis_job_url__ = "" diff --git a/appspec.yml b/appspec.yml index c663536ab..882459f2e 100644 --- a/appspec.yml +++ b/appspec.yml @@ -1,11 +1,11 @@ ---- -files: - - +--- +files: + - destination: /home/notify-app/notifications-admin source: / -hooks: - AfterInstall: - - +hooks: + AfterInstall: + - location: scripts/aws_install_dependencies.sh runas: root timeout: 300 @@ -27,11 +27,9 @@ hooks: location: scripts/deregister_from_elb.sh runas: ubuntu timeout: 300 - - + - location: scripts/aws_stop_app.sh runas: root timeout: 300 os: linux version: 0.0 - - diff --git a/deploy-exclude.lst b/deploy-exclude.lst new file mode 100644 index 000000000..5eaf61748 --- /dev/null +++ b/deploy-exclude.lst @@ -0,0 +1,9 @@ +*__pycache__* +*.git* +*app/assets* +*bower_components* +*cache* +*docker* +*node_modules* +*target* +*venv* diff --git a/docker/Dockerfile-build b/docker/Dockerfile-build new file mode 100644 index 000000000..105f1fdca --- /dev/null +++ b/docker/Dockerfile-build @@ -0,0 +1,36 @@ +FROM python:3.4-slim + +ENV PYTHONUNBUFFERED=1 \ + DEBIAN_FRONTEND=noninteractive \ + NODEJS_VERSION=6.3.1-1nodesource1~jessie1 + +RUN \ + echo "Install base packages" \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + apt-transport-https \ + make \ + curl \ + git \ + build-essential \ + libxml2-dev \ + libxslt-dev \ + zlib1g-dev \ + zip \ + rlwrap \ + + && echo "Install nodejs" \ + && cd /tmp \ + && curl -sSLO https://deb.nodesource.com/node_6.x/pool/main/n/nodejs/nodejs_${NODEJS_VERSION}_amd64.deb \ + && dpkg -i /tmp/nodejs_${NODEJS_VERSION}_amd64.deb \ + + && echo "Clean up" \ + && rm -rf /var/lib/apt/lists/* /tmp/* + +RUN \ + echo "Install global pip packages" \ + && pip install \ + virtualenv \ + awscli + +WORKDIR /var/project diff --git a/docker/Makefile b/docker/Makefile new file mode 100644 index 000000000..ea3add478 --- /dev/null +++ b/docker/Makefile @@ -0,0 +1,10 @@ +.DEFAULT_GOAL := help +SHELL := /bin/bash + +.PHONY: help +help: + @cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' + +.PHONY: build-build-image +build-build-image: + docker build -f Dockerfile-build -t govuk/notify-admin-builder . diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh index 09cdbe4e0..b0f6694d9 100644 --- a/scripts/common_functions.sh +++ b/scripts/common_functions.sh @@ -183,7 +183,7 @@ get_instance_health_elb() { ;; *) msg "Instance '$instance_id' not part of ELB '$elb_name'" - return 0 + return 1 esac fi } @@ -345,3 +345,40 @@ get_instance_id() { curl -s http://169.254.169.254/latest/meta-data/instance-id return $? } + +# Usage: get_instance_name_from_tags +# +# Looks up tags for the given instance, extracting the 'name' +# returns or error_exit +get_instance_name_from_tags() { + local instance_id=$1 + + local instance_name=$($AWS_CLI ec2 describe-tags \ + --filters "Name=resource-id,Values=${instance_id}" \ + --query Tags[0].Value \ + --output text) + if [ $? != 0 ]; then + error_exit "Couldn't get instance name for '$instance_id'" + fi + echo $instance_name + return $? +} + +ELB_NAME="" + +get_elb_name_for_instance_name() { + local instance_name=$1 + + declare -A elb_to_instance_mapping + + elb_to_instance_mapping['notify-admin']='notify-admin' + + elb_to_instance_mapping['notify_admin']='notify-admin-elb' + + local elb_name=${elb_to_instance_mapping[${instance_name}]} + if [ -z $elb_name ]; then + msg "No ELB for instance ${instance_name}" + else + ELB_NAME=$elb_name + fi +} diff --git a/scripts/deregister_from_elb.sh b/scripts/deregister_from_elb.sh index 25650196b..62bab1612 100755 --- a/scripts/deregister_from_elb.sh +++ b/scripts/deregister_from_elb.sh @@ -28,7 +28,9 @@ msg "Started $(basename $0) at $(/bin/date "+%F %T")" start_sec=$(/bin/date +%s.%N) msg "Getting relevant load balancer" -get_elb_list $INSTANCE_ID "notify-admin-elb" +INSTANCE_NAME=$(get_instance_name_from_tags $INSTANCE_ID) +get_elb_name_for_instance_name $INSTANCE_NAME +get_elb_list $INSTANCE_ID $ELB_NAME msg "Checking that user set at least one load balancer" if test -z "$ELB_LIST"; then diff --git a/scripts/register_with_elb.sh b/scripts/register_with_elb.sh index 9385716d4..7cc78006c 100755 --- a/scripts/register_with_elb.sh +++ b/scripts/register_with_elb.sh @@ -28,8 +28,10 @@ msg "Started $(basename $0) at $(/bin/date "+%F %T")" start_sec=$(/bin/date +%s.%N) msg "Getting relevant load balancer" -get_elb_list $INSTANCE_ID "notify-admin-elb" - +INSTANCE_NAME=$(get_instance_name_from_tags $INSTANCE_ID) +get_elb_name_for_instance_name $INSTANCE_NAME +ELB_LIST=$ELB_NAME +get_elb_list $INSTANCE_ID $ELB_NAME msg "Checking that user set at least one load balancer" if test -z "$ELB_LIST"; then diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index b1d6333f3..9bd70ae62 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -24,6 +24,9 @@ function display_result { fi } +if [ -d venv ]; then + source ./venv/bin/activate +fi pep8 . display_result $? 1 "Code style check" diff --git a/scripts/update_version_file.sh b/scripts/update_version_file.sh deleted file mode 100755 index 231c210b7..000000000 --- a/scripts/update_version_file.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# -# Update the version file of the project from the Travis build details -# -sed -i -e "s/__travis_commit__ =.*/__travis_commit__ = \"$TRAVIS_COMMIT\"/g" ./app/version.py -sed -i -e "s/__travis_job_number__ =.*/__travis_job_number__ = \"$TRAVIS_BUILD_NUMBER\"/g" ./app/version.py -sed -i -e "s/__time__ =.*/__time__ = \"$(date +%Y-%m-%d:%H:%M:%S)\"/g" ./app/version.py \ No newline at end of file diff --git a/tests/app/main/test_validators.py b/tests/app/main/test_validators.py index f8b1a6490..5ea1300ca 100644 --- a/tests/app/main/test_validators.py +++ b/tests/app/main/test_validators.py @@ -141,4 +141,4 @@ def test_sms_sender_form_validation(app_, mock_get_user_by_email): form.sms_sender.data = '###########' form.validate() - assert 'Sms text message sender can only contain alpha-numeric characters' == form.errors['sms_sender'][0] + assert 'Text message sender can only contain alpha-numeric characters' == form.errors['sms_sender'][0] diff --git a/tests/app/main/views/test_code_not_received.py b/tests/app/main/views/test_code_not_received.py index f7d5f89a7..09c252424 100644 --- a/tests/app/main/views/test_code_not_received.py +++ b/tests/app/main/views/test_code_not_received.py @@ -66,7 +66,7 @@ def test_should_render_correct_resend_template_for_pending_user(app_, page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') assert page.h1.string == 'Check your mobile number' - expected = 'Check your mobile phone number is correct and then resend the confirmation code.' + expected = 'Check your mobile phone number is correct and then resend the security code.' message = page.find_all('p')[1].text assert message == expected assert page.find('form').input['value'] == api_user_pending.mobile_number diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 1be535cbd..4cf56ed1a 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -11,70 +11,36 @@ from app.main.views.dashboard import get_dashboard_totals, format_weekly_stats_t from tests import validate_route_permission from tests.conftest import SERVICE_ONE_ID - stub_template_stats = [ { - 'template': { - 'name': 'Brine Shrimp', - 'template_type': 'sms', - 'id': 1 - }, - 'id': '6005e192-4738-4962-beec-ebd982d0b03f', - 'day': '2016-04-06', - 'usage_count': 6, - 'service': '1491b86f-c950-48f5-bed1-2a55df027ecb' + 'template_type': 'sms', + 'template_name': 'one', + 'template_id': 'id-1', + 'count': 100 }, { - 'template': { - 'name': 'Pickle feet', - 'template_type': 'sms', - 'id': 2 - }, - 'id': '0bd529cd-a0fd-43e5-80ee-b95ef6b0d51f', - 'day': '2016-04-06', - 'usage_count': 6, - 'service': '1491b86f-c950-48f5-bed1-2a55df027ecb' - }, - { - 'template': { - 'name': 'Brine Shrimp', - 'template_type': 'sms', - 'id': 1 - }, - 'id': '24531628-ffff-4082-a443-9f6db5af83d9', - 'day': '2016-04-05', - 'usage_count': 7, - 'service': '1491b86f-c950-48f5-bed1-2a55df027ecb' - }, - { - 'template': { - 'name': 'Pickle feet', - 'template_type': 'sms', - 'id': 2 - }, - 'id': '0bd529cd-a0fd-43e5-80ee-b95ef6b0d51f', - 'day': '2016-03-06', - 'usage_count': 200, - 'service': '1491b86f-c950-48f5-bed1-2a55df027ecb' - }, + 'template_type': 'email', + 'template_name': 'two', + 'template_id': 'id-2', + 'count': 200 + } ] def test_get_started( - app_, - mocker, - api_user_active, - mock_get_service, - mock_get_service_templates_when_no_templates_exist, - mock_get_user, - mock_get_user_by_email, - mock_login, - mock_get_jobs, - mock_has_permissions, - mock_get_detailed_service, - mock_get_usage + app_, + mocker, + api_user_active, + mock_get_service, + mock_get_service_templates_when_no_templates_exist, + mock_get_user, + mock_get_user_by_email, + mock_login, + mock_get_jobs, + mock_has_permissions, + mock_get_detailed_service, + mock_get_usage ): - mock_template_stats = mocker.patch('app.template_statistics_client.get_template_statistics_for_service', return_value=copy.deepcopy(stub_template_stats)) @@ -83,24 +49,23 @@ def test_get_started( response = client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID)) # mock_get_service_templates_when_no_templates_exist.assert_called_once_with(SERVICE_ONE_ID) - print(response.get_data(as_text=True)) assert response.status_code == 200 assert 'Get started' in response.get_data(as_text=True) def test_get_started_is_hidden_once_templates_exist( - app_, - mocker, - api_user_active, - mock_get_service, - mock_get_service_templates, - mock_get_user, - mock_get_user_by_email, - mock_login, - mock_get_jobs, - mock_has_permissions, - mock_get_detailed_service, - mock_get_usage + app_, + mocker, + api_user_active, + mock_get_service, + mock_get_service_templates, + mock_get_user, + mock_get_user_by_email, + mock_login, + mock_get_jobs, + mock_has_permissions, + mock_get_detailed_service, + mock_get_usage ): mock_template_stats = mocker.patch('app.template_statistics_client.get_template_statistics_for_service', return_value=copy.deepcopy(stub_template_stats)) @@ -125,7 +90,6 @@ def test_should_show_recent_templates_on_dashboard(app_, mock_has_permissions, mock_get_detailed_service, mock_get_usage): - mock_template_stats = mocker.patch('app.template_statistics_client.get_template_statistics_for_service', return_value=copy.deepcopy(stub_template_stats)) @@ -147,28 +111,27 @@ def test_should_show_recent_templates_on_dashboard(app_, assert len(table_rows) == 2 - assert 'Pickle feet' in table_rows[0].find_all('th')[0].text - assert 'Text message template' in table_rows[0].find_all('th')[0].text - assert '206' in table_rows[0].find_all('td')[0].text + assert 'two' in table_rows[0].find_all('th')[0].text + assert 'Email template' in table_rows[0].find_all('th')[0].text + assert '200' in table_rows[0].find_all('td')[0].text - assert 'Brine Shrimp' in table_rows[1].find_all('th')[0].text + assert 'one' in table_rows[1].find_all('th')[0].text assert 'Text message template' in table_rows[1].find_all('th')[0].text - assert '13' in table_rows[1].find_all('td')[0].text + assert '100' in table_rows[1].find_all('td')[0].text def test_should_show_all_templates_on_template_statistics_page( - app_, - mocker, - api_user_active, - mock_get_service, - mock_get_service_templates, - mock_get_user, - mock_get_user_by_email, - mock_login, - mock_get_jobs, - mock_has_permissions + app_, + mocker, + api_user_active, + mock_get_service, + mock_get_service_templates, + mock_get_user, + mock_get_user_by_email, + mock_login, + mock_get_jobs, + mock_has_permissions ): - mock_template_stats = mocker.patch('app.template_statistics_client.get_template_statistics_for_service', return_value=copy.deepcopy(stub_template_stats)) @@ -186,32 +149,31 @@ def test_should_show_all_templates_on_template_statistics_page( assert len(table_rows) == 2 - assert 'Pickle feet' in table_rows[0].find_all('th')[0].text - assert 'Text message template' in table_rows[0].find_all('th')[0].text - assert '206' in table_rows[0].find_all('td')[0].text + assert 'two' in table_rows[0].find_all('th')[0].text + assert 'Email template' in table_rows[0].find_all('th')[0].text + assert '200' in table_rows[0].find_all('td')[0].text - assert 'Brine Shrimp' in table_rows[1].find_all('th')[0].text + assert 'one' in table_rows[1].find_all('th')[0].text assert 'Text message template' in table_rows[1].find_all('th')[0].text - assert '13' in table_rows[1].find_all('td')[0].text + assert '100' in table_rows[1].find_all('td')[0].text @freeze_time("2016-01-01 11:09:00.061258") def test_should_show_recent_jobs_on_dashboard( - app_, - mocker, - api_user_active, - mock_get_service, - mock_get_service_templates, - mock_get_user, - mock_get_user_by_email, - mock_login, - mock_get_template_statistics, - mock_get_detailed_service, - mock_get_jobs, - mock_has_permissions, - mock_get_usage + app_, + mocker, + api_user_active, + mock_get_service, + mock_get_service_templates, + mock_get_user, + mock_get_user_by_email, + mock_login, + mock_get_template_statistics, + mock_get_detailed_service, + mock_get_jobs, + mock_has_permissions, + mock_get_usage ): - with app_.test_request_context(), app_.test_client() as client: client.login(api_user_active) response = client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID)) @@ -226,10 +188,10 @@ def test_should_show_recent_jobs_on_dashboard( assert len(table_rows) == 4 for index, filename in enumerate(( - "export 1/1/2016.xls", - "all email addresses.xlsx", - "applicants.ods", - "thisisatest.csv", + "export 1/1/2016.xls", + "all email addresses.xlsx", + "applicants.ods", + "thisisatest.csv", )): assert filename in table_rows[index].find_all('th')[0].text assert 'Uploaded 1 January at 11:09' in table_rows[index].find_all('th')[0].text @@ -259,7 +221,6 @@ def test_menu_send_messages(mocker, mock_get_template_statistics, mock_get_detailed_service, mock_get_usage): - with app_.test_request_context(): resp = _test_dashboard_menu( mocker, @@ -271,11 +232,11 @@ def test_menu_send_messages(mocker, assert url_for( 'main.choose_template', service_id=service_one['id'], - template_type='email')in page + template_type='email') in page assert url_for( 'main.choose_template', service_id=service_one['id'], - template_type='sms')in page + template_type='sms') in page assert url_for('main.manage_users', service_id=service_one['id']) in page assert url_for('main.service_settings', service_id=service_one['id']) not in page @@ -408,11 +369,14 @@ def test_aggregate_template_stats(): expected = aggregate_usage(copy.deepcopy(stub_template_stats)) assert len(expected) == 2 - for item in expected: - if item['template'].id == 1: - assert item['usage_count'] == 13 - elif item['template'].id == 2: - assert item['usage_count'] == 206 + assert expected[0]['template_name'] == 'two' + assert expected[0]['count'] == 200 + assert expected[0]['template_id'] == 'id-2' + assert expected[0]['template_type'] == 'email' + assert expected[1]['template_name'] == 'one' + assert expected[1]['count'] == 100 + assert expected[1]['template_id'] == 'id-1' + assert expected[1]['template_type'] == 'sms' def test_service_dashboard_updates_gets_dashboard_totals(mocker, diff --git a/tests/conftest.py b/tests/conftest.py index 37d5a020f..12b9e95b5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1068,16 +1068,11 @@ def mock_remove_user_from_service(mocker): def mock_get_template_statistics(mocker, service_one, fake_uuid): template = template_json(service_one['id'], fake_uuid, "Test template", "sms", "Something very interesting") data = { - "usage_count": 1, - "template": { - "name": template['name'], - "template_type": template['template_type'], - "id": template['id'] - }, - "service": template['service'], - "id": str(generate_uuid()), - "day": "2016-04-04", - "updated_at": "2016-04-04T12:00:00.000000+00:00" + "count": 1, + "template_name": template['name'], + "template_type": template['template_type'], + "template_id": template['id'], + "day": "2016-04-04" } def _get_stats(service_id, limit_days=None):