feat: Quarkus and Java upgrade + OTel (#11)

pagopa · May 8, 2024 · 86958e6 · 86958e6
1 parent 51c31c8
commit 86958e6
Show file tree

Hide file tree

Showing 10 changed files with 2,582 additions and 1,256 deletions.
diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml
@@ -54,7 +54,7 @@ jobs:
         uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
         id: cache-jdk
         with:
-          key: OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz
+          key: OpenJDK21U-jdk_x64_linux_hotspot_21.0.2_13.tar.gz
           path: |
             ${{ runner.temp }}/jdk_setup.tar.gz
             ${{ runner.temp }}/jdk_setup.sha256
@@ -65,8 +65,8 @@ jobs:
       - name: Download JDK and verify its hash
         if: steps.semantic.outputs.new_release_published == 'true' && steps.cache-jdk.outputs.cache-hit != 'true'
         run: |
-          echo "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b  ${{ runner.temp }}/jdk_setup.tar.gz" >> ${{ runner.temp }}/jdk_setup.sha256
-          curl -L "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz" -o "${{ runner.temp }}/jdk_setup.tar.gz"
+          echo "454bebb2c9fe48d981341461ffb6bf1017c7b7c6e15c6b0c29b959194ba3aaa5  ${{ runner.temp }}/jdk_setup.tar.gz" >> ${{ runner.temp }}/jdk_setup.sha256
+          curl -L "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_x64_linux_hotspot_21.0.2_13.tar.gz" -o "${{ runner.temp }}/jdk_setup.tar.gz"
           sha256sum --check --status "${{ runner.temp }}/jdk_setup.sha256"
 
       #
@@ -78,7 +78,7 @@ jobs:
         with:
           distribution: "jdkfile"
           jdkFile: "${{ runner.temp }}/jdk_setup.tar.gz"
-          java-version: "17"
+          java-version: "21"
           cache: maven
 
       #
@@ -89,7 +89,7 @@ jobs:
         uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
         id: cache-maven
         with:
-          key: apache-maven-3.9.2-bin.tar.gz
+          key: apache-maven-3.9.6-bin.tar.gz
           path: |
             ${{ runner.temp }}/maven_setup.tar.gz
             ${{ runner.temp }}/maven_setup.sha256
@@ -100,8 +100,8 @@ jobs:
       - name: Download Maven and verify its hash
         if: steps.semantic.outputs.new_release_published == 'true' && steps.cache-maven.outputs.cache-hit != 'true'
         run: |
-          echo "809ef3220c6d179195c06c324cb9a6d34d8ecba566c5cfd8eb83167bc034117d  ${{ runner.temp }}/maven_setup.tar.gz" >> ${{ runner.temp }}/maven_setup.sha256
-          curl -L "https://archive.apache.org/dist/maven/maven-3/3.9.2/binaries/apache-maven-3.9.2-bin.tar.gz" -o "${{ runner.temp }}/maven_setup.tar.gz"
+          echo "6eedd2cae3626d6ad3a5c9ee324bd265853d64297f07f033430755bd0e0c3a4b  ${{ runner.temp }}/maven_setup.tar.gz" >> ${{ runner.temp }}/maven_setup.sha256
+          curl -L "https://archive.apache.org/dist/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz" -o "${{ runner.temp }}/maven_setup.tar.gz"
           sha256sum --check --status "${{ runner.temp }}/maven_setup.sha256"
 
       #
@@ -135,7 +135,7 @@ jobs:
       #
       - name: RELEASE CANDIDATE - Build native executable
         if: steps.semantic.outputs.new_release_published == 'true'
-        run: ${{ runner.temp }}/maven/bin/mvn clean package -Pnative -Dmaven.test.skip=true -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image@sha256:05baf3fd2173f6f25ad35216b6b066c35fbfb97f06daba75efb5b22bc0a85b9c -s ${{ runner.temp }}/settings.xml --no-transfer-progress
+        run: ${{ runner.temp }}/maven/bin/mvn clean package -Pnative -Dmaven.test.skip=true -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image@sha256:ce70e1a8016471ff0fc9c8f048cd9e37afddacd3de37ed0bca74201d102e45f5 -s ${{ runner.temp }}/settings.xml --no-transfer-progress
 
       #
       # RELEASE CANDIDATE - Build Docker image.
@@ -165,15 +165,27 @@ jobs:
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       #
-      # RELEASE CANDIDATE - Update Container App.
+      # RELEASE CANDIDATE - Update Container App + OpenAPI descriptor on APIM
       #
-      - name: RELEASE CANDIDATE - Update Container App
+      - name: RELEASE CANDIDATE - Update Container App + OpenAPI descriptor on APIM
         if: steps.semantic.outputs.new_release_published == 'true'
         uses: azure/CLI@fa0f960f00db49b95fdb54328a767aee31e80105
         with:
           inlineScript: |
             az config set extension.use_dynamic_install=yes_without_prompt
-            az containerapp update -n ${{ secrets.AZURE_CONTAINER_APP_NAME }} -g ${{ secrets.AZURE_RESOURCE_GROUP_NAME }} --image ghcr.io/${{ github.repository }}:${{ steps.semantic.outputs.new_release_version }}-RC
+            az containerapp update -n ${{ secrets.AZURE_CONTAINER_APP_NAME }} -g ${{ secrets.AZURE_RESOURCE_GROUP_NAME }} --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }} -i ghcr.io/${{ github.repository }}:${{ steps.semantic.outputs.new_release_version }}-RC
+            API_DATA=$(az apim api show --resource-group ${{ secrets.AZURE_APIM_RESOURCE_GROUP }} --service-name ${{ secrets.AZURE_APIM_NAME }} --api-id ${{ secrets.AZURE_APIM_API_ID }} --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }} --query "{path:path, serviceUrl:serviceUrl}")
+            API_PATH=$(echo $API_DATA | jq -r '.path') 
+            API_SERVICE_URL=$(echo $API_DATA | jq -r '.serviceUrl') 
+            az apim api import \
+              --resource-group ${{ secrets.AZURE_APIM_RESOURCE_GROUP }} \
+              --service-name ${{ secrets.AZURE_APIM_NAME }} \
+              --api-id ${{ secrets.AZURE_APIM_API_ID }} \
+              --specification-format OpenApi \
+              --specification-path src/main/resources/META-INF/openapi.yaml \
+              --path $API_PATH \
+              --service-url $API_SERVICE_URL \
+              --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       #
       # Install Node.
