[NRL-1922] Fix missing returns for shell functions

mattdean3-nhs · mattdean3-nhs · commit 3ba141f40107 · 2026-03-03T17:45:16.000Z
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -32,13 +32,15 @@ function _check_mgmt() {
     echo "Please log in as the mgmt account" >&2
     return 1
   fi
+  return 0
 }
 
 function _check_non_mgmt() {
   if [[ "$(aws iam list-account-aliases --query 'AccountAliases[0]' --output text)" == 'nhsd-ddc-spine-nrlf-mgmt' ]]; then
     echo "Please log in as a non-mgmt account" >&2
     return 1
   fi
+  return 0
 }
 
 function _bootstrap() {
@@ -129,7 +131,7 @@ function _bootstrap() {
       local workspace
       workspace=$2
       # Fetch the resources using the AWS CLI command
-      aws resourcegroupstaggingapi get-resources --tag-filters Key=workspace,Values="$2" | jq -c '.ResourceTagMappingList[]' |
+      aws resourcegroupstaggingapi get-resources --tag-filters Key=workspace,Values="${workspace}" | jq -c '.ResourceTagMappingList[]' |
       while IFS= read -r item; do
           arn=$(jq -r '.ResourceARN' <<< "$item")
 
@@ -206,6 +208,8 @@ function _bootstrap() {
     #----------------
     *) _bootstrap_help ;;
     esac
+
+    return 0
 }
 
 _bootstrap "${@:1}"
diff --git a/scripts/check-build-environment.sh b/scripts/check-build-environment.sh
@@ -10,11 +10,13 @@ function success() {
 
   local message="$1"
   echo "  ✅  ${message}"
+  return 0
 }
 
 function warning() {
   local message="$1"
   echo -e "  ⚠️  \e[31m${message}\e[39m"
+  return 0
 }
 
 echo
@@ -38,7 +40,7 @@ for dep in ${BUILD_DEPENDENCIES}; do
         dep_path="$(which ${dep} 2> /dev/null)"
     set -e
 
-    if [[ -n "${dep_path}" -a -x "${dep_path}" ]]
+    if [[ -n "${dep_path}" && -x "${dep_path}" ]]
     then
         success "${dep} found at ${dep_path}"
     else
diff --git a/scripts/check-deploy-environment.sh b/scripts/check-deploy-environment.sh
@@ -13,11 +13,13 @@ function success() {
 
   local message="$1"
   echo "  ✅  ${message}"
+  return 0
 }
 
 function warning() {
   local message="$1"
   echo -e "  ⚠️  \e[31m${message}\e[39m"
+  return 0
 }
 
 echo
diff --git a/scripts/pull-lambda-code-for-stack.sh b/scripts/pull-lambda-code-for-stack.sh
@@ -22,7 +22,9 @@ function pull_lambda_code(){
     echo -n "- Downloading code for lambda ${lambda_name}.... "
     code_url="$(aws lambda get-function  --function-name "${lambda_name}" | jq -r .Code.Location)"
     curl "${code_url}" 2>/dev/null > "${DIST_DIR}/${api_name}-${endpoint_name}.zip"
+
     echo "✅"
+    return 0
 }
 
 function pull_layer_code(){
@@ -35,7 +37,9 @@ function pull_layer_code(){
     echo -n "- Downloading code for layer ${layer_name} version ${layer_version}.... "
     code_url="$(aws lambda get-layer-version --layer-name "${layer_name}" --version-number "${layer_version}" | jq -r .Content.Location)"
     curl "${code_url}" 2>/dev/null > "${DIST_DIR}/${layer_pkg_name}"
+
     echo "✅"
+    return 0
 }
 
 mkdir -p "${DIST_DIR}"

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,13 @@ function success() {`
`13`	`13`
`14`	`14`	`local message="$1"`
`15`	`15`	`echo " ✅ ${message}"`
	`16`	`+ return 0`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`function warning() {`
`19`	`20`	`local message="$1"`
`20`	`21`	`echo -e " ⚠️ \e[31m${message}\e[39m"`
	`22`	`+ return 0`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`echo`