Merge branch 'dev' into LTD-5962

uktrade · Mar 10, 2025 · 2b3fcc3 · 2b3fcc3
2 parents 14c5ec5 + 107580b
commit 2b3fcc3
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 39 deletions.
diff --git a/caseworker/f680/urls.py b/caseworker/f680/urls.py
@@ -12,7 +12,6 @@
         views.CaseDetailView.as_view(),
         name="details",
     ),
-    path("document/", include("caseworker.f680.document.urls")),
     path(
         "recommendation/",
         recommendation_views.CaseRecommendationView.as_view(),

diff --git a/ci.api.env b/ci.api.env
@@ -4,9 +4,10 @@ PORT=8100
 ALLOWED_HOSTS=*
 INTERNAL_USERS='[{"email": "[email protected]", "role": "Super User"}, {"email": "[email protected]", "role": "Super User"}, {"email": "[email protected]", "role": "Super User"}, {"email": "[email protected]", "role": "Super User"}, {"email": "[email protected]", "role": "Super User"}, {"email": "[email protected]", "role": "Licensing Unit Officer", "first_name":"LU", "last_name":"Officer", "team_id": "58e77e47-42c8-499f-a58d-94f94541f8c6", "default_queue": "f0e7c2fa-100f-42ad-b740-bb072393e664"}, {"email": "[email protected]", "role": "Licensing Unit Manager", "first_name":"Licensing", "last_name":"Manager", "team_id": "58e77e47-42c8-499f-a58d-94f94541f8c6", "default_queue": "9f5a2a93-03ed-4416-a8f8-8b728e5ea9d0"}, {"email": "[email protected]", "role": "Licencing Unit Senior Manager", "first_name":"LU", "last_name":"Senior Manager", "team_id": "58e77e47-42c8-499f-a58d-94f94541f8c6", "default_queue": "7b643901-565a-4ec8-8a7a-de34bc541a0e"}, {"email": "[email protected]", "role": "Enforcement Unit Manager", "first_name":"Enforcement", "last_name":"Manager", "team_id": "48b4fe54-7d4f-4c03-b143-f8d1dcef9f5b", "default_queue": "50543c0d-bf2a-4f68-b33f-2ab89759db11"}]'
 EXPORTER_USERS='[{"email": "[email protected]", "organisation": "Archway Communications", "role": "Super User"}, {"email": "[email protected]", "role": "Super User"}]'
-AWS_ACCESS_KEY_ID=AWS_ACCESS_KEY_ID
-AWS_SECRET_ACCESS_KEY=AWS_SECRET_ACCESS_KEY
-AWS_STORAGE_BUCKET_NAME=AWS_STORAGE_BUCKET_NAME
+AWS_ENDPOINT_URL=http://s3:9000
+AWS_ACCESS_KEY_ID=minio_username
+AWS_SECRET_ACCESS_KEY=minio_password
+AWS_STORAGE_BUCKET_NAME=uploads
 AWS_REGION=eu-west-2
 LITE_HMRC_INTEGRATION_ENABLED=False
 LITE_HMRC_INTEGRATION_URL=LITE_HMRC_INTEGRATION_URL
@@ -47,10 +48,3 @@ MOCK_VIRUS_SCAN_ACTIVATE_ENDPOINTS=TRUE
 AV_SERVICE_URL=http://localhost:8100/mock_virus_scan/scan
 AV_SERVICE_PASSWORD=AV_SERVICE_PASSWORD
 AV_SERVICE_USERNAME=AV_SERVICE_USERNAME
-
-# Below values can be found in vault
-
-export AWS_ACCESS_KEY_ID=
-export AWS_REGION=
-export AWS_SECRET_ACCESS_KEY=
-export AWS_STORAGE_BUCKET_NAME=
diff --git a/ci.caseworker.env b/ci.caseworker.env
@@ -8,9 +8,10 @@ HAWK_AUTHENTICATION_ENABLED=False
 LITE_API_HAWK_KEY=LITE_API_HAWK_KEY
 LITE_INTERNAL_HAWK_KEY=LITE_INTERNAL_HAWK_KEY
 TEST_TYPE_HEADLESS=False
-AWS_ACCESS_KEY_ID=AKIAIEXAMPLE
-AWS_SECRET_ACCESS_KEY=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-AWS_STORAGE_BUCKET_NAME=my-bucket
+AWS_ENDPOINT_URL=http://s3:9000
+AWS_ACCESS_KEY_ID=minio_username
+AWS_SECRET_ACCESS_KEY=minio_password
+AWS_STORAGE_BUCKET_NAME=uploads
 AWS_REGION=eu-west-2
 DJANGO_SECRET_KEY=DJANGO_SECRET_KEY
 LITE_SPIRE_ARCHIVE_CLIENT_BASE_URL=http://localhost:9000
@@ -41,7 +42,3 @@ export DIRECTORY_SSO_API_CLIENT_BASE_URL=
 export DIRECTORY_SSO_API_CLIENT_API_KEY=
 export AUTHBROKER_CLIENT_ID=
 export AUTHBROKER_CLIENT_SECRET=
-export AWS_ACCESS_KEY_ID=
-export AWS_REGION=
-export AWS_SECRET_ACCESS_KEY=
-export AWS_STORAGE_BUCKET_NAME=
diff --git a/ci.exporter.env b/ci.exporter.env
@@ -5,9 +5,10 @@ ALLOWED_HOSTS=*
 PERMISSIONS_FINDER_URL=
 GTM_ID=
 FEEDBACK_URL=mailto:
-AWS_ACCESS_KEY_ID=AKIAIEXAMPLE
-AWS_SECRET_ACCESS_KEY=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-AWS_STORAGE_BUCKET_NAME=my-bucket
+AWS_ENDPOINT_URL=http://s3:9000
+AWS_ACCESS_KEY_ID=minio_username
+AWS_SECRET_ACCESS_KEY=minio_password
+AWS_STORAGE_BUCKET_NAME=uploads
 AWS_REGION=eu-west-2
 DJANGO_SECRET_KEY=DJANGO_SECRET_KEY
 HAWK_AUTHENTICATION_ENABLED=False
@@ -54,8 +55,4 @@ export EXPORTER_AUTHBROKER_CLIENT_ID=
 export EXPORTER_AUTHBROKER_CLIENT_SECRET=
 export GOVUK_BASIC_AUTH_USER_NAME=
 export GOVUK_BASIC_AUTH_USER_PASSWORD=
-export AWS_ACCESS_KEY_ID=
-export AWS_REGION=
-export AWS_SECRET_ACCESS_KEY=
-export AWS_STORAGE_BUCKET_NAME=
 export AUTHBROKER_LOW_SECURITY=True
diff --git a/docker-compose.api.yml b/docker-compose.api.yml
@@ -4,12 +4,6 @@ services:
   api:
     container_name: api
     image: liteapi
-    environment:
-      # Below values can be found in vault
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
-      AWS_REGION: ${AWS_REGION}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
-      AWS_STORAGE_BUCKET_NAME: ${AWS_STORAGE_BUCKET_NAME}
     env_file:
       - api.env
     depends_on:
@@ -51,3 +45,15 @@ services:
     ports:
       - 9200:9200
       - 9300:9300
+
+  s3:
+    container_name: s3
+    image: minio/minio
+    ports:
+      - 9000:9000
+      - 9001:9001
+    entrypoint: sh
+    command: -c 'mkdir -p /buckets/uploads && mkdir -p /buckets/anonymiser && minio server /buckets --console-address ":9001"'
+    environment:
+      - MINIO_ROOT_USER=minio_username
+      - MINIO_ROOT_PASSWORD=minio_password
diff --git a/docker-compose.caseworker.yml b/docker-compose.caseworker.yml
@@ -19,10 +19,6 @@ services:
       EXPORTER_TEST_SSO_PASSWORD: ${EXPORTER_TEST_SSO_PASSWORD}
       TEST_SSO_EMAIL: ${TEST_SSO_EMAIL}
       TEST_SSO_PASSWORD: ${TEST_SSO_PASSWORD}
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
-      AWS_REGION: ${AWS_REGION}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
-      AWS_STORAGE_BUCKET_NAME: ${AWS_STORAGE_BUCKET_NAME}
     env_file:
       - ./caseworker.env
     ports:

diff --git a/docker-compose.exporter.yml b/docker-compose.exporter.yml
@@ -15,10 +15,6 @@ services:
       TEST_SSO_PASSWORD: ${TEST_SSO_PASSWORD}
       EXPORTER_TEST_SSO_EMAIL: ${EXPORTER_TEST_SSO_EMAIL}
       EXPORTER_TEST_SSO_PASSWORD: ${EXPORTER_TEST_SSO_PASSWORD}
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
-      AWS_REGION: ${AWS_REGION}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
-      AWS_STORAGE_BUCKET_NAME: ${AWS_STORAGE_BUCKET_NAME}
       GOVUK_BASIC_AUTH_USER_NAME: ${GOVUK_BASIC_AUTH_USER_NAME}
       GOVUK_BASIC_AUTH_USER_PASSWORD: ${GOVUK_BASIC_AUTH_USER_PASSWORD}
     env_file: