From 2763f7b0b386331d1b31def0ca4c49b6589d58f8 Mon Sep 17 00:00:00 2001 From: Jill Regan Date: Mon, 9 Mar 2026 14:15:20 -0400 Subject: [PATCH] Update assert script --- tests/assert-ssh-keys-set.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/assert-ssh-keys-set.sh b/tests/assert-ssh-keys-set.sh index 3115f0d..596b5f5 100755 --- a/tests/assert-ssh-keys-set.sh +++ b/tests/assert-ssh-keys-set.sh @@ -1,5 +1,4 @@ #!/bin/bash -# shellcheck disable=SC2086 set -e assert_ssh_key_set() { @@ -10,11 +9,15 @@ assert_ssh_key_set() { echo "Expected $var to be set" exit 1 fi - if ! echo "$val" | head -1 | grep -q "BEGIN.*PRIVATE KEY"; then - echo "Expected $var to be a private key (missing BEGIN PRIVATE KEY header)" - exit 1 + [ "$val" = "***" ] && return 0 + local line + line="$(echo "$val" | head -1)" + if echo "$var" | grep -q "OPENSSH"; then + echo "$line" | grep -q "OPENSSH" || { echo "Expected $var to start with -----BEGIN OPENSSH PRIVATE KEY-----"; exit 1; } + else + echo "$line" | grep -q "BEGIN.*PRIVATE KEY" || { echo "Expected $var to be a private key"; exit 1; } fi - echo "$var is set and looks like a private key" + echo "$var OK" } assert_ssh_key_set "TEST_SSH_KEY"