From 5a1612fe32cd5aaaf99a2acdfca148c9aac0384e Mon Sep 17 00:00:00 2001 From: Aditya Manthramurthy Date: Mon, 19 Jun 2023 17:53:08 -0700 Subject: [PATCH] Bump up madmin-go and pkg deps (#17469) --- buildscripts/heal-manual.go | 2 +- cmd/admin-bucket-handlers.go | 2 +- cmd/admin-handler-utils.go | 2 +- cmd/admin-handlers-config-kv.go | 2 +- cmd/admin-handlers-idp-config.go | 2 +- cmd/admin-handlers-idp-ldap.go | 2 +- cmd/admin-handlers-site-replication.go | 2 +- cmd/admin-handlers-users-race_test.go | 2 +- cmd/admin-handlers-users.go | 2 +- cmd/admin-handlers-users_test.go | 2 +- cmd/admin-handlers.go | 4 ++-- cmd/admin-handlers_test.go | 2 +- cmd/admin-heal-ops.go | 2 +- cmd/admin-router.go | 2 +- cmd/admin-server-info.go | 2 +- cmd/api-errors.go | 2 +- cmd/background-heal-ops.go | 2 +- cmd/background-newdisks-heal-ops.go | 2 +- cmd/batch-handlers.go | 2 +- cmd/bootstrap-messages.go | 2 +- cmd/bucket-encryption-handlers.go | 2 +- cmd/bucket-handlers.go | 2 +- cmd/bucket-lifecycle.go | 2 +- cmd/bucket-metadata-sys.go | 2 +- cmd/bucket-metadata.go | 2 +- cmd/bucket-policy-handlers.go | 2 +- cmd/bucket-quota.go | 2 +- cmd/bucket-replication-utils.go | 2 +- cmd/bucket-replication.go | 2 +- cmd/bucket-replication_test.go | 2 +- cmd/bucket-targets.go | 2 +- cmd/bucket-versioning-handler.go | 2 +- cmd/callhome.go | 2 +- cmd/common-main.go | 2 +- cmd/config-current.go | 2 +- cmd/config-encrypted_test.go | 2 +- cmd/config.go | 2 +- cmd/consolelogger.go | 2 +- cmd/data-scanner-metric.go | 2 +- cmd/data-scanner.go | 2 +- cmd/data-usage-cache.go | 2 +- cmd/data-usage-utils.go | 2 +- cmd/erasure-healing-common.go | 2 +- cmd/erasure-healing-common_test.go | 2 +- cmd/erasure-healing.go | 2 +- cmd/erasure-healing_test.go | 2 +- cmd/erasure-object.go | 2 +- cmd/erasure-server-pool-decom.go | 2 +- cmd/erasure-server-pool-rebalance.go | 2 +- cmd/erasure-server-pool.go | 2 +- cmd/erasure-sets.go | 2 +- cmd/erasure.go | 2 +- cmd/ftp-server-driver.go | 2 +- cmd/global-heal.go | 2 +- cmd/globals.go | 2 +- cmd/handler-utils.go | 2 +- cmd/http-tracer.go | 2 +- cmd/iam-object-store.go | 2 +- cmd/iam-store.go | 2 +- cmd/iam.go | 2 +- cmd/kms-handlers.go | 2 +- cmd/last-minute.go | 2 +- cmd/metrics-realtime.go | 2 +- cmd/metrics-v2.go | 2 +- cmd/mrf.go | 2 +- cmd/naughty-disk_test.go | 2 +- cmd/notification-summary.go | 2 +- cmd/notification.go | 2 +- cmd/object-api-datatypes.go | 2 +- cmd/object-api-interface.go | 2 +- cmd/os-instrumented.go | 2 +- cmd/peer-rest-client.go | 2 +- cmd/peer-rest-server.go | 2 +- cmd/perf-tests.go | 2 +- cmd/server-main.go | 2 +- cmd/server-rlimit.go | 2 +- cmd/server-startup-msg.go | 2 +- cmd/server-startup-msg_test.go | 2 +- cmd/sftp-server-driver.go | 2 +- cmd/signature-v4-utils_test.go | 2 +- cmd/site-replication-utils.go | 2 +- cmd/site-replication.go | 2 +- cmd/site-replication_test.go | 2 +- cmd/speedtest.go | 2 +- cmd/storage-interface.go | 2 +- cmd/storage-rest-client.go | 2 +- cmd/storage-rest-server.go | 2 +- cmd/sts-handlers.go | 2 +- cmd/sts-handlers_test.go | 2 +- cmd/tier-handlers.go | 2 +- cmd/tier-last-day-stats.go | 2 +- cmd/tier.go | 2 +- cmd/tier_gen.go | 2 +- cmd/utils.go | 2 +- cmd/warm-backend-azure.go | 2 +- cmd/warm-backend-gcs.go | 2 +- cmd/warm-backend-minio.go | 2 +- cmd/warm-backend-s3.go | 2 +- cmd/warm-backend.go | 2 +- cmd/xl-storage-disk-id-check.go | 2 +- cmd/xl-storage.go | 2 +- go.mod | 5 +++-- go.sum | 6 ++++-- internal/config/config.go | 2 +- internal/config/identity/ldap/config.go | 2 +- internal/config/identity/openid/openid.go | 2 +- internal/event/event.go | 2 +- internal/logger/audit.go | 2 +- internal/logger/logger.go | 2 +- internal/logger/targets.go | 2 +- 110 files changed, 116 insertions(+), 113 deletions(-) diff --git a/buildscripts/heal-manual.go b/buildscripts/heal-manual.go index 936aeeb8a..1bffd98a2 100644 --- a/buildscripts/heal-manual.go +++ b/buildscripts/heal-manual.go @@ -27,7 +27,7 @@ import ( "os" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) func main() { diff --git a/cmd/admin-bucket-handlers.go b/cmd/admin-bucket-handlers.go index 834f0fea0..fc9b0d04e 100644 --- a/cmd/admin-bucket-handlers.go +++ b/cmd/admin-bucket-handlers.go @@ -32,7 +32,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/klauspost/compress/zip" "github.com/minio/kes-go" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/internal/bucket/lifecycle" objectlock "github.com/minio/minio/internal/bucket/object/lock" diff --git a/cmd/admin-handler-utils.go b/cmd/admin-handler-utils.go index 79702d949..c89444fc6 100644 --- a/cmd/admin-handler-utils.go +++ b/cmd/admin-handler-utils.go @@ -24,7 +24,7 @@ import ( "net/http" "github.com/minio/kes-go" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/config" iampolicy "github.com/minio/pkg/iam/policy" diff --git a/cmd/admin-handlers-config-kv.go b/cmd/admin-handlers-config-kv.go index 74e2ec577..ad71a1225 100644 --- a/cmd/admin-handlers-config-kv.go +++ b/cmd/admin-handlers-config-kv.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/config/cache" "github.com/minio/minio/internal/config/etcd" diff --git a/cmd/admin-handlers-idp-config.go b/cmd/admin-handlers-idp-config.go index 6e378fe27..dc9ccf572 100644 --- a/cmd/admin-handlers-idp-config.go +++ b/cmd/admin-handlers-idp-config.go @@ -26,7 +26,7 @@ import ( "net/http" "strings" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/config" cfgldap "github.com/minio/minio/internal/config/identity/ldap" diff --git a/cmd/admin-handlers-idp-ldap.go b/cmd/admin-handlers-idp-ldap.go index 2b02ec846..9e1e686a1 100644 --- a/cmd/admin-handlers-idp-ldap.go +++ b/cmd/admin-handlers-idp-ldap.go @@ -22,7 +22,7 @@ import ( "io" "net/http" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" "github.com/minio/mux" iampolicy "github.com/minio/pkg/iam/policy" diff --git a/cmd/admin-handlers-site-replication.go b/cmd/admin-handlers-site-replication.go index e02687a97..5e9a2973c 100644 --- a/cmd/admin-handlers-site-replication.go +++ b/cmd/admin-handlers-site-replication.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/mux" "github.com/minio/minio/internal/logger" diff --git a/cmd/admin-handlers-users-race_test.go b/cmd/admin-handlers-users-race_test.go index 7708d46ca..b491fe162 100644 --- a/cmd/admin-handlers-users-race_test.go +++ b/cmd/admin-handlers-users-race_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" minio "github.com/minio/minio-go/v7" "github.com/minio/pkg/sync/errgroup" ) diff --git a/cmd/admin-handlers-users.go b/cmd/admin-handlers-users.go index f7617cea2..7c03b378a 100644 --- a/cmd/admin-handlers-users.go +++ b/cmd/admin-handlers-users.go @@ -30,7 +30,7 @@ import ( "time" "github.com/klauspost/compress/zip" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/config/dns" "github.com/minio/minio/internal/logger" diff --git a/cmd/admin-handlers-users_test.go b/cmd/admin-handlers-users_test.go index 74a90a3f4..ec23d352d 100644 --- a/cmd/admin-handlers-users_test.go +++ b/cmd/admin-handlers-users_test.go @@ -33,7 +33,7 @@ import ( "testing" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" cr "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go index b9295b1b3..5a64a466b 100644 --- a/cmd/admin-handlers.go +++ b/cmd/admin-handlers.go @@ -45,8 +45,8 @@ import ( "github.com/dustin/go-humanize" "github.com/klauspost/compress/zip" - "github.com/minio/madmin-go/v2" - "github.com/minio/madmin-go/v2/estream" + "github.com/minio/madmin-go/v3" + "github.com/minio/madmin-go/v3/estream" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/dsync" "github.com/minio/minio/internal/handlers" diff --git a/cmd/admin-handlers_test.go b/cmd/admin-handlers_test.go index 25c247094..2b8696f97 100644 --- a/cmd/admin-handlers_test.go +++ b/cmd/admin-handlers_test.go @@ -31,7 +31,7 @@ import ( "testing" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/auth" "github.com/minio/mux" ) diff --git a/cmd/admin-heal-ops.go b/cmd/admin-heal-ops.go index c5fb9e176..4ae3ad61e 100644 --- a/cmd/admin-heal-ops.go +++ b/cmd/admin-heal-ops.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" ) diff --git a/cmd/admin-router.go b/cmd/admin-router.go index 52b463b4c..ef3c8933f 100644 --- a/cmd/admin-router.go +++ b/cmd/admin-router.go @@ -22,7 +22,7 @@ import ( "github.com/klauspost/compress/gzhttp" "github.com/klauspost/compress/gzip" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" "github.com/minio/mux" ) diff --git a/cmd/admin-server-info.go b/cmd/admin-server-info.go index 4c2e526b7..6f08a8e0c 100644 --- a/cmd/admin-server-info.go +++ b/cmd/admin-server-info.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" diff --git a/cmd/api-errors.go b/cmd/api-errors.go index 65fd70528..7b570be6e 100644 --- a/cmd/api-errors.go +++ b/cmd/api-errors.go @@ -31,7 +31,7 @@ import ( "github.com/minio/minio/internal/ioutil" "google.golang.org/api/googleapi" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/internal/auth" diff --git a/cmd/background-heal-ops.go b/cmd/background-heal-ops.go index a27f57d16..5846842e3 100644 --- a/cmd/background-heal-ops.go +++ b/cmd/background-heal-ops.go @@ -24,7 +24,7 @@ import ( "strconv" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" "github.com/minio/pkg/env" ) diff --git a/cmd/background-newdisks-heal-ops.go b/cmd/background-newdisks-heal-ops.go index 1efe2206c..0b2ad8a37 100644 --- a/cmd/background-newdisks-heal-ops.go +++ b/cmd/background-newdisks-heal-ops.go @@ -30,7 +30,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/logger" diff --git a/cmd/batch-handlers.go b/cmd/batch-handlers.go index fe396ab2e..1f6908ac5 100644 --- a/cmd/batch-handlers.go +++ b/cmd/batch-handlers.go @@ -37,7 +37,7 @@ import ( "github.com/dustin/go-humanize" "github.com/lithammer/shortuuid/v4" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" miniogo "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/cmd/bootstrap-messages.go b/cmd/bootstrap-messages.go index 4d2cb110b..7df3b956a 100644 --- a/cmd/bootstrap-messages.go +++ b/cmd/bootstrap-messages.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/pubsub" ) diff --git a/cmd/bucket-encryption-handlers.go b/cmd/bucket-encryption-handlers.go index a3a657055..71bd0aedc 100644 --- a/cmd/bucket-encryption-handlers.go +++ b/cmd/bucket-encryption-handlers.go @@ -26,7 +26,7 @@ import ( "net/http" "github.com/minio/kes-go" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" "github.com/minio/mux" diff --git a/cmd/bucket-handlers.go b/cmd/bucket-handlers.go index b95130c8d..7f3048a07 100644 --- a/cmd/bucket-handlers.go +++ b/cmd/bucket-handlers.go @@ -41,7 +41,7 @@ import ( "github.com/minio/mux" "github.com/valyala/bytebufferpool" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio-go/v7/pkg/tags" diff --git a/cmd/bucket-lifecycle.go b/cmd/bucket-lifecycle.go index 6eda7559b..eb2a01816 100644 --- a/cmd/bucket-lifecycle.go +++ b/cmd/bucket-lifecycle.go @@ -32,7 +32,7 @@ import ( "time" "github.com/google/uuid" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/internal/amztime" sse "github.com/minio/minio/internal/bucket/encryption" diff --git a/cmd/bucket-metadata-sys.go b/cmd/bucket-metadata-sys.go index 14ca646bf..e07b0a213 100644 --- a/cmd/bucket-metadata-sys.go +++ b/cmd/bucket-metadata-sys.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio-go/v7/pkg/tags" bucketsse "github.com/minio/minio/internal/bucket/encryption" diff --git a/cmd/bucket-metadata.go b/cmd/bucket-metadata.go index 64d5aa799..ce1d7edf9 100644 --- a/cmd/bucket-metadata.go +++ b/cmd/bucket-metadata.go @@ -29,7 +29,7 @@ import ( "path" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/tags" bucketsse "github.com/minio/minio/internal/bucket/encryption" "github.com/minio/minio/internal/bucket/lifecycle" diff --git a/cmd/bucket-policy-handlers.go b/cmd/bucket-policy-handlers.go index 1dd50b626..0b30d11ba 100644 --- a/cmd/bucket-policy-handlers.go +++ b/cmd/bucket-policy-handlers.go @@ -24,7 +24,7 @@ import ( "net/http" humanize "github.com/dustin/go-humanize" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" "github.com/minio/mux" "github.com/minio/pkg/bucket/policy" diff --git a/cmd/bucket-quota.go b/cmd/bucket-quota.go index 86f333e52..d7413d4a7 100644 --- a/cmd/bucket-quota.go +++ b/cmd/bucket-quota.go @@ -24,7 +24,7 @@ import ( "fmt" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" ) diff --git a/cmd/bucket-replication-utils.go b/cmd/bucket-replication-utils.go index aec277b69..b143965b1 100644 --- a/cmd/bucket-replication-utils.go +++ b/cmd/bucket-replication-utils.go @@ -28,7 +28,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/replication" xhttp "github.com/minio/minio/internal/http" ) diff --git a/cmd/bucket-replication.go b/cmd/bucket-replication.go index f66d6eafd..0eef43b15 100644 --- a/cmd/bucket-replication.go +++ b/cmd/bucket-replication.go @@ -35,7 +35,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/encrypt" "github.com/minio/minio-go/v7/pkg/tags" diff --git a/cmd/bucket-replication_test.go b/cmd/bucket-replication_test.go index 047714d53..c54af60cf 100644 --- a/cmd/bucket-replication_test.go +++ b/cmd/bucket-replication_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/replication" xhttp "github.com/minio/minio/internal/http" ) diff --git a/cmd/bucket-targets.go b/cmd/bucket-targets.go index 4bcad4375..e1249465b 100644 --- a/cmd/bucket-targets.go +++ b/cmd/bucket-targets.go @@ -25,7 +25,7 @@ import ( "time" jsoniter "github.com/json-iterator/go" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio/internal/bucket/replication" diff --git a/cmd/bucket-versioning-handler.go b/cmd/bucket-versioning-handler.go index 35ee5d70c..3bfa3667c 100644 --- a/cmd/bucket-versioning-handler.go +++ b/cmd/bucket-versioning-handler.go @@ -24,7 +24,7 @@ import ( "net/http" humanize "github.com/dustin/go-humanize" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/versioning" "github.com/minio/minio/internal/logger" "github.com/minio/mux" diff --git a/cmd/callhome.go b/cmd/callhome.go index b1a10da42..340039a67 100644 --- a/cmd/callhome.go +++ b/cmd/callhome.go @@ -28,7 +28,7 @@ import ( "net/url" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" ) diff --git a/cmd/common-main.go b/cmd/common-main.go index c724d01b1..11e00e7ba 100644 --- a/cmd/common-main.go +++ b/cmd/common-main.go @@ -52,7 +52,7 @@ import ( "github.com/minio/console/restapi" "github.com/minio/console/restapi/operations" "github.com/minio/kes-go" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/set" diff --git a/cmd/config-current.go b/cmd/config-current.go index 6b3c9082b..33bd9402c 100644 --- a/cmd/config-current.go +++ b/cmd/config-current.go @@ -24,7 +24,7 @@ import ( "strings" "sync" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/config/api" "github.com/minio/minio/internal/config/cache" diff --git a/cmd/config-encrypted_test.go b/cmd/config-encrypted_test.go index 02d5cea85..7b59ae733 100644 --- a/cmd/config-encrypted_test.go +++ b/cmd/config-encrypted_test.go @@ -21,7 +21,7 @@ import ( "bytes" "testing" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/auth" ) diff --git a/cmd/config.go b/cmd/config.go index 1ce4aba8e..95e994d02 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -27,7 +27,7 @@ import ( "strings" jsoniter "github.com/json-iterator/go" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/kms" ) diff --git a/cmd/consolelogger.go b/cmd/consolelogger.go index 43b77d244..65a93f429 100644 --- a/cmd/consolelogger.go +++ b/cmd/consolelogger.go @@ -23,7 +23,7 @@ import ( "sync" "sync/atomic" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger/target/console" "github.com/minio/minio/internal/logger/target/types" diff --git a/cmd/data-scanner-metric.go b/cmd/data-scanner-metric.go index 440afdd5f..9154a1944 100644 --- a/cmd/data-scanner-metric.go +++ b/cmd/data-scanner-metric.go @@ -7,7 +7,7 @@ import ( "time" "unsafe" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/lifecycle" ) diff --git a/cmd/data-scanner.go b/cmd/data-scanner.go index 334ee11e7..8c4ce1ae3 100644 --- a/cmd/data-scanner.go +++ b/cmd/data-scanner.go @@ -34,7 +34,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/lifecycle" "github.com/minio/minio/internal/bucket/object/lock" "github.com/minio/minio/internal/bucket/replication" diff --git a/cmd/data-usage-cache.go b/cmd/data-usage-cache.go index 344d78b01..45435a22e 100644 --- a/cmd/data-usage-cache.go +++ b/cmd/data-usage-cache.go @@ -33,7 +33,7 @@ import ( "github.com/cespare/xxhash/v2" "github.com/klauspost/compress/zstd" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/lifecycle" "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/logger" diff --git a/cmd/data-usage-utils.go b/cmd/data-usage-utils.go index 881b9e038..eb8a35556 100644 --- a/cmd/data-usage-utils.go +++ b/cmd/data-usage-utils.go @@ -21,7 +21,7 @@ import ( "sort" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) // BucketTargetUsageInfo - bucket target usage info provides diff --git a/cmd/erasure-healing-common.go b/cmd/erasure-healing-common.go index b83122876..06db36b19 100644 --- a/cmd/erasure-healing-common.go +++ b/cmd/erasure-healing-common.go @@ -22,7 +22,7 @@ import ( "context" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) func commonETags(etags []string) (etag string, maxima int) { diff --git a/cmd/erasure-healing-common_test.go b/cmd/erasure-healing-common_test.go index d0d6398c0..41b630b17 100644 --- a/cmd/erasure-healing-common_test.go +++ b/cmd/erasure-healing-common_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) // Returns the latest updated FileInfo files and error in case of failure. diff --git a/cmd/erasure-healing.go b/cmd/erasure-healing.go index a16224221..57b19f132 100644 --- a/cmd/erasure-healing.go +++ b/cmd/erasure-healing.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" "github.com/minio/pkg/sync/errgroup" ) diff --git a/cmd/erasure-healing_test.go b/cmd/erasure-healing_test.go index 393fc1310..ae7ff89fa 100644 --- a/cmd/erasure-healing_test.go +++ b/cmd/erasure-healing_test.go @@ -32,7 +32,7 @@ import ( "github.com/dustin/go-humanize" uuid2 "github.com/google/uuid" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/config/storageclass" ) diff --git a/cmd/erasure-object.go b/cmd/erasure-object.go index 22cf9cf08..270c2ffa0 100644 --- a/cmd/erasure-object.go +++ b/cmd/erasure-object.go @@ -32,7 +32,7 @@ import ( "time" "github.com/klauspost/readahead" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/internal/bucket/lifecycle" "github.com/minio/minio/internal/bucket/object/lock" diff --git a/cmd/erasure-server-pool-decom.go b/cmd/erasure-server-pool-decom.go index 3048eff39..7c89eb87c 100644 --- a/cmd/erasure-server-pool-decom.go +++ b/cmd/erasure-server-pool-decom.go @@ -31,7 +31,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/logger" "github.com/minio/pkg/console" diff --git a/cmd/erasure-server-pool-rebalance.go b/cmd/erasure-server-pool-rebalance.go index 909cf20af..564ee5bcf 100644 --- a/cmd/erasure-server-pool-rebalance.go +++ b/cmd/erasure-server-pool-rebalance.go @@ -32,7 +32,7 @@ import ( "time" "github.com/lithammer/shortuuid/v4" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/logger" "github.com/minio/pkg/env" diff --git a/cmd/erasure-server-pool.go b/cmd/erasure-server-pool.go index 6109c1178..ef00f9102 100644 --- a/cmd/erasure-server-pool.go +++ b/cmd/erasure-server-pool.go @@ -33,7 +33,7 @@ import ( "github.com/dustin/go-humanize" "github.com/google/uuid" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/s3utils" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio-go/v7/pkg/tags" diff --git a/cmd/erasure-sets.go b/cmd/erasure-sets.go index 58974d5de..dcb450686 100644 --- a/cmd/erasure-sets.go +++ b/cmd/erasure-sets.go @@ -33,7 +33,7 @@ import ( "github.com/dchest/siphash" "github.com/dustin/go-humanize" "github.com/google/uuid" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/internal/bpool" diff --git a/cmd/erasure.go b/cmd/erasure.go index c393b546f..81a2305ee 100644 --- a/cmd/erasure.go +++ b/cmd/erasure.go @@ -28,7 +28,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bpool" "github.com/minio/minio/internal/dsync" "github.com/minio/minio/internal/logger" diff --git a/cmd/ftp-server-driver.go b/cmd/ftp-server-driver.go index 32e9b964d..1733cad60 100644 --- a/cmd/ftp-server-driver.go +++ b/cmd/ftp-server-driver.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio/internal/auth" diff --git a/cmd/global-heal.go b/cmd/global-heal.go index d453cc89d..73b59ac0b 100644 --- a/cmd/global-heal.go +++ b/cmd/global-heal.go @@ -24,7 +24,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/color" "github.com/minio/minio/internal/config/storageclass" "github.com/minio/minio/internal/logger" diff --git a/cmd/globals.go b/cmd/globals.go index 79201c42f..6e86192a7 100644 --- a/cmd/globals.go +++ b/cmd/globals.go @@ -27,7 +27,7 @@ import ( "time" "github.com/minio/console/restapi" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/bucket/bandwidth" diff --git a/cmd/handler-utils.go b/cmd/handler-utils.go index a070f14ad..1b7ff0717 100644 --- a/cmd/handler-utils.go +++ b/cmd/handler-utils.go @@ -26,7 +26,7 @@ import ( "regexp" "strings" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/handlers" xhttp "github.com/minio/minio/internal/http" diff --git a/cmd/http-tracer.go b/cmd/http-tracer.go index f70d8327f..98339c892 100644 --- a/cmd/http-tracer.go +++ b/cmd/http-tracer.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/handlers" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/mcontext" diff --git a/cmd/iam-object-store.go b/cmd/iam-object-store.go index 8b54b0a54..d5181412b 100644 --- a/cmd/iam-object-store.go +++ b/cmd/iam-object-store.go @@ -28,7 +28,7 @@ import ( "unicode/utf8" jsoniter "github.com/json-iterator/go" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" diff --git a/cmd/iam-store.go b/cmd/iam-store.go index 6de7b2a14..b0a5d0e53 100644 --- a/cmd/iam-store.go +++ b/cmd/iam-store.go @@ -28,7 +28,7 @@ import ( "time" jsoniter "github.com/json-iterator/go" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/config/identity/openid" diff --git a/cmd/iam.go b/cmd/iam.go index 5450ef38e..fc30b5d87 100644 --- a/cmd/iam.go +++ b/cmd/iam.go @@ -32,7 +32,7 @@ import ( "sync/atomic" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/arn" "github.com/minio/minio/internal/auth" diff --git a/cmd/kms-handlers.go b/cmd/kms-handlers.go index 172b4b199..eeceef84d 100644 --- a/cmd/kms-handlers.go +++ b/cmd/kms-handlers.go @@ -24,7 +24,7 @@ import ( "time" "github.com/minio/kes-go" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" diff --git a/cmd/last-minute.go b/cmd/last-minute.go index ad5537241..e21dfab0a 100644 --- a/cmd/last-minute.go +++ b/cmd/last-minute.go @@ -22,7 +22,7 @@ package cmd import ( "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) const ( diff --git a/cmd/metrics-realtime.go b/cmd/metrics-realtime.go index 19a53d569..c751f4306 100644 --- a/cmd/metrics-realtime.go +++ b/cmd/metrics-realtime.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/disk" ) diff --git a/cmd/metrics-v2.go b/cmd/metrics-v2.go index f41645916..36fcb0434 100644 --- a/cmd/metrics-v2.go +++ b/cmd/metrics-v2.go @@ -28,7 +28,7 @@ import ( "time" "github.com/minio/kes-go" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/lifecycle" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/mcontext" diff --git a/cmd/mrf.go b/cmd/mrf.go index 16434ef48..5b798276a 100644 --- a/cmd/mrf.go +++ b/cmd/mrf.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) const ( diff --git a/cmd/naughty-disk_test.go b/cmd/naughty-disk_test.go index cdde30de4..c06e64f84 100644 --- a/cmd/naughty-disk_test.go +++ b/cmd/naughty-disk_test.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) // naughtyDisk wraps a POSIX disk and returns programmed errors diff --git a/cmd/notification-summary.go b/cmd/notification-summary.go index 53725f5a0..86fb684e3 100644 --- a/cmd/notification-summary.go +++ b/cmd/notification-summary.go @@ -18,7 +18,7 @@ package cmd import ( - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) // GetTotalCapacity gets the total capacity in the cluster. diff --git a/cmd/notification.go b/cmd/notification.go index 48c2a0121..825fd2433 100644 --- a/cmd/notification.go +++ b/cmd/notification.go @@ -29,7 +29,7 @@ import ( "github.com/cespare/xxhash/v2" "github.com/klauspost/compress/zip" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/bandwidth" "github.com/minio/minio/internal/logger" xnet "github.com/minio/pkg/net" diff --git a/cmd/object-api-datatypes.go b/cmd/object-api-datatypes.go index 505669093..e9bf2ab9e 100644 --- a/cmd/object-api-datatypes.go +++ b/cmd/object-api-datatypes.go @@ -23,7 +23,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/replication" "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/logger" diff --git a/cmd/object-api-interface.go b/cmd/object-api-interface.go index e4c1fc468..f73b56864 100644 --- a/cmd/object-api-interface.go +++ b/cmd/object-api-interface.go @@ -23,7 +23,7 @@ import ( "net/http" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/encrypt" "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/internal/hash" diff --git a/cmd/os-instrumented.go b/cmd/os-instrumented.go index edd144a4e..ddc78ad28 100644 --- a/cmd/os-instrumented.go +++ b/cmd/os-instrumented.go @@ -23,7 +23,7 @@ import ( "sync/atomic" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/disk" ioutilx "github.com/minio/minio/internal/ioutil" ) diff --git a/cmd/peer-rest-client.go b/cmd/peer-rest-client.go index f616242d4..f81acbfcd 100644 --- a/cmd/peer-rest-client.go +++ b/cmd/peer-rest-client.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/bandwidth" "github.com/minio/minio/internal/event" xhttp "github.com/minio/minio/internal/http" diff --git a/cmd/peer-rest-server.go b/cmd/peer-rest-server.go index 4d57e00cc..e146dff50 100644 --- a/cmd/peer-rest-server.go +++ b/cmd/peer-rest-server.go @@ -30,7 +30,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" b "github.com/minio/minio/internal/bucket/bandwidth" "github.com/minio/minio/internal/event" "github.com/minio/minio/internal/logger" diff --git a/cmd/perf-tests.go b/cmd/perf-tests.go index 3b7b8c657..8b6bb89fb 100644 --- a/cmd/perf-tests.go +++ b/cmd/perf-tests.go @@ -29,7 +29,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/pkg/randreader" ) diff --git a/cmd/server-main.go b/cmd/server-main.go index 27a714bbc..71fc97c5e 100644 --- a/cmd/server-main.go +++ b/cmd/server-main.go @@ -36,7 +36,7 @@ import ( "github.com/coreos/go-systemd/v22/daemon" "github.com/minio/cli" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/set" diff --git a/cmd/server-rlimit.go b/cmd/server-rlimit.go index cd1c38789..33d7bbea2 100644 --- a/cmd/server-rlimit.go +++ b/cmd/server-rlimit.go @@ -21,7 +21,7 @@ import ( "runtime" "runtime/debug" - "github.com/minio/madmin-go/v2/kernel" + "github.com/minio/madmin-go/v3/kernel" "github.com/minio/minio/internal/logger" "github.com/minio/pkg/sys" ) diff --git a/cmd/server-startup-msg.go b/cmd/server-startup-msg.go index a432efa64..67dc0050c 100644 --- a/cmd/server-startup-msg.go +++ b/cmd/server-startup-msg.go @@ -25,7 +25,7 @@ import ( "strings" humanize "github.com/dustin/go-humanize" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" color "github.com/minio/minio/internal/color" "github.com/minio/minio/internal/logger" xnet "github.com/minio/pkg/net" diff --git a/cmd/server-startup-msg_test.go b/cmd/server-startup-msg_test.go index f3dd7c54c..019477f84 100644 --- a/cmd/server-startup-msg_test.go +++ b/cmd/server-startup-msg_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) // Tests if we generate storage info. diff --git a/cmd/sftp-server-driver.go b/cmd/sftp-server-driver.go index bdf5567e5..2d15763b8 100644 --- a/cmd/sftp-server-driver.go +++ b/cmd/sftp-server-driver.go @@ -28,7 +28,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio/internal/auth" diff --git a/cmd/signature-v4-utils_test.go b/cmd/signature-v4-utils_test.go index 984bbe6e7..c125bfcd0 100644 --- a/cmd/signature-v4-utils_test.go +++ b/cmd/signature-v4-utils_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/auth" xhttp "github.com/minio/minio/internal/http" ) diff --git a/cmd/site-replication-utils.go b/cmd/site-replication-utils.go index 8ea2d8291..7a9c13896 100644 --- a/cmd/site-replication-utils.go +++ b/cmd/site-replication-utils.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) //go:generate msgp -file=$GOFILE diff --git a/cmd/site-replication.go b/cmd/site-replication.go index 002bc35bf..515945692 100644 --- a/cmd/site-replication.go +++ b/cmd/site-replication.go @@ -34,7 +34,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" minioClient "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/replication" diff --git a/cmd/site-replication_test.go b/cmd/site-replication_test.go index 4f29a4e7d..397bb9f99 100644 --- a/cmd/site-replication_test.go +++ b/cmd/site-replication_test.go @@ -20,7 +20,7 @@ package cmd import ( "testing" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/set" ) diff --git a/cmd/speedtest.go b/cmd/speedtest.go index b96159022..a4c0c06dd 100644 --- a/cmd/speedtest.go +++ b/cmd/speedtest.go @@ -26,7 +26,7 @@ import ( "time" "github.com/minio/dperf/pkg/dperf" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) const speedTest = "speedtest" diff --git a/cmd/storage-interface.go b/cmd/storage-interface.go index e4bac7811..b3def9fbb 100644 --- a/cmd/storage-interface.go +++ b/cmd/storage-interface.go @@ -22,7 +22,7 @@ import ( "io" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) // StorageAPI interface. diff --git a/cmd/storage-rest-client.go b/cmd/storage-rest-client.go index 2bec567a1..2deb05e27 100644 --- a/cmd/storage-rest-client.go +++ b/cmd/storage-rest-client.go @@ -33,7 +33,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/rest" diff --git a/cmd/storage-rest-server.go b/cmd/storage-rest-server.go index cb426acee..0ca7d6193 100644 --- a/cmd/storage-rest-server.go +++ b/cmd/storage-rest-server.go @@ -38,7 +38,7 @@ import ( "github.com/tinylib/msgp/msgp" jwtreq "github.com/golang-jwt/jwt/v4/request" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/config" xhttp "github.com/minio/minio/internal/http" xioutil "github.com/minio/minio/internal/ioutil" diff --git a/cmd/sts-handlers.go b/cmd/sts-handlers.go index 10e188b57..f8051e0ab 100644 --- a/cmd/sts-handlers.go +++ b/cmd/sts-handlers.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/config/identity/openid" "github.com/minio/minio/internal/hash/sha256" diff --git a/cmd/sts-handlers_test.go b/cmd/sts-handlers_test.go index afb905813..fe1155e57 100644 --- a/cmd/sts-handlers_test.go +++ b/cmd/sts-handlers_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" minio "github.com/minio/minio-go/v7" cr "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/set" diff --git a/cmd/tier-handlers.go b/cmd/tier-handlers.go index 9c4fc4d26..933cef58a 100644 --- a/cmd/tier-handlers.go +++ b/cmd/tier-handlers.go @@ -24,7 +24,7 @@ import ( "strconv" jsoniter "github.com/json-iterator/go" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/config/storageclass" "github.com/minio/minio/internal/logger" "github.com/minio/mux" diff --git a/cmd/tier-last-day-stats.go b/cmd/tier-last-day-stats.go index bea39a23e..0c984a67d 100644 --- a/cmd/tier-last-day-stats.go +++ b/cmd/tier-last-day-stats.go @@ -20,7 +20,7 @@ package cmd import ( "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) type lastDayTierStats struct { diff --git a/cmd/tier.go b/cmd/tier.go index ff73ab291..ea1e28994 100644 --- a/cmd/tier.go +++ b/cmd/tier.go @@ -28,7 +28,7 @@ import ( "strings" "sync" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/crypto" "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/kms" diff --git a/cmd/tier_gen.go b/cmd/tier_gen.go index 056eed510..f30a39a97 100644 --- a/cmd/tier_gen.go +++ b/cmd/tier_gen.go @@ -3,7 +3,7 @@ package cmd // Code generated by github.com/tinylib/msgp DO NOT EDIT. import ( - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/tinylib/msgp/msgp" ) diff --git a/cmd/utils.go b/cmd/utils.go index fc7384e88..8f23c789e 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -42,7 +42,7 @@ import ( "github.com/coreos/go-oidc" "github.com/dustin/go-humanize" "github.com/felixge/fgprof" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" miniogopolicy "github.com/minio/minio-go/v7/pkg/policy" "github.com/minio/minio/internal/config" diff --git a/cmd/warm-backend-azure.go b/cmd/warm-backend-azure.go index dcdded519..fddb35dbf 100644 --- a/cmd/warm-backend-azure.go +++ b/cmd/warm-backend-azure.go @@ -28,7 +28,7 @@ import ( "strings" "github.com/Azure/azure-storage-blob-go/azblob" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) type warmBackendAzure struct { diff --git a/cmd/warm-backend-gcs.go b/cmd/warm-backend-gcs.go index 9bc697b4c..5d3816535 100644 --- a/cmd/warm-backend-gcs.go +++ b/cmd/warm-backend-gcs.go @@ -23,7 +23,7 @@ import ( "io" "cloud.google.com/go/storage" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "google.golang.org/api/googleapi" "google.golang.org/api/iterator" "google.golang.org/api/option" diff --git a/cmd/warm-backend-minio.go b/cmd/warm-backend-minio.go index 5e57fce52..e885d9a29 100644 --- a/cmd/warm-backend-minio.go +++ b/cmd/warm-backend-minio.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" minio "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" ) diff --git a/cmd/warm-backend-s3.go b/cmd/warm-backend-s3.go index 2087ff19d..743bbe8b0 100644 --- a/cmd/warm-backend-s3.go +++ b/cmd/warm-backend-s3.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" ) diff --git a/cmd/warm-backend.go b/cmd/warm-backend.go index 8338f34c8..8169ee242 100644 --- a/cmd/warm-backend.go +++ b/cmd/warm-backend.go @@ -24,7 +24,7 @@ import ( "fmt" "io" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" xhttp "github.com/minio/minio/internal/http" ) diff --git a/cmd/xl-storage-disk-id-check.go b/cmd/xl-storage-disk-id-check.go index 2ec616822..8c2eaddee 100644 --- a/cmd/xl-storage-disk-id-check.go +++ b/cmd/xl-storage-disk-id-check.go @@ -29,7 +29,7 @@ import ( "sync/atomic" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" "github.com/minio/pkg/env" ) diff --git a/cmd/xl-storage.go b/cmd/xl-storage.go index 6a57506d3..8d0647e9d 100644 --- a/cmd/xl-storage.go +++ b/cmd/xl-storage.go @@ -39,7 +39,7 @@ import ( "github.com/google/uuid" jsoniter "github.com/json-iterator/go" "github.com/klauspost/filepathx" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/lifecycle" "github.com/minio/minio/internal/disk" xioutil "github.com/minio/minio/internal/ioutil" diff --git a/go.mod b/go.mod index 4856b25c7..f1880c389 100644 --- a/go.mod +++ b/go.mod @@ -48,10 +48,10 @@ require ( github.com/minio/dperf v0.4.10 github.com/minio/highwayhash v1.0.2 github.com/minio/kes-go v0.1.0 - github.com/minio/madmin-go/v2 v2.2.0 + github.com/minio/madmin-go/v3 v3.0.1 github.com/minio/minio-go/v7 v7.0.58-0.20230618181316-a73fe95ad965 github.com/minio/mux v1.9.0 - github.com/minio/pkg v1.7.4 + github.com/minio/pkg v1.7.5 github.com/minio/selfupdate v0.6.0 github.com/minio/sha256-simd v1.0.1 github.com/minio/simdjson-go v0.4.5 @@ -180,6 +180,7 @@ require ( github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/minio/colorjson v1.0.4 // indirect github.com/minio/filepath v1.0.0 // indirect + github.com/minio/madmin-go/v2 v2.2.0 // indirect github.com/minio/mc v0.0.0-20230526175537-0fac0e006eae // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/minio/websocket v1.6.0 // indirect diff --git a/go.sum b/go.sum index e843ca1ff..79c8c3d8f 100644 --- a/go.sum +++ b/go.sum @@ -786,6 +786,8 @@ github.com/minio/kes-go v0.1.0/go.mod h1:VorHLaIYis9/MxAHAtXN4d8PUMNKhIxTIlvFt0h github.com/minio/madmin-go v1.6.6/go.mod h1:ATvkBOLiP3av4D++2v1UEHC/QzsGtgXD5kYvvRYzdKs= github.com/minio/madmin-go/v2 v2.2.0 h1:DtJPzallTD/7wx0ZaxPBl+HrKgI5L5Z+ULa6tAMvuH8= github.com/minio/madmin-go/v2 v2.2.0/go.mod h1:8bL1RMNkblIENFSgGYjeHrzUx9PxROb7OqfNuMU9ivE= +github.com/minio/madmin-go/v3 v3.0.1 h1:+WuNw0q8gYTNHUmV5X1nCox28uYmJkeMT75vh9VKPkA= +github.com/minio/madmin-go/v3 v3.0.1/go.mod h1:lPrMoc1aeiIWmmrxBthkDqzMPQwC/Lu9ByuyM2wenJk= github.com/minio/mc v0.0.0-20230526175537-0fac0e006eae h1:jqj4OwgFKlbL8xUWWM4CnsUgKFp3kcFEyll2R+4fVbI= github.com/minio/mc v0.0.0-20230526175537-0fac0e006eae/go.mod h1:hVJCldV0teZzZtbkeP+t0BebFVOiSQvZzsCQL8Ax2ps= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= @@ -797,8 +799,8 @@ github.com/minio/minio-go/v7 v7.0.58-0.20230618181316-a73fe95ad965/go.mod h1:NUD github.com/minio/mux v1.9.0 h1:dWafQFyEfGhJvK6AwLOt83bIG5bxKxKJnKMCi0XAaoA= github.com/minio/mux v1.9.0/go.mod h1:1pAare17ZRL5GpmNL+9YmqHoWnLmMZF9C/ioUCfy0BQ= github.com/minio/pkg v1.5.4/go.mod h1:2MOaRFdmFKULD+uOLc3qHLGTQTuxCNPKNPfLBTxC8CA= -github.com/minio/pkg v1.7.4 h1:bCrjtfw75AD8/6ZFkYWEe+Syn+I7DYMbNWjm0AUoYLw= -github.com/minio/pkg v1.7.4/go.mod h1:0iX1IuJGSCnMvIvrEJauk1GgQSX9JdU6Kh0P3EQRGkI= +github.com/minio/pkg v1.7.5 h1:UOUJjewE5zoaDPlCMJtNx/swc1jT1ZR+IajT7hrLd44= +github.com/minio/pkg v1.7.5/go.mod h1:mEfGMTm5Z0b5EGxKNuPwyb5A2d+CC/VlUyRj6RJtIwo= github.com/minio/selfupdate v0.6.0 h1:i76PgT0K5xO9+hjzKcacQtO7+MjJ4JKA8Ak8XQ9DDwU= github.com/minio/selfupdate v0.6.0/go.mod h1:bO02GTIPCMQFTEvE5h4DjYB58bCoZ35XLeBf0buTDdM= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= diff --git a/internal/config/config.go b/internal/config/config.go index de833d202..ffbc34ce2 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -25,7 +25,7 @@ import ( "sort" "strings" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/auth" "github.com/minio/pkg/env" diff --git a/internal/config/identity/ldap/config.go b/internal/config/identity/ldap/config.go index 84efabe5e..0e4ea4d0d 100644 --- a/internal/config/identity/ldap/config.go +++ b/internal/config/identity/ldap/config.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/config" "github.com/minio/pkg/ldap" ) diff --git a/internal/config/identity/openid/openid.go b/internal/config/identity/openid/openid.go index 3f076af96..9f16a1b37 100644 --- a/internal/config/identity/openid/openid.go +++ b/internal/config/identity/openid/openid.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/arn" "github.com/minio/minio/internal/auth" diff --git a/internal/event/event.go b/internal/event/event.go index e01a801a6..cbffe363c 100644 --- a/internal/event/event.go +++ b/internal/event/event.go @@ -18,7 +18,7 @@ package event import ( - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) const ( diff --git a/internal/logger/audit.go b/internal/logger/audit.go index 29210e688..4f4ba62d3 100644 --- a/internal/logger/audit.go +++ b/internal/logger/audit.go @@ -28,7 +28,7 @@ import ( "github.com/minio/minio/internal/mcontext" "github.com/minio/pkg/logger/message/audit" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" xhttp "github.com/minio/minio/internal/http" ) diff --git a/internal/logger/logger.go b/internal/logger/logger.go index 66bb50eb9..d201b2875 100644 --- a/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -29,7 +29,7 @@ import ( "time" "github.com/minio/highwayhash" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/set" xhttp "github.com/minio/minio/internal/http" "github.com/minio/pkg/logger/message/log" diff --git a/internal/logger/targets.go b/internal/logger/targets.go index da39c6184..d31975ae0 100644 --- a/internal/logger/targets.go +++ b/internal/logger/targets.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger/target/http" "github.com/minio/minio/internal/logger/target/kafka" "github.com/minio/minio/internal/logger/target/types"