Test

.github/.trufflehog3.yml

@@ -35,6 +35,7 @@ exclude: # exclude matching issues
       - "*.ico"
       - "*.css"
       - "*.scss"
+      - "*.config.ts"
   - message: Ignore integrity hashes on Openshift config files
     pattern: sha256:.*
     paths:

.github/workflows/api-dotnetcore.yml

@@ -106,19 +106,19 @@ jobs:
 
       - name: Codecov
         uses: codecov/codecov-action@v3.1.1
+        env: 
+          CODECOV_TOKEN: ${{ secrets.CODECOV }}
         with:
           # User defined upload name. Visible in Codecov UI
           name: PIMS
-          # Repository upload token - get it from codecov.io. Required only for private repositories
-          token: ${{ secrets.CodeCov }}
           # Path to coverage file to upload
           file: ${{env.working-directory}}/tests/unit/TestResults/coverage.opencover.xml
           # Flag upload to group coverage metrics (e.g. unittests | integration | ui,chrome)
           flags: unittests
           # Environment variables to tag the upload with (e.g. PYTHON | OS,PYTHON)
           env_vars: C#
           # Specify whether or not CI build should fail if Codecov runs into an error during upload
-          fail_ci_if_error: true
+          fail_ci_if_error: false
 
       - name: SonarScanner for .NET 8 with pull request decoration support
         id: scan

.github/workflows/app-react.yml

@@ -52,26 +52,26 @@ jobs:
       - run: npm run build --if-present
         working-directory: ${{env.working-directory}}
 
-      - run: npm run coverage -- --maxWorkers=2
+      - run: npm run coverage -- --bail 1 --maxWorkers 2 --minWorkers 2
         working-directory: ${{env.working-directory}}
         env:
           REACT_APP_TENANT: MOTI
 
       - name: Codecov
         uses: codecov/codecov-action@v3.1.1
+        env: 
+          CODECOV_TOKEN: ${{ secrets.CODECOV }}
         with:
           # User defined upload name. Visible in Codecov UI
           name: PIMS
-          # Repository upload token - get it from codecov.io. Required only for private repositories
-          token: ${{ secrets.CodeCov }}
           # Path to coverage file to upload
           file: ${{env.working-directory}}/coverage/coverage-final.json
           # Flag upload to group coverage metrics (e.g. unittests | integration | ui,chrome)
           flags: unittests
           # Environment variables to tag the upload with (e.g. PYTHON | OS,PYTHON)
           env_vars: javascript
           # Specify whether or not CI build should fail if Codecov runs into an error during upload
-          fail_ci_if_error: true
+          fail_ci_if_error: false
 
       - name: SonarQube Scan
         id: scan

Makefile

@@ -184,27 +184,27 @@ infra: ## Starts infrastructure containers (e.g. database, geoserver). Useful fo
 
 start: ## Starts the local containers (n=service name)
 	@echo "$(P) Starting client and server containers..."
-	@docker-compose start $(n)
+	@docker-compose --profile all start $(n)
 
 up: ## Runs the local containers (n=service name)
 	@echo "$(P) Running client and server..."
-	@docker-compose up -d --no-recreate $(n)
+	@docker-compose --profile all up -d --no-recreate $(n)
 
 destroy: ## Stops the local containers and removes them (n=service name)
 	@echo "$(P) Removing docker containers..."
 	@docker-compose rm -s -f $(n)
 
 down: ## Stops the local containers and removes them
 	@echo "$(P) Stopping client and server..."
-	@docker-compose down
+	@docker-compose --profile all down
 
 stop: ## Stops the local containers (n=service name)
 	@echo "$(P) Stopping client and server..."
-	@docker-compose stop $(n)
+	@docker-compose --profile all stop $(n)
 
 build: ## Builds the local containers (n=service name)
 	@echo "$(P) Building images..."
-	@docker-compose build --no-cache $(n)
+	@docker-compose --profile all build --no-cache $(n)
 
 rebuild: ## Build the local contains (n=service name) and then start them after building
 	@"$(MAKE)" build n=$(n)
@@ -216,6 +216,9 @@ clean: ## Removes all local containers, images, volumes, etc
 	@docker volume rm -f psp-frontend-node-cache
 	@docker volume rm -f psp-api-db-data
 
+restart-mayan: 
+	@docker-compose --profile mayan up --build -d
+
 logs: ## Shows logs for running containers (n=service name)
 	@docker-compose logs -f $(n)
 

docker-compose.yml

@@ -1,8 +1,14 @@
 version: "3.5"
 
+include:
+  - tools/mayan-edms/docker-compose.yml
+
 services:
   ####################### Database #######################
   database:
+    profiles:
+      - all
+      - psp
     environment:
       - TARGET_SPRINT
       - SEED
@@ -21,6 +27,9 @@ services:
 
   ####################### Backend #######################
   backend:
+    profiles:
+      - all
+      - psp
     restart: on-failure:1
     container_name: psp-api
     build:
@@ -39,6 +48,9 @@ services:
 
   ####################### Frontend #######################
   frontend:
+    profiles:
+      - all
+      - psp
     stdin_open: true
     tty: true
     restart: on-failure:1
@@ -59,6 +71,9 @@ services:
 
   ####################### GeoServer #######################
   geoserver:
+    profiles:
+      - all
+      - psp
     image: kartoza/geoserver:2.19.2
     volumes:
       - ./tools/geoserver/geoserver_data:/opt/geoserver/data_dir/workspaces
@@ -77,6 +92,8 @@ services:
   ####################### Clam AV #######################
   # example av test file here: https://serverfault.com/questions/484082/how-should-i-test-clam-anti-virus
   clamav:
+    profiles:
+      - all
     image: mkodockx/docker-clamav:alpine-idb-amd64
     environment:
       - CLAMD_CONF_MaxFileSize=500M
@@ -86,14 +103,17 @@ services:
     restart: on-failure
     container_name: psp-clamav
     healthcheck:
-      test: ["CMD", "./check.sh"]
+      test: [ "CMD", "./check.sh" ]
       interval: 60s
       retries: 3
       start_period: 120s
     networks:
       - psp
 
   prometheus:
+    profiles:
+      - all
+      - monitoring
     image: ubuntu/prometheus
     container_name: psp-prometheus
     ports:
@@ -108,6 +128,9 @@ services:
       - "--web.enable-lifecycle"
 
   grafana:
+    profiles:
+      - all
+      - monitoring
     image: grafana/grafana-oss
     container_name: psp-grafana
     restart: on-failure