Use github.com/minio/pkg/v2 (#3027)

donatello · web-flow · commit 467b6b9bcb74 · 2023-09-01T17:29:07.000-06:00
diff --git 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/console"
-	"github.com/minio/pkg/trie"
-	"github.com/minio/pkg/words"
+	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v2/trie"
+	"github.com/minio/pkg/v2/words"
 )
 
 // Help template for Console.
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/minio/madmin-go/v3 v3.0.2
 	github.com/minio/mc v0.0.0-20230619193119-5f39522e6902
 	github.com/minio/minio-go/v7 v7.0.58-0.20230622175401-7048a16cfbca
-	github.com/minio/pkg v1.7.5
+	github.com/minio/pkg/v2 v2.0.0
 	github.com/minio/selfupdate v0.6.0
 	github.com/minio/websocket v1.6.0
 	github.com/mitchellh/go-homedir v1.1.0
@@ -98,6 +98,7 @@ require (
 	github.com/minio/colorjson v1.0.5 // indirect
 	github.com/minio/filepath v1.0.0 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
+	github.com/minio/pkg v1.7.5 // indirect
 	github.com/minio/sha256-simd v1.0.1 // 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
@@ -259,6 +259,8 @@ github.com/minio/minio-go/v7 v7.0.58-0.20230622175401-7048a16cfbca/go.mod h1:NUD
 github.com/minio/mux v1.9.0 h1:dWafQFyEfGhJvK6AwLOt83bIG5bxKxKJnKMCi0XAaoA=
 github.com/minio/pkg v1.7.5 h1:UOUJjewE5zoaDPlCMJtNx/swc1jT1ZR+IajT7hrLd44=
 github.com/minio/pkg v1.7.5/go.mod h1:mEfGMTm5Z0b5EGxKNuPwyb5A2d+CC/VlUyRj6RJtIwo=
+github.com/minio/pkg/v2 v2.0.0 h1:IbbRstuf4rCKuOlTaa/azoXXHME9XMAH6UBhKxRbRqM=
+github.com/minio/pkg/v2 v2.0.0/go.mod h1:6xTAr5M9yobpUroXAAaTrGJ9fhOZIqKYOT0I87u2yZ4=
 github.com/minio/selfupdate v0.6.0 h1:i76PgT0K5xO9+hjzKcacQtO7+MjJ4JKA8Ak8XQ9DDwU=
 github.com/minio/selfupdate v0.6.0/go.mod h1:bO02GTIPCMQFTEvE5h4DjYB58bCoZ35XLeBf0buTDdM=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
diff --git a/integration/service_account_test.go b/integration/service_account_test.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/go-openapi/swag"
 
-	iampolicy "github.com/minio/pkg/iam/policy"
+	iampolicy "github.com/minio/pkg/v2/policy"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/auth/idp/oauth2/config.go b/pkg/auth/idp/oauth2/config.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/minio/console/pkg/auth/token"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 	"golang.org/x/crypto/pbkdf2"
 )
 
