PR template & docker compose changes

Author: MarkGentHe1

.github/workflows/check-pull-request.yml

@@ -19,51 +19,32 @@ jobs:
     steps:
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '8.0.x'
-    
+          dotnet-version: '8.0.x'    
       - name: Check out code
         uses: actions/checkout@v3
         with:
-          path: working-dir
-    
+          path: working-dir    
       - name: Restore
-        run: dotnet restore ./working-dir/KeeperData.Api.sln
-  
+        run: dotnet restore ./working-dir/KeeperData.Api.sln  
       - name: Build
-        run: dotnet build ./working-dir/KeeperData.Api.sln --configuration Release --no-restore -warnaserror
-  
+        run: dotnet build ./working-dir/KeeperData.Api.sln --configuration Release --no-restore -warnaserror  
       - name: Verify format
         run: dotnet format ./working-dir/KeeperData.Api.sln --verify-no-changes --verbosity diagnostic
-  
-      - name: Make localstack init script executable
-        run: chmod +x ./working-dir/compose/start-localstack.sh
-
-      - name: Make script executable
-        run: chmod +x ./working-dir/wait-for-docker-logs.sh
-  
-      - name: Run docker-compose
-        uses: hoverkraft-tech/compose-action@v2.0.1
-        with:
-          compose-file: |
-            ./working-dir/docker-compose.yml
-            ./working-dir/docker-compose.override.yml
-      
-      - name: Wait for localstack
-        run: ./working-dir/wait-for-docker-logs.sh localstack-emulator "Bootstrapping Complete" 60
-
-      - name: Test
-        run: dotnet test ./working-dir/KeeperData.Api.sln --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" --collect:"XPlat Code Coverage" --results-directory ./coverage
-
-      - name: install dotnet coverage
-        run: dotnet tool install --global dotnet-coverage        
-        
-      - name: merge coverage reports
-        run:  dotnet-coverage merge *.cobertura.xml --recursive --output merged.cobertura.xml --output-format cobertura
-  
+      - name: Test (unit and component)
+        run: dotnet test ./working-dir/KeeperData.Api.sln --filter "Category!=Integration" --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" --collect:"XPlat Code Coverage" --results-directory ./coverage
+      - name: Install ReportGenerator
+        run: dotnet tool install --global dotnet-reportgenerator-globaltool
+      - name: Generate Coverage Summary
+        run: |
+          reportgenerator \
+            -reports:"./coverage/**/coverage.cobertura.xml" \
+            -targetdir:"coverage-report" \
+            -reporttypes:"Cobertura;MarkdownSummary" \
+            -assemblyfilters:+KeeperData.*
       - name: Code coverage report
         uses: irongut/CodeCoverageSummary@v1.3.0
         with:
-          filename: merged.cobertura.xml
+          filename: coverage-report/Cobertura.xml
           badge: true
           fail_below_min: false
           format: markdown
@@ -72,14 +53,41 @@ jobs:
           indicators: true
           output: both
           thresholds: '60 80'
-
       - name: Add Coverage PR Comment
         uses: marocchino/sticky-pull-request-comment@v2
         if: github.event_name == 'pull_request'
         with:
           recreate: true
           path: code-coverage-results.md
 
+  integration-tests:
+    name: Run Integration Tests
+    runs-on: ubuntu-latest
+    needs: pr-validator
+    steps:
+      - uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.0.x'
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          path: working-dir
+      - name: Make LocalStack init script executable
+        run: chmod +x ./working-dir/compose/start-localstack.sh
+      - name: Run docker-compose
+        uses: hoverkraft-tech/compose-action@v2.0.1
+        with:
+          compose-file: |
+            ./working-dir/docker-compose.yml
+            ./working-dir/docker-compose.override.yml
+      - name: Make script executable
+        run: chmod +x ./working-dir/wait-for-docker-logs.sh
+      - name: Wait for localstack
+        run: ./working-dir/wait-for-docker-logs.sh localstack-emulator "Bootstrapping Complete" 60
+      - name: Wait for keeperdata_api to be ready
+        run: ./working-dir/wait-for-docker-logs.sh keeperdata_api "Now listening on" 60
+      - name: Run integration tests
+        run: dotnet test ./working-dir/KeeperData.Api.sln --filter "Category=Integration"
 
     ## SonarCloud
     ## Uncomment to unable SonarCloud scan

Dockerfile

@@ -29,11 +29,6 @@ RUN dotnet restore "KeeperData.Core/KeeperData.Core.csproj" -r linux-x64 -v n
 
 COPY ["src/", "."]
 
-# Run all tests except those with "Integration" in the path
-RUN find ./tests -name '*.csproj' | grep -v Integration | while read testproj; do \
-    dotnet test "$testproj" --configuration ${BUILD_CONFIGURATION} --no-restore --verbosity normal; \
-done
-
 FROM build AS publish
 WORKDIR "/src/KeeperData.Api"
 RUN dotnet publish "KeeperData.Api.csproj" -v n -c ${BUILD_CONFIGURATION} -o /app/publish -r linux-x64 --no-restore /p:UseAppHost=false

docker-compose.override.yml

@@ -6,7 +6,6 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_HTTP_PORTS=8080
       - AWS__ServiceURL=http://localstack-emulator:4566
-      #- AWS__ServiceURL=http://sqs.eu-west-2.localhost.localstack.cloud:4566/
       - Mongo__DatabaseUri=mongodb://mongodb:27017
       - QueueConsumerOptions__IntakeEventQueueOptions__QueueUrl=http://sqs.eu-west-2.127.0.0.1:4566/000000000000/ls_keeper_data_intake_queue
     ports:

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.4'
 name: 'keeperdata_api'
 services:
   localstack:
@@ -15,7 +14,8 @@ services:
       SERVICES: s3,sqs,sns,firehose
       LOCALSTACK_HOST: 127.0.0.1
     volumes:
-      - '${TMPDIR:-/tmp}/localstack:/var/lib/localstack'
+      - "./localstack_data:/var/lib/localstack"
+      - "/var/run/docker.sock:/var/run/docker.sock"
       - ./compose/start-localstack.sh:/etc/localstack/init/ready.d/start-localstack.sh
     healthcheck:
       test: ['CMD', 'curl', 'http://localstack-emulator:4566/health']