OPS 52 fix reporting (#146)

* Fixed monthly reporting

* Fixed wrong secret

* Handle missing approver

Author: ToreMerkely

.github/actions/generate-jira-pr-report/scripts/generate-jira-pr-report.bash

@@ -79,11 +79,10 @@ main()
         echo ${sha} | tr '\n' ',' >> ${SOURCE_REPORT_FILE}
         echo ${date} | tr '\n' ',' >> ${SOURCE_REPORT_FILE}
 
-        jq -r '.[].git_commit_info.author' ${SOURCE_REPORT_DIR}/${sha}/pull-request.json | tr '\n' ',' >> ${SOURCE_REPORT_FILE} 
-        jq -r '.[].pull_requests[].approvers[]' ${SOURCE_REPORT_DIR}/${sha}/pull-request.json | uniq | tr '\n' ',' >> ${SOURCE_REPORT_FILE}
-        
-        jq -r '.[] | .jira_results[] | select(.issue_exists == true) | .issue_id' ${SOURCE_REPORT_DIR}/${sha}/work-reference.json | tr '\n' ',' >> ${SOURCE_REPORT_FILE}
-        
+        jq -r '[.[].git_commit_info.author] | join(",") + ","' ${SOURCE_REPORT_DIR}/${sha}/pull-request.json | tr -d '\n' >> ${SOURCE_REPORT_FILE}
+        jq -r '[.[].pull_requests[].approvers[]] | unique | join(",") + ","' ${SOURCE_REPORT_DIR}/${sha}/pull-request.json | tr -d '\n' >> ${SOURCE_REPORT_FILE}
+        jq -r '[.[] | .jira_results[] | select(.issue_exists == true) | .issue_id] | join(",") + ","' ${SOURCE_REPORT_DIR}/${sha}/work-reference.json | tr -d '\n' >> ${SOURCE_REPORT_FILE}
+
         echo >> ${SOURCE_REPORT_FILE}
     done <<< "$commits"
 }

.github/actions/generate-periodic-reports/action.yml

@@ -48,7 +48,7 @@ runs:
 
     - name: Generate Jira PR report
       id: jira-pr-report
-      uses: ./.github/actions/generate-jira-pr-report@main
+      uses: ./.github/actions/generate-jira-pr-report
       with:
         result-dir: /tmp/audit-reports
         kosli-source-flow: ${{ inputs.kosli-source-flow }}

.github/workflows/generate-monthly-reports.yml

@@ -14,7 +14,7 @@ on:
 
 env:
   KOSLI_ORG: "${{ vars.KOSLI_ORG }}"
-  KOSLI_API_TOKEN: "${{ secrets.KOSLI_API_TOKEN }}"
+  KOSLI_API_TOKEN: "${{ secrets.KOSLI_PUBLIC_API_TOKEN }}"
   KOSLI_CLI_VERSION: "${{ vars.KOSLI_CLI_VERSION }}"
 
 
@@ -32,7 +32,7 @@ jobs:
 
       - name: Generate reports
         id: generate-periodic-reports
-        uses: ./.github/actions/generate-periodic-reports@main
+        uses: ./.github/actions/generate-periodic-reports
         with:
           start-date: ${{ github.event.inputs.start-date }}
           end-date: ${{ github.event.inputs.end-date }}