From 8e151ea83e80b54240e6f379223cdcda6408836e Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:53:46 +0100 Subject: [PATCH] build-locally script detect secrets should have no timestamp left in file on linux Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- build-locally.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/build-locally.sh b/build-locally.sh index fdedd60..226dd8c 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -73,7 +73,7 @@ function check_exit_code () { function check_secrets { h2 "updating secrets baseline" cd ${BASEDIR} - detect-secrets scan --update .secrets.baseline + detect-secrets scan --update .secrets.baseline rc=$? check_exit_code $rc "Failed to run detect-secrets. Please check it is installed properly" success "updated secrets file" @@ -90,9 +90,21 @@ function check_secrets { error "Not all secrets found have been audited" exit 1 fi - sed -i '' '/[ ]*"generated_at": ".*",/d' .secrets.baseline success "secrets audit complete" + + h2 "Removing the timestamp from the secrets baseline file so it doesn't always cause a git change." + mkdir -p temp + rc=$? + check_exit_code $rc "Failed to create a temporary folder" + cat .secrets.baseline | grep -v "generated_at" > temp/.secrets.baseline.temp + rc=$? + check_exit_code $rc "Failed to create a temporary file with no timestamp inside" + mv temp/.secrets.baseline.temp .secrets.baseline + rc=$? + check_exit_code $rc "Failed to overwrite the secrets baseline with one containing no timestamp inside." + success "secrets baseline timestamp content has been removed ok" } + #----------------------------------------------------------------------------------------- # Main logic. #-----------------------------------------------------------------------------------------