From e689f34212901804b4e413f3480fe32ccf2698b3 Mon Sep 17 00:00:00 2001
From: Yared Yemane <yaredyemane1@gmail.com>
Date: Wed, 25 Mar 2026 06:19:20 -0700
Subject: [PATCH] minio .env access adjustment

---
 internal/config/config.go | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/internal/config/config.go b/internal/config/config.go
index 2cbcef7..f843f50 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -491,10 +491,36 @@ func (c *Config) loadEnv() error {
 		c.MinIO.Enabled = true
 	}
 	c.MinIO.Endpoint = os.Getenv("MINIO_ENDPOINT")
-	c.MinIO.AccessKey = os.Getenv("MINIO_ACCESS_KEY")
-	c.MinIO.SecretKey = os.Getenv("MINIO_SECRET_KEY")
-	c.MinIO.Bucket = os.Getenv("MINIO_BUCKET")
-	if c.MinIO.Bucket == "" {
+	// New env var names (preferred)
+	// - MINIO_ROOT_USER
+	// - MINIO_ROOT_PASSWORD
+	// - MINIO_BUCKET_NAME
+	//
+	// Backward compatible fallbacks:
+	// - MINIO_ACCESS_KEY / MINIO_SECRET_KEY / MINIO_BUCKET
+	rootUser := os.Getenv("MINIO_ROOT_USER")
+	rootPass := os.Getenv("MINIO_ROOT_PASSWORD")
+	bucketName := os.Getenv("MINIO_BUCKET_NAME")
+
+	if rootUser != "" {
+		c.MinIO.AccessKey = rootUser
+	} else {
+		c.MinIO.AccessKey = os.Getenv("MINIO_ACCESS_KEY")
+	}
+
+	if rootPass != "" {
+		c.MinIO.SecretKey = rootPass
+	} else {
+		c.MinIO.SecretKey = os.Getenv("MINIO_SECRET_KEY")
+	}
+
+	if bucketName != "" {
+		c.MinIO.Bucket = bucketName
+	} else {
+		c.MinIO.Bucket = os.Getenv("MINIO_BUCKET")
+	}
+
+	if strings.TrimSpace(c.MinIO.Bucket) == "" {
 		c.MinIO.Bucket = "yimaru"
 	}
 	minioUseSSL := os.Getenv("MINIO_USE_SSL")