diff --git a/pkg/auth/ldap/config.go b/pkg/auth/ldap/config.go
@@ -19,7 +19,7 @@ package ldap
 import (
 	"strings"
 
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 func GetLDAPEnabled() bool {
diff --git 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/env"
+	"github.com/minio/pkg/v2/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
@@ -29,8 +29,8 @@ import (
 	"strings"
 
 	"github.com/minio/cli"
-	xcerts "github.com/minio/pkg/certs"
-	"github.com/minio/pkg/env"
+	xcerts "github.com/minio/pkg/v2/certs"
+	"github.com/minio/pkg/v2/env"
 	"github.com/mitchellh/go-homedir"
 )
 
diff --git 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/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 // NewConfig - initialize new logger config.
diff --git 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/console"
+	c "github.com/minio/pkg/v2/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
@@ -31,10 +31,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 
 	"github.com/minio/console/pkg"
-	"github.com/minio/pkg/certs"
+	"github.com/minio/pkg/v2/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
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"log"
 
-	"github.com/minio/pkg/licverifier"
+	"github.com/minio/pkg/v2/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
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/minio/pkg/licverifier"
+	"github.com/minio/pkg/v2/licverifier"
 )
 
 var (
diff --git a/pkg/subnet/subnet.go b/pkg/subnet/subnet.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/minio/console/pkg/http"
 
-	"github.com/minio/pkg/licverifier"
+	"github.com/minio/pkg/v2/licverifier"
 
 	"github.com/minio/console/models"
 	"github.com/minio/madmin-go/v3"
diff --git a/pkg/subnet/utils.go b/pkg/subnet/utils.go
@@ -36,7 +36,7 @@ import (
 
 	"github.com/minio/madmin-go/v3"
 	mc "github.com/minio/mc/cmd"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 const (
diff --git a/pkg/utils/parity.go b/pkg/utils/parity.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/minio/pkg/ellipses"
+	"github.com/minio/pkg/v2/ellipses"
 )
 
 // This file implements and supports ellipses pattern for
diff --git a/pkg/utils/parity_test.go b/pkg/utils/parity_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/minio/pkg/ellipses"
+	"github.com/minio/pkg/v2/ellipses"
 )
 
 func TestGetDivisibleSize(t *testing.T) {
diff --git a/restapi/admin_client_mock.go b/restapi/admin_client_mock.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/minio/madmin-go/v3"
-	iampolicy "github.com/minio/pkg/iam/policy"
+	iampolicy "github.com/minio/pkg/v2/policy"
 )
 
 type AdminClientMock struct{}
diff --git a/restapi/admin_policies.go b/restapi/admin_policies.go
@@ -32,7 +32,7 @@ import (
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
-	iampolicy "github.com/minio/pkg/iam/policy"
+	iampolicy "github.com/minio/pkg/v2/policy"
 
 	policies "github.com/minio/console/restapi/policy"
 )
diff --git a/restapi/admin_policies_test.go b/restapi/admin_policies_test.go
@@ -26,7 +26,7 @@ import (
 	"testing"
 
 	"github.com/minio/console/models"
-	iampolicy "github.com/minio/pkg/iam/policy"
+	iampolicy "github.com/minio/pkg/v2/policy"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/restapi/admin_releases.go b/restapi/admin_releases.go
@@ -30,7 +30,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	release "github.com/minio/console/restapi/operations/release"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 var (
diff --git a/restapi/admin_users.go b/restapi/admin_users.go
@@ -32,7 +32,7 @@ import (
 	bucketApi "github.com/minio/console/restapi/operations/bucket"
 	userApi "github.com/minio/console/restapi/operations/user"
 	"github.com/minio/madmin-go/v3"
-	iampolicy "github.com/minio/pkg/iam/policy"
+	iampolicy "github.com/minio/pkg/v2/policy"
 )
 
 // Policy evaluated constants
diff --git a/restapi/admin_users_test.go b/restapi/admin_users_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 
 	"github.com/minio/madmin-go/v3"
-	iampolicy "github.com/minio/pkg/iam/policy"
+	iampolicy "github.com/minio/pkg/v2/policy"
 	asrt "github.com/stretchr/testify/assert"
 )
 
diff --git a/restapi/client-admin.go b/restapi/client-admin.go
@@ -33,7 +33,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/iam/policy"
+	iampolicy "github.com/minio/pkg/v2/policy"
 )
 
 const globalAppName = "MinIO Console"
diff --git a/restapi/client.go b/restapi/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/net"
+	xnet "github.com/minio/pkg/v2/net"
 
 	"github.com/minio/console/models"
 	"github.com/minio/console/pkg"
diff --git a/restapi/config.go b/restapi/config.go
@@ -23,9 +23,9 @@ import (
 	"strings"
 
 	"github.com/minio/console/pkg/auth/idp/oauth2"
-	xcerts "github.com/minio/pkg/certs"
-	"github.com/minio/pkg/env"
-	xnet "github.com/minio/pkg/net"
+	xcerts "github.com/minio/pkg/v2/certs"
+	"github.com/minio/pkg/v2/env"
+	xnet "github.com/minio/pkg/v2/net"
 )
 
 var (
diff --git a/restapi/configure_console.go b/restapi/configure_console.go
@@ -42,9 +42,9 @@ import (
 	"github.com/klauspost/compress/gzhttp"
 
 	portal_ui "github.com/minio/console/portal-ui"
-	"github.com/minio/pkg/env"
-	"github.com/minio/pkg/mimedb"
-	xnet "github.com/minio/pkg/net"
+	"github.com/minio/pkg/v2/env"
+	"github.com/minio/pkg/v2/mimedb"
+	xnet "github.com/minio/pkg/v2/net"
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/swag"
diff --git a/restapi/policy/policies_test.go b/restapi/policy/policies_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	"github.com/minio/madmin-go/v3"
-	minioIAMPolicy "github.com/minio/pkg/iam/policy"
+	minioIAMPolicy "github.com/minio/pkg/v2/policy"
 )
 
 func TestReplacePolicyVariables(t *testing.T) {
diff --git a/restapi/service_accounts_handlers.go b/restapi/service_accounts_handlers.go
@@ -31,7 +31,7 @@ import (
 	saApi "github.com/minio/console/restapi/operations/service_account"
 	userApi "github.com/minio/console/restapi/operations/user"
 	"github.com/minio/madmin-go/v3"
-	iampolicy "github.com/minio/pkg/iam/policy"
+	iampolicy "github.com/minio/pkg/v2/policy"
 )
 
 func registerServiceAccountsHandlers(api *operations.ConsoleAPI) {
diff --git a/restapi/service_accounts_handlers_test.go b/restapi/service_accounts_handlers_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	"github.com/minio/madmin-go/v3"
-	iampolicy "github.com/minio/pkg/iam/policy"
+	iampolicy "github.com/minio/pkg/v2/policy"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/restapi/user_buckets.go b/restapi/user_buckets.go
@@ -40,7 +40,7 @@ import (
 	bucketApi "github.com/minio/console/restapi/operations/bucket"
 	"github.com/minio/minio-go/v7/pkg/policy"
 	"github.com/minio/minio-go/v7/pkg/replication"
-	minioIAMPolicy "github.com/minio/pkg/iam/policy"
+	minioIAMPolicy "github.com/minio/pkg/v2/policy"
 )
 
 func registerBucketsHandlers(api *operations.ConsoleAPI) {
diff --git a/restapi/user_log_search.go b/restapi/user_log_search.go
@@ -26,7 +26,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	logApi "github.com/minio/console/restapi/operations/logging"
-	iampolicy "github.com/minio/pkg/iam/policy"
+	iampolicy "github.com/minio/pkg/v2/policy"
 )
 
 func registerLogSearchHandlers(api *operations.ConsoleAPI) {
diff --git a/restapi/user_login.go b/restapi/user_login.go
@@ -35,7 +35,7 @@ import (
 	authApi "github.com/minio/console/restapi/operations/auth"
 	"github.com/minio/madmin-go/v3"
 	"github.com/minio/minio-go/v7/pkg/credentials"
-	"github.com/minio/pkg/env"
+	"github.com/minio/pkg/v2/env"
 )
 
 func registerLoginHandlers(api *operations.ConsoleAPI) {
diff --git a/restapi/user_login_test.go b/restapi/user_login_test.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/minio/madmin-go/v3"
 
-	iampolicy "github.com/minio/pkg/iam/policy"
+	iampolicy "github.com/minio/pkg/v2/policy"
 
 	"github.com/minio/console/pkg/auth"
 
diff --git a/restapi/user_objects.go b/restapi/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/mimedb"
+	"github.com/minio/pkg/v2/mimedb"
 )
 
 // enum types
diff --git a/restapi/user_session.go b/restapi/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/bucket/policy/condition"
+	"github.com/minio/pkg/v2/policy/condition"
 
-	minioIAMPolicy "github.com/minio/pkg/iam/policy"
+	minioIAMPolicy "github.com/minio/pkg/v2/policy"
 
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/minio/console/models"

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`
`29`	`29`	`"github.com/go-openapi/swag"`
`30`	`30`
`31`		`- iampolicy "github.com/minio/pkg/iam/policy"`
	`31`	`+ iampolicy "github.com/minio/pkg/v2/policy"`
`32`	`32`	`"github.com/stretchr/testify/assert"`
`33`	`33`	`)`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"time"`
`26`	`26`
`27`	`27`	`"github.com/minio/console/pkg/auth/token"`
`28`		`- "github.com/minio/pkg/env"`
	`28`	`+ "github.com/minio/pkg/v2/env"`
`29`	`29`	`"golang.org/x/crypto/pbkdf2"`
`30`	`30`	`)`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package ldap`
`19`	`19`	`import (`
`20`	`20`	`"strings"`
`21`	`21`
`22`		`- "github.com/minio/pkg/env"`
	`22`	`+ "github.com/minio/pkg/v2/env"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`func GetLDAPEnabled() bool {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"time"`
`21`	`21`
`22`	`22`	`"github.com/minio/console/pkg/auth/utils"`
`23`		`- "github.com/minio/pkg/env"`
	`23`	`+ "github.com/minio/pkg/v2/env"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`// GetConsoleSTSDuration returns the default session duration for the STS requested tokens (defaults to 12h)`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ import (`
`29`	`29`	`"strings"`
`30`	`30`
`31`	`31`	`"github.com/minio/cli"`
`32`		`- xcerts "github.com/minio/pkg/certs"`
`33`		`- "github.com/minio/pkg/env"`
	`32`	`+ xcerts "github.com/minio/pkg/v2/certs"`
	`33`	`+ "github.com/minio/pkg/v2/env"`
`34`	`34`	`"github.com/mitchellh/go-homedir"`
`35`	`35`	`)`
`36`	`36`