From cabbcee89b97cbb4768c87128536fd52c34e8f77 Mon Sep 17 00:00:00 2001 From: "sharon.emmett" Date: Wed, 30 Jul 2025 16:57:25 +0100 Subject: [PATCH 01/11] PRODSEC-1585 testing wiz dir scan --- .github/workflows/maven-master-pulls.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index bc9b9a79ea5..b4af168c917 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -42,18 +42,9 @@ jobs: WIZ_CLIENT_SECRET: ${{ secrets.WIZ_CLIENT_SECRET }} - name: Scan Maven build directory with Wiz - run: | - ./wizcli dir scan \ - --path . \ - --policy "$POLICY" \ - --tag repo="${{ github.repository }}" \ - --tag commit="${{ github.sha }}" \ - --tag java="${{ matrix.java }}" > /dev/null 2>&1 - env: - POLICY: "SmartBear default vulnerabilities policy" + run: ./wizcli dir scan --path target/*.jar build-java8: - runs-on: ubuntu-latest strategy: matrix: From 18b3a3deedad5b4db905971cb0a2bdbbb2661baa Mon Sep 17 00:00:00 2001 From: "sharon.emmett" Date: Thu, 31 Jul 2025 09:41:44 +0100 Subject: [PATCH 02/11] PRODSEC-1585 current directory testing --- .github/workflows/maven-master-pulls.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index b4af168c917..6fc8a9eb612 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -32,6 +32,17 @@ jobs: - name: Build with Maven run: mvn -B -U verify --file pom.xml + - name: Check local context + run: | + if find . -type d -name "target" | grep -q .; then + echo "Target directory exists." + echo "$PWD" + else + echo "Target directory does not exist." + echo "$PWD" + exit 1 + fi + - name: Download Wiz CLI run: curl -o wizcli https://downloads.wiz.io/wizcli/latest/wizcli-linux-amd64 && chmod +x wizcli From 08cdd43ae08fbf047824185d2be697a11b51ea28 Mon Sep 17 00:00:00 2001 From: "sharon.emmett" Date: Thu, 31 Jul 2025 09:45:54 +0100 Subject: [PATCH 03/11] PRODSEC-1585 update to output directory location --- .github/workflows/maven-master-pulls.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index 6fc8a9eb612..ac5855573cd 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -35,8 +35,9 @@ jobs: - name: Check local context run: | if find . -type d -name "target" | grep -q .; then - echo "Target directory exists." - echo "$PWD" + if [ -n "$matches" ]; then + echo "Target directory found at:" + echo "$matches" else echo "Target directory does not exist." echo "$PWD" From 7ab0f5bf587f40a6cdf09f829e6c7f7c392d2067 Mon Sep 17 00:00:00 2001 From: "sharon.emmett" Date: Thu, 31 Jul 2025 09:52:08 +0100 Subject: [PATCH 04/11] PRODSEC-1585 correct script error --- .github/workflows/maven-master-pulls.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index ac5855573cd..0c37bd49255 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -34,10 +34,10 @@ jobs: - name: Check local context run: | - if find . -type d -name "target" | grep -q .; then - if [ -n "$matches" ]; then - echo "Target directory found at:" - echo "$matches" + matches=$(find . -type d -name "target") + if [ -n "$matches" ]; then + echo "Target directory found at:" + echo "$matches" else echo "Target directory does not exist." echo "$PWD" From 0c59c06df5470c9b0336118f8b657f1bca9c6ed9 Mon Sep 17 00:00:00 2001 From: "sharon.emmett" Date: Thu, 31 Jul 2025 10:17:24 +0100 Subject: [PATCH 05/11] PRODSEC-1585 update path variable remove wildcard --- .github/workflows/maven-master-pulls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index 0c37bd49255..1601af54922 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -54,7 +54,7 @@ jobs: WIZ_CLIENT_SECRET: ${{ secrets.WIZ_CLIENT_SECRET }} - name: Scan Maven build directory with Wiz - run: ./wizcli dir scan --path target/*.jar + run: ./wizcli dir scan --path ./target build-java8: runs-on: ubuntu-latest From 10d600e4fc182f3f2b3127b80933ec4787fc00da Mon Sep 17 00:00:00 2001 From: "sharon.emmett" Date: Thu, 31 Jul 2025 10:21:54 +0100 Subject: [PATCH 06/11] PRODSEC-1585 path update --- .github/workflows/maven-master-pulls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index 1601af54922..e0e1c78b9c1 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -54,7 +54,7 @@ jobs: WIZ_CLIENT_SECRET: ${{ secrets.WIZ_CLIENT_SECRET }} - name: Scan Maven build directory with Wiz - run: ./wizcli dir scan --path ./target + run: ./wizcli dir scan --path ./modules build-java8: runs-on: ubuntu-latest From 2dea28c1c26bd91a5dd6c2a7708b15a49b66138f Mon Sep 17 00:00:00 2001 From: "sharon.emmett" Date: Thu, 31 Jul 2025 11:19:51 +0100 Subject: [PATCH 07/11] PRODSEC-1585 check path diff --- .github/workflows/maven-master-pulls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index e0e1c78b9c1..89fae5b3b40 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -54,7 +54,7 @@ jobs: WIZ_CLIENT_SECRET: ${{ secrets.WIZ_CLIENT_SECRET }} - name: Scan Maven build directory with Wiz - run: ./wizcli dir scan --path ./modules + run: ./wizcli dir scan --path ./ build-java8: runs-on: ubuntu-latest From 3c5a0ce92a8be553137a11bf342840db1aa1b200 Mon Sep 17 00:00:00 2001 From: "sharon.emmett" Date: Thu, 31 Jul 2025 16:19:32 +0100 Subject: [PATCH 08/11] PRODSEC-1585 retesting tag settings --- .github/workflows/maven-master-pulls.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index 89fae5b3b40..94ed34cbcf9 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -54,7 +54,9 @@ jobs: WIZ_CLIENT_SECRET: ${{ secrets.WIZ_CLIENT_SECRET }} - name: Scan Maven build directory with Wiz - run: ./wizcli dir scan --path ./ + run: ./wizcli dir scan --path ./ --tag repo="${{ github.repository }}" \ + --tag commit="${{ github.sha }}" \ + --tag java="${{ matrix.java }}" > /dev/null 2>&1 build-java8: runs-on: ubuntu-latest From 11af5064cc945446e24ab4e609886085802917e0 Mon Sep 17 00:00:00 2001 From: "sharon.emmett" Date: Thu, 31 Jul 2025 17:02:28 +0100 Subject: [PATCH 09/11] PRODSEC-1585 correct cli cmd --- .github/workflows/maven-master-pulls.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index 94ed34cbcf9..b1d157f474f 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -54,10 +54,8 @@ jobs: WIZ_CLIENT_SECRET: ${{ secrets.WIZ_CLIENT_SECRET }} - name: Scan Maven build directory with Wiz - run: ./wizcli dir scan --path ./ --tag repo="${{ github.repository }}" \ - --tag commit="${{ github.sha }}" \ - --tag java="${{ matrix.java }}" > /dev/null 2>&1 - + run: ./wizcli dir scan --path ./ --tag java="${{ matrix.java }}" + build-java8: runs-on: ubuntu-latest strategy: From 35fe1cb823cced8f246672b8beadb868b361697d Mon Sep 17 00:00:00 2001 From: "sharon.emmett" Date: Thu, 31 Jul 2025 17:46:36 +0100 Subject: [PATCH 10/11] PRODSEC-1585 add second tag --- .github/workflows/maven-master-pulls.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index b1d157f474f..59b9d5f6007 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -54,8 +54,8 @@ jobs: WIZ_CLIENT_SECRET: ${{ secrets.WIZ_CLIENT_SECRET }} - name: Scan Maven build directory with Wiz - run: ./wizcli dir scan --path ./ --tag java="${{ matrix.java }}" - + run: ./wizcli dir scan --path ./ --tag java="${{ matrix.java }}" --tag commit="${{ github.sha }}" + build-java8: runs-on: ubuntu-latest strategy: From f8f4e5dbf6956424011dd66944317d60f4563183 Mon Sep 17 00:00:00 2001 From: "sharon.emmett" Date: Thu, 31 Jul 2025 17:53:14 +0100 Subject: [PATCH 11/11] PRODSEC-1585 remove duplicate info --- .github/workflows/maven-master-pulls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml index 59b9d5f6007..d3ad606ea4b 100644 --- a/.github/workflows/maven-master-pulls.yml +++ b/.github/workflows/maven-master-pulls.yml @@ -54,7 +54,7 @@ jobs: WIZ_CLIENT_SECRET: ${{ secrets.WIZ_CLIENT_SECRET }} - name: Scan Maven build directory with Wiz - run: ./wizcli dir scan --path ./ --tag java="${{ matrix.java }}" --tag commit="${{ github.sha }}" + run: ./wizcli dir scan --path ./ --tag java="${{ matrix.java }}" build-java8: runs-on: ubuntu-latest