@@ -232,7 +244,7 @@ jobs:
       #
       - name: STABLE - Build native executable
         if: steps.semantic.outputs.new_release_published == 'true'
-        run: ${{ runner.temp }}/maven/bin/mvn clean package -Pnative -Dmaven.test.skip=true -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image@sha256:05baf3fd2173f6f25ad35216b6b066c35fbfb97f06daba75efb5b22bc0a85b9c -s ${{ runner.temp }}/settings.xml --no-transfer-progress
+        run: ${{ runner.temp }}/maven/bin/mvn clean package -Pnative -Dmaven.test.skip=true -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image@sha256:ce70e1a8016471ff0fc9c8f048cd9e37afddacd3de37ed0bca74201d102e45f5 -s ${{ runner.temp }}/settings.xml --no-transfer-progress
 
       #
       # STABLE - Build Docker image.
@@ -259,4 +271,4 @@ jobs:
         with:
           inlineScript: |
             az config set extension.use_dynamic_install=yes_without_prompt
-            az containerapp update -n ${{ secrets.AZURE_CONTAINER_APP_NAME }} -g ${{ secrets.AZURE_RESOURCE_GROUP_NAME }} --image ghcr.io/${{ github.repository }}:${{ steps.semantic.outputs.new_release_version }}
+            az containerapp update -n ${{ secrets.AZURE_CONTAINER_APP_NAME }} -g ${{ secrets.AZURE_RESOURCE_GROUP_NAME }} --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }} -i ghcr.io/${{ github.repository }}:${{ steps.semantic.outputs.new_release_version }}
diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
@@ -44,40 +44,40 @@ jobs:
         uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
         id: cache-jdk
         with:
