From af7340992364dee595f5797d6094c0534f22d877 Mon Sep 17 00:00:00 2001 From: Scott McDonald Date: Fri, 28 Aug 2026 17:47:40 +0000 Subject: [PATCH] fix(scripts): follow the 2-networking-a-fedramp directory rename Commit 7033b8c (#162) renamed fast/stages-aw/2-networking-a-fedramp-high to 2-networking-a-fedramp, but deploy.sh, destroy.sh, restore.sh and clean.sh still cd into the old path. In deploy.sh the FedRAMP High/Moderate option of stage 2 therefore fails at 'cd ... || exit' before deploy_networking runs, and the other three scripts skip the stage the same way. Signed-off-by: Scott McDonald --- scripts/clean.sh | 2 +- scripts/deploy.sh | 2 +- scripts/destroy.sh | 4 ++-- scripts/restore.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/clean.sh b/scripts/clean.sh index 099c0316f..e113cf27e 100755 --- a/scripts/clean.sh +++ b/scripts/clean.sh @@ -146,7 +146,7 @@ if promptUser "Would you like to also clean up all local Terraform state and con STAGES=( "${SCRIPT_DIR}/../fast/stages-aw/0-bootstrap" "${SCRIPT_DIR}/../fast/stages-aw/1-resman" - "${SCRIPT_DIR}/../fast/stages-aw/2-networking-a-fedramp-high" + "${SCRIPT_DIR}/../fast/stages-aw/2-networking-a-fedramp" "${SCRIPT_DIR}/../fast/stages-aw/2-networking-b-il5-ngfw" "${SCRIPT_DIR}/../fast/stages-aw/3-security" ) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 8ee8149fa..5d0c569d7 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -1063,7 +1063,7 @@ if promptUser "Stage 2 - Networking -"; then ########### FedRAMP High/Moderate ########### elif [ "$choice" == 2 ]; then echo "You have selected FedRAMP High/Moderate" - cd "${SCRIPT_DIR}"/../fast/stages-aw/2-networking-a-fedramp-high || exit + cd "${SCRIPT_DIR}"/../fast/stages-aw/2-networking-a-fedramp || exit deploy_networking ########### IL4/IL5 ########### diff --git a/scripts/destroy.sh b/scripts/destroy.sh index 3a1bc5c38..6a07a16da 100755 --- a/scripts/destroy.sh +++ b/scripts/destroy.sh @@ -662,7 +662,7 @@ if [[ "${skip_stage_2:-}" != "true" ]] && promptUser "Stage 2 - Networking"; the ########### FedRAMP High/Moderate ########### elif [ "$choice" == 2 ]; then - cd "${SCRIPT_DIR}"/../fast/stages-aw/2-networking-a-fedramp-high || exit + cd "${SCRIPT_DIR}"/../fast/stages-aw/2-networking-a-fedramp || exit destroy_networking ########### IL4/IL5 ########### @@ -1920,7 +1920,7 @@ if promptUser "Would you like to perform a final deep clean of all local Terrafo STAGES=( "${SCRIPT_DIR}/../fast/stages-aw/0-bootstrap" "${SCRIPT_DIR}/../fast/stages-aw/1-resman" - "${SCRIPT_DIR}/../fast/stages-aw/2-networking-a-fedramp-high" + "${SCRIPT_DIR}/../fast/stages-aw/2-networking-a-fedramp" "${SCRIPT_DIR}/../fast/stages-aw/2-networking-b-il5-ngfw" "${SCRIPT_DIR}/../fast/stages-aw/3-security" ) diff --git a/scripts/restore.sh b/scripts/restore.sh index 8ad2935b6..83d263875 100644 --- a/scripts/restore.sh +++ b/scripts/restore.sh @@ -47,7 +47,7 @@ if promptUser "Stage 2 - Networking"; then ########### FedRAMP High/Moderate ########### elif [ "$choice" == 2 ]; then - cd "${SCRIPT_DIR}"/../fast/stages-aw/2-networking-a-fedramp-high || exit + cd "${SCRIPT_DIR}"/../fast/stages-aw/2-networking-a-fedramp || exit ########### IL4/IL5 ########### elif [ "$choice" == 3 ]; then