Skip to content

Commit 08263dc

Browse files
committed
Refactor user existence checks in MinIO scripts to utilize JSON output. Improved error handling in healthcheck script and streamlined access key verification in entrypoint script.
1 parent a648806 commit 08263dc

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

src/entrypoint.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ fi
1616
################################################################################
1717

1818
check_user_exists() {
19-
local user_list
20-
user_list=$(mc admin user ls "$MINIO_ALIAS")
21-
case "$user_list" in
22-
*"$MINIO_USER_ACCESS_KEY"*) return 0 ;;
23-
*) return 1 ;;
24-
esac
19+
local user_json
20+
user_json=$(mc admin user ls "$MINIO_ALIAS" --json)
21+
user_json=${user_json#*\"accessKey\":\"}
22+
local access_key=${user_json%%\"*}
23+
[ "$access_key" = "$MINIO_USER_ACCESS_KEY" ]
2524
}
2625

2726
create_policy() {

src/healthcheck.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ echo "Checking for policy: $MINIO_POLICY_NAME"
1111

1212
# Check if user exists
1313
echo "Checking MinIO user..."
14-
user_list=$(mc admin user ls "$MINIO_ALIAS")
15-
case "$user_list" in
16-
*"$MINIO_USER_ACCESS_KEY"*)
17-
echo "✅ MinIO user found"
18-
;;
19-
*)
20-
echo "ERROR: MinIO user $MINIO_USER_ACCESS_KEY not found"
21-
exit 1
22-
;;
23-
esac
14+
user_json=$(mc admin user ls "$MINIO_ALIAS" --json)
15+
# Extract accessKey from JSON using bash string manipulation
16+
user_json=${user_json#*\"accessKey\":\"}
17+
access_key=${user_json%%\"*}
18+
if [ "$access_key" = "${MINIO_USER_ACCESS_KEY}" ]; then
19+
echo "✅ MinIO user found"
20+
else
21+
echo "ERROR: MinIO user ${MINIO_USER_ACCESS_KEY} not found"
22+
exit 1
23+
fi
2424

2525
# Check if policy exists
2626
echo "Checking MinIO policy..."

0 commit comments

Comments
 (0)