Forward Sonar params as secrets

Author: ascheman

.github/workflows/build-artifacts.yml

@@ -22,6 +22,13 @@ on:
         required: false
         type: string
         default: ''
+    secrets:
+      SONAR_ORGANIZATION:
+        required: false
+      SONAR_PROJECT_KEY:
+        required: false
+      SONAR_TOKEN:
+        required: false
 
 jobs:
   build:
@@ -73,9 +80,9 @@ jobs:
         if: ${{ inputs.run-sonar }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_ORGANIZATION: ${{ inputs.sonar-organization }}
-          SONAR_PROJECT_KEY: ${{ inputs.sonar-project-key }}
-          SONAR_TOKEN: ${{ inputs.sonar-token }}
+          SONAR_ORGANIZATION: ${{ secrets.SONAR_ORGANIZATION || inputs.sonar-organization }}
+          SONAR_PROJECT_KEY: ${{ secrets.SONAR_PROJECT_KEY || inputs.sonar-project-key }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN || inputs.sonar-token }}
         run: |
           ./gradlew sonar -Psonar.branch.name=${GITHUB_REF#refs/heads/} --info --scan
 

.github/workflows/gradle-build.yml

@@ -15,9 +15,10 @@ jobs:
       # SonarQube requires JDK 17 or higher
       java-version: '17'
       run-sonar: true
-      sonar-organization: ${{ secrets.SONAR_ORGANIZATION }}
-      sonar-project-key: ${{ secrets.SONAR_PROJECT_KEY }}
-      sonar-token: ${{ secrets.SONAR_TOKEN }}
+    secrets:
+      SONAR_ORGANIZATION: ${{ secrets.SONAR_ORGANIZATION }}
+      SONAR_PROJECT_KEY: ${{ secrets.SONAR_PROJECT_KEY }}
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
   post-build:
     needs: build-artifacts