From 3c470a6b8babc803a2d79e45cccfc806e57a2709 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Wed, 27 Sep 2023 08:22:50 -0700
Subject: [PATCH] fix: the inspect script to use scheme per deployment (#18118)

---
 cmd/admin-handlers.go | 14 +++++++++-----
 cmd/erasure-object.go |  4 ++++
 go.mod                |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go
index 68f59cba8..89b4c7150 100644
--- a/cmd/admin-handlers.go
+++ b/cmd/admin-handlers.go
@@ -2929,9 +2929,14 @@ func (a adminAPIHandlers) InspectDataHandler(w http.ResponseWriter, r *http.Requ
 	sb.WriteString("\n")
 	logger.LogIf(ctx, embedFileInZip(inspectZipW, "inspect-input.txt", sb.Bytes(), 0o600))
 
+	scheme := "https"
+	if !globalIsTLS {
+		scheme = "http"
+	}
+
 	// save MinIO start script to inspect command
 	var scrb bytes.Buffer
-	scrb.WriteString(`#!/usr/bin/env bash
+	fmt.Fprintf(&scrb, `#!/usr/bin/env bash
 
 function main() {
 	for file in $(ls -1); do
@@ -2940,10 +2945,10 @@ function main() {
 	done
 
 	# Read content of inspect-input.txt
-	MINIO_OPTS=$(grep "Server command line args" <./inspect-input.txt | sed "s/Server command line args: //g" | sed -r "s#https:\/\/#\.\/#g")
+	MINIO_OPTS=$(grep "Server command line args" <./inspect-input.txt | sed "s/Server command line args: //g" | sed -r "s#%s:\/\/#\.\/#g")
 
 	# Start MinIO instance using the options
-	START_CMD="CI=on _MINIO_AUTO_DISK_HEALING=off minio server ${MINIO_OPTS} &"
+	START_CMD="CI=on _MINIO_AUTO_DRIVE_HEALING=off minio server ${MINIO_OPTS} &"
 	echo
 	echo "Starting MinIO instance: ${START_CMD}"
 	echo
@@ -2955,8 +2960,7 @@ function main() {
 	sleep 10
 }
 
-main "$@"`,
-	)
+main "$@"`, scheme)
 	logger.LogIf(ctx, embedFileInZip(inspectZipW, "start-minio.sh", scrb.Bytes(), 0o755))
 }
 
diff --git a/cmd/erasure-object.go b/cmd/erasure-object.go
index 9015d68ae..237fb4b48 100644
--- a/cmd/erasure-object.go
+++ b/cmd/erasure-object.go
@@ -496,8 +496,12 @@ func (er erasureObjects) deleteIfDangling(ctx context.Context, bucket, object st
 	m, ok := isObjectDangling(metaArr, errs, dataErrs)
 	if ok {
 		tags := make(map[string]interface{}, 4)
+		tags["size"] = m.Size
 		tags["set"] = er.setIndex
 		tags["pool"] = er.poolIndex
+		tags["merrs"] = errors.Join(errs...)
+		tags["derrs"] = errors.Join(dataErrs...)
+		tags["mtime"] = m.ModTime.Format(http.TimeFormat)
 		tags["parity"] = m.Erasure.ParityBlocks
 		if cok {
 			tags["caller"] = fmt.Sprintf("%s:%d", file, line)
diff --git a/go.mod b/go.mod
index 186d0b9ec..02de78264 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/minio/minio
 
-go 1.19
+go 1.20
 
 require (
 	cloud.google.com/go/storage v1.33.0