From e7a69e39cdbdc208a6efd6d38960116ef40fb06f Mon Sep 17 00:00:00 2001
From: Shlomo Zalman Heigh <shlomo.heigh@cyberark.com>
Date: Wed, 18 Dec 2024 11:18:55 -0500
Subject: [PATCH 1/2] CNJR-5882: Fix goreleaser deprecated flag

---
 bin/build_release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/build_release b/bin/build_release
index 396e0e0b8..e210ca578 100755
--- a/bin/build_release
+++ b/bin/build_release
@@ -48,6 +48,6 @@ docker run --rm -t \
   --env VERSION="${VERSION}" \
   --volume "${REPO_ROOT}:/secretless-broker" \
   --workdir /secretless-broker \
-  "${GORELEASER_IMAGE}:${GORELEASER_LATEST_TAG}" --rm-dist "$@"
+  "${GORELEASER_IMAGE}:${GORELEASER_LATEST_TAG}" --clean "$@"
 
 echo "Releases built. Archives can be found in dist/goreleaser"

From c5d6ca3bd580b63423b74d673b12fec18fc4317b Mon Sep 17 00:00:00 2001
From: Shlomo Zalman Heigh <shlomo.heigh@cyberark.com>
Date: Wed, 18 Dec 2024 11:22:07 -0500
Subject: [PATCH 2/2] CNJR-5878: Fix gosec excluded dirs in Jenkins

---
 bin/check_golang_security | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/check_golang_security b/bin/check_golang_security
index 46e2949a8..4f5df0776 100755
--- a/bin/check_golang_security
+++ b/bin/check_golang_security
@@ -7,7 +7,7 @@
 set -eo pipefail
 
 current_dir=$("$(dirname "$0")/abspath")
-toplevel_dir="$current_dir/.."
+toplevel_dir="$(cd "$current_dir/.." && pwd)"
 
 # Default values to pass to security_scan
 confidence='medium'
@@ -39,6 +39,7 @@ if [[ ! -v BRANCH_NAME ]]; then
 else
   # Running in Jenkins
   excluded_directories="${toplevel_dir}/test,${toplevel_dir}/third_party/go-mssqldb"
+  echo "Excluding directories: ${excluded_directories}"
   go install github.com/securego/gosec/v2/cmd/gosec@latest
   git config --global --add safe.directory "${WORKSPACE}"
   ./bin/run_gosec -c "${confidence}" -s "${severity}" -b "${current_branch}" -e "${excluded_directories}"