Update to minio/pkg/v2 (#17967)

internal/bucket/object/lock/lock.go

@@ -34,7 +34,7 @@ import (
 	xhttp "github.com/minio/minio/internal/http"
 
 	"github.com/minio/minio/internal/logger"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 // Enabled indicates object locking is enabled

internal/bucket/replication/destination.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/minio/pkg/wildcard"
+	"github.com/minio/pkg/v2/wildcard"
 )
 
 // DestinationARNPrefix - destination ARN prefix as per AWS S3 specification.

internal/bucket/versioning/versioning.go

@@ -22,7 +22,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/minio/pkg/wildcard"
+	"github.com/minio/pkg/v2/wildcard"
 )
 
 // State - enabled/disabled/suspended states

internal/config/api/api.go

@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 // API sub-system constants

internal/config/cache/config.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/ellipses"
+	"github.com/minio/pkg/v2/ellipses"
 )
 
 const (

internal/config/cache/lookup.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 // Cache ENVs

internal/config/callhome/callhome.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 // Callhome related keys

internal/config/certs.go

@@ -25,7 +25,7 @@ import (
 	"errors"
 	"os"
 
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 // EnvCertPassword is the environment variable which contains the password used

internal/config/compress/compress.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 // Config represents the compression settings.

internal/config/config.go

@@ -28,7 +28,7 @@ import (
 	"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"
+	"github.com/minio/pkg/v2/env"
 )
 
 // ErrorConfig holds the config error types

internal/config/etcd/etcd.go

@@ -24,8 +24,8 @@ import (
 	"time"
 
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
-	xnet "github.com/minio/pkg/net"
+	"github.com/minio/pkg/v2/env"
+	xnet "github.com/minio/pkg/v2/net"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/client/v3/namespace"
 	"go.uber.org/zap"

internal/config/heal/heal.go

@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 // Compression environment variables

internal/config/identity/ldap/config.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/minio/madmin-go/v3"
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/ldap"
+	"github.com/minio/pkg/v2/ldap"
 )
 
 const (

internal/config/identity/openid/jwt.go

@@ -30,8 +30,8 @@ import (
 	jwtgo "github.com/golang-jwt/jwt/v4"
 	"github.com/minio/minio/internal/arn"
 	"github.com/minio/minio/internal/auth"
-	iampolicy "github.com/minio/pkg/iam/policy"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
+	iampolicy "github.com/minio/pkg/v2/policy"
 )
 
 type publicKeys struct {

internal/config/identity/openid/jwt_test.go

@@ -35,7 +35,7 @@ import (
 	"github.com/minio/minio/internal/arn"
 	"github.com/minio/minio/internal/config"
 	jwtm "github.com/minio/minio/internal/jwt"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 func TestUpdateClaimsExpiry(t *testing.T) {

internal/config/identity/openid/openid.go

@@ -36,8 +36,8 @@ import (
 	"github.com/minio/minio/internal/config"
 	"github.com/minio/minio/internal/config/identity/openid/provider"
 	"github.com/minio/minio/internal/hash/sha256"
-	iampolicy "github.com/minio/pkg/iam/policy"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
+	iampolicy "github.com/minio/pkg/v2/policy"
 )
 
 // OpenID keys and envs.

internal/config/identity/openid/providercfg.go

@@ -28,7 +28,7 @@ import (
 	"github.com/minio/minio/internal/config"
 	"github.com/minio/minio/internal/config/identity/openid/provider"
 	xhttp "github.com/minio/minio/internal/http"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 type providerCfg struct {

internal/config/identity/plugin/config.go

@@ -34,8 +34,8 @@ import (
 	"github.com/minio/minio/internal/arn"
 	"github.com/minio/minio/internal/config"
 	"github.com/minio/minio/internal/logger"
-	"github.com/minio/pkg/env"
-	xnet "github.com/minio/pkg/net"
+	"github.com/minio/pkg/v2/env"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 // Authentication Plugin config and env variables

internal/config/identity/tls/config.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/minio/minio/internal/auth"
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 const (

internal/config/lambda/parse.go

@@ -27,8 +27,8 @@ import (
 	"github.com/minio/minio/internal/config/lambda/event"
 	"github.com/minio/minio/internal/config/lambda/target"
 	"github.com/minio/minio/internal/logger"
-	"github.com/minio/pkg/env"
-	xnet "github.com/minio/pkg/net"
+	"github.com/minio/pkg/v2/env"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 // ErrTargetsOffline - Indicates single/multiple target failures.

internal/config/lambda/target/webhook.go

@@ -32,8 +32,8 @@ import (
 
 	"github.com/minio/minio/internal/config/lambda/event"
 	"github.com/minio/minio/internal/logger"
-	"github.com/minio/pkg/certs"
-	xnet "github.com/minio/pkg/net"
+	"github.com/minio/pkg/v2/certs"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 // Webhook constants

internal/config/notify/parse.go

@@ -32,8 +32,8 @@ import (
 	"github.com/minio/minio/internal/event"
 	"github.com/minio/minio/internal/event/target"
 	"github.com/minio/minio/internal/logger"
-	"github.com/minio/pkg/env"
-	xnet "github.com/minio/pkg/net"
+	"github.com/minio/pkg/v2/env"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 const (

internal/config/policy/opa/config.go

@@ -24,9 +24,9 @@ import (
 	"net/http"
 
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
-	iampolicy "github.com/minio/pkg/iam/policy"
-	xnet "github.com/minio/pkg/net"
+	"github.com/minio/pkg/v2/env"
+	xnet "github.com/minio/pkg/v2/net"
+	iampolicy "github.com/minio/pkg/v2/policy"
 )
 
 // Env IAM OPA URL

internal/config/policy/plugin/config.go

@@ -26,8 +26,8 @@ import (
 
 	"github.com/minio/minio/internal/config"
 	xhttp "github.com/minio/minio/internal/http"
-	iampolicy "github.com/minio/pkg/iam/policy"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
+	iampolicy "github.com/minio/pkg/v2/policy"
 )
 
 // Authorization Plugin config and env variables

internal/config/scanner/scanner.go

@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 // Compression environment variables

internal/config/storageclass/storage-class.go

@@ -25,7 +25,7 @@ import (
 	"sync"
 
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 // Standard constants for all storage class

internal/config/subnet/config.go

@@ -25,8 +25,8 @@ import (
 	"sync"
 
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
-	xnet "github.com/minio/pkg/net"
+	"github.com/minio/pkg/v2/env"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 // DefaultKVS - default KV config for subnet settings

internal/crypto/auto-encryption.go

@@ -19,7 +19,7 @@ package crypto
 
 import (
 	"github.com/minio/minio/internal/config"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 const (

internal/dsync/drwmutex.go

@@ -27,8 +27,8 @@ import (
 	"time"
 
 	"github.com/minio/minio/internal/mcontext"
-	"github.com/minio/pkg/console"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v2/env"
 )
 
 // Indicator if logging is enabled.

internal/event/rules.go

@@ -20,7 +20,7 @@ package event
 import (
 	"strings"
 
-	"github.com/minio/pkg/wildcard"
+	"github.com/minio/pkg/v2/wildcard"
 )
 
 // NewPattern - create new pattern for prefix/suffix.

internal/event/target/amqp.go

@@ -32,7 +32,7 @@ import (
 	"github.com/minio/minio/internal/logger"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 	"github.com/rabbitmq/amqp091-go"
 )
 

internal/event/target/elasticsearch.go

@@ -37,7 +37,7 @@ import (
 	"github.com/minio/minio/internal/logger"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 	"github.com/pkg/errors"
 )
 

internal/event/target/kafka.go

@@ -35,7 +35,7 @@ import (
 	"github.com/minio/minio/internal/logger"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 
 	"github.com/IBM/sarama"
 	saramatls "github.com/IBM/sarama/tools/tls"

internal/event/target/mqtt.go

@@ -33,7 +33,7 @@ import (
 	"github.com/minio/minio/internal/logger"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 const (

internal/event/target/mysql.go

@@ -35,7 +35,7 @@ import (
 	"github.com/minio/minio/internal/logger"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 const (

internal/event/target/nats.go

@@ -33,7 +33,7 @@ import (
 	"github.com/minio/minio/internal/logger"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 	"github.com/nats-io/nats.go"
 	"github.com/nats-io/stan.go"
 )

internal/event/target/nats_contrib_test.go

@@ -19,7 +19,7 @@ package target
 import (
 	"testing"
 
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 	natsserver "github.com/nats-io/nats-server/v2/test"
 )
 

internal/event/target/nats_tls_contrib_test.go

@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 	natsserver "github.com/nats-io/nats-server/v2/test"
 )
 

internal/event/target/nsq.go

@@ -33,7 +33,7 @@ import (
 	"github.com/minio/minio/internal/logger"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 // NSQ constants

internal/event/target/nsq_test.go

@@ -20,7 +20,7 @@ package target
 import (
 	"testing"
 
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 func TestNSQArgs_Validate(t *testing.T) {

internal/event/target/postgresql.go

@@ -36,7 +36,7 @@ import (
 	"github.com/minio/minio/internal/logger"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 const (

internal/event/target/redis.go

@@ -33,7 +33,7 @@ import (
 	"github.com/minio/minio/internal/logger"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 // Redis constants

internal/event/target/webhook.go

@@ -39,8 +39,8 @@ import (
 	"github.com/minio/minio/internal/logger"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	"github.com/minio/pkg/certs"
-	xnet "github.com/minio/pkg/net"
+	"github.com/minio/pkg/v2/certs"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 // Webhook constants

internal/http/server_test.go

@@ -24,7 +24,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/minio/pkg/certs"
+	"github.com/minio/pkg/v2/certs"
 )
 
 func TestNewServer(t *testing.T) {

internal/http/transports.go

@@ -25,7 +25,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/minio/pkg/certs"
+	"github.com/minio/pkg/v2/certs"
 )
 
 // tlsClientSessionCacheSize is the cache size for client sessions.

internal/kms/kes.go

@@ -29,8 +29,8 @@ import (
 	"sync"
 
 	"github.com/minio/kes-go"
-	"github.com/minio/pkg/certs"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/certs"
+	"github.com/minio/pkg/v2/env"
 )
 
 const (

internal/logger/audit.go

@@ -26,7 +26,7 @@ import (
 
 	internalAudit "github.com/minio/minio/internal/logger/message/audit"
 	"github.com/minio/minio/internal/mcontext"
-	"github.com/minio/pkg/logger/message/audit"
+	"github.com/minio/pkg/v2/logger/message/audit"
 
 	xhttp "github.com/minio/minio/internal/http"
 )

internal/logger/config.go

@@ -24,8 +24,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/minio/pkg/env"
-	xnet "github.com/minio/pkg/net"
+	"github.com/minio/pkg/v2/env"
+	xnet "github.com/minio/pkg/v2/net"
 
 	"github.com/minio/minio/internal/config"
 	"github.com/minio/minio/internal/logger/target/http"

internal/logger/console.go

@@ -25,8 +25,8 @@ import (
 	"time"
 
 	"github.com/minio/minio/internal/color"
-	c "github.com/minio/pkg/console"
-	"github.com/minio/pkg/logger/message/log"
+	c "github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v2/logger/message/log"
 )
 
 // ConsoleLoggerTgt is a stringified value to represent console logging

internal/logger/logger.go

@@ -32,7 +32,7 @@ import (
 	"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"
+	"github.com/minio/pkg/v2/logger/message/log"
 )
 
 // HighwayHash key for logging in anonymous mode

internal/logger/message/audit/entry.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/pkg/logger/message/audit"
+	"github.com/minio/pkg/v2/logger/message/audit"
 
 	"github.com/minio/minio/internal/handlers"
 	xhttp "github.com/minio/minio/internal/http"

internal/logger/target/console/console.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/minio/minio/internal/color"
 	"github.com/minio/minio/internal/logger"
-	"github.com/minio/pkg/console"
-	"github.com/minio/pkg/logger/message/log"
+	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v2/logger/message/log"
 )
 
 // Target implements loggerTarget to send log

internal/logger/target/http/http.go

@@ -36,7 +36,7 @@ import (
 	"github.com/minio/minio/internal/logger/target/types"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 const (

internal/logger/target/kafka/kafka.go

@@ -37,7 +37,7 @@ import (
 	"github.com/minio/minio/internal/logger/target/types"
 	"github.com/minio/minio/internal/once"
 	"github.com/minio/minio/internal/store"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 // the suffix for the configured queue dir where the logs will be persisted.

internal/rest/client.go

@@ -36,7 +36,7 @@ import (
 	xhttp "github.com/minio/minio/internal/http"
 	"github.com/minio/minio/internal/logger"
 	"github.com/minio/minio/internal/mcontext"
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 // DefaultTimeout - default REST timeout is 10 seconds.

internal/s3select/select.go

@@ -38,7 +38,7 @@ import (
 	"github.com/minio/minio/internal/s3select/parquet"
 	"github.com/minio/minio/internal/s3select/simdj"
 	"github.com/minio/minio/internal/s3select/sql"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 	"github.com/minio/simdjson-go"
 	"github.com/pierrec/lz4"
 )

internal/store/store.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	xnet "github.com/minio/pkg/net"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 const (