From f1524b0120f3949b23a6d272b116aeb79225a2d2 Mon Sep 17 00:00:00 2001 From: Aditya Manthramurthy Date: Fri, 24 May 2024 10:44:55 -0700 Subject: [PATCH] Bump up minio/pkg to v3 (#3349) --- api/admin_client_mock.go | 2 +- api/admin_policies.go | 2 +- api/admin_policies_test.go | 2 +- api/admin_releases.go | 2 +- api/admin_users.go | 2 +- api/admin_users_test.go | 2 +- api/client-admin.go | 2 +- api/client.go | 2 +- api/config.go | 6 ++-- api/configure_console.go | 6 ++-- api/license.go | 4 +-- api/policy/policies_test.go | 2 +- api/public_objects.go | 2 +- api/service_accounts_handlers.go | 2 +- api/user_buckets.go | 2 +- api/user_log_search.go | 2 +- api/user_login.go | 2 +- api/user_login_test.go | 2 +- api/user_objects.go | 2 +- api/user_session.go | 4 +-- cmd/console/main.go | 6 ++-- go.mod | 29 +++++++++--------- go.sum | 52 +++++++++++++++++--------------- pkg/auth/idp/oauth2/config.go | 2 +- pkg/auth/idp/oauth2/provider.go | 2 +- pkg/auth/ldap/config.go | 2 +- pkg/auth/token/config.go | 2 +- pkg/certs/certs.go | 4 +-- pkg/logger/config.go | 2 +- pkg/logger/console.go | 2 +- pkg/logger/logger.go | 4 +-- pkg/subnet/config.go | 2 +- pkg/subnet/config_test.go | 2 +- pkg/subnet/utils.go | 2 +- pkg/utils/parity.go | 2 +- pkg/utils/parity_test.go | 2 +- 36 files changed, 87 insertions(+), 82 deletions(-) diff --git a/api/admin_client_mock.go b/api/admin_client_mock.go index e3514c6da..2165a1fc1 100644 --- a/api/admin_client_mock.go +++ b/api/admin_client_mock.go @@ -22,7 +22,7 @@ import ( "time" "github.com/minio/madmin-go/v3" - iampolicy "github.com/minio/pkg/v2/policy" + iampolicy "github.com/minio/pkg/v3/policy" ) type AdminClientMock struct{} diff --git a/api/admin_policies.go b/api/admin_policies.go index 2e56820b3..a400e476e 100644 --- a/api/admin_policies.go +++ b/api/admin_policies.go @@ -32,7 +32,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/api/operations" "github.com/minio/console/models" - iampolicy "github.com/minio/pkg/v2/policy" + iampolicy "github.com/minio/pkg/v3/policy" policies "github.com/minio/console/api/policy" ) diff --git a/api/admin_policies_test.go b/api/admin_policies_test.go index 7d21be4ec..c0380f742 100644 --- a/api/admin_policies_test.go +++ b/api/admin_policies_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/minio/console/models" - iampolicy "github.com/minio/pkg/v2/policy" + iampolicy "github.com/minio/pkg/v3/policy" "github.com/stretchr/testify/assert" ) diff --git a/api/admin_releases.go b/api/admin_releases.go index eff803983..d70658903 100644 --- a/api/admin_releases.go +++ b/api/admin_releases.go @@ -30,7 +30,7 @@ import ( "github.com/minio/console/api/operations" release "github.com/minio/console/api/operations/release" "github.com/minio/console/models" - "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v3/env" ) var ( diff --git a/api/admin_users.go b/api/admin_users.go index 6cc22b305..e0b51155f 100644 --- a/api/admin_users.go +++ b/api/admin_users.go @@ -32,7 +32,7 @@ import ( userApi "github.com/minio/console/api/operations/user" "github.com/minio/console/models" "github.com/minio/madmin-go/v3" - iampolicy "github.com/minio/pkg/v2/policy" + iampolicy "github.com/minio/pkg/v3/policy" ) // Policy evaluated constants diff --git a/api/admin_users_test.go b/api/admin_users_test.go index 7d9d65196..1dc5e3303 100644 --- a/api/admin_users_test.go +++ b/api/admin_users_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/minio/madmin-go/v3" - iampolicy "github.com/minio/pkg/v2/policy" + iampolicy "github.com/minio/pkg/v3/policy" asrt "github.com/stretchr/testify/assert" ) diff --git a/api/client-admin.go b/api/client-admin.go index 80814be67..ba11a81c6 100644 --- a/api/client-admin.go +++ b/api/client-admin.go @@ -35,7 +35,7 @@ import ( "github.com/minio/console/models" "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/credentials" - iampolicy "github.com/minio/pkg/v2/policy" + iampolicy "github.com/minio/pkg/v3/policy" ) const globalAppName = "MinIO Console" diff --git a/api/client.go b/api/client.go index da79b70c6..152e371e8 100644 --- a/api/client.go +++ b/api/client.go @@ -27,7 +27,7 @@ import ( "github.com/minio/minio-go/v7/pkg/replication" "github.com/minio/minio-go/v7/pkg/sse" - xnet "github.com/minio/pkg/v2/net" + xnet "github.com/minio/pkg/v3/net" "github.com/minio/console/models" "github.com/minio/console/pkg" diff --git a/api/config.go b/api/config.go index f6f2a2435..06193e080 100644 --- a/api/config.go +++ b/api/config.go @@ -26,9 +26,9 @@ import ( "time" "github.com/minio/console/pkg/auth/idp/oauth2" - xcerts "github.com/minio/pkg/v2/certs" - "github.com/minio/pkg/v2/env" - xnet "github.com/minio/pkg/v2/net" + xcerts "github.com/minio/pkg/v3/certs" + "github.com/minio/pkg/v3/env" + xnet "github.com/minio/pkg/v3/net" ) var ( diff --git a/api/configure_console.go b/api/configure_console.go index 852685faa..134933cce 100644 --- a/api/configure_console.go +++ b/api/configure_console.go @@ -44,9 +44,9 @@ import ( "github.com/klauspost/compress/gzhttp" portal_ui "github.com/minio/console/web-app" - "github.com/minio/pkg/v2/env" - "github.com/minio/pkg/v2/mimedb" - xnet "github.com/minio/pkg/v2/net" + "github.com/minio/pkg/v3/env" + "github.com/minio/pkg/v3/mimedb" + xnet "github.com/minio/pkg/v3/net" "github.com/go-openapi/errors" "github.com/go-openapi/swag" diff --git a/api/license.go b/api/license.go index 5d3b9e393..4a13171dd 100644 --- a/api/license.go +++ b/api/license.go @@ -20,8 +20,8 @@ import ( "net/http" "os" - "github.com/minio/pkg/v2/licverifier" - "github.com/minio/pkg/v2/subnet" + "github.com/minio/pkg/v3/licverifier" + "github.com/minio/pkg/v3/subnet" ) type SubnetPlan int diff --git a/api/policy/policies_test.go b/api/policy/policies_test.go index 5284fe438..d0ca55ddd 100644 --- a/api/policy/policies_test.go +++ b/api/policy/policies_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/minio/madmin-go/v3" - minioIAMPolicy "github.com/minio/pkg/v2/policy" + minioIAMPolicy "github.com/minio/pkg/v3/policy" ) func TestReplacePolicyVariables(t *testing.T) { diff --git a/api/public_objects.go b/api/public_objects.go index e714aa8c6..8dccfbbdb 100644 --- a/api/public_objects.go +++ b/api/public_objects.go @@ -29,7 +29,7 @@ import ( "github.com/go-openapi/swag" "github.com/minio/console/api/operations" "github.com/minio/console/api/operations/public" - xnet "github.com/minio/pkg/v2/net" + xnet "github.com/minio/pkg/v3/net" ) func registerPublicObjectsHandlers(api *operations.ConsoleAPI) { diff --git a/api/service_accounts_handlers.go b/api/service_accounts_handlers.go index dd2f01bfd..c718d9821 100644 --- a/api/service_accounts_handlers.go +++ b/api/service_accounts_handlers.go @@ -29,7 +29,7 @@ import ( "github.com/minio/console/models" "github.com/minio/console/pkg/utils" "github.com/minio/madmin-go/v3" - iampolicy "github.com/minio/pkg/v2/policy" + iampolicy "github.com/minio/pkg/v3/policy" ) func registerServiceAccountsHandlers(api *operations.ConsoleAPI) { diff --git a/api/user_buckets.go b/api/user_buckets.go index ba3736194..3048ad313 100644 --- a/api/user_buckets.go +++ b/api/user_buckets.go @@ -41,7 +41,7 @@ import ( "github.com/minio/console/pkg/auth/token" "github.com/minio/minio-go/v7/pkg/policy" "github.com/minio/minio-go/v7/pkg/replication" - minioIAMPolicy "github.com/minio/pkg/v2/policy" + minioIAMPolicy "github.com/minio/pkg/v3/policy" ) func registerBucketsHandlers(api *operations.ConsoleAPI) { diff --git a/api/user_log_search.go b/api/user_log_search.go index 44dd1cf89..783292cce 100644 --- a/api/user_log_search.go +++ b/api/user_log_search.go @@ -26,7 +26,7 @@ import ( "github.com/minio/console/api/operations" logApi "github.com/minio/console/api/operations/logging" "github.com/minio/console/models" - iampolicy "github.com/minio/pkg/v2/policy" + iampolicy "github.com/minio/pkg/v3/policy" ) func registerLogSearchHandlers(api *operations.ConsoleAPI) { diff --git a/api/user_login.go b/api/user_login.go index 39658a379..2bd0c9e73 100644 --- a/api/user_login.go +++ b/api/user_login.go @@ -35,7 +35,7 @@ import ( "github.com/minio/console/pkg/auth/idp/oauth2" "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7/pkg/credentials" - "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v3/env" ) func registerLoginHandlers(api *operations.ConsoleAPI) { diff --git a/api/user_login_test.go b/api/user_login_test.go index 1b398b30b..be8268e37 100644 --- a/api/user_login_test.go +++ b/api/user_login_test.go @@ -26,7 +26,7 @@ import ( "github.com/minio/madmin-go/v3" - iampolicy "github.com/minio/pkg/v2/policy" + iampolicy "github.com/minio/pkg/v3/policy" "github.com/minio/console/pkg/auth" diff --git a/api/user_objects.go b/api/user_objects.go index 06d038961..a26946a0c 100644 --- a/api/user_objects.go +++ b/api/user_objects.go @@ -44,7 +44,7 @@ import ( mc "github.com/minio/mc/cmd" "github.com/minio/mc/pkg/probe" "github.com/minio/minio-go/v7/pkg/tags" - "github.com/minio/pkg/v2/mimedb" + "github.com/minio/pkg/v3/mimedb" ) // enum types diff --git a/api/user_session.go b/api/user_session.go index ff9defc65..6ed72fbfb 100644 --- a/api/user_session.go +++ b/api/user_session.go @@ -27,9 +27,9 @@ import ( "github.com/minio/madmin-go/v3" jwtgo "github.com/golang-jwt/jwt/v4" - "github.com/minio/pkg/v2/policy/condition" + "github.com/minio/pkg/v3/policy/condition" - minioIAMPolicy "github.com/minio/pkg/v2/policy" + minioIAMPolicy "github.com/minio/pkg/v3/policy" "github.com/go-openapi/runtime/middleware" "github.com/minio/console/api/operations" diff --git a/cmd/console/main.go b/cmd/console/main.go index 435c69f33..2dc859b9f 100644 --- a/cmd/console/main.go +++ b/cmd/console/main.go @@ -25,9 +25,9 @@ import ( "github.com/minio/cli" "github.com/minio/console/pkg" - "github.com/minio/pkg/v2/console" - "github.com/minio/pkg/v2/trie" - "github.com/minio/pkg/v2/words" + "github.com/minio/pkg/v3/console" + "github.com/minio/pkg/v3/trie" + "github.com/minio/pkg/v3/words" ) // Help template for Console. diff --git a/go.mod b/go.mod index a0adb7df3..9d815cf27 100644 --- a/go.mod +++ b/go.mod @@ -32,18 +32,18 @@ require ( github.com/stretchr/testify v1.9.0 github.com/tidwall/gjson v1.17.1 github.com/unrolled/secure v1.14.0 - golang.org/x/crypto v0.22.0 - golang.org/x/net v0.24.0 + golang.org/x/crypto v0.23.0 + golang.org/x/net v0.25.0 golang.org/x/oauth2 v0.18.0 // Added to include security fix for // https://github.com/golang/go/issues/56152 - golang.org/x/text v0.14.0 // indirect + golang.org/x/text v0.15.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) require ( github.com/mattn/go-ieproxy v0.0.11 - github.com/minio/pkg/v2 v2.0.17 + github.com/minio/pkg/v3 v3.0.0 ) require ( @@ -99,6 +99,7 @@ require ( github.com/minio/filepath v1.0.0 // indirect github.com/minio/kes-go v0.2.1 // indirect github.com/minio/md5-simd v1.1.2 // indirect + github.com/minio/pkg/v2 v2.0.17 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/montanaflynn/stats v0.7.1 // indirect github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect @@ -115,19 +116,19 @@ require ( github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.52.3 // indirect - github.com/prometheus/procfs v0.13.0 // indirect + github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/procfs v0.14.0 // indirect github.com/prometheus/prom2json v1.3.3 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/rjeczalik/notify v0.9.3 // indirect github.com/safchain/ethtool v0.3.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.3 // indirect + github.com/shirou/gopsutil/v3 v3.24.4 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect github.com/tinylib/msgp v1.1.9 // indirect - github.com/tklauser/go-sysconf v0.3.13 // indirect - github.com/tklauser/numcpus v0.7.0 // indirect + github.com/tklauser/go-sysconf v0.3.14 // indirect + github.com/tklauser/numcpus v0.8.0 // indirect github.com/vbauerster/mpb/v8 v8.7.3 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.etcd.io/etcd/api/v3 v3.5.13 // indirect @@ -137,13 +138,13 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/term v0.19.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/term v0.20.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240509183442-62759503f434 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434 // indirect google.golang.org/grpc v1.63.2 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 4603cb53f..a5778a98c 100644 --- a/go.sum +++ b/go.sum @@ -184,6 +184,8 @@ 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/v2 v2.0.17 h1:ndmGlitUj/eCVRPmfsAw3KlbtVNxqk0lQIvDXlcTHiQ= github.com/minio/pkg/v2 v2.0.17/go.mod h1:V+OP/fKRD/qhJMQpdXXrCXcLYjGMpHKEE26zslthm5k= +github.com/minio/pkg/v3 v3.0.0 h1:0vOKHgwpya//mb7RH0i1lyPMH2IBBF5hJMNY5Bk2WlY= +github.com/minio/pkg/v3 v3.0.0/go.mod h1:53gkSUVHcfYoskOs5YAJ3D99nsd2SKru90rdE9whlXU= 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/websocket v1.6.0 h1:CPvnQvNvlVaQmvw5gtJNyYQhg4+xRmrPNhBbv8BdpAE= @@ -224,10 +226,10 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.52.3 h1:5f8uj6ZwHSscOGNdIQg6OiZv/ybiK2CO2q2drVZAQSA= -github.com/prometheus/common v0.52.3/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= -github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= -github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= +github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= +github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/procfs v0.14.0 h1:Lw4VdGGoKEZilJsayHf0B+9YgLGREba2C6xr+Fdfq6s= +github.com/prometheus/procfs v0.14.0/go.mod h1:XL+Iwz8k8ZabyZfMFHPiilCniixqQarAy5Mu67pHlNQ= github.com/prometheus/prom2json v1.3.3 h1:IYfSMiZ7sSOfliBoo89PcufjWO4eAR0gznGcETyaUgo= github.com/prometheus/prom2json v1.3.3/go.mod h1:Pv4yIPktEkK7btWsrUTWDDDrnpUrAELaOCj+oFwlgmc= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -244,8 +246,8 @@ github.com/safchain/ethtool v0.3.0 h1:gimQJpsI6sc1yIqP/y8GYgiXn/NjgvpM0RNoWLVVmP github.com/safchain/ethtool v0.3.0/go.mod h1:SA9BwrgyAqNo7M+uaL6IYbxpm5wk3L7Mm6ocLW+CJUs= github.com/secure-io/sio-go v0.3.1 h1:dNvY9awjabXTYGsTF1PiCySl9Ltofk9GA3VdWlo7rRc= github.com/secure-io/sio-go v0.3.1/go.mod h1:+xbkjDzPjwh4Axd07pRKSNriS9SCiYksWnZqdnfpQxs= -github.com/shirou/gopsutil/v3 v3.24.3 h1:eoUGJSmdfLzJ3mxIhmOAhgKEKgQkeOwKpz1NbhVnuPE= -github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg= +github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU= +github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -271,11 +273,11 @@ github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhso github.com/tinylib/msgp v1.1.9 h1:SHf3yoO2sGA0veCJeCBYLHuttAVFHGm2RHgNodW7wQU= github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UDlO/k= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= -github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4= -github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0= +github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU= +github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= -github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4= -github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY= +github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY= +github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE= github.com/unrolled/secure v1.14.0 h1:u9vJTU/pR4Bny0ntLUMxdfLtmIRGvQf2sEFuA0TG9AE= github.com/unrolled/secure v1.14.0/go.mod h1:BmF5hyM6tXczk3MpQkFf1hpKSRqCyhqcbiQtiAF7+40= github.com/vbauerster/mpb/v8 v8.7.3 h1:n/mKPBav4FFWp5fH4U0lPpXfiOmCEgl5Yx/NM3tKJA0= @@ -308,8 +310,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -324,8 +326,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -362,8 +364,9 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -371,8 +374,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -380,8 +383,9 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -394,16 +398,16 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be h1:Zz7rLWqp0ApfsR/l7+zSHhY3PMiH2xqgxlfYfAfNpoU= -google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be/go.mod h1:dvdCTIoAGbkWbcIKBniID56/7XHTt6WfxXNMxuziJ+w= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/api v0.0.0-20240509183442-62759503f434 h1:OpXbo8JnN8+jZGPrL4SSfaDjSCjupr8lXyBAbexEm/U= +google.golang.org/genproto/googleapis/api v0.0.0-20240509183442-62759503f434/go.mod h1:FfiGhwUm6CJviekPrc0oJ+7h29e+DmWU6UtjX0ZvI7Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434 h1:umK/Ey0QEzurTNlsV3R+MfxHAb78HCEX/IkuR+zH4WQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM= google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/pkg/auth/idp/oauth2/config.go b/pkg/auth/idp/oauth2/config.go index 4db88cc0f..a836e3daa 100644 --- a/pkg/auth/idp/oauth2/config.go +++ b/pkg/auth/idp/oauth2/config.go @@ -26,7 +26,7 @@ import ( "github.com/minio/console/pkg/auth/token" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v3/env" "golang.org/x/crypto/pbkdf2" "golang.org/x/oauth2" xoauth2 "golang.org/x/oauth2" diff --git a/pkg/auth/idp/oauth2/provider.go b/pkg/auth/idp/oauth2/provider.go index 1672b712e..70ac02775 100644 --- a/pkg/auth/idp/oauth2/provider.go +++ b/pkg/auth/idp/oauth2/provider.go @@ -32,7 +32,7 @@ import ( "github.com/minio/console/pkg/auth/utils" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v3/env" "golang.org/x/crypto/pbkdf2" "golang.org/x/oauth2" xoauth2 "golang.org/x/oauth2" diff --git a/pkg/auth/ldap/config.go b/pkg/auth/ldap/config.go index 81eeaab84..8f0a916a6 100644 --- a/pkg/auth/ldap/config.go +++ b/pkg/auth/ldap/config.go @@ -19,7 +19,7 @@ package ldap import ( "strings" - "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v3/env" ) func GetLDAPEnabled() bool { diff --git a/pkg/auth/token/config.go b/pkg/auth/token/config.go index 9cc5a2019..e4dd4353b 100644 --- a/pkg/auth/token/config.go +++ b/pkg/auth/token/config.go @@ -20,7 +20,7 @@ import ( "time" "github.com/minio/console/pkg/auth/utils" - "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v3/env" ) // GetConsoleSTSDuration returns the default session duration for the STS requested tokens (defaults to 12h) diff --git a/pkg/certs/certs.go b/pkg/certs/certs.go index 8b275549a..dbf3b53bc 100644 --- a/pkg/certs/certs.go +++ b/pkg/certs/certs.go @@ -29,8 +29,8 @@ import ( "strings" "github.com/minio/cli" - xcerts "github.com/minio/pkg/v2/certs" - "github.com/minio/pkg/v2/env" + xcerts "github.com/minio/pkg/v3/certs" + "github.com/minio/pkg/v3/env" "github.com/mitchellh/go-homedir" ) diff --git a/pkg/logger/config.go b/pkg/logger/config.go index 9bd5d65cd..d2dcc724d 100644 --- a/pkg/logger/config.go +++ b/pkg/logger/config.go @@ -25,7 +25,7 @@ import ( "github.com/minio/console/pkg/logger/config" "github.com/minio/console/pkg/logger/target/http" - "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v3/env" ) // NewConfig - initialize new logger config. diff --git a/pkg/logger/console.go b/pkg/logger/console.go index fa776e078..b848fd9dc 100644 --- a/pkg/logger/console.go +++ b/pkg/logger/console.go @@ -25,7 +25,7 @@ import ( "github.com/minio/console/pkg/logger/color" "github.com/minio/console/pkg/logger/message/log" - c "github.com/minio/pkg/v2/console" + c "github.com/minio/pkg/v3/console" ) // Logger interface describes the methods that need to be implemented to satisfy the interface requirements. diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go index 09943a9d6..03899153d 100644 --- a/pkg/logger/logger.go +++ b/pkg/logger/logger.go @@ -31,10 +31,10 @@ import ( "syscall" "time" - "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v3/env" "github.com/minio/console/pkg" - "github.com/minio/pkg/v2/certs" + "github.com/minio/pkg/v3/certs" "github.com/minio/console/pkg/logger/config" "github.com/minio/console/pkg/logger/message/log" diff --git a/pkg/subnet/config.go b/pkg/subnet/config.go index d85889468..bcc77e5ba 100644 --- a/pkg/subnet/config.go +++ b/pkg/subnet/config.go @@ -20,7 +20,7 @@ import ( "errors" "log" - "github.com/minio/pkg/v2/licverifier" + "github.com/minio/pkg/v3/licverifier" ) // GetLicenseInfoFromJWT will return license metadata from a jwt string license diff --git a/pkg/subnet/config_test.go b/pkg/subnet/config_test.go index 17d8ce3ae..81f060716 100644 --- a/pkg/subnet/config_test.go +++ b/pkg/subnet/config_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/minio/pkg/v2/licverifier" + "github.com/minio/pkg/v3/licverifier" ) var ( diff --git a/pkg/subnet/utils.go b/pkg/subnet/utils.go index a7e6001fb..ad2ef17f5 100644 --- a/pkg/subnet/utils.go +++ b/pkg/subnet/utils.go @@ -33,7 +33,7 @@ import ( "github.com/minio/madmin-go/v3" mc "github.com/minio/mc/cmd" - "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v3/env" ) const ( diff --git a/pkg/utils/parity.go b/pkg/utils/parity.go index 9fef73c75..232e3b7c5 100644 --- a/pkg/utils/parity.go +++ b/pkg/utils/parity.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/minio/pkg/v2/ellipses" + "github.com/minio/pkg/v3/ellipses" ) // This file implements and supports ellipses pattern for diff --git a/pkg/utils/parity_test.go b/pkg/utils/parity_test.go index 5436a7977..31ab2daff 100644 --- a/pkg/utils/parity_test.go +++ b/pkg/utils/parity_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/minio/pkg/v2/ellipses" + "github.com/minio/pkg/v3/ellipses" ) func TestGetDivisibleSize(t *testing.T) {