From 38bd4879f33a33b81fa9bfca06dbae8aa34a03db Mon Sep 17 00:00:00 2001
From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com>
Date: Thu, 9 Oct 2025 20:36:11 +0200
Subject: [PATCH] [workflow] Update SBOM report workflow to use agentSpec +
 imageVersion (#13151)

---
 .github/workflows/create_sbom_report.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml
index 8d9d76366..c297e207a 100644
--- a/.github/workflows/create_sbom_report.yml
+++ b/.github/workflows/create_sbom_report.yml
@@ -3,11 +3,10 @@ name: Create SBOM for the release
 # github.event.client_payload.agentSpec - Current YAML Label
 # github.event.client_payload.ReleaseID - Current release ID
 # github.event.client_payload.imageVersion - AzDO image version "major.minor"
-# github.event.client_payload.ReleaseBranchName - Necessary to identify workflow run
 #
 # Current SYFT tool issues:
-# macOS (major): prompt privilegies that blocking process indefinetely (https://github.com/anchore/syft/issues/1367)
-run-name: Collecting SBOM for ${{ github.event.client_payload.ReleaseBranchName || 'unknown release' }}
+# macOS (major): prompt privileges that blocking process indefinitely (https://github.com/anchore/syft/issues/1367)
+run-name: Collecting SBOM for ${{ github.event.client_payload.agentSpec || 'unknown image' }} - ${{ github.event.client_payload.imageVersion || 'unknown version' }}
 on:
   repository_dispatch:
     types: [generate-sbom]
@@ -21,7 +20,7 @@ jobs:
       check_status: ${{ steps.check.outputs.status }}
     runs-on: ubuntu-latest
     steps:
-    - name: Check release for ${{ github.event.client_payload.ReleaseBranchName }}
+    - name: Check release for ${{ github.event.client_payload.agentSpec }}
       id: check
       shell: pwsh
       run: |
@@ -46,7 +45,7 @@ jobs:
     if: ${{ needs.sbom-check.outputs.check_status == 'okay' }}
     runs-on: ${{ github.event.client_payload.agentSpec }}
     steps:
-      - name: Available image version check for ${{ github.event.client_payload.ReleaseBranchName }}
+      - name: Available image version check for ${{ github.event.client_payload.agentSpec }} - ${{ github.event.client_payload.imageVersion }}
         run: |
           $imageVersionComponents = $env:ImageVersion.Split('.')
           $imageMajorVersion = $imageVersionComponents[0]