-          key: OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz
+          key: OpenJDK21U-jdk_x64_linux_hotspot_21.0.2_13.tar.gz
           path: |
             ${{ runner.temp }}/jdk_setup.tar.gz
             ${{ runner.temp }}/jdk_setup.sha256
       
       - name: Download JDK and verify its hash
         if: steps.cache-jdk.outputs.cache-hit != 'true'
         run: |
-          echo "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b  ${{ runner.temp }}/jdk_setup.tar.gz" >> ${{ runner.temp }}/jdk_setup.sha256
-          curl -L "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz" -o "${{ runner.temp }}/jdk_setup.tar.gz"
+          echo "454bebb2c9fe48d981341461ffb6bf1017c7b7c6e15c6b0c29b959194ba3aaa5  ${{ runner.temp }}/jdk_setup.tar.gz" >> ${{ runner.temp }}/jdk_setup.sha256
+          curl -L "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_x64_linux_hotspot_21.0.2_13.tar.gz" -o "${{ runner.temp }}/jdk_setup.tar.gz"
           sha256sum --check --status "${{ runner.temp }}/jdk_setup.sha256"
 
       - name: Setup JDK 
         uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
         with:
           distribution: "jdkfile"
           jdkFile: "${{ runner.temp }}/jdk_setup.tar.gz"
-          java-version: "17"
+          java-version: "21"
           cache: maven
 
       - name: Cache Maven
         uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
         id: cache-maven
         with:
-          key: apache-maven-3.9.2-bin.tar.gz
+          key: apache-maven-3.9.6-bin.tar.gz
           path: |
             ${{ runner.temp }}/maven_setup.tar.gz
             ${{ runner.temp }}/maven_setup.sha256
 
       - name: Download Maven and verify its hash
         if: steps.cache-maven.outputs.cache-hit != 'true'
         run: |
-          echo "809ef3220c6d179195c06c324cb9a6d34d8ecba566c5cfd8eb83167bc034117d  ${{ runner.temp }}/maven_setup.tar.gz" >> ${{ runner.temp }}/maven_setup.sha256
-          curl -L "https://archive.apache.org/dist/maven/maven-3/3.9.2/binaries/apache-maven-3.9.2-bin.tar.gz" -o "${{ runner.temp }}/maven_setup.tar.gz"
+          echo "6eedd2cae3626d6ad3a5c9ee324bd265853d64297f07f033430755bd0e0c3a4b  ${{ runner.temp }}/maven_setup.tar.gz" >> ${{ runner.temp }}/maven_setup.sha256
+          curl -L "https://archive.apache.org/dist/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz" -o "${{ runner.temp }}/maven_setup.tar.gz"
           sha256sum --check --status "${{ runner.temp }}/maven_setup.sha256"
 
       - name: Setup Maven

diff --git a/.github/workflows/validate-manually.yml b/.github/workflows/validate-manually.yml
diff --git a/dep-sha256-man.json b/dep-sha256-man.json
@@ -0,0 +1,25 @@
+{
+	"dependencies": [
+		{
+			"id": "com.aayushatharva.brotli4j:native-osx-aarch64:jar:1.16.0",
+			"artifactId": "native-osx-aarch64",
+			"groupId": "com.aayushatharva.brotli4j",
+			"version": "1.16.0",
+			"sha256": "ZwSoHwKsqDvf9N6IJPNp9kvWMSs8efr3KdFN8F4LJR4="
+		},
+		{
+			"id": "com.aayushatharva.brotli4j:native-windows-x86_64:jar:1.16.0",
+			"artifactId": "native-windows-x86_64",
+			"groupId": "com.aayushatharva.brotli4j",
+			"version": "1.16.0",
+			"sha256": "MwHGGIY_iznHx7M6E9R1aKS2UYMvNmFYm8RQ5qr_DxU="
+		},
+		{
+			"id": "com.aayushatharva.brotli4j:native-linux-x86_64:jar:1.16.0",
+			"artifactId": "native-linux-x86_64",
+			"groupId": "com.aayushatharva.brotli4j",
+			"version": "1.16.0",
+			"sha256": "tpM8OJhX4af0AEVQls7AHudr5z1RqfsRZNJwDT0xBU0="
+		}
+	]
+}