From cb5b4c0acd8558ed9daffb0b98fd01401f37cbdc Mon Sep 17 00:00:00 2001 From: Thomas Fink <53316058+ThomasAFink@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:59:56 +0200 Subject: [PATCH 1/4] Update docker-compose.yaml --- localinfra/docker-compose.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/localinfra/docker-compose.yaml b/localinfra/docker-compose.yaml index 75745f2..465f7d1 100644 --- a/localinfra/docker-compose.yaml +++ b/localinfra/docker-compose.yaml @@ -6,8 +6,8 @@ services: ports: - '5432:5432' environment: - POSTGRES_PASSWORD: kobit-local - POSTGRES_USER: kobit + POSTGRES_PASSWORD: postgres + POSTGRES_USER: postgres POSTGRES_DB: kobit_local volumes: - ./postgres:/var/lib/postgres/data @@ -26,7 +26,7 @@ services: depends_on: - postgresql environment: - PGADMIN_DEFAULT_PASSWORD: kobit-local + PGADMIN_DEFAULT_PASSWORD: postgres PGADMIN_DEFAULT_EMAIL: kobit@local.com ports: - '80:80' @@ -50,4 +50,4 @@ services: mail: image: bytemark/smtp ports: - - "25:25" \ No newline at end of file + - "25:25" From a4ece2ca1140954f6c5063c0d8642d4ae57ca455 Mon Sep 17 00:00:00 2001 From: Thomas Fink <53316058+ThomasAFink@users.noreply.github.com> Date: Wed, 24 Apr 2024 11:00:18 +0200 Subject: [PATCH 2/4] Update application-local.yml --- src/main/resources/application-local.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 83393c2..fceffe9 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -1,9 +1,9 @@ spring: datasource: - url: jdbc:postgresql://localhost:5432/kobit_local; + url: jdbc:postgresql://localhost:5432/kobit_local username: postgres - password: kobit-local + password: postgres http: @@ -17,4 +17,4 @@ spring: hostname: ${AWS_S3_HOSTNAME} region: static: eu-central-1 - auto: false \ No newline at end of file + auto: false From 04ac45ad2c6f8b6836a907d81fbc646e045a0e11 Mon Sep 17 00:00:00 2001 From: Thomas Fink <53316058+ThomasAFink@users.noreply.github.com> Date: Wed, 24 Apr 2024 11:12:16 +0200 Subject: [PATCH 3/4] Update build.yaml --- .github/workflows/build.yaml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0af7e46..0be2879 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,16 +9,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - - - name: Advance Security Policy as Code - uses: advanced-security/policy-as-code@v2.0 - with: - policy: GeekMasher/security-queries - policy-path: policies/default.yml - - token: ${{ secrets.ACCESS_TOKEN }} - - argvs: '--disable-dependabot --disable-secret-scanning --disable-code-scanning' - name: Set up JDK 11 uses: actions/setup-java@v3 with: @@ -26,4 +16,19 @@ jobs: distribution: 'adopt' cache: maven - name: Build with maven - run: mvn --batch-mode --update-snapshots verify \ No newline at end of file + run: mvn --batch-mode --update-snapshots verify + + compliance: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Advance Security Policy as Code + uses: advanced-security/policy-as-code@v2.4.1 + with: + policy: it-at-m/policy-as-code + policy-path: default.yaml + token: ${{ secrets.ACCESS_TOKEN }} + argvs: "--disable-dependabot --disable-secret-scanning --disable-code-scanning --display" From 50c7ab451be9ae0605fbf37f268de0614c114e9d Mon Sep 17 00:00:00 2001 From: Thomas Fink Date: Wed, 24 Apr 2024 11:14:45 +0200 Subject: [PATCH 4/4] run spotless apply --- .../decisiontree/service/DecisionTreeServiceTest.java | 6 ------ .../kobit/backend/validation/ValidateContactPointTest.java | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/test/java/de/muenchen/kobit/backend/decisiontree/service/DecisionTreeServiceTest.java b/src/test/java/de/muenchen/kobit/backend/decisiontree/service/DecisionTreeServiceTest.java index cf1a848..60f6fad 100644 --- a/src/test/java/de/muenchen/kobit/backend/decisiontree/service/DecisionTreeServiceTest.java +++ b/src/test/java/de/muenchen/kobit/backend/decisiontree/service/DecisionTreeServiceTest.java @@ -1,20 +1,14 @@ package de.muenchen.kobit.backend.decisiontree.service; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import de.muenchen.kobit.backend.competence.Competence; import de.muenchen.kobit.backend.competence.service.CompetenceService; -import de.muenchen.kobit.backend.contactpoint.view.ContactPointView; import de.muenchen.kobit.backend.decisiontree.branches.*; import de.muenchen.kobit.backend.decisiontree.relevance.service.RelevanceService; import de.muenchen.kobit.backend.decisiontree.view.DecisionPoint; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; import java.util.List; -import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/muenchen/kobit/backend/validation/ValidateContactPointTest.java b/src/test/java/de/muenchen/kobit/backend/validation/ValidateContactPointTest.java index 46516a1..0b8acc1 100644 --- a/src/test/java/de/muenchen/kobit/backend/validation/ValidateContactPointTest.java +++ b/src/test/java/de/muenchen/kobit/backend/validation/ValidateContactPointTest.java @@ -227,7 +227,8 @@ void validateTest_InvalidNameShort() throws MalformedURLException { assertThrows( InvalidContactPointException.class, () -> validateContactPoint.validate(contactPointView)); - assertThat(exception.getMessage()).isEqualTo("Name must be at least 4 characters and not more than 100!"); + assertThat(exception.getMessage()) + .isEqualTo("Name must be at least 4 characters and not more than 100!"); } @Test