Incorporate feedback from an internal team

stefaniuk · stefaniuk · commit 9b4513551b1a · 2023-08-09T09:15:29.000+01:00
diff --git a/.github/actions/perform-static-analysis/action.yaml b/.github/actions/perform-static-analysis/action.yaml
@@ -15,5 +15,6 @@ runs:
       shell: bash
       if: steps.check.outputs.secret_exist == 'true'
       run: |
+        export BRANCH_NAME=${GITHUB_HEAD_REF:-$(echo $GITHUB_REF | sed 's#refs/heads/##')}
         export SONAR_TOKEN=${{ inputs.sonar_token }}
         ./scripts/reports/perform-static-analysis.sh
diff --git a/.github/actions/scan-dependencies/action.yaml b/.github/actions/scan-dependencies/action.yaml
@@ -24,7 +24,9 @@ runs:
   steps:
     - name: "Generate SBOM"
       shell: bash
-      run: BUILD_DATETIME=${{ inputs.build_datetime }} ./scripts/reports/generate-sbom.sh
+      run: |
+        export BUILD_DATETIME=${{ inputs.build_datetime }}
+        ./scripts/reports/generate-sbom.sh
     - name: "Compress SBOM report"
       shell: bash
       run: zip sbom-report.json.zip sbom-report.json
@@ -35,7 +37,9 @@ runs:
         path: ./sbom-report.json.zip
     - name: "Scan vulnerabilities"
       shell: bash
-      run: BUILD_DATETIME=${{ inputs.build_datetime }} ./scripts/reports/scan-vulnerabilities.sh
+      run: |
+        export BUILD_DATETIME=${{ inputs.build_datetime }}
+        ./scripts/reports/scan-vulnerabilities.sh
     - name: "Compress vulnerabilities report"
       shell: bash
       run: zip vulnerabilities-report.json.zip vulnerabilities-report.json
diff --git a/scripts/reports/perform-static-analysis.sh b/scripts/reports/perform-static-analysis.sh
@@ -9,7 +9,8 @@ set -e
 #   $ ./perform-static-analysis.sh
 #
 # Expects:
-#  SONAR_TOKEN=token  # SonarCloud token
+#   BRANCH_NAME=branch-name # Branch to report on
+#   SONAR_TOKEN=token       # SonarCloud token
 #
 # Options:
 #   VERBOSE=true  # Show all the executed commands, default is `false`
@@ -33,7 +34,7 @@ function create-report() {
     --volume $PWD:/usr/src \
     sonarsource/sonar-scanner-cli:$image_version \
       -Dproject.settings=/usr/src/scripts/config/sonar-scanner.properties \
-      -Dsonar.branch.name="$(git rev-parse --abbrev-ref HEAD)" \
+      -Dsonar.branch.name="${BRANCH_NAME:-$(git rev-parse --abbrev-ref HEAD)}" \
       -Dsonar.token="$(echo $SONAR_TOKEN)"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ set -e`
`9`	`9`	`# $ ./perform-static-analysis.sh`
`10`	`10`	`#`
`11`	`11`	`# Expects:`
`12`		`-# SONAR_TOKEN=token # SonarCloud token`
	`12`	`+# BRANCH_NAME=branch-name # Branch to report on`
	`13`	`+# SONAR_TOKEN=token # SonarCloud token`
`13`	`14`	`#`
`14`	`15`	`# Options:`
`15`	`16`	# VERBOSE=true # Show all the executed commands, default is `false`
`@@ -33,7 +34,7 @@ function create-report() {`
`33`	`34`	`--volume $PWD:/usr/src \`
`34`	`35`	`sonarsource/sonar-scanner-cli:$image_version \`
`35`	`36`	`-Dproject.settings=/usr/src/scripts/config/sonar-scanner.properties \`
`36`		`- -Dsonar.branch.name="$(git rev-parse --abbrev-ref HEAD)" \`
	`37`	`+ -Dsonar.branch.name="${BRANCH_NAME:-$(git rev-parse --abbrev-ref HEAD)}" \`
`37`	`38`	`-Dsonar.token="$(echo $SONAR_TOKEN)"`
`38`	`39`	`}`
`39`	`40`