diff --git a/buildscripts/heal-manual.go b/buildscripts/heal-manual.go index a95bb5f85..936aeeb8a 100644 --- a/buildscripts/heal-manual.go +++ b/buildscripts/heal-manual.go @@ -27,7 +27,7 @@ import ( "os" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" ) func main() { diff --git a/cmd/admin-bucket-handlers.go b/cmd/admin-bucket-handlers.go index cf3433507..cbd12c1a6 100644 --- a/cmd/admin-bucket-handlers.go +++ b/cmd/admin-bucket-handlers.go @@ -33,7 +33,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/klauspost/compress/zip" "github.com/minio/kes" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 e242492de..8277bd72c 100644 --- a/cmd/admin-handler-utils.go +++ b/cmd/admin-handler-utils.go @@ -24,7 +24,7 @@ import ( "net/http" "github.com/minio/kes" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 e5b31c7ba..40fe92077 100644 --- a/cmd/admin-handlers-config-kv.go +++ b/cmd/admin-handlers-config-kv.go @@ -27,7 +27,7 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 b355f97b5..a6640b764 100644 --- a/cmd/admin-handlers-idp-config.go +++ b/cmd/admin-handlers-idp-config.go @@ -27,7 +27,7 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 c39b9c50a..293475163 100644 --- a/cmd/admin-handlers-idp-ldap.go +++ b/cmd/admin-handlers-idp-ldap.go @@ -21,7 +21,7 @@ import ( "encoding/json" "net/http" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/admin-handlers-site-replication.go b/cmd/admin-handlers-site-replication.go index 24cff510b..1e6cfc076 100644 --- a/cmd/admin-handlers-site-replication.go +++ b/cmd/admin-handlers-site-replication.go @@ -27,7 +27,7 @@ import ( "time" "github.com/gorilla/mux" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" diff --git a/cmd/admin-handlers-users-race_test.go b/cmd/admin-handlers-users-race_test.go index c3524da1d..fb7438b67 100644 --- a/cmd/admin-handlers-users-race_test.go +++ b/cmd/admin-handlers-users-race_test.go @@ -31,7 +31,7 @@ import ( "testing" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" minio "github.com/minio/minio-go/v7" ) diff --git a/cmd/admin-handlers-users.go b/cmd/admin-handlers-users.go index c2d129df4..5f569d820 100644 --- a/cmd/admin-handlers-users.go +++ b/cmd/admin-handlers-users.go @@ -29,7 +29,7 @@ import ( "github.com/gorilla/mux" "github.com/klauspost/compress/zip" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 97437df28..cee6094b5 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" + "github.com/minio/madmin-go/v2" "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 96ed173ac..7c5ec2116 100644 --- a/cmd/admin-handlers.go +++ b/cmd/admin-handlers.go @@ -47,8 +47,8 @@ import ( "github.com/dustin/go-humanize" "github.com/gorilla/mux" "github.com/klauspost/compress/zip" - "github.com/minio/madmin-go" - "github.com/minio/madmin-go/estream" + "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v2/estream" "github.com/minio/minio/internal/dsync" "github.com/minio/minio/internal/handlers" xhttp "github.com/minio/minio/internal/http" diff --git a/cmd/admin-handlers_test.go b/cmd/admin-handlers_test.go index 93018c47b..25640b79a 100644 --- a/cmd/admin-handlers_test.go +++ b/cmd/admin-handlers_test.go @@ -30,7 +30,7 @@ import ( "time" "github.com/gorilla/mux" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/auth" ) diff --git a/cmd/admin-heal-ops.go b/cmd/admin-heal-ops.go index c1dc7108c..c8ba3b073 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" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger" ) diff --git a/cmd/admin-router.go b/cmd/admin-router.go index 7dba7266d..d00b32986 100644 --- a/cmd/admin-router.go +++ b/cmd/admin-router.go @@ -23,7 +23,7 @@ import ( "github.com/gorilla/mux" "github.com/klauspost/compress/gzhttp" "github.com/klauspost/compress/gzip" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger" ) diff --git a/cmd/admin-server-info.go b/cmd/admin-server-info.go index 3bd5c6ecd..572b39362 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" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/logger" ) diff --git a/cmd/api-errors.go b/cmd/api-errors.go index 9317b1cae..34eaab35b 100644 --- a/cmd/api-errors.go +++ b/cmd/api-errors.go @@ -30,7 +30,7 @@ import ( "github.com/Azure/azure-storage-blob-go/azblob" "google.golang.org/api/googleapi" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 abc57b338..3c669b092 100644 --- a/cmd/background-heal-ops.go +++ b/cmd/background-heal-ops.go @@ -21,7 +21,7 @@ import ( "context" "runtime" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" ) // healTask represents what to heal along with options diff --git a/cmd/background-newdisks-heal-ops.go b/cmd/background-newdisks-heal-ops.go index cef2af553..cca0c85c1 100644 --- a/cmd/background-newdisks-heal-ops.go +++ b/cmd/background-newdisks-heal-ops.go @@ -29,7 +29,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/logger" ) diff --git a/cmd/batch-handlers.go b/cmd/batch-handlers.go index ec3b94682..585d3835c 100644 --- a/cmd/batch-handlers.go +++ b/cmd/batch-handlers.go @@ -34,7 +34,7 @@ import ( "github.com/dustin/go-humanize" "github.com/lithammer/shortuuid/v4" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" miniogo "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/tags" diff --git a/cmd/bucket-encryption-handlers.go b/cmd/bucket-encryption-handlers.go index aa5999485..e4d1da48b 100644 --- a/cmd/bucket-encryption-handlers.go +++ b/cmd/bucket-encryption-handlers.go @@ -27,7 +27,7 @@ import ( "github.com/gorilla/mux" "github.com/minio/kes" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" diff --git a/cmd/bucket-handlers.go b/cmd/bucket-handlers.go index 828be195d..8cbeec4b0 100644 --- a/cmd/bucket-handlers.go +++ b/cmd/bucket-handlers.go @@ -36,7 +36,7 @@ import ( "github.com/google/uuid" "github.com/gorilla/mux" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio-go/v7/pkg/tags" sse "github.com/minio/minio/internal/bucket/encryption" diff --git a/cmd/bucket-metadata-sys.go b/cmd/bucket-metadata-sys.go index 767c14027..70c45eb79 100644 --- a/cmd/bucket-metadata-sys.go +++ b/cmd/bucket-metadata-sys.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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-metadata.go b/cmd/bucket-metadata.go index 4a9ebe4f4..04e285bf6 100644 --- a/cmd/bucket-metadata.go +++ b/cmd/bucket-metadata.go @@ -29,7 +29,7 @@ import ( "path" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 57157bc87..b315525c0 100644 --- a/cmd/bucket-policy-handlers.go +++ b/cmd/bucket-policy-handlers.go @@ -25,7 +25,7 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/gorilla/mux" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/bucket-quota.go b/cmd/bucket-quota.go index cd2f66c8d..7a9372883 100644 --- a/cmd/bucket-quota.go +++ b/cmd/bucket-quota.go @@ -24,7 +24,7 @@ import ( "fmt" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger" ) diff --git a/cmd/bucket-replication-utils.go b/cmd/bucket-replication-utils.go index 788eaf996..c525fc87b 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" + "github.com/minio/madmin-go/v2" "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 1d50da256..f1ba7ac6a 100644 --- a/cmd/bucket-replication.go +++ b/cmd/bucket-replication.go @@ -34,7 +34,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 7ded8fc8b..047714d53 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" + "github.com/minio/madmin-go/v2" "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 93f97945f..5c0370bf7 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" + "github.com/minio/madmin-go/v2" "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 db679caf1..5acc71c50 100644 --- a/cmd/bucket-versioning-handler.go +++ b/cmd/bucket-versioning-handler.go @@ -25,7 +25,7 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/gorilla/mux" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/bucket/versioning" "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" diff --git a/cmd/callhome.go b/cmd/callhome.go index fc467a1a2..53eb29825 100644 --- a/cmd/callhome.go +++ b/cmd/callhome.go @@ -28,7 +28,7 @@ import ( "net/url" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger" ) diff --git a/cmd/common-main.go b/cmd/common-main.go index 7f374c2d7..ed84253fd 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" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 2c35ac432..b627fd6ff 100644 --- a/cmd/config-current.go +++ b/cmd/config-current.go @@ -24,7 +24,7 @@ import ( "strings" "sync" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/config/api" diff --git a/cmd/config-encrypted.go b/cmd/config-encrypted.go index 099a0de6a..5620fc3a5 100644 --- a/cmd/config-encrypted.go +++ b/cmd/config-encrypted.go @@ -25,7 +25,7 @@ import ( "time" "unicode/utf8" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" diff --git a/cmd/config-encrypted_test.go b/cmd/config-encrypted_test.go index 4957440d4..02d5cea85 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" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/auth" ) diff --git a/cmd/config-migrate.go b/cmd/config-migrate.go index 98a28463c..f10230d27 100644 --- a/cmd/config-migrate.go +++ b/cmd/config-migrate.go @@ -27,7 +27,7 @@ import ( "strings" "unicode/utf8" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/config/cache" diff --git a/cmd/config.go b/cmd/config.go index a7975f9b7..e6e7cbd46 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -28,7 +28,7 @@ import ( "unicode/utf8" jsoniter "github.com/json-iterator/go" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/kms" ) diff --git a/cmd/consolelogger.go b/cmd/consolelogger.go index 925ba6b62..ba309b338 100644 --- a/cmd/consolelogger.go +++ b/cmd/consolelogger.go @@ -23,7 +23,7 @@ import ( "sync" "sync/atomic" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger/message/log" "github.com/minio/minio/internal/logger/target/console" diff --git a/cmd/data-scanner-metric.go b/cmd/data-scanner-metric.go index c3cbf6cef..888d0d586 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" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/bucket/lifecycle" ) diff --git a/cmd/data-scanner.go b/cmd/data-scanner.go index 8b63de9c8..c635b6aa1 100644 --- a/cmd/data-scanner.go +++ b/cmd/data-scanner.go @@ -35,7 +35,7 @@ import ( "github.com/bits-and-blooms/bloom/v3" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 d5b343b25..271b6a86f 100644 --- a/cmd/data-usage-cache.go +++ b/cmd/data-usage-cache.go @@ -32,7 +32,7 @@ import ( "github.com/cespare/xxhash/v2" "github.com/klauspost/compress/zstd" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 e377b7e16..5324c5838 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" + "github.com/minio/madmin-go/v2" ) // BucketTargetUsageInfo - bucket target usage info provides diff --git a/cmd/erasure-healing-common.go b/cmd/erasure-healing-common.go index af1131963..4d8bf88ee 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" + "github.com/minio/madmin-go/v2" ) // commonTime returns a maximally occurring time from a list of time. diff --git a/cmd/erasure-healing-common_test.go b/cmd/erasure-healing-common_test.go index 72c268074..b109f05df 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" + "github.com/minio/madmin-go/v2" ) // 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 960ed0b7a..d69938c5b 100644 --- a/cmd/erasure-healing.go +++ b/cmd/erasure-healing.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/sync/errgroup" ) diff --git a/cmd/erasure-healing_test.go b/cmd/erasure-healing_test.go index 115f3ce58..4f1c3f77c 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" + "github.com/minio/madmin-go/v2" ) // Tests isObjectDangling function diff --git a/cmd/erasure-object.go b/cmd/erasure-object.go index cac25c86a..bcea46308 100644 --- a/cmd/erasure-object.go +++ b/cmd/erasure-object.go @@ -31,7 +31,7 @@ import ( "sync" "github.com/klauspost/readahead" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 0c0b6c63e..b3c25e9cf 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" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/bucket/lifecycle" "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/logger" diff --git a/cmd/erasure-server-pool-rebalance.go b/cmd/erasure-server-pool-rebalance.go index ebbdd83cc..c218dd76b 100644 --- a/cmd/erasure-server-pool-rebalance.go +++ b/cmd/erasure-server-pool-rebalance.go @@ -31,7 +31,7 @@ import ( "time" "github.com/lithammer/shortuuid/v4" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/bucket/lifecycle" "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/logger" diff --git a/cmd/erasure-server-pool.go b/cmd/erasure-server-pool.go index d39eb0dff..eb36a49a9 100644 --- a/cmd/erasure-server-pool.go +++ b/cmd/erasure-server-pool.go @@ -32,7 +32,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/internal/bucket/lifecycle" diff --git a/cmd/erasure-sets.go b/cmd/erasure-sets.go index 57d439232..4cb4728a9 100644 --- a/cmd/erasure-sets.go +++ b/cmd/erasure-sets.go @@ -34,7 +34,7 @@ import ( "github.com/dchest/siphash" "github.com/dustin/go-humanize" "github.com/google/uuid" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 0726311ba..1cf7f01a9 100644 --- a/cmd/erasure.go +++ b/cmd/erasure.go @@ -28,7 +28,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/bpool" "github.com/minio/minio/internal/dsync" "github.com/minio/minio/internal/logger" diff --git a/cmd/global-heal.go b/cmd/global-heal.go index 8febcaf72..abd508f06 100644 --- a/cmd/global-heal.go +++ b/cmd/global-heal.go @@ -25,7 +25,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/color" "github.com/minio/minio/internal/config/storageclass" "github.com/minio/minio/internal/jobtokens" diff --git a/cmd/globals.go b/cmd/globals.go index b1096b962..06f2c99c2 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" + "github.com/minio/madmin-go/v2" "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 63facc700..a83cecacf 100644 --- a/cmd/handler-utils.go +++ b/cmd/handler-utils.go @@ -29,7 +29,7 @@ import ( "regexp" "strings" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 52ba67892..20c953977 100644 --- a/cmd/http-tracer.go +++ b/cmd/http-tracer.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/handlers" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/mcontext" diff --git a/cmd/iam-store.go b/cmd/iam-store.go index af9ba3f99..1269327a1 100644 --- a/cmd/iam-store.go +++ b/cmd/iam-store.go @@ -29,7 +29,7 @@ import ( "github.com/dustin/go-humanize" jsoniter "github.com/json-iterator/go" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 163317f67..7da93bee4 100644 --- a/cmd/iam.go +++ b/cmd/iam.go @@ -33,7 +33,7 @@ import ( "time" humanize "github.com/dustin/go-humanize" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 75ee38c09..12fa87adc 100644 --- a/cmd/kms-handlers.go +++ b/cmd/kms-handlers.go @@ -24,7 +24,7 @@ import ( "time" "github.com/minio/kes" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 f3e169bad..ad5537241 100644 --- a/cmd/last-minute.go +++ b/cmd/last-minute.go @@ -22,7 +22,7 @@ package cmd import ( "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" ) const ( diff --git a/cmd/metrics-realtime.go b/cmd/metrics-realtime.go index a2f5e8751..19a53d569 100644 --- a/cmd/metrics-realtime.go +++ b/cmd/metrics-realtime.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/disk" ) diff --git a/cmd/metrics-v2.go b/cmd/metrics-v2.go index 1231538a0..0e4aed039 100644 --- a/cmd/metrics-v2.go +++ b/cmd/metrics-v2.go @@ -28,7 +28,7 @@ import ( "time" "github.com/minio/kes" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 9b109ec00..f3f79ab1f 100644 --- a/cmd/mrf.go +++ b/cmd/mrf.go @@ -23,7 +23,7 @@ import ( "sync/atomic" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger" ) diff --git a/cmd/naughty-disk_test.go b/cmd/naughty-disk_test.go index 84a2b31eb..cdde30de4 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" + "github.com/minio/madmin-go/v2" ) // naughtyDisk wraps a POSIX disk and returns programmed errors diff --git a/cmd/notification-summary.go b/cmd/notification-summary.go index e257970fc..ff3933a20 100644 --- a/cmd/notification-summary.go +++ b/cmd/notification-summary.go @@ -18,7 +18,7 @@ package cmd import ( - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" ) // GetTotalCapacity gets the total capacity in the cluster. diff --git a/cmd/notification.go b/cmd/notification.go index f35477a0f..93db127ba 100644 --- a/cmd/notification.go +++ b/cmd/notification.go @@ -32,7 +32,7 @@ import ( "github.com/bits-and-blooms/bloom/v3" "github.com/cespare/xxhash/v2" "github.com/klauspost/compress/zip" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" bucketBandwidth "github.com/minio/minio/internal/bucket/bandwidth" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/sync/errgroup" diff --git a/cmd/object-api-datatypes.go b/cmd/object-api-datatypes.go index d6c46585b..e1be71a78 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" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/bucket/replication" "github.com/minio/minio/internal/hash" ) diff --git a/cmd/object-api-interface.go b/cmd/object-api-interface.go index 9b66ca81c..6bd544251 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" + "github.com/minio/madmin-go/v2" "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 760b997bb..edd144a4e 100644 --- a/cmd/os-instrumented.go +++ b/cmd/os-instrumented.go @@ -23,7 +23,7 @@ import ( "sync/atomic" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 4acf90b21..51fd70d05 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" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/event" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" diff --git a/cmd/peer-rest-server.go b/cmd/peer-rest-server.go index 4d84fef90..633e2135a 100644 --- a/cmd/peer-rest-server.go +++ b/cmd/peer-rest-server.go @@ -31,7 +31,7 @@ import ( "github.com/dustin/go-humanize" "github.com/gorilla/mux" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" 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 51488fec8..3b7b8c657 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" + "github.com/minio/madmin-go/v2" "github.com/minio/minio-go/v7" "github.com/minio/pkg/randreader" ) diff --git a/cmd/server-rlimit.go b/cmd/server-rlimit.go index c273779a3..cd1c38789 100644 --- a/cmd/server-rlimit.go +++ b/cmd/server-rlimit.go @@ -21,7 +21,7 @@ import ( "runtime" "runtime/debug" - "github.com/minio/madmin-go/kernel" + "github.com/minio/madmin-go/v2/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 45735d1a0..b679dd0ef 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" + "github.com/minio/madmin-go/v2" 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 b305b64ac..f3dd7c54c 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" + "github.com/minio/madmin-go/v2" ) // Tests if we generate storage info. diff --git a/cmd/signature-v4-utils_test.go b/cmd/signature-v4-utils_test.go index fe876b91a..c5d47d889 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" + "github.com/minio/madmin-go/v2" "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 6bb7a2c95..192389f0d 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" + "github.com/minio/madmin-go/v2" ) //go:generate msgp -file=$GOFILE diff --git a/cmd/site-replication.go b/cmd/site-replication.go index 63d0507ec..c9c91b870 100644 --- a/cmd/site-replication.go +++ b/cmd/site-replication.go @@ -34,7 +34,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" 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 c19275342..4f29a4e7d 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" + "github.com/minio/madmin-go/v2" "github.com/minio/minio-go/v7/pkg/set" ) diff --git a/cmd/speedtest.go b/cmd/speedtest.go index 1bf2f1194..b96159022 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" + "github.com/minio/madmin-go/v2" ) const speedTest = "speedtest" diff --git a/cmd/storage-interface.go b/cmd/storage-interface.go index 950884a33..e4bac7811 100644 --- a/cmd/storage-interface.go +++ b/cmd/storage-interface.go @@ -22,7 +22,7 @@ import ( "io" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" ) // StorageAPI interface. diff --git a/cmd/storage-rest-client.go b/cmd/storage-rest-client.go index 646a1bd30..3f1e1b069 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" + "github.com/minio/madmin-go/v2" 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 9a555606d..3253d3bb0 100644 --- a/cmd/storage-rest-server.go +++ b/cmd/storage-rest-server.go @@ -39,7 +39,7 @@ import ( jwtreq "github.com/golang-jwt/jwt/v4/request" "github.com/gorilla/mux" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 313e1b020..6340ac468 100644 --- a/cmd/sts-handlers.go +++ b/cmd/sts-handlers.go @@ -30,7 +30,7 @@ import ( "time" "github.com/gorilla/mux" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 8dfc6445f..2a7a9a16c 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" + "github.com/minio/madmin-go/v2" 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 4708f9b00..7f89a9069 100644 --- a/cmd/tier-handlers.go +++ b/cmd/tier-handlers.go @@ -24,7 +24,7 @@ import ( "github.com/gorilla/mux" jsoniter "github.com/json-iterator/go" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/config/storageclass" "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" diff --git a/cmd/tier-last-day-stats.go b/cmd/tier-last-day-stats.go index b4bb8199b..bea39a23e 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" + "github.com/minio/madmin-go/v2" ) type lastDayTierStats struct { diff --git a/cmd/tier.go b/cmd/tier.go index 27cf4972b..7f42d6fcf 100644 --- a/cmd/tier.go +++ b/cmd/tier.go @@ -28,7 +28,7 @@ import ( "strings" "sync" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 03464d331..056eed510 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" + "github.com/minio/madmin-go/v2" "github.com/tinylib/msgp/msgp" ) diff --git a/cmd/utils.go b/cmd/utils.go index 76d16be8f..192a3501b 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -45,7 +45,7 @@ import ( "github.com/dustin/go-humanize" "github.com/felixge/fgprof" "github.com/gorilla/mux" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 706ec5273..4da8e6757 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" + "github.com/minio/madmin-go/v2" ) type warmBackendAzure struct { diff --git a/cmd/warm-backend-gcs.go b/cmd/warm-backend-gcs.go index 2edba0559..322d584c8 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" + "github.com/minio/madmin-go/v2" "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 30f9914bc..2f8aafe58 100644 --- a/cmd/warm-backend-minio.go +++ b/cmd/warm-backend-minio.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" 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 d6eeed1e2..a79512651 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" + "github.com/minio/madmin-go/v2" "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 de3eb1dfb..dc1034e1f 100644 --- a/cmd/warm-backend.go +++ b/cmd/warm-backend.go @@ -24,7 +24,7 @@ import ( "fmt" "io" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" ) // WarmBackendGetOpts is used to express byte ranges within an object. The zero diff --git a/cmd/xl-storage-disk-id-check.go b/cmd/xl-storage-disk-id-check.go index d8c71df59..0aa8d8cc0 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" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger" "github.com/minio/pkg/env" ) diff --git a/cmd/xl-storage.go b/cmd/xl-storage.go index 2a075e967..79e7764c7 100644 --- a/cmd/xl-storage.go +++ b/cmd/xl-storage.go @@ -38,7 +38,7 @@ import ( "github.com/dustin/go-humanize" "github.com/google/uuid" jsoniter "github.com/json-iterator/go" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/bucket/lifecycle" "github.com/minio/minio/internal/color" "github.com/minio/minio/internal/disk" diff --git a/docs/debugging/inspect/decrypt-v2.go b/docs/debugging/inspect/decrypt-v2.go index 8871ca2ac..8952cd72e 100644 --- a/docs/debugging/inspect/decrypt-v2.go +++ b/docs/debugging/inspect/decrypt-v2.go @@ -23,7 +23,7 @@ import ( "io" "os" - "github.com/minio/madmin-go/estream" + "github.com/minio/madmin-go/v2/estream" ) func extractInspectV2(pk []byte, r io.Reader, w io.Writer) error { diff --git a/go.mod b/go.mod index 8b917d62e..eebee3224 100644 --- a/go.mod +++ b/go.mod @@ -34,8 +34,8 @@ require ( github.com/hashicorp/golang-lru v0.5.4 github.com/inconshreveable/mousetrap v1.0.1 github.com/json-iterator/go v1.1.12 - github.com/klauspost/compress v1.15.11 - github.com/klauspost/cpuid/v2 v2.1.2 + github.com/klauspost/compress v1.15.12 + github.com/klauspost/cpuid/v2 v2.2.1 github.com/klauspost/pgzip v1.2.5 github.com/klauspost/readahead v1.4.0 github.com/klauspost/reedsolomon v1.11.3 @@ -43,14 +43,14 @@ require ( github.com/lithammer/shortuuid/v4 v4.0.0 github.com/miekg/dns v1.1.50 github.com/minio/cli v1.24.0 - github.com/minio/console v0.21.3 + github.com/minio/console v0.22.0 github.com/minio/csvparser v1.0.0 github.com/minio/dperf v0.4.2 github.com/minio/highwayhash v1.0.2 github.com/minio/kes v0.22.0 - github.com/minio/madmin-go v1.7.5 - github.com/minio/minio-go/v7 v7.0.43 - github.com/minio/pkg v1.5.4 + github.com/minio/madmin-go/v2 v2.0.0 + github.com/minio/minio-go/v7 v7.0.44 + github.com/minio/pkg v1.5.5 github.com/minio/selfupdate v0.5.0 github.com/minio/sha256-simd v1.0.0 github.com/minio/simdjson-go v0.4.2 @@ -84,8 +84,8 @@ require ( go.etcd.io/etcd/client/v3 v3.5.5 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 - golang.org/x/crypto v0.2.0 - golang.org/x/oauth2 v0.1.0 + golang.org/x/crypto v0.3.0 + golang.org/x/oauth2 v0.2.0 golang.org/x/sys v0.2.0 golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 google.golang.org/api v0.98.0 @@ -150,6 +150,7 @@ require ( github.com/jcmturner/gofork v1.7.6 // indirect github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect github.com/jcmturner/rpc/v2 v2.0.3 // indirect + github.com/jedib0t/go-pretty/v6 v6.3.8 // indirect github.com/jessevdk/go-flags v1.5.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect @@ -169,7 +170,7 @@ require ( github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect github.com/minio/colorjson v1.0.4 // indirect github.com/minio/filepath v1.0.0 // indirect - github.com/minio/mc v0.0.0-20221103000258-583d449e38cd // indirect + github.com/minio/mc v0.0.0-20221201184114-854b4f123f03 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect diff --git a/go.sum b/go.sum index 7a9b1025d..18372244a 100644 --- a/go.sum +++ b/go.sum @@ -626,6 +626,8 @@ github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= +github.com/jedib0t/go-pretty/v6 v6.3.8 h1:p5eZqLFMEGr7CC+9915lC4Dk7Gub6mH7NE35jDhkJsQ= +github.com/jedib0t/go-pretty/v6 v6.3.8/go.mod h1:MgmISkTWDSFu0xOqiZ0mKNntMQ2mDgOcwOkwBEkMDJI= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= @@ -650,14 +652,15 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= -github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.15.12 h1:YClS/PImqYbn+UILDnqxQCZ3RehC9N318SU3kElDUEM= +github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.1.0/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= -github.com/klauspost/cpuid/v2 v2.1.2 h1:XhdX4fqAJUA0yj+kUwMavO0hHrSPAecYdYf1ZmxHvak= github.com/klauspost/cpuid/v2 v2.1.2/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/klauspost/cpuid/v2 v2.2.1 h1:U33DW0aiEj633gHYw3LoDNfkDiYnE5Q8M/TKJn2f2jI= +github.com/klauspost/cpuid/v2 v2.2.1/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/klauspost/readahead v1.4.0 h1:w4hQ3BpdLjBnRQkZyNi+nwdHU7eGP9buTexWK9lU7gY= @@ -745,8 +748,8 @@ github.com/minio/cli v1.24.0 h1:QrSIs7iISwaFmTlGFAR9cSpkZn7/tTaFsj5oAUCC47I= github.com/minio/cli v1.24.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= github.com/minio/colorjson v1.0.4 h1:sNJYTb2uNswdqmGARg9wrogCX8+GRZzEacYbJT86e00= github.com/minio/colorjson v1.0.4/go.mod h1:ZgE8vYon4xC4yfBPclP/2gqMRYw+p+xRsBbLMDKdb9M= -github.com/minio/console v0.21.3 h1:4jIwCG+RqGJbr3zT+xqmYt3b5XURxzfGNaQrwz084vU= -github.com/minio/console v0.21.3/go.mod h1:97brMYbmPeX+CpZO+XhO3wg2mn1pIjiOQ+hGhRxrnzI= +github.com/minio/console v0.22.0 h1:D6P7KxX+z0FrvTBnobNOQsX88shP0MELOB7i5fbvG04= +github.com/minio/console v0.22.0/go.mod h1:DoMe9LaqOyfwDCNOmXvoDfV7aM/tV8cB986z8McriB4= github.com/minio/csvparser v1.0.0 h1:xJEHcYK8ZAjeW4hNV9Zu30u+/2o4UyPnYgyjWp8b7ZU= github.com/minio/csvparser v1.0.0/go.mod h1:lKXskSLzPgC5WQyzP7maKH7Sl1cqvANXo9YCto8zbtM= github.com/minio/dperf v0.4.2 h1:u2fcdXViX3+alZcEYSOh1crNbGtVU5drQ24lP3Xx6j8= @@ -759,17 +762,18 @@ github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLT github.com/minio/kes v0.22.0 h1:3PGIgjHTC5fAjmqfUcLIcSxV5CaxPyjY3q8q28UF158= github.com/minio/kes v0.22.0/go.mod h1:q5T0uTFrr7l6GosXvF0ufCtUKkbmbSZW1Yhu4KgLKE8= github.com/minio/madmin-go v1.6.6/go.mod h1:ATvkBOLiP3av4D++2v1UEHC/QzsGtgXD5kYvvRYzdKs= -github.com/minio/madmin-go v1.7.5 h1:IF8j2HR0jWc7msiOcy0KJ8EyY7Q3z+j+lsmSDksQm+I= -github.com/minio/madmin-go v1.7.5/go.mod h1:3SO8SROxHN++tF6QxdTii2SSUaYSrr8lnE9EJWjvz0k= -github.com/minio/mc v0.0.0-20221103000258-583d449e38cd h1:9FqmFhidgzw4YI5x30Jbff9psgUQrMr61Wuq1ndTwug= -github.com/minio/mc v0.0.0-20221103000258-583d449e38cd/go.mod h1:cP4HBhF2WqgxEcyZHskWrIV6q4GpInRUjmglrPUutW0= +github.com/minio/madmin-go/v2 v2.0.0 h1:VR+zCIeoHPveppvMUhZ/vmok1UJp4pH38M4wkqpyT88= +github.com/minio/madmin-go/v2 v2.0.0/go.mod h1:5aFi/VLWBHC2DEFfGIlUmAeJhaF4ZAjuYpEWZFU14Zw= +github.com/minio/mc v0.0.0-20221201184114-854b4f123f03 h1:/q0NA3KjhTL+q/R9xEye0lpJECJmwaZnuIBsBn4HP28= +github.com/minio/mc v0.0.0-20221201184114-854b4f123f03/go.mod h1:+Jrdvdo6p83JtqUO38UUeTu4aspklp9cF9k6DqFkb0Q= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= github.com/minio/minio-go/v7 v7.0.41/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw= -github.com/minio/minio-go/v7 v7.0.43 h1:14Q4lwblqTdlAmba05oq5xL0VBLHi06zS4yLnIkz6hI= -github.com/minio/minio-go/v7 v7.0.43/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw= -github.com/minio/pkg v1.5.4 h1:tP89j5EPym0C/kwacUm3NKgvpWEksDq2bVJJMQYLkmk= +github.com/minio/minio-go/v7 v7.0.44 h1:9zUJ7iU7ax2P1jOvTp6nVrgzlZq3AZlFm0XfRFDKstM= +github.com/minio/minio-go/v7 v7.0.44/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw= github.com/minio/pkg v1.5.4/go.mod h1:2MOaRFdmFKULD+uOLc3qHLGTQTuxCNPKNPfLBTxC8CA= +github.com/minio/pkg v1.5.5 h1:z53jAVkXpRD+Y4LBt9cN+EaPUbWD6iOWhZuC90JvGqk= +github.com/minio/pkg v1.5.5/go.mod h1:EiGlHS2xaooa2VMxhJsxxAZHDObHVUB3HwtuoEXOCVE= github.com/minio/selfupdate v0.5.0 h1:0UH1HlL49+2XByhovKl5FpYTjKfvrQ2sgL1zEXK6mfI= github.com/minio/selfupdate v0.5.0/go.mod h1:mcDkzMgq8PRcpCRJo/NlPY7U45O5dfYl2Y0Rg7IustY= github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= @@ -872,6 +876,7 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/xattr v0.4.9 h1:5883YPCtkSd8LFbs13nXplj9g9tlrwoJRjgpgMu1/fE= github.com/pkg/xattr v0.4.9/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU= @@ -993,8 +998,9 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw= github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= @@ -1110,8 +1116,8 @@ golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.2.0 h1:BRXPfhNivWL5Yq0BGQ39a2sW6t44aODpfxkWjYdzewE= -golang.org/x/crypto v0.2.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= +golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1234,8 +1240,8 @@ golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7Lm golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= -golang.org/x/oauth2 v0.1.0 h1:isLCZuhj4v+tYv7eskaN4v/TM+A1begWWgyVJDdl1+Y= -golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= +golang.org/x/oauth2 v0.2.0 h1:GtQkldQ9m7yvzCL1V+LrYow3Khe0eJH0w7RbX/VbaIU= +golang.org/x/oauth2 v0.2.0/go.mod h1:Cwn6afJ8jrQwYMxQDTpISoXmXW9I6qF6vDeuuoX3Ibs= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/internal/bucket/bandwidth/monitor.go b/internal/bucket/bandwidth/monitor.go index 48dacccbd..1efe0a990 100644 --- a/internal/bucket/bandwidth/monitor.go +++ b/internal/bucket/bandwidth/monitor.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "golang.org/x/time/rate" ) diff --git a/internal/bucket/bandwidth/monitor_test.go b/internal/bucket/bandwidth/monitor_test.go index d7eb6a49b..786599659 100644 --- a/internal/bucket/bandwidth/monitor_test.go +++ b/internal/bucket/bandwidth/monitor_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" ) const ( diff --git a/internal/config/config.go b/internal/config/config.go index ca1219a7f..73c7d210f 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -25,7 +25,7 @@ import ( "sort" "strings" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "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 a62f5fbfa..6bb0bf63c 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" + "github.com/minio/madmin-go/v2" "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 1d24b7623..44da71923 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" + "github.com/minio/madmin-go/v2" "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 231cc12ca..7c6846978 100644 --- a/internal/event/event.go +++ b/internal/event/event.go @@ -18,7 +18,7 @@ package event import ( - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" ) const ( diff --git a/internal/logger/audit.go b/internal/logger/audit.go index e23de5ba1..016f6a0ca 100644 --- a/internal/logger/audit.go +++ b/internal/logger/audit.go @@ -25,7 +25,7 @@ import ( "time" "github.com/klauspost/compress/gzhttp" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger/message/audit" ) diff --git a/internal/logger/logger.go b/internal/logger/logger.go index 831b22812..877e4f4ac 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" + "github.com/minio/madmin-go/v2" "github.com/minio/minio-go/v7/pkg/set" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger/message/log" diff --git a/internal/logger/message/log/entry.go b/internal/logger/message/log/entry.go index bbb3424df..7f75c0408 100644 --- a/internal/logger/message/log/entry.go +++ b/internal/logger/message/log/entry.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" ) // ObjectVersion object version key/versionId diff --git a/internal/logger/targets.go b/internal/logger/targets.go index 91961191f..4abe913df 100644 --- a/internal/logger/targets.go +++ b/internal/logger/targets.go @@ -22,7 +22,7 @@ import ( "strings" "sync" - "github.com/minio/madmin-go" + "github.com/minio/madmin-go/v2" "github.com/minio/minio/internal/logger/target/http" "github.com/minio/minio/internal/logger/target/kafka" "github.com/minio/minio/internal/logger/target/types"