From 1755b210cd80ea2a9fd7f89b11177596205c3ed1 Mon Sep 17 00:00:00 2001 From: GerhardPx Date: Mon, 8 Jul 2024 09:51:23 +0200 Subject: [PATCH 1/6] JSON file in workflow und OpenApi in authservice --- .../dispatch-microservice-mvn-release.yml | 9 +++++ wls-auth-service/pom.xml | 40 +++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/.github/workflows/dispatch-microservice-mvn-release.yml b/.github/workflows/dispatch-microservice-mvn-release.yml index 14529f92b..21f4646e1 100644 --- a/.github/workflows/dispatch-microservice-mvn-release.yml +++ b/.github/workflows/dispatch-microservice-mvn-release.yml @@ -37,6 +37,15 @@ jobs: -DdevelopmentVersion=${{ github.event.inputs.development-version }} -Dtag=${{ github.event.inputs.service }}/${{ github.event.inputs.release-version }} -Darguments="-DskipTests" + - name: Create GitHub Release + id: create_release + uses: softprops/action-gh-release@v2 + with: + files: "${{ github.event.inputs.service }}/target/*.jar\n${{ github.event.inputs.service }}/target/openapi.json" + tag_name: ${{ github.event.inputs.service }}/${{ github.event.inputs.release-version }} + draft: false + prerelease: false + generate_release_notes: false build-github-release: permissions: diff --git a/wls-auth-service/pom.xml b/wls-auth-service/pom.xml index d24210435..e40842f1d 100644 --- a/wls-auth-service/pom.xml +++ b/wls-auth-service/pom.xml @@ -429,6 +429,46 @@ + + + org.openapitools + openapi-generator-maven-plugin + 7.5.0 + + + generateAuthService + + generate + + + ${project.basedir}/src/main/resources/openapis/openapi.eai.0.0.1-RC1.json + java + resttemplate + + ${groupId}.authservice.eai.aou.client + ${groupId}.authservice.eai.aou.model + + false + false + false + false + + + false + false + true + true + + + + + BaseApi.java,ApiClient.java,JavaTimeFormatter.java,Authentication.java,OAuth.java,ApiKeyAuth.java,HttpBasicAuth.java,HttpBearerAuth.java,RFC3339DateFormat.java + + + + + + From f1093018929f5b7057276aa3911eae5725f6de6d Mon Sep 17 00:00:00 2001 From: GerhardPx Date: Thu, 11 Jul 2024 12:33:20 +0200 Subject: [PATCH 2/6] workflow changes und OpenApi in allen Microservices --- ...allable-create-github-release-from-tag.yml | 6 +-- .../dispatch-microservice-mvn-release.yml | 9 ----- wls-auth-service/pom.xml | 39 +++++-------------- wls-basisdaten-service/pom.xml | 19 +++++++++ wls-briefwahl-service/pom.xml | 19 +++++++++ wls-broadcast-service/pom.xml | 19 +++++++++ wls-ergebnismeldung-service/pom.xml | 19 +++++++++ wls-infomanagement-service/pom.xml | 19 +++++++++ wls-monitoring-service/pom.xml | 19 +++++++++ wls-wahlvorbereitung-service/pom.xml | 19 +++++++++ wls-wahlvorstand-service/pom.xml | 19 +++++++++ 11 files changed, 164 insertions(+), 42 deletions(-) diff --git a/.github/workflows/callable-create-github-release-from-tag.yml b/.github/workflows/callable-create-github-release-from-tag.yml index de746d2bb..a2a52126c 100644 --- a/.github/workflows/callable-create-github-release-from-tag.yml +++ b/.github/workflows/callable-create-github-release-from-tag.yml @@ -45,8 +45,8 @@ jobs: id: create_release uses: softprops/action-gh-release@v2 with: - files: ${{ inputs.files }} - tag_name: ${{ inputs.tag }} + files: "${{ github.event.inputs.service }}/target/*.jar\n${{ github.event.inputs.service }}/target/openapi.json" + tag_name: ${{ github.event.inputs.service }}/${{ github.event.inputs.release-version }} draft: false prerelease: false - generate_release_notes: false \ No newline at end of file + generate_release_notes: false diff --git a/.github/workflows/dispatch-microservice-mvn-release.yml b/.github/workflows/dispatch-microservice-mvn-release.yml index 21f4646e1..14529f92b 100644 --- a/.github/workflows/dispatch-microservice-mvn-release.yml +++ b/.github/workflows/dispatch-microservice-mvn-release.yml @@ -37,15 +37,6 @@ jobs: -DdevelopmentVersion=${{ github.event.inputs.development-version }} -Dtag=${{ github.event.inputs.service }}/${{ github.event.inputs.release-version }} -Darguments="-DskipTests" - - name: Create GitHub Release - id: create_release - uses: softprops/action-gh-release@v2 - with: - files: "${{ github.event.inputs.service }}/target/*.jar\n${{ github.event.inputs.service }}/target/openapi.json" - tag_name: ${{ github.event.inputs.service }}/${{ github.event.inputs.release-version }} - draft: false - prerelease: false - generate_release_notes: false build-github-release: permissions: diff --git a/wls-auth-service/pom.xml b/wls-auth-service/pom.xml index e40842f1d..d4ac39b19 100644 --- a/wls-auth-service/pom.xml +++ b/wls-auth-service/pom.xml @@ -431,43 +431,22 @@ - org.openapitools - openapi-generator-maven-plugin - 7.5.0 + org.springdoc + springdoc-openapi-maven-plugin + 1.4 - generateAuthService + integration-test generate - - ${project.basedir}/src/main/resources/openapis/openapi.eai.0.0.1-RC1.json - java - resttemplate - - ${groupId}.authservice.eai.aou.client - ${groupId}.authservice.eai.aou.model - - false - false - false - false - - - false - false - true - true - - - - - BaseApi.java,ApiClient.java,JavaTimeFormatter.java,Authentication.java,OAuth.java,ApiKeyAuth.java,HttpBasicAuth.java,HttpBearerAuth.java,RFC3339DateFormat.java - - - + + http://localhost:8080/v3/api-docs + openapi.json + ${project.build.directory} + diff --git a/wls-basisdaten-service/pom.xml b/wls-basisdaten-service/pom.xml index 1fe60d91a..da79b9ae7 100644 --- a/wls-basisdaten-service/pom.xml +++ b/wls-basisdaten-service/pom.xml @@ -429,6 +429,25 @@ + + + org.springdoc + springdoc-openapi-maven-plugin + 1.4 + + + integration-test + + generate + + + + + http://localhost:8080/v3/api-docs + openapi.json + ${project.build.directory} + + diff --git a/wls-briefwahl-service/pom.xml b/wls-briefwahl-service/pom.xml index 30ce4c3f2..8329cc353 100644 --- a/wls-briefwahl-service/pom.xml +++ b/wls-briefwahl-service/pom.xml @@ -448,6 +448,25 @@ + + + org.springdoc + springdoc-openapi-maven-plugin + 1.4 + + + integration-test + + generate + + + + + http://localhost:8080/v3/api-docs + openapi.json + ${project.build.directory} + + diff --git a/wls-broadcast-service/pom.xml b/wls-broadcast-service/pom.xml index de12471ba..b56680557 100644 --- a/wls-broadcast-service/pom.xml +++ b/wls-broadcast-service/pom.xml @@ -451,6 +451,25 @@ + + + org.springdoc + springdoc-openapi-maven-plugin + 1.4 + + + integration-test + + generate + + + + + http://localhost:8080/v3/api-docs + openapi.json + ${project.build.directory} + + diff --git a/wls-ergebnismeldung-service/pom.xml b/wls-ergebnismeldung-service/pom.xml index 242e252c4..0a1471ec9 100644 --- a/wls-ergebnismeldung-service/pom.xml +++ b/wls-ergebnismeldung-service/pom.xml @@ -429,6 +429,25 @@ + + + org.springdoc + springdoc-openapi-maven-plugin + 1.4 + + + integration-test + + generate + + + + + http://localhost:8080/v3/api-docs + openapi.json + ${project.build.directory} + + diff --git a/wls-infomanagement-service/pom.xml b/wls-infomanagement-service/pom.xml index 4802e5961..1a2a3270e 100644 --- a/wls-infomanagement-service/pom.xml +++ b/wls-infomanagement-service/pom.xml @@ -448,6 +448,25 @@ + + + org.springdoc + springdoc-openapi-maven-plugin + 1.4 + + + integration-test + + generate + + + + + http://localhost:8080/v3/api-docs + openapi.json + ${project.build.directory} + + diff --git a/wls-monitoring-service/pom.xml b/wls-monitoring-service/pom.xml index b8a02dd87..a88eb44f2 100644 --- a/wls-monitoring-service/pom.xml +++ b/wls-monitoring-service/pom.xml @@ -429,6 +429,25 @@ + + + org.springdoc + springdoc-openapi-maven-plugin + 1.4 + + + integration-test + + generate + + + + + http://localhost:8080/v3/api-docs + openapi.json + ${project.build.directory} + + diff --git a/wls-wahlvorbereitung-service/pom.xml b/wls-wahlvorbereitung-service/pom.xml index b94e148a2..e117c0338 100644 --- a/wls-wahlvorbereitung-service/pom.xml +++ b/wls-wahlvorbereitung-service/pom.xml @@ -451,6 +451,25 @@ + + + org.springdoc + springdoc-openapi-maven-plugin + 1.4 + + + integration-test + + generate + + + + + http://localhost:8080/v3/api-docs + openapi.json + ${project.build.directory} + + diff --git a/wls-wahlvorstand-service/pom.xml b/wls-wahlvorstand-service/pom.xml index 8b7645fd6..57a17d221 100644 --- a/wls-wahlvorstand-service/pom.xml +++ b/wls-wahlvorstand-service/pom.xml @@ -429,6 +429,25 @@ + + + org.springdoc + springdoc-openapi-maven-plugin + 1.4 + + + integration-test + + generate + + + + + http://localhost:8080/v3/api-docs + openapi.json + ${project.build.directory} + + From 76de9cc896f81e21f79c57d16e553579c2cb594f Mon Sep 17 00:00:00 2001 From: GerhardPx Date: Thu, 11 Jul 2024 15:35:19 +0200 Subject: [PATCH 3/6] workflow korrigiert --- .../workflows/callable-create-github-release-from-tag.yml | 6 +++--- .github/workflows/dispatch-microservice-mvn-release.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/callable-create-github-release-from-tag.yml b/.github/workflows/callable-create-github-release-from-tag.yml index a2a52126c..afdf09e04 100644 --- a/.github/workflows/callable-create-github-release-from-tag.yml +++ b/.github/workflows/callable-create-github-release-from-tag.yml @@ -39,14 +39,14 @@ jobs: distribution: 'temurin' - name: build jar without tests - run: mvn -B -ntp -DskipTests package -f ${{ inputs.service }}/pom.xml + run: mvn -B -ntp -DskipTests verify -f ${{ inputs.service }}/pom.xml - name: Create GitHub Release id: create_release uses: softprops/action-gh-release@v2 with: - files: "${{ github.event.inputs.service }}/target/*.jar\n${{ github.event.inputs.service }}/target/openapi.json" - tag_name: ${{ github.event.inputs.service }}/${{ github.event.inputs.release-version }} + files: ${{ inputs.files }} + tag_name: ${{ inputs.tag }} draft: false prerelease: false generate_release_notes: false diff --git a/.github/workflows/dispatch-microservice-mvn-release.yml b/.github/workflows/dispatch-microservice-mvn-release.yml index 14529f92b..b03d13cb7 100644 --- a/.github/workflows/dispatch-microservice-mvn-release.yml +++ b/.github/workflows/dispatch-microservice-mvn-release.yml @@ -48,7 +48,7 @@ jobs: with: tag: ${{ github.event.inputs.service }}/${{ github.event.inputs.release-version }} service: ${{ github.event.inputs.service }} - files: ${{ inputs.service }}/target/*.jar + files: "${{ github.event.inputs.service }}/target/*.jar\n${{ github.event.inputs.service }}/target/openapi.json" build-github-container-image: permissions: From 49a4a3681bf9aa8d117800dc643ff818384cb8be Mon Sep 17 00:00:00 2001 From: GerhardPx Date: Thu, 11 Jul 2024 15:36:05 +0200 Subject: [PATCH 4/6] OpenApi Generierung in wahlvorbereitung gefixed --- wls-wahlvorbereitung-service/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/wls-wahlvorbereitung-service/pom.xml b/wls-wahlvorbereitung-service/pom.xml index e117c0338..63dcca77b 100644 --- a/wls-wahlvorbereitung-service/pom.xml +++ b/wls-wahlvorbereitung-service/pom.xml @@ -310,6 +310,18 @@ repackage + + pre-integration-test + + start + + + + post-integration-test + + stop + + From 09abe47564eca744bf5c9ac620e96c2e7645d33b Mon Sep 17 00:00:00 2001 From: GerhardPx Date: Thu, 11 Jul 2024 15:40:25 +0200 Subject: [PATCH 5/6] Zeilenumbruch --- .github/workflows/callable-create-github-release-from-tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/callable-create-github-release-from-tag.yml b/.github/workflows/callable-create-github-release-from-tag.yml index afdf09e04..d918576fc 100644 --- a/.github/workflows/callable-create-github-release-from-tag.yml +++ b/.github/workflows/callable-create-github-release-from-tag.yml @@ -49,4 +49,4 @@ jobs: tag_name: ${{ inputs.tag }} draft: false prerelease: false - generate_release_notes: false + generate_release_notes: false \ No newline at end of file From 374c04ae2ed85ad73ebb62083f7e5193da865a98 Mon Sep 17 00:00:00 2001 From: GerhardPx Date: Fri, 12 Jul 2024 09:09:52 +0200 Subject: [PATCH 6/6] =?UTF-8?q?Fix=20bei=20der=20execution=20f=C3=BCr=20al?= =?UTF-8?q?le=20services=20applied?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wls-auth-service/pom.xml | 12 ++++++++++++ wls-basisdaten-service/pom.xml | 12 ++++++++++++ wls-briefwahl-service/pom.xml | 12 ++++++++++++ wls-broadcast-service/pom.xml | 12 ++++++++++++ wls-ergebnismeldung-service/pom.xml | 12 ++++++++++++ wls-infomanagement-service/pom.xml | 12 ++++++++++++ wls-monitoring-service/pom.xml | 12 ++++++++++++ wls-wahlvorstand-service/pom.xml | 12 ++++++++++++ 8 files changed, 96 insertions(+) diff --git a/wls-auth-service/pom.xml b/wls-auth-service/pom.xml index d4ac39b19..bfebab6ae 100644 --- a/wls-auth-service/pom.xml +++ b/wls-auth-service/pom.xml @@ -301,6 +301,18 @@ repackage + + pre-integration-test + + start + + + + post-integration-test + + stop + + diff --git a/wls-basisdaten-service/pom.xml b/wls-basisdaten-service/pom.xml index da79b9ae7..013c7f9d2 100644 --- a/wls-basisdaten-service/pom.xml +++ b/wls-basisdaten-service/pom.xml @@ -301,6 +301,18 @@ repackage + + pre-integration-test + + start + + + + post-integration-test + + stop + + diff --git a/wls-briefwahl-service/pom.xml b/wls-briefwahl-service/pom.xml index 8329cc353..4d6fefed3 100644 --- a/wls-briefwahl-service/pom.xml +++ b/wls-briefwahl-service/pom.xml @@ -308,6 +308,18 @@ repackage + + pre-integration-test + + start + + + + post-integration-test + + stop + + diff --git a/wls-broadcast-service/pom.xml b/wls-broadcast-service/pom.xml index b56680557..3a9cc3b0d 100644 --- a/wls-broadcast-service/pom.xml +++ b/wls-broadcast-service/pom.xml @@ -310,6 +310,18 @@ repackage + + pre-integration-test + + start + + + + post-integration-test + + stop + + diff --git a/wls-ergebnismeldung-service/pom.xml b/wls-ergebnismeldung-service/pom.xml index 0a1471ec9..ab5cb4018 100644 --- a/wls-ergebnismeldung-service/pom.xml +++ b/wls-ergebnismeldung-service/pom.xml @@ -301,6 +301,18 @@ repackage + + pre-integration-test + + start + + + + post-integration-test + + stop + + diff --git a/wls-infomanagement-service/pom.xml b/wls-infomanagement-service/pom.xml index 1a2a3270e..1cef24fb6 100644 --- a/wls-infomanagement-service/pom.xml +++ b/wls-infomanagement-service/pom.xml @@ -307,6 +307,18 @@ repackage + + pre-integration-test + + start + + + + post-integration-test + + stop + + diff --git a/wls-monitoring-service/pom.xml b/wls-monitoring-service/pom.xml index a88eb44f2..369eada40 100644 --- a/wls-monitoring-service/pom.xml +++ b/wls-monitoring-service/pom.xml @@ -301,6 +301,18 @@ repackage + + pre-integration-test + + start + + + + post-integration-test + + stop + + diff --git a/wls-wahlvorstand-service/pom.xml b/wls-wahlvorstand-service/pom.xml index 57a17d221..f26fc413c 100644 --- a/wls-wahlvorstand-service/pom.xml +++ b/wls-wahlvorstand-service/pom.xml @@ -301,6 +301,18 @@ repackage + + pre-integration-test + + start + + + + post-integration-test + + stop + +