internal/server/storage/s3: Update logic for checking MinIO version from multiple possible binary names

gibmat · gibmat · commit 3c695de9aa96 · 2025-03-22T16:39:16.000Z
Signed-off-by: Mathias Gibbens &lt;gibmat@debian.org&gt;
diff --git a/internal/server/storage/s3/miniod/admin_client.go b/internal/server/storage/s3/miniod/admin_client.go
@@ -101,11 +101,13 @@ func (c *AdminClient) isMinIOClient() bool {
 		return false
 	}
 
-	if !strings.Contains(lines[0], "mc version") && !strings.Contains(lines[0], "mcli version") {
-		return false
+	for _, name := range []string{"miniocli", "minioc", "mcli", "minio-client", "mc"} {
+		if strings.Contains(lines[0], name+" version") {
+			return true
+		}
 	}
 
-	return true
+	return false
 }
 
 // ServiceStop stops the MinIO cluster.

Original file line number	Diff line number	Diff line change
`@@ -101,11 +101,13 @@ func (c *AdminClient) isMinIOClient() bool {`
`101`	`101`	`return false`
`102`	`102`	`}`
`103`	`103`
`104`		`- if !strings.Contains(lines[0], "mc version") && !strings.Contains(lines[0], "mcli version") {`
`105`		`- return false`
	`104`	`+ for _, name := range []string{"miniocli", "minioc", "mcli", "minio-client", "mc"} {`
	`105`	`+ if strings.Contains(lines[0], name+" version") {`
	`106`	`+ return true`
	`107`	`+ }`
`106`	`108`	`}`
`107`	`109`
`108`		`- return true`
	`110`	`+ return false`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`// ServiceStop stops the MinIO cluster.`