Remove MOU bucket, for now

app/cloudfoundry_config.py

@@ -32,9 +32,3 @@ def extract_cloudfoundry_config():
         vcap_services['s3'], f"notifications-admin-logo-upload-bucket-{os.environ['DEPLOY_ENV']}")
     if bucket_service:
         os.environ['LOGO_UPLOAD_BUCKET_NAME'] = bucket_service['credentials']['bucket']
-
-    # MOU Upload Bucket Name
-    bucket_service = find_by_service_name(
-        vcap_services['s3'], f"notifications-admin-mou-upload-bucket-{os.environ['DEPLOY_ENV']}")
-    if bucket_service:
-        os.environ['MOU_UPLOAD_BUCKET_NAME'] = bucket_service['credentials']['bucket']

app/config.py

@@ -59,7 +59,7 @@ class Config(object):
 
     NOTIFY_ENVIRONMENT = 'development'
     LOGO_UPLOAD_BUCKET_NAME = 'public-logos-local'
-    MOU_BUCKET_NAME = 'local-mou'
+    # MOU_BUCKET_NAME = 'local-mou'
     # TRANSIENT_UPLOADED_LETTERS = 'local-transient-uploaded-letters'
     ROUTE_SECRET_KEY_1 = os.environ.get('ROUTE_SECRET_KEY_1', 'dev-route-secret-key-1')
     ROUTE_SECRET_KEY_2 = os.environ.get('ROUTE_SECRET_KEY_2', 'dev-route-secret-key-2')
@@ -108,7 +108,7 @@ class Development(Config):
     CSV_UPLOAD_BUCKET_NAME = 'local-notifications-csv-upload'  # created in gsa sandbox
     CONTACT_LIST_UPLOAD_BUCKET_NAME = 'local-contact-list'  # created in gsa sandbox
     LOGO_UPLOAD_BUCKET_NAME = 'local-public-logos-tools'  # created in gsa sandbox
-    MOU_BUCKET_NAME = 'local-notify-tools-mou'  # created in gsa sandbox
+    # MOU_BUCKET_NAME = 'local-notify-tools-mou'  # created in gsa sandbox
     # TRANSIENT_UPLOADED_LETTERS = 'development-transient-uploaded-letters'  # not created in gsa sandbox
     # PRECOMPILED_ORIGINALS_BACKUP_LETTERS =
     # 'development-letters-precompiled-originals-backup'  # not created in sandbox
@@ -135,7 +135,7 @@ class Test(Development):
     CONTACT_LIST_UPLOAD_BUCKET_NAME = 'test-contact-list'
     LOGO_UPLOAD_BUCKET_NAME = 'public-logos-test'
     LOGO_CDN_DOMAIN = 'static-logos.test.com'
-    MOU_BUCKET_NAME = 'test-mou'
+    # MOU_BUCKET_NAME = 'test-mou'
     # TRANSIENT_UPLOADED_LETTERS = 'test-transient-uploaded-letters'
     # PRECOMPILED_ORIGINALS_BACKUP_LETTERS = 'test-letters-precompiled-originals-backup'
     NOTIFY_ENVIRONMENT = 'test'
@@ -166,7 +166,7 @@ class Preview(Config):
     CONTACT_LIST_UPLOAD_BUCKET_NAME = 'preview-contact-list'
     LOGO_UPLOAD_BUCKET_NAME = 'public-logos-preview'
     LOGO_CDN_DOMAIN = 'static-logos.notify.works'
-    MOU_BUCKET_NAME = 'notify.works-mou'
+    # MOU_BUCKET_NAME = 'notify.works-mou'
     # TRANSIENT_UPLOADED_LETTERS = 'preview-transient-uploaded-letters'
     # PRECOMPILED_ORIGINALS_BACKUP_LETTERS = 'preview-letters-precompiled-originals-backup'
     NOTIFY_ENVIRONMENT = 'preview'
@@ -186,7 +186,7 @@ class Staging(Config):
     CONTACT_LIST_UPLOAD_BUCKET_NAME = 'staging-contact-list'
     LOGO_UPLOAD_BUCKET_NAME = 'public-logos-staging'
     LOGO_CDN_DOMAIN = 'static-logos.staging-notify.works'
-    MOU_BUCKET_NAME = 'staging-notify.works-mou'
+    # MOU_BUCKET_NAME = 'staging-notify.works-mou'
     # TRANSIENT_UPLOADED_LETTERS = 'staging-transient-uploaded-letters'
     # PRECOMPILED_ORIGINALS_BACKUP_LETTERS = 'staging-letters-precompiled-originals-backup'
     NOTIFY_ENVIRONMENT = 'staging'
@@ -206,7 +206,8 @@ class Live(Config):
         'CONTACT_LIST_BUCKET_NAME', 'notifications-prototype-contact-list-upload')  # created in gsa sandbox
     LOGO_UPLOAD_BUCKET_NAME = os.environ.get(
         'LOGO_UPLOAD_BUCKET_NAME', 'notifications-prototype-logo-upload')  # created in gsa sandbox
-    MOU_BUCKET_NAME = os.environ.get('MOU_UPLOAD_BUCKET_NAME', 'notifications-prototype-mou')  # created in gsa sandbox
+    # MOU_BUCKET_NAME = os.environ.get(
+    #     'MOU_UPLOAD_BUCKET_NAME', 'notifications-prototype-mou')  # created in gsa sandbox
     # TRANSIENT_UPLOADED_LETTERS = 'prototype-transient-uploaded-letters'  # not created in gsa sandbox
     # PRECOMPILED_ORIGINALS_BACKUP_LETTERS = 'prototype-letters-precompiled-originals-backup'  # not in sandbox
 

app/templates/views/agreement/service-agreement-signed.html

@@ -21,8 +21,6 @@
       {{ current_service.organisation.name }} has already accepted the US
       Notify data sharing and financial agreement.
     </p>
-    <p class="govuk-body">For more information, you can <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">download a copy of the agreement (PDF)</a>.
-    </p>
     <p class="govuk-body">
       The agreement is confidential and should not be shared outside your organisation.
     </p>

app/templates/views/agreement/service-agreement.html

@@ -27,9 +27,6 @@
     <p class="govuk-body">
       Once accepted, the agreement covers all Notify services from {{ current_service.organisation.name }}.
     </p>
-    <p class="govuk-body">
-      <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">Download a copy of the data sharing and financial agreement (PDF)</a>.
-    </p>
     <p class="govuk-body">
       The agreement is confidential and should not be shared outside your organisation.
     </p>

app/templates/views/organisations/organisation/billing.html

@@ -22,20 +22,10 @@
           {{ current_org.agreement_signed_on_behalf_of_name or current_org.agreement_signed_by.name }} signed the agreement
           on behalf of {{ current_org.name}}.
         </p>
-        <p class="govuk-body">
-          <a class="govuk-link govuk-link--no-visited-state"
-             href="{{ url_for('.organisation_download_agreement', org_id=current_org.id) }}">Download the current version of the agreement (PDF)
-          </a>
-        </p>
       {% elif current_org.agreement_signed %}
         <p class="govuk-body">
           {{ current_org.name}} has accepted the US Notify data sharing and financial agreement.
         </p>
-        <p class="govuk-body">
-          <a class="govuk-link govuk-link--no-visited-state"
-             href="{{ url_for('.organisation_download_agreement', org_id=current_org.id) }}">Download the current version of the agreement (PDF)
-          </a>
-        </p>
       {% elif current_org.agreement_signed is false %}
         <p class="govuk-body">
           {{ current_org.name}} needs to accept the US Notify data sharing and financial agreement.