Skip to content

[NRL-1700] Fixup error handling in truststore rotate functions #1087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattdean3-nhs merged 1 commit into from
Nov 5, 2025
Merged

[NRL-1700] Fixup error handling in truststore rotate functions #1087

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions scripts/truststore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,15 @@ function _truststore_rotate_ca() {
env="$1"
fqdn="$2"

if [[ ! -f "truststore/ca/$env.crt" ]] ||
[[ ! -f "truststore/ca/$env.key" ]] ||
[[ ! -f "truststore/server/$env.pem" ]]; then
echo "Error: One or more ca cert truststore files not found for environment $env - cannot rotate CA" 1>&2
echo "Try running this first:" 1>&2
echo " $0 pull-all $env && $0 pull-ca-key dev" 1>&2
return 1
fi

# Archive the existing ca certs
archive_date="$(date +%Y-%m-%d)"
if [[ -f "truststore/ca/$env.archived_$archive_date.crt" ]] ||
Expand Down Expand Up @@ -176,6 +185,14 @@ function _truststore_rotate_cert() {
ca_name="$2"
fqdn="$3"

if [[ ! -f "truststore/client/$cert_name.crt" ]] ||
[[ ! -f "truststore/client/$cert_name.key" ]]; then
echo "Error: One or more client cert truststore files not found for $cert_name - cannot rotate client cert" 1>&2
echo "Try running this first:" 1>&2
echo " $0 pull-all $cert_name" 1>&2
return 1
fi

# Archive the existing client certs
archive_date=$(date +%Y-%m-%d)
if [[ -f "truststore/client/$cert_name.archived_$archive_date.crt" ]] ||
Expand Down