Merge pull request #66 from nhsconnect/PRMT-4472

PRMT-4472
nhsconnect · Feb 9, 2024 · 5c44b13 · 5c44b13
2 parents cdfab95 + 2cbb801
commit 5c44b13
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/docker-compose-dtest.yml b/docker-compose-dtest.yml
@@ -8,23 +8,14 @@ services:
     links:
       - db:db
       - localstack:localstack
-    environment:
-      - AUTHORIZATION_KEYS=auth-key-1
-      - SKIP_DB_MIGRATION=false
-      - S3_BUCKET_NAME=test-bucket
-      - DATABASE_USER=deductions_user
-      - DATABASE_PASSWORD=secret
-      - DATABASE_NAME=deductions_test
-      - DATABASE_HOST=db
-      - LOCALSTACK_URL=http://localstack:4572
     ports:
     - 3000:3000
   db:
     image: postgres:12.1
     environment:
-      POSTGRES_PASSWORD: secret
-      POSTGRES_USER: deductions_user
-      POSTGRES_DB: deductions_test
+      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
+      POSTGRES_USER: ${DATABASE_USER}
+      POSTGRES_DB: ${DATABASE_NAME}
       LC_ALL: C
   localstack:
     image: localstack/localstack:0.10.9

diff --git a/docker-compose-itest.yml b/docker-compose-itest.yml
@@ -9,9 +9,9 @@ services:
   db:
     image: postgres:12.1
     environment:
-      POSTGRES_PASSWORD: secret
-      POSTGRES_USER: deductions_user
-      POSTGRES_DB: deductions_test
+      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
+      POSTGRES_USER: ${DATABASE_USER}
+      POSTGRES_DB: ${DATABASE_NAME}
       LC_ALL: C
     ports:
       - "5432:5432"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,10 +7,10 @@ services:
     expose:
       - 5432
     environment:
-      - POSTGRES_USER=${DATABASE_USER}
-      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
-      - POSTGRES_DB=${DATABASE_NAME}
-      - LC_ALL=C
+      POSTGRES_USER: ${DATABASE_USER}
+      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
+      POSTGRES_DB: ${DATABASE_NAME}
+      LC_ALL: C
   localstack:
     image: localstack/localstack
     ports:

diff --git a/tasks b/tasks
@@ -94,11 +94,16 @@ function prepare_local_envs_for_ide {
   echo $envs | tr ' ' ';'
 }
 
+function generate_secure_string {
+  local length=$1
+  tr -dc 'A-Za-z0-9_!@#$%^&*()' < /dev/urandom | head -c $length ; echo
+}
+
 function configure_local_envs {
-  export AUTHORIZATION_KEYS=auth-key-1
+  export AUTHORIZATION_KEYS=$(generate_secure_string 10)
   export DATABASE_NAME=deductions_test
-  export DATABASE_USER=deductions_user
-  export DATABASE_PASSWORD=secret
+  export DATABASE_USER=$(generate_secure_string 20)
+  export DATABASE_PASSWORD=$(generate_secure_string 20)
   export DATABASE_HOST=db
   export S3_BUCKET_NAME=test-bucket
   export LOCALSTACK_URL=http://localstack:4572