Merge branch 'feature/EASI-4457' of github.com:CMS-Enterprise/easi-ap…

…p into EASI-4457/advice-letter-dataloader
CMS-Enterprise · Jul 16, 2024 · c23214a · c23214a
2 parents ed83b18 + e66b076
commit c23214a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.envrc b/.envrc
@@ -82,7 +82,7 @@ export MINIO_ACCESS_KEY='minioadmin'
 export MINIO_SECRET_KEY='minioadmin'
 
 # If not on Windows+WSL, run `scripts/dev hosts:check` to ensure this will resolve!
-export MINIO_ADDRESS="http://host.docker.internal:9004"
+export MINIO_ADDRESS="http://minio:9004"
 
 # For connecting to a local postgres instance
 export PGHOST=localhost

diff --git a/docs/cedar.md b/docs/cedar.md
@@ -73,6 +73,6 @@ export CEDAR_CORE_API_VERSION=2.0.0
 Additionally, if you're using the `openconnect-tinyproxy` VPN container for selective proxying, add the following to your `.envrc.local` file to instruct Go to use the proxy:
 
 ```
-export HTTP_PROXY=http://host.docker.internal:8888
-export HTTPS_PROXY=http://host.docker.internal:8888
+export HTTP_PROXY=http://localhost:8888
+export HTTPS_PROXY=http://localhost:8888
 ```
diff --git a/scripts/dev b/scripts/dev
@@ -351,7 +351,7 @@ namespace :db do
   end
 
   # Make sure this list of tables matches the list in pkg/storage/truncate.go
-  desc "Deletes all rows from all tables"
+  desc "Deletes all rows from all tables and all files in Minio (S3)"
   task :clean do
     tables = %w{
       cedar_system_bookmarks
@@ -391,6 +391,10 @@ namespace :db do
     sql = tables.map { |table| "DELETE FROM #{table};" }.join
     puts "Cleaning database..."
     `echo "#{sql}" | psql`
+
+    # Delete all files from Minio
+    puts "Cleaning Minio file storage..."
+    `docker-compose run --entrypoint='mc --quiet rm -r --force local/easi-app-file-uploads/' minio_mc > /dev/null 2>&1`
   end
 end
 

diff --git a/src/data/mock/systemIntake.ts b/src/data/mock/systemIntake.ts
@@ -121,7 +121,7 @@ export const documents: SystemIntakeDocument[] = [
     status: SystemIntakeDocumentStatus.AVAILABLE,
     uploadedAt: '2023-06-14T18:24:46.310929Z',
     url:
-      'http://host.docker.internal:9004/easi-app-file-uploads/ead3f487-8aaa-47d2-aa26-335e9b560a92.pdf?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20230614%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230614T184943Z&X-Amz-Expires=900&X-Amz-SignedHeaders=host&X-Amz-Signature=f71d5d63d68958a2bd8526c2b2cdd5abe78b21eb69d10739fe8f8e6fd5d010ec',
+      'http://localhost:9004/easi-app-file-uploads/ead3f487-8aaa-47d2-aa26-335e9b560a92.pdf?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20230614%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230614T184943Z&X-Amz-Expires=900&X-Amz-SignedHeaders=host&X-Amz-Signature=f71d5d63d68958a2bd8526c2b2cdd5abe78b21eb69d10739fe8f8e6fd5d010ec',
     __typename: 'SystemIntakeDocument'
   },
   {
@@ -135,7 +135,7 @@ export const documents: SystemIntakeDocument[] = [
     status: SystemIntakeDocumentStatus.PENDING,
     uploadedAt: '2023-06-14T18:24:46.32661Z',
     url:
-      'http://host.docker.internal:9004/easi-app-file-uploads/7e047111-6228-4943-9c4b-0961f27858f4.pdf?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20230614%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230614T184943Z&X-Amz-Expires=900&X-Amz-SignedHeaders=host&X-Amz-Signature=0e3f337697c616b01533accd95a316cbeabeb6990961b9881911c757837cbf95',
+      'http://localhost:9004/easi-app-file-uploads/7e047111-6228-4943-9c4b-0961f27858f4.pdf?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20230614%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230614T184943Z&X-Amz-Expires=900&X-Amz-SignedHeaders=host&X-Amz-Signature=0e3f337697c616b01533accd95a316cbeabeb6990961b9881911c757837cbf95',
     __typename: 'SystemIntakeDocument'
   },
   {
@@ -149,7 +149,7 @@ export const documents: SystemIntakeDocument[] = [
     status: SystemIntakeDocumentStatus.UNAVAILABLE,
     uploadedAt: '2023-06-14T18:24:46.342866Z',
     url:
-      'http://host.docker.internal:9004/easi-app-file-uploads/f779e8e4-9c78-4b14-bbab-37618447f3f9.pdf?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20230614%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230614T184943Z&X-Amz-Expires=900&X-Amz-SignedHeaders=host&X-Amz-Signature=7e6755645a1f163d41d2fa7c19776d0ceb4cfd3ff8e1c2918c428a551fe44764',
+      'http://localhost:9004/easi-app-file-uploads/f779e8e4-9c78-4b14-bbab-37618447f3f9.pdf?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20230614%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230614T184943Z&X-Amz-Expires=900&X-Amz-SignedHeaders=host&X-Amz-Signature=7e6755645a1f163d41d2fa7c19776d0ceb4cfd3ff8e1c2918c428a551fe44764',
     __typename: 'SystemIntakeDocument'
   }
 ];