From ffd4dd6d6fe548009e49111eeb99151cc0e5205b Mon Sep 17 00:00:00 2001
From: sandhi <sagarwal@progress.com>
Date: Fri, 20 Mar 2026 12:59:42 +0530
Subject: [PATCH] Add hab path

Signed-off-by: sandhi <sagarwal@progress.com>
---
 .github/workflows/ci-main-pull-request.yml   | 37 ++++++++++++++------
 .github/workflows/grype-hab-package-scan.yml | 25 +++++++++++--
 2 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci-main-pull-request.yml b/.github/workflows/ci-main-pull-request.yml
index 3595157..d677565 100644
--- a/.github/workflows/ci-main-pull-request.yml
+++ b/.github/workflows/ci-main-pull-request.yml
@@ -196,6 +196,10 @@ on:
         required: false
         type: string
         default: 'stable'
+      grype-hab-path:
+        description: "Path to built Habitat package (used if build_package is true, overrides hab_origin/hab_package inputs)"
+        required: false
+        type: string
       grype-hab-scan-linux:
         description: 'Scan Linux (x86_64-linux) Habitat package'
         required: false
@@ -895,20 +899,31 @@ jobs:
             echo "level=none" >> $GITHUB_OUTPUT
           fi
 
+      - name: Install Grype and update database
+        run: |
+          curl -sSfL https://get.anchore.io/grype | sh -s -- -b /usr/local/bin
+          grype db update
+          grype version
+      
+      - name: Generate Artifact Name
+        run: |
+            TIMESTAMP=$(date +%Y%m%d-%H%M%S)
+            ARTIFACT_NAME=$(echo "grype-scan-${{ github.event.repository.name }}-${TIMESTAMP}" | sed 's|/|-|g')
+            echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV
+
       - name: Run Grype scan on repo
         id: scan
-        uses: anchore/scan-action@v3
-        with:
-          path: .
-          fail-build: true
-          severity-cutoff: ${{ steps.severity.outputs.level }}
-          output-format: json
+        run: |
+          # Run grype with only-fixed flag and output to JSON for analysis
+          grype dir:. --only-fixed -o json > grype-scan.json
+          grype dir:. --only-fixed --only-fixed --output table >> grype-scan.log || true
+          echo "✅ Grype scan completed successfully"
   
 
       - name: Check Grype results and fail if vulnerabilities found
         if: always()
         run: |
-          JSON_FILE="./results.json"
+          JSON_FILE="./grype-scan.json"
           
           if [ ! -f "$JSON_FILE" ] || [ -z "$JSON_FILE" ]; then
             echo "⚠️  Grype JSON output not found"
@@ -949,9 +964,10 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: grype-results
-          path: ./results.json
-          retention-days: 30
+          name: ${{ env.ARTIFACT_NAME }}
+          path: |
+            grype-scan.json
+            grype-scan.log
 
       # - name: Run Grype scan on repo
       #   uses: anchore/scan-action@v3
@@ -984,6 +1000,7 @@ jobs:
       hab_version: ${{ inputs.grype-hab-version }}
       hab_release: ${{ inputs.grype-hab-release }}
       hab_channel: ${{ inputs.grype-hab-channel }}
+      hab_path: ${{ inputs.grype-hab-path }}
       scan-linux: ${{ inputs.grype-hab-scan-linux }}
       scan-windows: ${{ inputs.grype-hab-scan-windows }}
       scan-macos: ${{ inputs.grype-hab-scan-macos }}
diff --git a/.github/workflows/grype-hab-package-scan.yml b/.github/workflows/grype-hab-package-scan.yml
index a4355cb..0b76f5a 100644
--- a/.github/workflows/grype-hab-package-scan.yml
+++ b/.github/workflows/grype-hab-package-scan.yml
@@ -88,6 +88,10 @@ on:
         required: false
         type: boolean
         default: false
+      hab_path:
+        description: "Path to built Habitat package (used if build_package is true, overrides hab_origin/hab_package inputs)"
+        required: false
+        type: string
     
 jobs:
   habitat-grype-scan-linux:
@@ -139,7 +143,12 @@ jobs:
             hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN
             echo "--- running linux hab build"
             export BUILD_ARGS="-X 'main.version=${{ inputs.hab_version }}' -X 'main.build_date_time=$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-            hab pkg build .
+            if [ -z "${{ inputs.hab_path }}" ]; then
+                hab pkg build .
+            else
+                hab pkg build ${{ inputs.hab_path }}
+            fi
+            
             hartifacts=$(ls results/*.hart)
             if [ -f "$hartifacts" ]; then
                 echo "Built package artifact: $hartifacts"
@@ -322,7 +331,12 @@ jobs:
             hab origin key download $env:HAB_ORIGIN
             hab origin key download --auth $env:HAB_AUTH_TOKEN --secret $env:HAB_ORIGIN
             write-output "--- running windows hab build"
-            hab pkg build .
+            if ([string]::IsNullOrEmpty("${{ inputs.hab_path }}")) {
+                hab pkg build .
+            } else {
+                hab pkg build ${{ inputs.hab_path }}
+            }
+            # hab pkg build .
 
       - name: Extract built package info
         if: ${{ inputs.build_package == true }}
@@ -521,7 +535,12 @@ jobs:
             elif [ -n "${{ secrets.HAB_AUTH_TOKEN }}" ]; then
                 export HAB_AUTH_TOKEN="${{ secrets.HAB_AUTH_TOKEN }}"
             fi
-            hab pkg build .
+            if [ -z "${{ inputs.hab_path }}" ]; then
+                hab pkg build .
+            else
+                hab pkg build ${{ inputs.hab_path }}
+            fi
+            # hab pkg build .
 
       - name: Extract built package info
         if: ${{ inputs.build_package == true }}