Merge branch 'atm/test-code-cov' into atm/debug-code-cov

Signed-off-by: Alex Meijer <ameijer@kubecost.com>

# Conflicts:
#	.github/workflows/build-test.yaml

.github/workflows/build-test.yaml

@@ -53,6 +53,8 @@ jobs:
           PR_NUM: ${{ github.event.number }}
         run: |
           echo $PR_NUM > pr_num.txt
+          echo $GITHUB_BASE_REF > base.txt
+          echo $GITHUB_HEAD_REF > head.txt
       - name: Upload code coverage
         uses: actions/upload-artifact@v3
         with:
@@ -60,8 +62,9 @@ jobs:
           path: |
            coverage.out
            pr_num.txt
+           base.txt
+           head.txt
       
-
   frontend:
     runs-on: ubuntu-latest
     steps:

.github/workflows/sonar.yaml

@@ -36,6 +36,11 @@ jobs:
             fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/oc-code-coverage.zip`, Buffer.from(download.data));
       - name: 'Unzip code coverage'
         run: unzip oc-code-coverage.zip -d coverage
+      - name: set env vars 
+        run: | 
+          echo "SONAR_PR_NUM=$(cat coverage/pr_num.txt)" >> $GITHUB_ENV
+          echo "SONAR_BASE=$(cat coverage/base.txt)" >> $GITHUB_ENV
+          echo "SONAR_HEAD=$(cat coverage/head.txt)" >> $GITHUB_ENV
       - name: SonarCloud Scan
         uses: sonarsource/sonarcloud-github-action@master
         env:
@@ -44,8 +49,8 @@ jobs:
         with:
           args: >
             -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }}
-            -Dsonar.pullrequest.key=${{ github.event.workflow_run.pull_requests[0].number }}
-            -Dsonar.pullrequest.branch=${{ github.event.workflow_run.pull_requests[0].head.ref }}
-            -Dsonar.pullrequest.base=${{ github.event.workflow_run.pull_requests[0].base.ref }}
+            -Dsonar.pullrequest.key=${{ env.SONAR_PR_NUM }}
+            -Dsonar.pullrequest.branch=${{ env.SONAR_HEAD }}
+            -Dsonar.pullrequest.base=${{ env.SONAR_BASE }}
             -Dsonar.projectKey=opencost_opencost
             -Dsonar.organization=opencost