From f3bec283d70f9ef8061508cbc3155d1efd48d9a5 Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Mon, 28 Oct 2024 09:07:47 -0700
Subject: [PATCH] `exit 1` if we can't generate creds using `AWS_ROLE_ARN`
 (#410)

---
 features/src/utils/devcontainer-feature.json                    | 2 +-
 features/src/utils/opt/devcontainer/bin/creds/s3/generate.sh    | 2 +-
 features/src/utils/opt/devcontainer/bin/creds/s3/gh/generate.sh | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index bc02ab3a..a006abb0 100644
--- a/features/src/utils/devcontainer-feature.json
+++ b/features/src/utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "devcontainer-utils",
   "id": "utils",
-  "version": "24.12.1",
+  "version": "24.12.2",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
diff --git a/features/src/utils/opt/devcontainer/bin/creds/s3/generate.sh b/features/src/utils/opt/devcontainer/bin/creds/s3/generate.sh
index 7069b4c9..53054f1b 100755
--- a/features/src/utils/opt/devcontainer/bin/creds/s3/generate.sh
+++ b/features/src/utils/opt/devcontainer/bin/creds/s3/generate.sh
@@ -14,7 +14,7 @@ _creds_s3_generate() {
     if test -n "${AWS_ROLE_ARN:-}" && gh nv-gha-aws --help >/dev/null 2>&1; then
         # shellcheck disable=SC1091
         devcontainer-utils-creds-s3-gh-generate;
-    elif test -n "${VAULT_HOST}"; then
+    elif test -n "${VAULT_HOST:-}"; then
         # shellcheck disable=SC1091
         devcontainer-utils-creds-s3-vault-generate;
     fi
diff --git a/features/src/utils/opt/devcontainer/bin/creds/s3/gh/generate.sh b/features/src/utils/opt/devcontainer/bin/creds/s3/gh/generate.sh
index 8c2c45d2..7e248f6a 100755
--- a/features/src/utils/opt/devcontainer/bin/creds/s3/gh/generate.sh
+++ b/features/src/utils/opt/devcontainer/bin/creds/s3/gh/generate.sh
@@ -63,6 +63,7 @@ _creds_github_generate() {
         fi
     done
 
+    exit 1;
 }
 
 _creds_github_generate "$@" <&0;