Merge branch 'tsys-release' into develop

.github/workflows/dockerImage.yml

@@ -139,13 +139,20 @@ jobs:
           echo "### Publish Docker image :x:" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "- It seems that something has gone wrong" >> $GITHUB_STEP_SUMMARY
+      - name: Publish to T-sys if T-sys release
+        if: ${{ (github.ref == 'refs/heads/tsys-release') && (matrix.registry == 'ghcr.io') }}
+        uses: fjogeleit/http-request-action@v1
+        with:
+          url: 'https://git.mms-support.de/api/v4/projects/${{ secrets.TSYS_SERVICE_ID }}/repository/tags?ref=master&tag_name=${{ env.DOCKER_IMAGE_TAG }}'
+          method: 'POST'
+          customHeaders: '{"PRIVATE-TOKEN": "${{ secrets.TSYS_ACCESS_TOKEN }}"}'
       - name: Run Trivy vulnerability image scanner
         if: ${{ (matrix.registry == 'ghcr.io') }}
         uses: aquasecurity/trivy-action@master
         with:
           image-ref: '${{ env.DOCKER_REGISTRY }}/${{ env.REPO_NAME_WITHOUT_PREFIX }}:${{ env.DOCKER_IMAGE_TAG }}'
           format: 'table'
-          exit-code: '1'
+          exit-code: '0'
           vuln-type: 'os,library'
           severity: 'CRITICAL'
       - name: Microsoft Teams Fail Card
@@ -181,11 +188,11 @@ jobs:
           custom-actions: |
             - text: View CI
               url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-
       - name: Publish to T-sys if T-sys release
         if: ${{ (github.ref == 'refs/heads/tsys-release') && (matrix.registry == 'ghcr.io') }}
         uses: fjogeleit/http-request-action@v1
         with:
           url: 'https://git.mms-support.de/api/v4/projects/${{ secrets.TSYS_SERVICE_ID }}/repository/tags?ref=master&tag_name=${{ env.DOCKER_IMAGE_TAG }}'
           method: 'POST'
           customHeaders: '{"PRIVATE-TOKEN": "${{ secrets.TSYS_ACCESS_TOKEN }}"}'
+

pom.xml

@@ -317,6 +317,11 @@
       <version>2.25.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>2.0</version>
+    </dependency>
     <dependency>
       <groupId>de.flapdoodle.embed</groupId>
       <artifactId>de.flapdoodle.embed.mongo</artifactId>

src/main/resources/application-local.properties

@@ -4,17 +4,28 @@ logging.level.org.springframework.web=DEBUG
 logging.level.org.hibernate=ERROR
 logging.level.de.caritas.cob.uploadservice.scheduler=DEBUG
 # Keycloak
-keycloak.auth-server-url=
-keycloak.realm=
+spring.datasource.url=jdbc:mariadb://localhost:3306/uploadservice
+spring.datasource.username=root
+spring.datasource.password=root
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDB103Dialect
+spring.liquibase.change-log=classpath:db/changelog/uploadservice-local-master.xml
+spring.liquibase.user=liquibase
+spring.liquibase.password=liquibase
+spring.liquibase.default-schema=uploadservice
+
+keycloak.auth-server-url=http://onlineberatung.local/auth
+keycloak.realm=online-beratung
 keycloak.bearer-only=true
 keycloak.resource=upload-service
-keycloak.principal-attribute=
+keycloak.principal-attribute=preferred_username
 keycloak.cors=false
-keycloakService.techuser.id=
-keycloakService.admin.username=
+keycloakService.techuser.id=658c7779-bb6d-42e2-bec9-3f2010b76ea1
+keycloakService.admin.username=realmadmin
 keycloakService.admin.password=
 keycloakService.admin.clientId=admin-cli
 # Rocket.Chat
-rocket.systemuser.username=
+rocket.chat.api.url=http://localhost:3000/api/v1
+rocket.systemuser.username=system1
 rocket.systemuser.password=
 rocket.credentialscheduler.cron=0 0/5 * * * ?