pass bucket correctly

Dewberry · May 15, 2024 · 216ff2f · 216ff2f
1 parent d3e7b7f
commit 216ff2f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -18,6 +18,7 @@ jobs:
         run: |
           touch .env
           echo INIT_AUTH=0 >> .env
+          echo S3_BUCKET=${{ secrets.S3_BUCKET }} >> .env
           echo S3_MOCK=0 >> .env
       - name: 'Create .env.json file'
         run: |
@@ -40,17 +41,14 @@ jobs:
 
       - name: Check if all 2 containers are alive
         run: |
-          sleep 25s
+          # sleep 25s
           docker ps -a
           if [ $(docker ps | grep mcat-ras- | wc -l) -lt 2 ]
           then
             echo "Less than 2 docker services alive."
             exit 1
           fi
 
-      - name: Show API container logs
-        run: docker logs mcat-ras-api
-
       - name: Show Newman results
         run: |
           sleep 50s

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -22,19 +22,18 @@ services:
       - ./.env
     networks:
       - app_network
+
   newman:
     image: postman/newman:alpine
     container_name: mcat-ras-newman
     entrypoint: [ "" ]
     command: >
       sh -c "sleep 30s &&
-             newman run /app/testing/postman_collection.json
-             --env-var url=api:5600
-             --env-var bucket=${S3_BUCKET}"
+             newman run /app/testing/postman_collection.json --env-var bucket=${S3_BUCKET}"
     volumes:
       - ./testing:/app/testing
     depends_on:
-      - "api"
+      - api
     environment:
       - S3_BUCKET=${S3_BUCKET}
     networks:

diff --git a/testing/postman_collection.json b/testing/postman_collection.json
@@ -76,7 +76,7 @@
 										"method": "GET",
 										"header": [],
 										"url": {
-											"raw": "http://{{url}}/forcingdata?definition_file=mcat-ras-testing/Example_Projects/2D Unsteady Flow Hydraulics/BaldEagleCrkMulti2D/BaldEagleDamBrk.prj&bucket={{bucket}}",
+											"raw": "{{url}}/forcingdata?definition_file=mcat-ras-testing/Example_Projects/2D Unsteady Flow Hydraulics/BaldEagleCrkMulti2D/BaldEagleDamBrk.prj&bucket={{bucket}}",
 											"protocol": "http",
 											"host": [
 												"{{url}}"
@@ -149,7 +149,7 @@
 										"method": "GET",
 										"header": [],
 										"url": {
-											"raw": "http://{{url}}/forcingdata?definition_file=mcat-ras-testing/mocked-data/bare-minimum-project/BaldEagleDamBrk.prj&bucket={{bucket}}",
+											"raw": "{{url}}/forcingdata?definition_file=mcat-ras-testing/mocked-data/bare-minimum-project/BaldEagleDamBrk.prj&bucket={{bucket}}",
 											"protocol": "http",
 											"host": [
 												"{{url}}"
@@ -191,7 +191,7 @@
 										"method": "GET",
 										"header": [],
 										"url": {
-											"raw": "http://{{url}}/forcingdata?definition_file=mcat-ras-testing/mocked-data/no-flow-file/BaldEagleDamBrk.prj&bucket={{bucket}}",
+											"raw": "{{url}}/forcingdata?definition_file=mcat-ras-testing/mocked-data/no-flow-file/BaldEagleDamBrk.prj&bucket={{bucket}}",
 											"protocol": "http",
 											"host": [
 												"{{url}}"
@@ -265,7 +265,7 @@
 								"method": "GET",
 								"header": [],
 								"url": {
-									"raw": "http://{{url}}/forcingdata?definition_file=mcat-ras-testing/Example_Projects/not-exist.prj&bucket={{bucket}}",
+									"raw": "{{url}}/forcingdata?definition_file=mcat-ras-testing/Example_Projects/not-exist.prj&bucket={{bucket}}",
 									"protocol": "http",
 									"host": [
 										"{{url}}"
@@ -360,7 +360,7 @@
 								"method": "GET",
 								"header": [],
 								"url": {
-									"raw": "http://{{url}}/isamodel?definition_file=mcat-ras-testing/Example_Projects/2D Unsteady Flow Hydraulics/BaldEagleCrkMulti2D/GISData/MainChannelBanks.prj&bucket={{bucket}}",
+									"raw": "{{url}}/isamodel?definition_file=mcat-ras-testing/Example_Projects/2D Unsteady Flow Hydraulics/BaldEagleCrkMulti2D/GISData/MainChannelBanks.prj&bucket={{bucket}}",
 									"protocol": "http",
 									"host": [
 										"{{url}}"
@@ -413,12 +413,7 @@
 	"variable": [
 		{
 			"key": "url",
-			"value": "localhost:5600",
-			"type": "string"
-		},
-		{
-			"key": "bucket",
-			"value": "",
+			"value": "api:5600",
 			"type": "string"
 		}
 	]