From 1c99fb106c3e1448ed92f8465d5695d055d432e7 Mon Sep 17 00:00:00 2001 From: Aditya Manthramurthy Date: Mon, 4 Sep 2023 12:57:37 -0700 Subject: [PATCH] Update to minio/pkg/v2 (#17967) --- cmd/acl-handlers.go | 2 +- cmd/admin-bucket-handlers.go | 23 +++-- cmd/admin-handler-utils.go | 2 +- cmd/admin-handlers-config-kv.go | 2 +- cmd/admin-handlers-idp-config.go | 4 +- cmd/admin-handlers-idp-ldap.go | 2 +- cmd/admin-handlers-pools.go | 2 +- cmd/admin-handlers-site-replication.go | 35 ++++---- cmd/admin-handlers-users-race_test.go | 2 +- cmd/admin-handlers-users.go | 2 +- cmd/admin-handlers-users_test.go | 2 +- cmd/admin-handlers.go | 6 +- cmd/api-errors.go | 2 +- cmd/api-response.go | 2 +- cmd/api-router.go | 2 +- cmd/auth-handler.go | 45 +++++----- cmd/auth-handler_test.go | 2 +- cmd/background-heal-ops.go | 2 +- cmd/background-newdisks-heal-ops.go | 2 +- cmd/batch-handlers.go | 8 +- cmd/batch-job-common-types.go | 2 +- cmd/batch-rotate.go | 4 +- cmd/bootstrap-peer-server.go | 2 +- cmd/bucket-encryption-handlers.go | 2 +- cmd/bucket-handlers.go | 29 +++---- cmd/bucket-lifecycle-handlers.go | 2 +- cmd/bucket-lifecycle.go | 4 +- cmd/bucket-listobjects-handlers.go | 2 +- cmd/bucket-metadata-sys.go | 6 +- cmd/bucket-metadata.go | 6 +- cmd/bucket-notification-handlers.go | 2 +- cmd/bucket-object-lock.go | 2 +- cmd/bucket-policy-handlers.go | 4 +- cmd/bucket-policy-handlers_test.go | 56 ++++++------ cmd/bucket-policy.go | 14 +-- cmd/bucket-replication-handlers.go | 2 +- cmd/bucket-versioning-handler.go | 2 +- cmd/common-main.go | 10 +-- cmd/config-current.go | 2 +- cmd/config-migrate.go | 4 +- cmd/config-versions.go | 2 +- cmd/consolelogger.go | 4 +- cmd/data-scanner.go | 2 +- cmd/disk-cache.go | 6 +- cmd/dummy-handlers.go | 2 +- cmd/endpoint-ellipses.go | 4 +- cmd/endpoint-ellipses_test.go | 2 +- cmd/endpoint.go | 4 +- cmd/erasure-common.go | 2 +- cmd/erasure-healing.go | 2 +- cmd/erasure-metadata-utils.go | 2 +- cmd/erasure-metadata.go | 2 +- cmd/erasure-multipart.go | 4 +- cmd/erasure-object.go | 6 +- cmd/erasure-server-pool-decom.go | 6 +- cmd/erasure-server-pool-rebalance.go | 2 +- cmd/erasure-server-pool.go | 4 +- cmd/erasure-sets.go | 4 +- cmd/erasure.go | 2 +- cmd/event-notification.go | 2 +- cmd/format-erasure.go | 2 +- cmd/generic-handlers.go | 2 +- cmd/global-heal.go | 4 +- cmd/globals.go | 4 +- cmd/handler-utils.go | 2 +- cmd/iam-store.go | 14 +-- cmd/iam.go | 2 +- cmd/jwt.go | 2 +- cmd/kms-handlers.go | 2 +- cmd/listen-notification-handlers.go | 2 +- cmd/main.go | 8 +- cmd/metacache-bucket.go | 2 +- cmd/metacache-entries.go | 2 +- cmd/metacache-set.go | 2 +- cmd/metrics-router.go | 2 +- cmd/metrics.go | 2 +- cmd/net.go | 2 +- cmd/notification.go | 4 +- cmd/object-api-utils.go | 4 +- cmd/object-api-utils_test.go | 2 +- cmd/object-handlers.go | 31 ++++--- cmd/object-lambda-handlers.go | 2 +- cmd/object-multipart-handlers.go | 9 +- cmd/peer-rest-client.go | 4 +- cmd/peer-rest-server.go | 2 +- cmd/peer-s3-client.go | 2 +- cmd/peer-s3-server.go | 2 +- cmd/perf-tests.go | 2 +- cmd/policy_test.go | 86 +++++++++---------- cmd/s3-zip-handlers.go | 8 +- cmd/server-main.go | 4 +- cmd/server-rlimit.go | 2 +- cmd/server-startup-msg.go | 2 +- cmd/server_test.go | 6 +- cmd/signature-v4-utils.go | 2 +- cmd/site-replication.go | 31 ++++--- cmd/storage-rest-client.go | 2 +- cmd/storage-rest-server.go | 2 +- cmd/storage-rest_test.go | 2 +- cmd/sts-handlers.go | 4 +- cmd/test-utils_test.go | 4 +- cmd/tier-handlers.go | 2 +- cmd/update.go | 4 +- cmd/utils.go | 8 +- cmd/xl-storage-disk-id-check.go | 2 +- cmd/xl-storage-format-v2.go | 2 +- docs/debugging/reorder-disks/main.go | 2 +- go.mod | 7 +- go.sum | 10 ++- internal/bucket/object/lock/lock.go | 2 +- internal/bucket/replication/destination.go | 2 +- internal/bucket/versioning/versioning.go | 2 +- internal/config/api/api.go | 2 +- internal/config/cache/config.go | 2 +- internal/config/cache/lookup.go | 2 +- internal/config/callhome/callhome.go | 2 +- internal/config/certs.go | 2 +- internal/config/compress/compress.go | 2 +- internal/config/config.go | 2 +- internal/config/etcd/etcd.go | 4 +- internal/config/heal/heal.go | 2 +- internal/config/identity/ldap/config.go | 2 +- internal/config/identity/openid/jwt.go | 4 +- internal/config/identity/openid/jwt_test.go | 2 +- internal/config/identity/openid/openid.go | 4 +- .../config/identity/openid/providercfg.go | 2 +- internal/config/identity/plugin/config.go | 4 +- internal/config/identity/tls/config.go | 2 +- internal/config/lambda/parse.go | 4 +- internal/config/lambda/target/webhook.go | 4 +- internal/config/notify/parse.go | 4 +- internal/config/policy/opa/config.go | 6 +- internal/config/policy/plugin/config.go | 4 +- internal/config/scanner/scanner.go | 2 +- internal/config/storageclass/storage-class.go | 2 +- internal/config/subnet/config.go | 4 +- internal/crypto/auto-encryption.go | 2 +- internal/dsync/drwmutex.go | 4 +- internal/event/rules.go | 2 +- internal/event/target/amqp.go | 2 +- internal/event/target/elasticsearch.go | 2 +- internal/event/target/kafka.go | 2 +- internal/event/target/mqtt.go | 2 +- internal/event/target/mysql.go | 2 +- internal/event/target/nats.go | 2 +- internal/event/target/nats_contrib_test.go | 2 +- .../event/target/nats_tls_contrib_test.go | 2 +- internal/event/target/nsq.go | 2 +- internal/event/target/nsq_test.go | 2 +- internal/event/target/postgresql.go | 2 +- internal/event/target/redis.go | 2 +- internal/event/target/webhook.go | 4 +- internal/http/server_test.go | 2 +- internal/http/transports.go | 2 +- internal/kms/kes.go | 4 +- internal/logger/audit.go | 2 +- internal/logger/config.go | 4 +- internal/logger/console.go | 4 +- internal/logger/logger.go | 2 +- internal/logger/message/audit/entry.go | 2 +- internal/logger/target/console/console.go | 4 +- internal/logger/target/http/http.go | 2 +- internal/logger/target/kafka/kafka.go | 2 +- internal/rest/client.go | 2 +- internal/s3select/select.go | 2 +- internal/store/store.go | 2 +- 166 files changed, 413 insertions(+), 417 deletions(-) diff --git a/cmd/acl-handlers.go b/cmd/acl-handlers.go index 8c8366a5d..63573df71 100644 --- a/cmd/acl-handlers.go +++ b/cmd/acl-handlers.go @@ -25,7 +25,7 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) // Data types used for returning dummy access control diff --git a/cmd/admin-bucket-handlers.go b/cmd/admin-bucket-handlers.go index acee0e367..bba399f12 100644 --- a/cmd/admin-bucket-handlers.go +++ b/cmd/admin-bucket-handlers.go @@ -41,8 +41,7 @@ import ( "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" - iampolicy "github.com/minio/pkg/iam/policy" + "github.com/minio/pkg/v2/policy" ) const ( @@ -58,7 +57,7 @@ const ( func (a adminAPIHandlers) PutBucketQuotaConfigHandler(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SetBucketQuotaAdminAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SetBucketQuotaAdminAction) if objectAPI == nil { return } @@ -110,7 +109,7 @@ func (a adminAPIHandlers) PutBucketQuotaConfigHandler(w http.ResponseWriter, r * func (a adminAPIHandlers) GetBucketQuotaConfigHandler(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.GetBucketQuotaAdminAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.GetBucketQuotaAdminAction) if objectAPI == nil { return } @@ -148,7 +147,7 @@ func (a adminAPIHandlers) SetRemoteTargetHandler(w http.ResponseWriter, r *http. update := r.Form.Get("update") == "true" // Get current object layer instance. - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SetBucketTargetAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SetBucketTargetAction) if objectAPI == nil { return } @@ -291,7 +290,7 @@ func (a adminAPIHandlers) ListRemoteTargetsHandler(w http.ResponseWriter, r *htt arnType := vars["type"] // Get current object layer instance. - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.GetBucketTargetAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.GetBucketTargetAction) if objectAPI == nil { return } @@ -325,7 +324,7 @@ func (a adminAPIHandlers) RemoveRemoteTargetHandler(w http.ResponseWriter, r *ht arn := vars["arn"] // Get current object layer instance. - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SetBucketTargetAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SetBucketTargetAction) if objectAPI == nil { return } @@ -365,7 +364,7 @@ func (a adminAPIHandlers) ExportBucketMetadataHandler(w http.ResponseWriter, r * bucket := pathClean(r.Form.Get("bucket")) // Get current object layer instance. - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.ExportBucketMetadataAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.ExportBucketMetadataAction) if objectAPI == nil { return } @@ -647,7 +646,7 @@ func (a adminAPIHandlers) ImportBucketMetadataHandler(w http.ResponseWriter, r * ctx := r.Context() // Get current object layer instance. - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.ImportBucketMetadataAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.ImportBucketMetadataAction) if objectAPI == nil { return } @@ -853,7 +852,7 @@ func (a adminAPIHandlers) ImportBucketMetadataHandler(w http.ResponseWriter, r * continue } - bucketPolicy, err := policy.ParseConfig(bytes.NewReader(bucketPolicyBytes), bucket) + bucketPolicy, err := policy.ParseBucketPolicyConfig(bytes.NewReader(bucketPolicyBytes), bucket) if err != nil { rpt.SetStatus(bucket, fileName, err) continue @@ -1021,7 +1020,7 @@ func (a adminAPIHandlers) ReplicationDiffHandler(w http.ResponseWriter, r *http. vars := mux.Vars(r) bucket := vars["bucket"] - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.ReplicationDiff) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.ReplicationDiff) if objectAPI == nil { return } @@ -1083,7 +1082,7 @@ func (a adminAPIHandlers) ReplicationMRFHandler(w http.ResponseWriter, r *http.R vars := mux.Vars(r) bucket := vars["bucket"] - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.ReplicationDiff) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.ReplicationDiff) if objectAPI == nil { return } diff --git a/cmd/admin-handler-utils.go b/cmd/admin-handler-utils.go index c89444fc6..9177a010b 100644 --- a/cmd/admin-handler-utils.go +++ b/cmd/admin-handler-utils.go @@ -27,7 +27,7 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/config" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" ) // validateAdminReq will validate request against and return whether it is allowed. diff --git a/cmd/admin-handlers-config-kv.go b/cmd/admin-handlers-config-kv.go index 8e964ae09..ab329fe11 100644 --- a/cmd/admin-handlers-config-kv.go +++ b/cmd/admin-handlers-config-kv.go @@ -38,7 +38,7 @@ import ( "github.com/minio/minio/internal/config/subnet" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" ) // DelConfigKVHandler - DELETE /minio/admin/v3/del-config-kv diff --git a/cmd/admin-handlers-idp-config.go b/cmd/admin-handlers-idp-config.go index 192ca23f9..3df6d8616 100644 --- a/cmd/admin-handlers-idp-config.go +++ b/cmd/admin-handlers-idp-config.go @@ -33,8 +33,8 @@ import ( "github.com/minio/minio/internal/config/identity/openid" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - iampolicy "github.com/minio/pkg/iam/policy" - "github.com/minio/pkg/ldap" + "github.com/minio/pkg/v2/ldap" + iampolicy "github.com/minio/pkg/v2/policy" ) func addOrUpdateIDPHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, isUpdate bool) { diff --git a/cmd/admin-handlers-idp-ldap.go b/cmd/admin-handlers-idp-ldap.go index 70ae95a77..6c2f1d809 100644 --- a/cmd/admin-handlers-idp-ldap.go +++ b/cmd/admin-handlers-idp-ldap.go @@ -25,7 +25,7 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" ) // ListLDAPPolicyMappingEntities lists users/groups mapped to given/all policies. diff --git a/cmd/admin-handlers-pools.go b/cmd/admin-handlers-pools.go index badcc2f61..e6e057dac 100644 --- a/cmd/admin-handlers-pools.go +++ b/cmd/admin-handlers-pools.go @@ -26,7 +26,7 @@ import ( "github.com/minio/minio/internal/logger" "github.com/minio/mux" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" ) var ( diff --git a/cmd/admin-handlers-site-replication.go b/cmd/admin-handlers-site-replication.go index 726888e85..a1039725e 100644 --- a/cmd/admin-handlers-site-replication.go +++ b/cmd/admin-handlers-site-replication.go @@ -33,15 +33,14 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" - iampolicy "github.com/minio/pkg/iam/policy" + "github.com/minio/pkg/v2/policy" ) // SiteReplicationAdd - PUT /minio/admin/v3/site-replication/add func (a adminAPIHandlers) SiteReplicationAdd(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, cred := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationAddAction) + objectAPI, cred := validateAdminReq(ctx, w, r, policy.SiteReplicationAddAction) if objectAPI == nil { return } @@ -75,7 +74,7 @@ func (a adminAPIHandlers) SiteReplicationAdd(w http.ResponseWriter, r *http.Requ func (a adminAPIHandlers) SRPeerJoin(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, cred := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationAddAction) + objectAPI, cred := validateAdminReq(ctx, w, r, policy.SiteReplicationAddAction) if objectAPI == nil { return } @@ -97,7 +96,7 @@ func (a adminAPIHandlers) SRPeerJoin(w http.ResponseWriter, r *http.Request) { func (a adminAPIHandlers) SRPeerBucketOps(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationOperationAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SiteReplicationOperationAction) if objectAPI == nil { return } @@ -144,7 +143,7 @@ func (a adminAPIHandlers) SRPeerBucketOps(w http.ResponseWriter, r *http.Request func (a adminAPIHandlers) SRPeerReplicateIAMItem(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationOperationAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SiteReplicationOperationAction) if objectAPI == nil { return } @@ -163,7 +162,7 @@ func (a adminAPIHandlers) SRPeerReplicateIAMItem(w http.ResponseWriter, r *http. if item.Policy == nil { err = globalSiteReplicationSys.PeerAddPolicyHandler(ctx, item.Name, nil, item.UpdatedAt) } else { - policy, perr := iampolicy.ParseConfig(bytes.NewReader(item.Policy)) + policy, perr := policy.ParseConfig(bytes.NewReader(item.Policy)) if perr != nil { writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, perr), r.URL) return @@ -196,7 +195,7 @@ func (a adminAPIHandlers) SRPeerReplicateIAMItem(w http.ResponseWriter, r *http. func (a adminAPIHandlers) SRPeerReplicateBucketItem(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationOperationAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SiteReplicationOperationAction) if objectAPI == nil { return } @@ -220,7 +219,7 @@ func (a adminAPIHandlers) SRPeerReplicateBucketItem(w http.ResponseWriter, r *ht if item.Policy == nil { err = globalSiteReplicationSys.PeerBucketPolicyHandler(ctx, item.Bucket, nil, item.UpdatedAt) } else { - bktPolicy, berr := policy.ParseConfig(bytes.NewReader(item.Policy), item.Bucket) + bktPolicy, berr := policy.ParseBucketPolicyConfig(bytes.NewReader(item.Policy), item.Bucket) if berr != nil { writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, berr), r.URL) return @@ -265,7 +264,7 @@ func (a adminAPIHandlers) SRPeerReplicateBucketItem(w http.ResponseWriter, r *ht func (a adminAPIHandlers) SiteReplicationInfo(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationInfoAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SiteReplicationInfoAction) if objectAPI == nil { return } @@ -285,7 +284,7 @@ func (a adminAPIHandlers) SiteReplicationInfo(w http.ResponseWriter, r *http.Req func (a adminAPIHandlers) SRPeerGetIDPSettings(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationAddAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SiteReplicationAddAction) if objectAPI == nil { return } @@ -322,7 +321,7 @@ func parseJSONBody(ctx context.Context, body io.Reader, v interface{}, encryptio func (a adminAPIHandlers) SiteReplicationStatus(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationInfoAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SiteReplicationInfoAction) if objectAPI == nil { return } @@ -351,7 +350,7 @@ func (a adminAPIHandlers) SiteReplicationStatus(w http.ResponseWriter, r *http.R func (a adminAPIHandlers) SiteReplicationMetaInfo(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationInfoAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SiteReplicationInfoAction) if objectAPI == nil { return } @@ -373,7 +372,7 @@ func (a adminAPIHandlers) SiteReplicationMetaInfo(w http.ResponseWriter, r *http func (a adminAPIHandlers) SiteReplicationEdit(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, cred := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationAddAction) + objectAPI, cred := validateAdminReq(ctx, w, r, policy.SiteReplicationAddAction) if objectAPI == nil { return } @@ -404,7 +403,7 @@ func (a adminAPIHandlers) SiteReplicationEdit(w http.ResponseWriter, r *http.Req func (a adminAPIHandlers) SRPeerEdit(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationAddAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SiteReplicationAddAction) if objectAPI == nil { return } @@ -439,7 +438,7 @@ func getSRStatusOptions(r *http.Request) (opts madmin.SRStatusOptions) { func (a adminAPIHandlers) SiteReplicationRemove(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationRemoveAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SiteReplicationRemoveAction) if objectAPI == nil { return } @@ -470,7 +469,7 @@ func (a adminAPIHandlers) SiteReplicationRemove(w http.ResponseWriter, r *http.R func (a adminAPIHandlers) SRPeerRemove(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationRemoveAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SiteReplicationRemoveAction) if objectAPI == nil { return } @@ -492,7 +491,7 @@ func (a adminAPIHandlers) SRPeerRemove(w http.ResponseWriter, r *http.Request) { func (a adminAPIHandlers) SiteReplicationResyncOp(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - objectAPI, _ := validateAdminReq(ctx, w, r, iampolicy.SiteReplicationResyncAction) + objectAPI, _ := validateAdminReq(ctx, w, r, policy.SiteReplicationResyncAction) if objectAPI == nil { return } diff --git a/cmd/admin-handlers-users-race_test.go b/cmd/admin-handlers-users-race_test.go index b491fe162..5d86d5d45 100644 --- a/cmd/admin-handlers-users-race_test.go +++ b/cmd/admin-handlers-users-race_test.go @@ -32,7 +32,7 @@ import ( "github.com/minio/madmin-go/v3" minio "github.com/minio/minio-go/v7" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/sync/errgroup" ) func runAllIAMConcurrencyTests(suite *TestSuiteIAM, c *check) { diff --git a/cmd/admin-handlers-users.go b/cmd/admin-handlers-users.go index 9c3cd83dd..8cf0d1801 100644 --- a/cmd/admin-handlers-users.go +++ b/cmd/admin-handlers-users.go @@ -34,7 +34,7 @@ import ( "github.com/minio/minio/internal/config/dns" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" ) // RemoveUser - DELETE /minio/admin/v3/remove-user?accessKey= diff --git a/cmd/admin-handlers-users_test.go b/cmd/admin-handlers-users_test.go index 526ea9e0e..8fd52f816 100644 --- a/cmd/admin-handlers-users_test.go +++ b/cmd/admin-handlers-users_test.go @@ -39,7 +39,7 @@ import ( "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio-go/v7/pkg/signer" "github.com/minio/minio/internal/auth" - "github.com/minio/pkg/env" + "github.com/minio/pkg/v2/env" ) const ( diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go index afd1f5b8c..216e04cfb 100644 --- a/cmd/admin-handlers.go +++ b/cmd/admin-handlers.go @@ -55,9 +55,9 @@ import ( "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - iampolicy "github.com/minio/pkg/iam/policy" - "github.com/minio/pkg/logger/message/log" - xnet "github.com/minio/pkg/net" + "github.com/minio/pkg/v2/logger/message/log" + xnet "github.com/minio/pkg/v2/net" + iampolicy "github.com/minio/pkg/v2/policy" "github.com/secure-io/sio-go" ) diff --git a/cmd/api-errors.go b/cmd/api-errors.go index a1f930215..2bec6a701 100644 --- a/cmd/api-errors.go +++ b/cmd/api-errors.go @@ -47,7 +47,7 @@ import ( levent "github.com/minio/minio/internal/config/lambda/event" "github.com/minio/minio/internal/event" "github.com/minio/minio/internal/hash" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) // APIError structure diff --git a/cmd/api-response.go b/cmd/api-response.go index 246af7cdd..60829470e 100644 --- a/cmd/api-response.go +++ b/cmd/api-response.go @@ -35,7 +35,7 @@ import ( "github.com/minio/minio/internal/hash" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" xxml "github.com/minio/xxml" ) diff --git a/cmd/api-router.go b/cmd/api-router.go index accf48891..d4a9ea66d 100644 --- a/cmd/api-router.go +++ b/cmd/api-router.go @@ -27,7 +27,7 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/wildcard" + "github.com/minio/pkg/v2/wildcard" "github.com/rs/cors" ) diff --git a/cmd/auth-handler.go b/cmd/auth-handler.go index 99cd7d08c..e54403f51 100644 --- a/cmd/auth-handler.go +++ b/cmd/auth-handler.go @@ -41,8 +41,7 @@ import ( xjwt "github.com/minio/minio/internal/jwt" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/mcontext" - "github.com/minio/pkg/bucket/policy" - iampolicy "github.com/minio/pkg/iam/policy" + "github.com/minio/pkg/v2/policy" ) // Verify if request has JWT. @@ -186,15 +185,15 @@ func validateAdminSignature(ctx context.Context, r *http.Request, region string) // checkAdminRequestAuth checks for authentication and authorization for the incoming // request. It only accepts V2 and V4 requests. Presigned, JWT and anonymous requests // are automatically rejected. -func checkAdminRequestAuth(ctx context.Context, r *http.Request, action iampolicy.AdminAction, region string) (auth.Credentials, APIErrorCode) { +func checkAdminRequestAuth(ctx context.Context, r *http.Request, action policy.AdminAction, region string) (auth.Credentials, APIErrorCode) { cred, owner, s3Err := validateAdminSignature(ctx, r, region) if s3Err != ErrNone { return cred, s3Err } - if globalIAMSys.IsAllowed(iampolicy.Args{ + if globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, - Action: iampolicy.Action(action), + Action: policy.Action(action), ConditionValues: getConditionValues(r, "", cred), IsOwner: owner, Claims: cred.Claims, @@ -248,7 +247,7 @@ func getClaimsFromTokenWithSecret(token, secret string) (map[string]interface{}, } // Check if a session policy is set. If so, decode it here. - sp, spok := claims.Lookup(iampolicy.SessionPolicyName) + sp, spok := claims.Lookup(policy.SessionPolicyName) if spok { // Looks like subpolicy is set and is a string, if set then its // base64 encoded, decode it. Decoding fails reject such @@ -413,7 +412,7 @@ func authorizeRequest(ctx context.Context, r *http.Request, action policy.Action if action != policy.ListAllMyBucketsAction && cred.AccessKey == "" { // Anonymous checks are not meant for ListAllBuckets action - if globalPolicySys.IsAllowed(policy.Args{ + if globalPolicySys.IsAllowed(policy.BucketPolicyArgs{ AccountName: cred.AccessKey, Groups: cred.Groups, Action: action, @@ -429,7 +428,7 @@ func authorizeRequest(ctx context.Context, r *http.Request, action policy.Action if action == policy.ListBucketVersionsAction { // In AWS S3 s3:ListBucket permission is same as s3:ListBucketVersions permission // verify as a fallback. - if globalPolicySys.IsAllowed(policy.Args{ + if globalPolicySys.IsAllowed(policy.BucketPolicyArgs{ AccountName: cred.AccessKey, Groups: cred.Groups, Action: policy.ListBucketAction, @@ -446,10 +445,10 @@ func authorizeRequest(ctx context.Context, r *http.Request, action policy.Action return ErrAccessDenied } if action == policy.DeleteObjectAction && versionID != "" { - if !globalIAMSys.IsAllowed(iampolicy.Args{ + if !globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, - Action: iampolicy.Action(policy.DeleteObjectVersionAction), + Action: policy.Action(policy.DeleteObjectVersionAction), BucketName: bucket, ConditionValues: getConditionValues(r, "", cred), ObjectName: object, @@ -460,10 +459,10 @@ func authorizeRequest(ctx context.Context, r *http.Request, action policy.Action return ErrAccessDenied } } - if globalIAMSys.IsAllowed(iampolicy.Args{ + if globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, - Action: iampolicy.Action(action), + Action: action, BucketName: bucket, ConditionValues: getConditionValues(r, "", cred), ObjectName: object, @@ -477,10 +476,10 @@ func authorizeRequest(ctx context.Context, r *http.Request, action policy.Action if action == policy.ListBucketVersionsAction { // In AWS S3 s3:ListBucket permission is same as s3:ListBucketVersions permission // verify as a fallback. - if globalIAMSys.IsAllowed(iampolicy.Args{ + if globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, - Action: iampolicy.ListBucketAction, + Action: policy.ListBucketAction, BucketName: bucket, ConditionValues: getConditionValues(r, "", cred), ObjectName: object, @@ -696,10 +695,10 @@ func isPutRetentionAllowed(bucketName, objectName string, retDays int, retDate t conditions["object-lock-remaining-retention-days"] = []string{strconv.Itoa(retDays)} } if retMode == objectlock.RetGovernance && byPassSet { - byPassSet = globalIAMSys.IsAllowed(iampolicy.Args{ + byPassSet = globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, - Action: iampolicy.BypassGovernanceRetentionAction, + Action: policy.BypassGovernanceRetentionAction, BucketName: bucketName, ObjectName: objectName, ConditionValues: conditions, @@ -707,10 +706,10 @@ func isPutRetentionAllowed(bucketName, objectName string, retDays int, retDate t Claims: cred.Claims, }) } - if globalIAMSys.IsAllowed(iampolicy.Args{ + if globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, - Action: iampolicy.PutObjectRetentionAction, + Action: policy.PutObjectRetentionAction, BucketName: bucketName, ConditionValues: conditions, ObjectName: objectName, @@ -728,7 +727,7 @@ func isPutRetentionAllowed(bucketName, objectName string, retDays int, retDate t // isPutActionAllowed - check if PUT operation is allowed on the resource, this // call verifies bucket policies and IAM policies, supports multi user // checks etc. -func isPutActionAllowed(ctx context.Context, atype authType, bucketName, objectName string, r *http.Request, action iampolicy.Action) (s3Err APIErrorCode) { +func isPutActionAllowed(ctx context.Context, atype authType, bucketName, objectName string, r *http.Request, action policy.Action) (s3Err APIErrorCode) { var cred auth.Credentials var owner bool region := globalSite.Region @@ -751,17 +750,17 @@ func isPutActionAllowed(ctx context.Context, atype authType, bucketName, objectN // Do not check for PutObjectRetentionAction permission, // if mode and retain until date are not set. // Can happen when bucket has default lock config set - if action == iampolicy.PutObjectRetentionAction && + if action == policy.PutObjectRetentionAction && r.Header.Get(xhttp.AmzObjectLockMode) == "" && r.Header.Get(xhttp.AmzObjectLockRetainUntilDate) == "" { return ErrNone } if cred.AccessKey == "" { - if globalPolicySys.IsAllowed(policy.Args{ + if globalPolicySys.IsAllowed(policy.BucketPolicyArgs{ AccountName: cred.AccessKey, Groups: cred.Groups, - Action: policy.Action(action), + Action: action, BucketName: bucketName, ConditionValues: getConditionValues(r, "", auth.AnonymousCredentials), IsOwner: false, @@ -772,7 +771,7 @@ func isPutActionAllowed(ctx context.Context, atype authType, bucketName, objectN return ErrAccessDenied } - if globalIAMSys.IsAllowed(iampolicy.Args{ + if globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, Action: action, diff --git a/cmd/auth-handler_test.go b/cmd/auth-handler_test.go index 3c8e6a85a..6b736a32c 100644 --- a/cmd/auth-handler_test.go +++ b/cmd/auth-handler_test.go @@ -28,7 +28,7 @@ import ( "time" "github.com/minio/minio/internal/auth" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" ) type nullReader struct{} diff --git a/cmd/background-heal-ops.go b/cmd/background-heal-ops.go index 5ae6540f0..5568d0b5d 100644 --- a/cmd/background-heal-ops.go +++ b/cmd/background-heal-ops.go @@ -26,7 +26,7 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/env" + "github.com/minio/pkg/v2/env" ) // 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 c3da04efa..c985b4621 100644 --- a/cmd/background-newdisks-heal-ops.go +++ b/cmd/background-newdisks-heal-ops.go @@ -34,7 +34,7 @@ import ( "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/env" + "github.com/minio/pkg/v2/env" ) const ( diff --git a/cmd/batch-handlers.go b/cmd/batch-handlers.go index baa980e20..869e653c3 100644 --- a/cmd/batch-handlers.go +++ b/cmd/batch-handlers.go @@ -47,10 +47,10 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/ioutil" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/console" - "github.com/minio/pkg/env" - iampolicy "github.com/minio/pkg/iam/policy" - "github.com/minio/pkg/workers" + "github.com/minio/pkg/v2/console" + "github.com/minio/pkg/v2/env" + iampolicy "github.com/minio/pkg/v2/policy" + "github.com/minio/pkg/v2/workers" "gopkg.in/yaml.v2" ) diff --git a/cmd/batch-job-common-types.go b/cmd/batch-job-common-types.go index a98d3e4e8..796a5cf7f 100644 --- a/cmd/batch-job-common-types.go +++ b/cmd/batch-job-common-types.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/minio/pkg/wildcard" + "github.com/minio/pkg/v2/wildcard" ) //go:generate msgp -file $GOFILE diff --git a/cmd/batch-rotate.go b/cmd/batch-rotate.go index 5463f58c7..b444b7d91 100644 --- a/cmd/batch-rotate.go +++ b/cmd/batch-rotate.go @@ -34,8 +34,8 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/env" - "github.com/minio/pkg/workers" + "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v2/workers" ) // keyrotate: diff --git a/cmd/bootstrap-peer-server.go b/cmd/bootstrap-peer-server.go index b6d199ceb..88653bb17 100644 --- a/cmd/bootstrap-peer-server.go +++ b/cmd/bootstrap-peer-server.go @@ -33,7 +33,7 @@ import ( "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/rest" "github.com/minio/mux" - "github.com/minio/pkg/env" + "github.com/minio/pkg/v2/env" ) const ( diff --git a/cmd/bucket-encryption-handlers.go b/cmd/bucket-encryption-handlers.go index 71bd0aedc..0a94978d2 100644 --- a/cmd/bucket-encryption-handlers.go +++ b/cmd/bucket-encryption-handlers.go @@ -30,7 +30,7 @@ import ( "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) const ( diff --git a/cmd/bucket-handlers.go b/cmd/bucket-handlers.go index 9e891ce3b..767f71d51 100644 --- a/cmd/bucket-handlers.go +++ b/cmd/bucket-handlers.go @@ -60,9 +60,8 @@ import ( "github.com/minio/minio/internal/ioutil" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/bucket/policy" - iampolicy "github.com/minio/pkg/iam/policy" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/policy" + "github.com/minio/pkg/v2/sync/errgroup" ) const ( @@ -367,10 +366,10 @@ func (api objectAPIHandlers) ListBucketsHandler(w http.ResponseWriter, r *http.R // Use the following trick to filter in place // https://github.com/golang/go/wiki/SliceTricks#filter-in-place for _, bucketInfo := range bucketsInfo { - if globalIAMSys.IsAllowed(iampolicy.Args{ + if globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, - Action: iampolicy.ListBucketAction, + Action: policy.ListBucketAction, BucketName: bucketInfo.Name, ConditionValues: getConditionValues(r, "", cred), IsOwner: owner, @@ -379,10 +378,10 @@ func (api objectAPIHandlers) ListBucketsHandler(w http.ResponseWriter, r *http.R }) { bucketsInfo[n] = bucketInfo n++ - } else if globalIAMSys.IsAllowed(iampolicy.Args{ + } else if globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, - Action: iampolicy.GetBucketLocationAction, + Action: policy.GetBucketLocationAction, BucketName: bucketInfo.Name, ConditionValues: getConditionValues(r, "", cred), IsOwner: owner, @@ -770,8 +769,8 @@ func (api objectAPIHandlers) PutBucketHandler(w http.ResponseWriter, r *http.Req if objectLockEnabled { // Creating a bucket with locking requires the user having more permissions - for _, action := range []iampolicy.Action{iampolicy.PutBucketObjectLockConfigurationAction, iampolicy.PutBucketVersioningAction} { - if !globalIAMSys.IsAllowed(iampolicy.Args{ + for _, action := range []policy.Action{policy.PutBucketObjectLockConfigurationAction, policy.PutBucketVersioningAction} { + if !globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, Action: action, @@ -1103,10 +1102,10 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h if len(fanOutEntries) > 0 { // Once signature is validated, check if the user has // explicit permissions for the user. - if !globalIAMSys.IsAllowed(iampolicy.Args{ + if !globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, - Action: iampolicy.PutObjectFanOutAction, + Action: policy.PutObjectFanOutAction, ConditionValues: getConditionValues(r, "", cred), BucketName: bucket, ObjectName: object, @@ -1119,10 +1118,10 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h } else { // Once signature is validated, check if the user has // explicit permissions for the user. - if !globalIAMSys.IsAllowed(iampolicy.Args{ + if !globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey, Groups: cred.Groups, - Action: iampolicy.PutObjectAction, + Action: policy.PutObjectAction, ConditionValues: getConditionValues(r, "", cred), BucketName: bucket, ObjectName: object, @@ -1501,7 +1500,7 @@ func (api objectAPIHandlers) GetBucketPolicyStatusHandler(w http.ResponseWriter, } // Check if anonymous (non-owner) has access to list objects. - readable := globalPolicySys.IsAllowed(policy.Args{ + readable := globalPolicySys.IsAllowed(policy.BucketPolicyArgs{ Action: policy.ListBucketAction, BucketName: bucket, ConditionValues: getConditionValues(r, "", auth.AnonymousCredentials), @@ -1509,7 +1508,7 @@ func (api objectAPIHandlers) GetBucketPolicyStatusHandler(w http.ResponseWriter, }) // Check if anonymous (non-owner) has access to upload objects. - writable := globalPolicySys.IsAllowed(policy.Args{ + writable := globalPolicySys.IsAllowed(policy.BucketPolicyArgs{ Action: policy.PutObjectAction, BucketName: bucket, ConditionValues: getConditionValues(r, "", auth.AnonymousCredentials), diff --git a/cmd/bucket-lifecycle-handlers.go b/cmd/bucket-lifecycle-handlers.go index 2632a08fd..b31f76a8c 100644 --- a/cmd/bucket-lifecycle-handlers.go +++ b/cmd/bucket-lifecycle-handlers.go @@ -27,7 +27,7 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) const ( diff --git a/cmd/bucket-lifecycle.go b/cmd/bucket-lifecycle.go index 78f6b292c..362e542a5 100644 --- a/cmd/bucket-lifecycle.go +++ b/cmd/bucket-lifecycle.go @@ -41,8 +41,8 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/s3select" - "github.com/minio/pkg/env" - "github.com/minio/pkg/workers" + "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v2/workers" ) const ( diff --git a/cmd/bucket-listobjects-handlers.go b/cmd/bucket-listobjects-handlers.go index a898dee58..e954af3b1 100644 --- a/cmd/bucket-listobjects-handlers.go +++ b/cmd/bucket-listobjects-handlers.go @@ -26,7 +26,7 @@ import ( "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) // Validate all the ListObjects query arguments, returns an APIErrorCode diff --git a/cmd/bucket-metadata-sys.go b/cmd/bucket-metadata-sys.go index 9e7a3a373..344e8a598 100644 --- a/cmd/bucket-metadata-sys.go +++ b/cmd/bucket-metadata-sys.go @@ -35,8 +35,8 @@ import ( "github.com/minio/minio/internal/event" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/bucket/policy" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/policy" + "github.com/minio/pkg/v2/sync/errgroup" ) // BucketMetadataSys captures all bucket metadata for a given cluster. @@ -310,7 +310,7 @@ func (sys *BucketMetadataSys) CreatedAt(bucket string) (time.Time, error) { // GetPolicyConfig returns configured bucket policy // The returned object may not be modified. -func (sys *BucketMetadataSys) GetPolicyConfig(bucket string) (*policy.Policy, time.Time, error) { +func (sys *BucketMetadataSys) GetPolicyConfig(bucket string) (*policy.BucketPolicy, time.Time, error) { meta, _, err := sys.GetConfig(GlobalContext, bucket) if err != nil { if errors.Is(err, errConfigNotFound) { diff --git a/cmd/bucket-metadata.go b/cmd/bucket-metadata.go index c47d954c0..797e9ed9f 100644 --- a/cmd/bucket-metadata.go +++ b/cmd/bucket-metadata.go @@ -41,7 +41,7 @@ import ( "github.com/minio/minio/internal/fips" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" "github.com/minio/sio" ) @@ -91,7 +91,7 @@ type BucketMetadata struct { LifecycleConfigUpdatedAt time.Time // Unexported fields. Must be updated atomically. - policyConfig *policy.Policy + policyConfig *policy.BucketPolicy notificationConfig *event.Config lifecycleConfig *lifecycle.Lifecycle objectLockConfig *objectlock.Config @@ -217,7 +217,7 @@ func loadBucketMetadata(ctx context.Context, objectAPI ObjectLayer, bucket strin // The first error encountered is returned. func (b *BucketMetadata) parseAllConfigs(ctx context.Context, objectAPI ObjectLayer) (err error) { if len(b.PolicyConfigJSON) != 0 { - b.policyConfig, err = policy.ParseConfig(bytes.NewReader(b.PolicyConfigJSON), b.Name) + b.policyConfig, err = policy.ParseBucketPolicyConfig(bytes.NewReader(b.PolicyConfigJSON), b.Name) if err != nil { return err } diff --git a/cmd/bucket-notification-handlers.go b/cmd/bucket-notification-handlers.go index b3608ffd8..128986c3a 100644 --- a/cmd/bucket-notification-handlers.go +++ b/cmd/bucket-notification-handlers.go @@ -26,7 +26,7 @@ import ( "github.com/minio/minio/internal/event" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) const ( diff --git a/cmd/bucket-object-lock.go b/cmd/bucket-object-lock.go index adef0336a..842458fea 100644 --- a/cmd/bucket-object-lock.go +++ b/cmd/bucket-object-lock.go @@ -28,7 +28,7 @@ import ( "github.com/minio/minio/internal/bucket/replication" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) // BucketObjectLockSys - map of bucket and retention configuration. diff --git a/cmd/bucket-policy-handlers.go b/cmd/bucket-policy-handlers.go index 0b30d11ba..321635b73 100644 --- a/cmd/bucket-policy-handlers.go +++ b/cmd/bucket-policy-handlers.go @@ -27,7 +27,7 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) const ( @@ -84,7 +84,7 @@ func (api objectAPIHandlers) PutBucketPolicyHandler(w http.ResponseWriter, r *ht return } - bucketPolicy, err := policy.ParseConfig(bytes.NewReader(bucketPolicyBytes), bucket) + bucketPolicy, err := policy.ParseBucketPolicyConfig(bytes.NewReader(bucketPolicyBytes), bucket) if err != nil { writeErrorResponse(ctx, w, APIError{ Code: "MalformedPolicy", diff --git a/cmd/bucket-policy-handlers_test.go b/cmd/bucket-policy-handlers_test.go index a1c20ce54..4f0e17581 100644 --- a/cmd/bucket-policy-handlers_test.go +++ b/cmd/bucket-policy-handlers_test.go @@ -29,31 +29,31 @@ import ( "testing" "github.com/minio/minio/internal/auth" - "github.com/minio/pkg/bucket/policy" - "github.com/minio/pkg/bucket/policy/condition" + "github.com/minio/pkg/v2/policy" + "github.com/minio/pkg/v2/policy/condition" ) -func getAnonReadOnlyBucketPolicy(bucketName string) *policy.Policy { - return &policy.Policy{ +func getAnonReadOnlyBucketPolicy(bucketName string) *policy.BucketPolicy { + return &policy.BucketPolicy{ Version: policy.DefaultVersion, - Statements: []policy.Statement{ - policy.NewStatement( + Statements: []policy.BPStatement{ + policy.NewBPStatement( "", policy.Allow, policy.NewPrincipal("*"), policy.NewActionSet(policy.GetBucketLocationAction, policy.ListBucketAction), - policy.NewResourceSet(policy.NewResource(bucketName, "")), + policy.NewResourceSet(policy.NewResource(bucketName)), condition.NewFunctions(), ), }, } } -func getAnonWriteOnlyBucketPolicy(bucketName string) *policy.Policy { - return &policy.Policy{ +func getAnonWriteOnlyBucketPolicy(bucketName string) *policy.BucketPolicy { + return &policy.BucketPolicy{ Version: policy.DefaultVersion, - Statements: []policy.Statement{ - policy.NewStatement( + Statements: []policy.BPStatement{ + policy.NewBPStatement( "", policy.Allow, policy.NewPrincipal("*"), @@ -61,34 +61,34 @@ func getAnonWriteOnlyBucketPolicy(bucketName string) *policy.Policy { policy.GetBucketLocationAction, policy.ListBucketMultipartUploadsAction, ), - policy.NewResourceSet(policy.NewResource(bucketName, "")), + policy.NewResourceSet(policy.NewResource(bucketName)), condition.NewFunctions(), ), }, } } -func getAnonReadOnlyObjectPolicy(bucketName, prefix string) *policy.Policy { - return &policy.Policy{ +func getAnonReadOnlyObjectPolicy(bucketName, prefix string) *policy.BucketPolicy { + return &policy.BucketPolicy{ Version: policy.DefaultVersion, - Statements: []policy.Statement{ - policy.NewStatement( + Statements: []policy.BPStatement{ + policy.NewBPStatement( "", policy.Allow, policy.NewPrincipal("*"), policy.NewActionSet(policy.GetObjectAction), - policy.NewResourceSet(policy.NewResource(bucketName, prefix)), + policy.NewResourceSet(policy.NewResource(bucketName+"/"+prefix)), condition.NewFunctions(), ), }, } } -func getAnonWriteOnlyObjectPolicy(bucketName, prefix string) *policy.Policy { - return &policy.Policy{ +func getAnonWriteOnlyObjectPolicy(bucketName, prefix string) *policy.BucketPolicy { + return &policy.BucketPolicy{ Version: policy.DefaultVersion, - Statements: []policy.Statement{ - policy.NewStatement( + Statements: []policy.BPStatement{ + policy.NewBPStatement( "", policy.Allow, policy.NewPrincipal("*"), @@ -98,7 +98,7 @@ func getAnonWriteOnlyObjectPolicy(bucketName, prefix string) *policy.Policy { policy.ListMultipartUploadPartsAction, policy.PutObjectAction, ), - policy.NewResourceSet(policy.NewResource(bucketName, prefix)), + policy.NewResourceSet(policy.NewResource(bucketName+"/"+prefix)), condition.NewFunctions(), ), }, @@ -493,13 +493,13 @@ func testGetBucketPolicyHandler(obj ObjectLayer, instanceType, bucketName string if recV4.Code != testCase.expectedRespStatus { // Verify whether the bucket policy fetched is same as the one inserted. - var expectedPolicy *policy.Policy - expectedPolicy, err = policy.ParseConfig(strings.NewReader(expectedBucketPolicyStr), testCase.bucketName) + var expectedPolicy *policy.BucketPolicy + expectedPolicy, err = policy.ParseBucketPolicyConfig(strings.NewReader(expectedBucketPolicyStr), testCase.bucketName) if err != nil { t.Fatalf("unexpected error. %v", err) } - var gotPolicy *policy.Policy - gotPolicy, err = policy.ParseConfig(bytes.NewReader(bucketPolicyReadBuf), testCase.bucketName) + var gotPolicy *policy.BucketPolicy + gotPolicy, err = policy.ParseBucketPolicyConfig(bytes.NewReader(bucketPolicyReadBuf), testCase.bucketName) if err != nil { t.Fatalf("unexpected error. %v", err) } @@ -530,11 +530,11 @@ func testGetBucketPolicyHandler(obj ObjectLayer, instanceType, bucketName string } if recV2.Code == http.StatusOK { // Verify whether the bucket policy fetched is same as the one inserted. - expectedPolicy, err := policy.ParseConfig(strings.NewReader(expectedBucketPolicyStr), testCase.bucketName) + expectedPolicy, err := policy.ParseBucketPolicyConfig(strings.NewReader(expectedBucketPolicyStr), testCase.bucketName) if err != nil { t.Fatalf("unexpected error. %v", err) } - gotPolicy, err := policy.ParseConfig(bytes.NewReader(bucketPolicyReadBuf), testCase.bucketName) + gotPolicy, err := policy.ParseBucketPolicyConfig(bytes.NewReader(bucketPolicyReadBuf), testCase.bucketName) if err != nil { t.Fatalf("unexpected error. %v", err) } diff --git a/cmd/bucket-policy.go b/cmd/bucket-policy.go index c1a316cd6..05076698e 100644 --- a/cmd/bucket-policy.go +++ b/cmd/bucket-policy.go @@ -32,20 +32,20 @@ import ( "github.com/minio/minio/internal/handlers" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) // PolicySys - policy subsystem. type PolicySys struct{} // Get returns stored bucket policy -func (sys *PolicySys) Get(bucket string) (*policy.Policy, error) { +func (sys *PolicySys) Get(bucket string) (*policy.BucketPolicy, error) { policy, _, err := globalBucketMetadataSys.GetPolicyConfig(bucket) return policy, err } // IsAllowed - checks given policy args is allowed to continue the Rest API. -func (sys *PolicySys) IsAllowed(args policy.Args) bool { +func (sys *PolicySys) IsAllowed(args policy.BucketPolicyArgs) bool { p, err := sys.Get(args.BucketName) if err == nil { return p.IsAllowed(args) @@ -236,7 +236,7 @@ func getConditionValues(r *http.Request, lc string, cred auth.Credentials) map[s } // PolicyToBucketAccessPolicy converts a MinIO policy into a minio-go policy data structure. -func PolicyToBucketAccessPolicy(bucketPolicy *policy.Policy) (*miniogopolicy.BucketAccessPolicy, error) { +func PolicyToBucketAccessPolicy(bucketPolicy *policy.BucketPolicy) (*miniogopolicy.BucketAccessPolicy, error) { // Return empty BucketAccessPolicy for empty bucket policy. if bucketPolicy == nil { return &miniogopolicy.BucketAccessPolicy{Version: policy.DefaultVersion}, nil @@ -258,15 +258,15 @@ func PolicyToBucketAccessPolicy(bucketPolicy *policy.Policy) (*miniogopolicy.Buc return &policyInfo, nil } -// BucketAccessPolicyToPolicy - converts minio-go/policy.BucketAccessPolicy to policy.Policy. -func BucketAccessPolicyToPolicy(policyInfo *miniogopolicy.BucketAccessPolicy) (*policy.Policy, error) { +// BucketAccessPolicyToPolicy - converts minio-go/policy.BucketAccessPolicy to policy.BucketPolicy. +func BucketAccessPolicyToPolicy(policyInfo *miniogopolicy.BucketAccessPolicy) (*policy.BucketPolicy, error) { data, err := json.Marshal(policyInfo) if err != nil { // This should not happen because policyInfo is valid to convert to JSON data. return nil, err } - var bucketPolicy policy.Policy + var bucketPolicy policy.BucketPolicy json := jsoniter.ConfigCompatibleWithStandardLibrary if err = json.Unmarshal(data, &bucketPolicy); err != nil { // This should not happen because data is valid to JSON data. diff --git a/cmd/bucket-replication-handlers.go b/cmd/bucket-replication-handlers.go index 0b7fa3d34..84a91a270 100644 --- a/cmd/bucket-replication-handlers.go +++ b/cmd/bucket-replication-handlers.go @@ -34,7 +34,7 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) // PutBucketReplicationConfigHandler - PUT Bucket replication configuration. diff --git a/cmd/bucket-versioning-handler.go b/cmd/bucket-versioning-handler.go index 3bfa3667c..64728a88b 100644 --- a/cmd/bucket-versioning-handler.go +++ b/cmd/bucket-versioning-handler.go @@ -28,7 +28,7 @@ import ( "github.com/minio/minio/internal/bucket/versioning" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) const ( diff --git a/cmd/common-main.go b/cmd/common-main.go index 2b3d22b1a..5c7f18b01 100644 --- a/cmd/common-main.go +++ b/cmd/common-main.go @@ -61,11 +61,11 @@ import ( "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/certs" - "github.com/minio/pkg/console" - "github.com/minio/pkg/ellipses" - "github.com/minio/pkg/env" - xnet "github.com/minio/pkg/net" + "github.com/minio/pkg/v2/certs" + "github.com/minio/pkg/v2/console" + "github.com/minio/pkg/v2/ellipses" + "github.com/minio/pkg/v2/env" + xnet "github.com/minio/pkg/v2/net" ) // serverDebugLog will enable debug printing diff --git a/cmd/config-current.go b/cmd/config-current.go index 006fd1b68..0ed0017a3 100644 --- a/cmd/config-current.go +++ b/cmd/config-current.go @@ -48,7 +48,7 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/env" + "github.com/minio/pkg/v2/env" ) func initHelp() { diff --git a/cmd/config-migrate.go b/cmd/config-migrate.go index 7dfd24974..f4bf4cb20 100644 --- a/cmd/config-migrate.go +++ b/cmd/config-migrate.go @@ -40,8 +40,8 @@ import ( "github.com/minio/minio/internal/event/target" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger/target/http" - xnet "github.com/minio/pkg/net" - "github.com/minio/pkg/quick" + xnet "github.com/minio/pkg/v2/net" + "github.com/minio/pkg/v2/quick" ) // Do not edit following message template, please open a GitHub issue to discuss instead. diff --git a/cmd/config-versions.go b/cmd/config-versions.go index f359f8338..edf6a22fe 100644 --- a/cmd/config-versions.go +++ b/cmd/config-versions.go @@ -31,7 +31,7 @@ import ( "github.com/minio/minio/internal/config/storageclass" "github.com/minio/minio/internal/event/target" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/quick" + "github.com/minio/pkg/v2/quick" ) type configV1 struct { diff --git a/cmd/consolelogger.go b/cmd/consolelogger.go index 65a93f429..dacb59e53 100644 --- a/cmd/consolelogger.go +++ b/cmd/consolelogger.go @@ -28,8 +28,8 @@ import ( "github.com/minio/minio/internal/logger/target/console" "github.com/minio/minio/internal/logger/target/types" "github.com/minio/minio/internal/pubsub" - "github.com/minio/pkg/logger/message/log" - xnet "github.com/minio/pkg/net" + "github.com/minio/pkg/v2/logger/message/log" + xnet "github.com/minio/pkg/v2/net" ) // number of log messages to buffer diff --git a/cmd/data-scanner.go b/cmd/data-scanner.go index fdf4b0e54..04b0f66b8 100644 --- a/cmd/data-scanner.go +++ b/cmd/data-scanner.go @@ -41,7 +41,7 @@ import ( "github.com/minio/minio/internal/config/heal" "github.com/minio/minio/internal/event" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/console" + "github.com/minio/pkg/v2/console" uatomic "go.uber.org/atomic" ) diff --git a/cmd/disk-cache.go b/cmd/disk-cache.go index 1c85399a2..e1e720012 100644 --- a/cmd/disk-cache.go +++ b/cmd/disk-cache.go @@ -33,9 +33,9 @@ import ( "github.com/minio/minio/internal/disk" "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/logger" - xnet "github.com/minio/pkg/net" - "github.com/minio/pkg/sync/errgroup" - "github.com/minio/pkg/wildcard" + xnet "github.com/minio/pkg/v2/net" + "github.com/minio/pkg/v2/sync/errgroup" + "github.com/minio/pkg/v2/wildcard" ) const ( diff --git a/cmd/dummy-handlers.go b/cmd/dummy-handlers.go index 428c172fb..f92c66743 100644 --- a/cmd/dummy-handlers.go +++ b/cmd/dummy-handlers.go @@ -22,7 +22,7 @@ import ( "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) // Data types used for returning dummy tagging XML. diff --git a/cmd/endpoint-ellipses.go b/cmd/endpoint-ellipses.go index 4f1e5549e..aa699be53 100644 --- a/cmd/endpoint-ellipses.go +++ b/cmd/endpoint-ellipses.go @@ -26,8 +26,8 @@ import ( "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/config" - "github.com/minio/pkg/ellipses" - "github.com/minio/pkg/env" + "github.com/minio/pkg/v2/ellipses" + "github.com/minio/pkg/v2/env" ) // This file implements and supports ellipses pattern for diff --git a/cmd/endpoint-ellipses_test.go b/cmd/endpoint-ellipses_test.go index 1977100e0..328a990e1 100644 --- a/cmd/endpoint-ellipses_test.go +++ b/cmd/endpoint-ellipses_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/minio/pkg/ellipses" + "github.com/minio/pkg/v2/ellipses" ) // Tests create endpoints with ellipses and without. diff --git a/cmd/endpoint.go b/cmd/endpoint.go index 305e81b6c..8c9b08aa7 100644 --- a/cmd/endpoint.go +++ b/cmd/endpoint.go @@ -36,8 +36,8 @@ import ( "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/mountinfo" - "github.com/minio/pkg/env" - xnet "github.com/minio/pkg/net" + "github.com/minio/pkg/v2/env" + xnet "github.com/minio/pkg/v2/net" "golang.org/x/exp/slices" ) diff --git a/cmd/erasure-common.go b/cmd/erasure-common.go index e0355f182..ce6eaa4a5 100644 --- a/cmd/erasure-common.go +++ b/cmd/erasure-common.go @@ -26,7 +26,7 @@ import ( "time" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/sync/errgroup" ) func (er erasureObjects) getOnlineDisks() (newDisks []StorageAPI) { diff --git a/cmd/erasure-healing.go b/cmd/erasure-healing.go index 5233c7ecc..beee465de 100644 --- a/cmd/erasure-healing.go +++ b/cmd/erasure-healing.go @@ -29,7 +29,7 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/sync/errgroup" ) const reservedMetadataPrefixLowerDataShardFix = ReservedMetadataPrefixLower + "data-shard-fix" diff --git a/cmd/erasure-metadata-utils.go b/cmd/erasure-metadata-utils.go index fc15dafb8..b401ac377 100644 --- a/cmd/erasure-metadata-utils.go +++ b/cmd/erasure-metadata-utils.go @@ -25,7 +25,7 @@ import ( "io" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/sync/errgroup" ) // figure out the most commonVersions across disk that satisfies diff --git a/cmd/erasure-metadata.go b/cmd/erasure-metadata.go index b2f8c0dfd..528814f83 100644 --- a/cmd/erasure-metadata.go +++ b/cmd/erasure-metadata.go @@ -32,7 +32,7 @@ import ( "github.com/minio/minio/internal/hash/sha256" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/sync/errgroup" "github.com/minio/sio" ) diff --git a/cmd/erasure-multipart.go b/cmd/erasure-multipart.go index f7a482098..d460b14bc 100644 --- a/cmd/erasure-multipart.go +++ b/cmd/erasure-multipart.go @@ -38,8 +38,8 @@ import ( xhttp "github.com/minio/minio/internal/http" xioutil "github.com/minio/minio/internal/ioutil" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/mimedb" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/mimedb" + "github.com/minio/pkg/v2/sync/errgroup" uatomic "go.uber.org/atomic" ) diff --git a/cmd/erasure-object.go b/cmd/erasure-object.go index cefa1d7b1..c86901f4d 100644 --- a/cmd/erasure-object.go +++ b/cmd/erasure-object.go @@ -43,9 +43,9 @@ import ( xhttp "github.com/minio/minio/internal/http" xioutil "github.com/minio/minio/internal/ioutil" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/mimedb" - "github.com/minio/pkg/sync/errgroup" - "github.com/minio/pkg/wildcard" + "github.com/minio/pkg/v2/mimedb" + "github.com/minio/pkg/v2/sync/errgroup" + "github.com/minio/pkg/v2/wildcard" uatomic "go.uber.org/atomic" ) diff --git a/cmd/erasure-server-pool-decom.go b/cmd/erasure-server-pool-decom.go index dbda64cf2..8f721319e 100644 --- a/cmd/erasure-server-pool-decom.go +++ b/cmd/erasure-server-pool-decom.go @@ -34,9 +34,9 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/console" - "github.com/minio/pkg/env" - "github.com/minio/pkg/workers" + "github.com/minio/pkg/v2/console" + "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v2/workers" ) // PoolDecommissionInfo currently decommissioning information diff --git a/cmd/erasure-server-pool-rebalance.go b/cmd/erasure-server-pool-rebalance.go index 15a5de530..ac7ca1c05 100644 --- a/cmd/erasure-server-pool-rebalance.go +++ b/cmd/erasure-server-pool-rebalance.go @@ -35,7 +35,7 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/env" + "github.com/minio/pkg/v2/env" ) //go:generate msgp -file $GOFILE -unexported diff --git a/cmd/erasure-server-pool.go b/cmd/erasure-server-pool.go index 864948b9d..71bc090a7 100644 --- a/cmd/erasure-server-pool.go +++ b/cmd/erasure-server-pool.go @@ -39,8 +39,8 @@ import ( "github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio/internal/config/storageclass" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/sync/errgroup" - "github.com/minio/pkg/wildcard" + "github.com/minio/pkg/v2/sync/errgroup" + "github.com/minio/pkg/v2/wildcard" ) type erasureServerPools struct { diff --git a/cmd/erasure-sets.go b/cmd/erasure-sets.go index a266ed507..ca6618e82 100644 --- a/cmd/erasure-sets.go +++ b/cmd/erasure-sets.go @@ -39,8 +39,8 @@ import ( "github.com/minio/minio/internal/bpool" "github.com/minio/minio/internal/dsync" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/console" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/console" + "github.com/minio/pkg/v2/sync/errgroup" ) // setsDsyncLockers is encapsulated type for Close() diff --git a/cmd/erasure.go b/cmd/erasure.go index 01ed9d294..3cfd53fd4 100644 --- a/cmd/erasure.go +++ b/cmd/erasure.go @@ -33,7 +33,7 @@ import ( "github.com/minio/minio/internal/dsync" xioutil "github.com/minio/minio/internal/ioutil" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/sync/errgroup" ) // list all errors that can be ignore in a bucket operation. diff --git a/cmd/event-notification.go b/cmd/event-notification.go index d38369371..ead5e7af8 100644 --- a/cmd/event-notification.go +++ b/cmd/event-notification.go @@ -29,7 +29,7 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/pubsub" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) // EventNotifier - notifies external systems about events in MinIO. diff --git a/cmd/format-erasure.go b/cmd/format-erasure.go index cd85e3e5c..86e62a488 100644 --- a/cmd/format-erasure.go +++ b/cmd/format-erasure.go @@ -33,7 +33,7 @@ import ( "github.com/minio/minio/internal/config/storageclass" xioutil "github.com/minio/minio/internal/ioutil" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/sync/errgroup" ) const ( diff --git a/cmd/generic-handlers.go b/cmd/generic-handlers.go index 50f158b6d..fe53f1891 100644 --- a/cmd/generic-handlers.go +++ b/cmd/generic-handlers.go @@ -31,7 +31,7 @@ import ( "github.com/dustin/go-humanize" "github.com/minio/minio-go/v7/pkg/s3utils" "github.com/minio/minio-go/v7/pkg/set" - xnet "github.com/minio/pkg/net" + xnet "github.com/minio/pkg/v2/net" "github.com/minio/minio/internal/amztime" "github.com/minio/minio/internal/config/dns" diff --git a/cmd/global-heal.go b/cmd/global-heal.go index b07ab2e95..1ef7aa1bf 100644 --- a/cmd/global-heal.go +++ b/cmd/global-heal.go @@ -28,8 +28,8 @@ import ( "github.com/minio/minio/internal/color" "github.com/minio/minio/internal/config/storageclass" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/console" - "github.com/minio/pkg/wildcard" + "github.com/minio/pkg/v2/console" + "github.com/minio/pkg/v2/wildcard" ) const ( diff --git a/cmd/globals.go b/cmd/globals.go index 500bada1a..2a6f746e2 100644 --- a/cmd/globals.go +++ b/cmd/globals.go @@ -52,8 +52,8 @@ import ( levent "github.com/minio/minio/internal/config/lambda/event" "github.com/minio/minio/internal/event" "github.com/minio/minio/internal/pubsub" - "github.com/minio/pkg/certs" - xnet "github.com/minio/pkg/net" + "github.com/minio/pkg/v2/certs" + xnet "github.com/minio/pkg/v2/net" ) // minio configuration related constants. diff --git a/cmd/handler-utils.go b/cmd/handler-utils.go index 0326cbcf4..92c0eb1e7 100644 --- a/cmd/handler-utils.go +++ b/cmd/handler-utils.go @@ -32,7 +32,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" ) const ( diff --git a/cmd/iam-store.go b/cmd/iam-store.go index 481605d74..6cf85e6e7 100644 --- a/cmd/iam-store.go +++ b/cmd/iam-store.go @@ -34,7 +34,7 @@ import ( "github.com/minio/minio/internal/config/identity/openid" "github.com/minio/minio/internal/jwt" "github.com/minio/minio/internal/logger" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" ) const ( @@ -1157,7 +1157,7 @@ func (store *IAMStoreSys) GetPolicy(name string) (iampolicy.Policy, error) { defer store.runlock() policies := newMappedPolicy(name).toSlice() - var combinedPolicy iampolicy.Policy + var toMerge []iampolicy.Policy for _, policy := range policies { if policy == "" { continue @@ -1166,9 +1166,9 @@ func (store *IAMStoreSys) GetPolicy(name string) (iampolicy.Policy, error) { if !ok { return v.Policy, errNoSuchPolicy } - combinedPolicy = combinedPolicy.Merge(v.Policy) + toMerge = append(toMerge, v.Policy) } - return combinedPolicy, nil + return iampolicy.MergePolicies(toMerge...), nil } // GetPolicyDoc - gets the policy doc which has the policy and some metadata. @@ -1292,7 +1292,7 @@ func (store *IAMStoreSys) listPolicyDocs(ctx context.Context, bucketName string) func filterPolicies(cache *iamCache, policyName string, bucketName string) (string, iampolicy.Policy) { var policies []string mp := newMappedPolicy(policyName) - combinedPolicy := iampolicy.Policy{} + var toMerge []iampolicy.Policy for _, policy := range mp.toSlice() { if policy == "" { continue @@ -1303,10 +1303,10 @@ func filterPolicies(cache *iamCache, policyName string, bucketName string) (stri } if bucketName == "" || p.Policy.MatchResource(bucketName) { policies = append(policies, policy) - combinedPolicy = combinedPolicy.Merge(p.Policy) + toMerge = append(toMerge, p.Policy) } } - return strings.Join(policies, ","), combinedPolicy + return strings.Join(policies, ","), iampolicy.MergePolicies(toMerge...) } // FilterPolicies - accepts a comma separated list of policy names as a string diff --git a/cmd/iam.go b/cmd/iam.go index 3e1087105..8f992c14a 100644 --- a/cmd/iam.go +++ b/cmd/iam.go @@ -47,7 +47,7 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/jwt" "github.com/minio/minio/internal/logger" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" etcd "go.etcd.io/etcd/client/v3" ) diff --git a/cmd/jwt.go b/cmd/jwt.go index fdfd4906c..f88a7332e 100644 --- a/cmd/jwt.go +++ b/cmd/jwt.go @@ -28,7 +28,7 @@ import ( "github.com/minio/minio/internal/auth" xjwt "github.com/minio/minio/internal/jwt" "github.com/minio/minio/internal/logger" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" ) const ( diff --git a/cmd/kms-handlers.go b/cmd/kms-handlers.go index b53e1df05..ae4810daa 100644 --- a/cmd/kms-handlers.go +++ b/cmd/kms-handlers.go @@ -29,7 +29,7 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/kms" "github.com/minio/minio/internal/logger" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" ) // KMSStatusHandler - GET /minio/kms/v1/status diff --git a/cmd/listen-notification-handlers.go b/cmd/listen-notification-handlers.go index 13be7c978..744f881f4 100644 --- a/cmd/listen-notification-handlers.go +++ b/cmd/listen-notification-handlers.go @@ -27,7 +27,7 @@ import ( "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/pubsub" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) func (api objectAPIHandlers) ListenNotificationHandler(w http.ResponseWriter, r *http.Request) { diff --git a/cmd/main.go b/cmd/main.go index c0a34f1f0..4d2e1d633 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -30,10 +30,10 @@ import ( "github.com/minio/cli" "github.com/minio/minio/internal/color" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/console" - "github.com/minio/pkg/env" - "github.com/minio/pkg/trie" - "github.com/minio/pkg/words" + "github.com/minio/pkg/v2/console" + "github.com/minio/pkg/v2/env" + "github.com/minio/pkg/v2/trie" + "github.com/minio/pkg/v2/words" ) // GlobalFlags - global flags for minio. diff --git a/cmd/metacache-bucket.go b/cmd/metacache-bucket.go index e7ae4a668..c8f334995 100644 --- a/cmd/metacache-bucket.go +++ b/cmd/metacache-bucket.go @@ -26,7 +26,7 @@ import ( "time" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/console" + "github.com/minio/pkg/v2/console" ) // a bucketMetacache keeps track of all caches generated diff --git a/cmd/metacache-entries.go b/cmd/metacache-entries.go index 7298c39ed..84150dfd8 100644 --- a/cmd/metacache-entries.go +++ b/cmd/metacache-entries.go @@ -27,7 +27,7 @@ import ( "strings" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/console" + "github.com/minio/pkg/v2/console" ) // metaCacheEntry is an object or a directory within an unknown bucket. diff --git a/cmd/metacache-set.go b/cmd/metacache-set.go index e3bb37d5f..b4b5dc1ed 100644 --- a/cmd/metacache-set.go +++ b/cmd/metacache-set.go @@ -38,7 +38,7 @@ import ( "github.com/minio/minio/internal/color" "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/console" + "github.com/minio/pkg/v2/console" ) type listPathOptions struct { diff --git a/cmd/metrics-router.go b/cmd/metrics-router.go index 5d58855fc..a222192a0 100644 --- a/cmd/metrics-router.go +++ b/cmd/metrics-router.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/minio/mux" - "github.com/minio/pkg/env" + "github.com/minio/pkg/v2/env" ) const ( diff --git a/cmd/metrics.go b/cmd/metrics.go index 0bc647924..018c35a72 100644 --- a/cmd/metrics.go +++ b/cmd/metrics.go @@ -25,7 +25,7 @@ import ( "github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/mcontext" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/expfmt" ) diff --git a/cmd/net.go b/cmd/net.go index 6e0dce6f4..e3c5867ed 100644 --- a/cmd/net.go +++ b/cmd/net.go @@ -29,7 +29,7 @@ import ( "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio/internal/config" "github.com/minio/minio/internal/logger" - xnet "github.com/minio/pkg/net" + xnet "github.com/minio/pkg/v2/net" ) // IPv4 addresses of local host. diff --git a/cmd/notification.go b/cmd/notification.go index 7a15253c8..00e5f52b5 100644 --- a/cmd/notification.go +++ b/cmd/notification.go @@ -33,8 +33,8 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/bucket/bandwidth" "github.com/minio/minio/internal/logger" - xnet "github.com/minio/pkg/net" - "github.com/minio/pkg/sync/errgroup" + xnet "github.com/minio/pkg/v2/net" + "github.com/minio/pkg/v2/sync/errgroup" ) // This file contains peer related notifications. For sending notifications to diff --git a/cmd/object-api-utils.go b/cmd/object-api-utils.go index ab6292e78..5a84d9b88 100644 --- a/cmd/object-api-utils.go +++ b/cmd/object-api-utils.go @@ -47,8 +47,8 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/ioutil" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/trie" - "github.com/minio/pkg/wildcard" + "github.com/minio/pkg/v2/trie" + "github.com/minio/pkg/v2/wildcard" "github.com/valyala/bytebufferpool" "golang.org/x/exp/slices" ) diff --git a/cmd/object-api-utils_test.go b/cmd/object-api-utils_test.go index 6f6530a1e..65572577f 100644 --- a/cmd/object-api-utils_test.go +++ b/cmd/object-api-utils_test.go @@ -34,7 +34,7 @@ import ( "github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/config/compress" "github.com/minio/minio/internal/crypto" - "github.com/minio/pkg/trie" + "github.com/minio/pkg/v2/trie" ) func pathJoinOld(elem ...string) string { diff --git a/cmd/object-handlers.go b/cmd/object-handlers.go index 28554f758..f5060e8b5 100644 --- a/cmd/object-handlers.go +++ b/cmd/object-handlers.go @@ -59,9 +59,8 @@ import ( "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/s3select" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" - iampolicy "github.com/minio/pkg/iam/policy" - xnet "github.com/minio/pkg/net" + xnet "github.com/minio/pkg/v2/net" + "github.com/minio/pkg/v2/policy" ) // supportedHeadGetReqParams - supported request parameters for GET and HEAD presigned request. @@ -154,7 +153,7 @@ func (api objectAPIHandlers) SelectObjectContentHandler(w http.ResponseWriter, r // * if you don’t have the s3:ListBucket // permission, Amazon S3 will return an HTTP // status code 403 ("access denied") error.` - if globalPolicySys.IsAllowed(policy.Args{ + if globalPolicySys.IsAllowed(policy.BucketPolicyArgs{ Action: policy.ListBucketAction, BucketName: bucket, ConditionValues: getConditionValues(r, "", auth.AnonymousCredentials), @@ -344,7 +343,7 @@ func (api objectAPIHandlers) getObjectHandler(ctx context.Context, objectAPI Obj // * if you don’t have the s3:ListBucket // permission, Amazon S3 will return an HTTP // status code 403 ("access denied") error.` - if globalPolicySys.IsAllowed(policy.Args{ + if globalPolicySys.IsAllowed(policy.BucketPolicyArgs{ Action: policy.ListBucketAction, BucketName: bucket, ConditionValues: getConditionValues(r, "", auth.AnonymousCredentials), @@ -643,7 +642,7 @@ func (api objectAPIHandlers) headObjectHandler(ctx context.Context, objectAPI Ob // * if you don’t have the s3:ListBucket // permission, Amazon S3 will return an HTTP // status code 403 ("access denied") error.` - if globalPolicySys.IsAllowed(policy.Args{ + if globalPolicySys.IsAllowed(policy.BucketPolicyArgs{ Action: policy.ListBucketAction, BucketName: bucket, ConditionValues: getConditionValues(r, "", auth.AnonymousCredentials), @@ -1374,8 +1373,8 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re srcInfo.UserDefined = filterReplicationStatusMetadata(srcInfo.UserDefined) srcInfo.UserDefined = objectlock.FilterObjectLockMetadata(srcInfo.UserDefined, true, true) - retPerms := isPutActionAllowed(ctx, getRequestAuthType(r), dstBucket, dstObject, r, iampolicy.PutObjectRetentionAction) - holdPerms := isPutActionAllowed(ctx, getRequestAuthType(r), dstBucket, dstObject, r, iampolicy.PutObjectLegalHoldAction) + retPerms := isPutActionAllowed(ctx, getRequestAuthType(r), dstBucket, dstObject, r, policy.PutObjectRetentionAction) + holdPerms := isPutActionAllowed(ctx, getRequestAuthType(r), dstBucket, dstObject, r, policy.PutObjectLegalHoldAction) getObjectInfo := objectAPI.GetObjectInfo if api.CacheAPI() != nil { getObjectInfo = api.CacheAPI().GetObjectInfo @@ -1668,7 +1667,7 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req ) // Check if put is allowed - if s3Err = isPutActionAllowed(ctx, rAuthType, bucket, object, r, iampolicy.PutObjectAction); s3Err != ErrNone { + if s3Err = isPutActionAllowed(ctx, rAuthType, bucket, object, r, policy.PutObjectAction); s3Err != ErrNone { writeErrorResponse(ctx, w, errorCodes.ToAPIErr(s3Err), r.URL) return } @@ -1716,7 +1715,7 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req return } if r.Header.Get(xhttp.AmzBucketReplicationStatus) == replication.Replica.String() { - if s3Err = isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, iampolicy.ReplicateObjectAction); s3Err != ErrNone { + if s3Err = isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, policy.ReplicateObjectAction); s3Err != ErrNone { writeErrorResponse(ctx, w, errorCodes.ToAPIErr(s3Err), r.URL) return } @@ -1796,8 +1795,8 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req putObject = api.CacheAPI().PutObject } - retPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, iampolicy.PutObjectRetentionAction) - holdPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, iampolicy.PutObjectLegalHoldAction) + retPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, policy.PutObjectRetentionAction) + holdPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, policy.PutObjectLegalHoldAction) getObjectInfo := objectAPI.GetObjectInfo if api.CacheAPI() != nil { @@ -2046,7 +2045,7 @@ func (api objectAPIHandlers) PutObjectExtractHandler(w http.ResponseWriter, r *h ) // Check if put is allowed - if s3Err = isPutActionAllowed(ctx, rAuthType, bucket, object, r, iampolicy.PutObjectAction); s3Err != ErrNone { + if s3Err = isPutActionAllowed(ctx, rAuthType, bucket, object, r, policy.PutObjectAction); s3Err != ErrNone { writeErrorResponse(ctx, w, errorCodes.ToAPIErr(s3Err), r.URL) return } @@ -2097,8 +2096,8 @@ func (api objectAPIHandlers) PutObjectExtractHandler(w http.ResponseWriter, r *h AutoEncrypt: globalAutoEncryption, }) - retPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, iampolicy.PutObjectRetentionAction) - holdPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, iampolicy.PutObjectLegalHoldAction) + retPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, policy.PutObjectRetentionAction) + holdPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, policy.PutObjectLegalHoldAction) if api.CacheAPI() != nil { putObject = api.CacheAPI().PutObject @@ -2150,7 +2149,7 @@ func (api objectAPIHandlers) PutObjectExtractHandler(w http.ResponseWriter, r *h pReader := NewPutObjReader(rawReader) if r.Header.Get(xhttp.AmzBucketReplicationStatus) == replication.Replica.String() { - if s3Err = isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, iampolicy.ReplicateObjectAction); s3Err != ErrNone { + if s3Err = isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, policy.ReplicateObjectAction); s3Err != ErrNone { return err } metadata[ReservedMetadataPrefixLower+ReplicaStatus] = replication.Replica.String() diff --git a/cmd/object-lambda-handlers.go b/cmd/object-lambda-handlers.go index a69ac5f81..46256828a 100644 --- a/cmd/object-lambda-handlers.go +++ b/cmd/object-lambda-handlers.go @@ -29,7 +29,7 @@ import ( miniogo "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" "github.com/minio/minio/internal/auth" levent "github.com/minio/minio/internal/config/lambda/event" diff --git a/cmd/object-multipart-handlers.go b/cmd/object-multipart-handlers.go index d714d5a1e..7eaaf9937 100644 --- a/cmd/object-multipart-handlers.go +++ b/cmd/object-multipart-handlers.go @@ -46,8 +46,7 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" - iampolicy "github.com/minio/pkg/iam/policy" + "github.com/minio/pkg/v2/policy" "github.com/minio/sio" ) @@ -145,8 +144,8 @@ func (api objectAPIHandlers) NewMultipartUploadHandler(w http.ResponseWriter, r metadata[xhttp.AmzObjectTagging] = objTags } - retPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, iampolicy.PutObjectRetentionAction) - holdPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, iampolicy.PutObjectLegalHoldAction) + retPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, policy.PutObjectRetentionAction) + holdPerms := isPutActionAllowed(ctx, getRequestAuthType(r), bucket, object, r, policy.PutObjectLegalHoldAction) getObjectInfo := objectAPI.GetObjectInfo if api.CacheAPI() != nil { @@ -655,7 +654,7 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http reader io.Reader = r.Body s3Error APIErrorCode ) - if s3Error = isPutActionAllowed(ctx, rAuthType, bucket, object, r, iampolicy.PutObjectAction); s3Error != ErrNone { + if s3Error = isPutActionAllowed(ctx, rAuthType, bucket, object, r, policy.PutObjectAction); s3Error != ErrNone { writeErrorResponse(ctx, w, errorCodes.ToAPIErr(s3Error), r.URL) return } diff --git a/cmd/peer-rest-client.go b/cmd/peer-rest-client.go index 89261d46e..2ca276175 100644 --- a/cmd/peer-rest-client.go +++ b/cmd/peer-rest-client.go @@ -35,8 +35,8 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/rest" - "github.com/minio/pkg/logger/message/log" - xnet "github.com/minio/pkg/net" + "github.com/minio/pkg/v2/logger/message/log" + xnet "github.com/minio/pkg/v2/net" "github.com/tinylib/msgp/msgp" ) diff --git a/cmd/peer-rest-server.go b/cmd/peer-rest-server.go index 3ada67dc0..17ad85901 100644 --- a/cmd/peer-rest-server.go +++ b/cmd/peer-rest-server.go @@ -36,7 +36,7 @@ import ( "github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/pubsub" "github.com/minio/mux" - "github.com/minio/pkg/logger/message/log" + "github.com/minio/pkg/v2/logger/message/log" "github.com/tinylib/msgp/msgp" ) diff --git a/cmd/peer-s3-client.go b/cmd/peer-s3-client.go index f86d6f909..41f9cdf16 100644 --- a/cmd/peer-s3-client.go +++ b/cmd/peer-s3-client.go @@ -27,7 +27,7 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/rest" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/sync/errgroup" "golang.org/x/exp/slices" ) diff --git a/cmd/peer-s3-server.go b/cmd/peer-s3-server.go index 48aff7f11..f5eb19008 100644 --- a/cmd/peer-s3-server.go +++ b/cmd/peer-s3-server.go @@ -26,7 +26,7 @@ import ( "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/sync/errgroup" + "github.com/minio/pkg/v2/sync/errgroup" ) const ( diff --git a/cmd/perf-tests.go b/cmd/perf-tests.go index d4ddc1324..b065f0fb5 100644 --- a/cmd/perf-tests.go +++ b/cmd/perf-tests.go @@ -34,7 +34,7 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio-go/v7" xhttp "github.com/minio/minio/internal/http" - "github.com/minio/pkg/randreader" + "github.com/minio/pkg/v2/randreader" ) // SpeedTestResult return value of the speedtest function diff --git a/cmd/policy_test.go b/cmd/policy_test.go index 97a24a264..b4da5943b 100644 --- a/cmd/policy_test.go +++ b/cmd/policy_test.go @@ -23,39 +23,39 @@ import ( miniogopolicy "github.com/minio/minio-go/v7/pkg/policy" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/pkg/bucket/policy" - "github.com/minio/pkg/bucket/policy/condition" + "github.com/minio/pkg/v2/policy" + "github.com/minio/pkg/v2/policy/condition" ) func TestPolicySysIsAllowed(t *testing.T) { - p := &policy.Policy{ + p := &policy.BucketPolicy{ Version: policy.DefaultVersion, - Statements: []policy.Statement{ - policy.NewStatement("", + Statements: []policy.BPStatement{ + policy.NewBPStatement("", policy.Allow, policy.NewPrincipal("*"), policy.NewActionSet(policy.GetBucketLocationAction), - policy.NewResourceSet(policy.NewResource("mybucket", "")), + policy.NewResourceSet(policy.NewResource("mybucket")), condition.NewFunctions(), ), - policy.NewStatement("", + policy.NewBPStatement("", policy.Allow, policy.NewPrincipal("*"), policy.NewActionSet(policy.PutObjectAction), - policy.NewResourceSet(policy.NewResource("mybucket", "/myobject*")), + policy.NewResourceSet(policy.NewResource("mybucket/myobject*")), condition.NewFunctions(), ), }, } - anonGetBucketLocationArgs := policy.Args{ + anonGetBucketLocationArgs := policy.BucketPolicyArgs{ AccountName: "Q3AM3UQ867SPQQA43P2F", Action: policy.GetBucketLocationAction, BucketName: "mybucket", ConditionValues: map[string][]string{}, } - anonPutObjectActionArgs := policy.Args{ + anonPutObjectActionArgs := policy.BucketPolicyArgs{ AccountName: "Q3AM3UQ867SPQQA43P2F", Action: policy.PutObjectAction, BucketName: "mybucket", @@ -66,7 +66,7 @@ func TestPolicySysIsAllowed(t *testing.T) { ObjectName: "myobject", } - anonGetObjectActionArgs := policy.Args{ + anonGetObjectActionArgs := policy.BucketPolicyArgs{ AccountName: "Q3AM3UQ867SPQQA43P2F", Action: policy.GetObjectAction, BucketName: "mybucket", @@ -74,7 +74,7 @@ func TestPolicySysIsAllowed(t *testing.T) { ObjectName: "myobject", } - getBucketLocationArgs := policy.Args{ + getBucketLocationArgs := policy.BucketPolicyArgs{ AccountName: "Q3AM3UQ867SPQQA43P2F", Action: policy.GetBucketLocationAction, BucketName: "mybucket", @@ -82,7 +82,7 @@ func TestPolicySysIsAllowed(t *testing.T) { IsOwner: true, } - putObjectActionArgs := policy.Args{ + putObjectActionArgs := policy.BucketPolicyArgs{ AccountName: "Q3AM3UQ867SPQQA43P2F", Action: policy.PutObjectAction, BucketName: "mybucket", @@ -94,7 +94,7 @@ func TestPolicySysIsAllowed(t *testing.T) { ObjectName: "myobject", } - getObjectActionArgs := policy.Args{ + getObjectActionArgs := policy.BucketPolicyArgs{ AccountName: "Q3AM3UQ867SPQQA43P2F", Action: policy.GetObjectAction, BucketName: "mybucket", @@ -103,7 +103,7 @@ func TestPolicySysIsAllowed(t *testing.T) { ObjectName: "myobject", } - yourbucketAnonGetObjectActionArgs := policy.Args{ + yourbucketAnonGetObjectActionArgs := policy.BucketPolicyArgs{ AccountName: "Q3AM3UQ867SPQQA43P2F", Action: policy.GetObjectAction, BucketName: "yourbucket", @@ -111,7 +111,7 @@ func TestPolicySysIsAllowed(t *testing.T) { ObjectName: "yourobject", } - yourbucketGetObjectActionArgs := policy.Args{ + yourbucketGetObjectActionArgs := policy.BucketPolicyArgs{ AccountName: "Q3AM3UQ867SPQQA43P2F", Action: policy.GetObjectAction, BucketName: "yourbucket", @@ -121,7 +121,7 @@ func TestPolicySysIsAllowed(t *testing.T) { } testCases := []struct { - args policy.Args + args policy.BucketPolicyArgs expectedResult bool }{ {anonGetBucketLocationArgs, true}, @@ -148,34 +148,34 @@ func getReadOnlyStatement(bucketName, prefix string) []miniogopolicy.Statement { { Effect: string(policy.Allow), Principal: miniogopolicy.User{AWS: set.CreateStringSet("*")}, - Resources: set.CreateStringSet(policy.NewResource(bucketName, "").String()), + Resources: set.CreateStringSet(policy.NewResource(bucketName).String()), Actions: set.CreateStringSet("s3:GetBucketLocation", "s3:ListBucket"), }, { Effect: string(policy.Allow), Principal: miniogopolicy.User{AWS: set.CreateStringSet("*")}, - Resources: set.CreateStringSet(policy.NewResource(bucketName, prefix).String()), + Resources: set.CreateStringSet(policy.NewResource(bucketName + "/" + prefix).String()), Actions: set.CreateStringSet("s3:GetObject"), }, } } func TestPolicyToBucketAccessPolicy(t *testing.T) { - case1Policy := &policy.Policy{ + case1Policy := &policy.BucketPolicy{ Version: policy.DefaultVersion, - Statements: []policy.Statement{ - policy.NewStatement("", + Statements: []policy.BPStatement{ + policy.NewBPStatement("", policy.Allow, policy.NewPrincipal("*"), policy.NewActionSet(policy.GetBucketLocationAction, policy.ListBucketAction), - policy.NewResourceSet(policy.NewResource("mybucket", "")), + policy.NewResourceSet(policy.NewResource("mybucket")), condition.NewFunctions(), ), - policy.NewStatement("", + policy.NewBPStatement("", policy.Allow, policy.NewPrincipal("*"), policy.NewActionSet(policy.GetObjectAction), - policy.NewResourceSet(policy.NewResource("mybucket", "/myobject*")), + policy.NewResourceSet(policy.NewResource("mybucket/myobject*")), condition.NewFunctions(), ), }, @@ -183,12 +183,12 @@ func TestPolicyToBucketAccessPolicy(t *testing.T) { case1Result := &miniogopolicy.BucketAccessPolicy{ Version: policy.DefaultVersion, - Statements: getReadOnlyStatement("mybucket", "/myobject*"), + Statements: getReadOnlyStatement("mybucket", "myobject*"), } - case2Policy := &policy.Policy{ + case2Policy := &policy.BucketPolicy{ Version: policy.DefaultVersion, - Statements: []policy.Statement{}, + Statements: []policy.BPStatement{}, } case2Result := &miniogopolicy.BucketAccessPolicy{ @@ -196,21 +196,21 @@ func TestPolicyToBucketAccessPolicy(t *testing.T) { Statements: []miniogopolicy.Statement{}, } - case3Policy := &policy.Policy{ + case3Policy := &policy.BucketPolicy{ Version: "12-10-2012", - Statements: []policy.Statement{ - policy.NewStatement("", + Statements: []policy.BPStatement{ + policy.NewBPStatement("", policy.Allow, policy.NewPrincipal("*"), policy.NewActionSet(policy.PutObjectAction), - policy.NewResourceSet(policy.NewResource("mybucket", "/myobject*")), + policy.NewResourceSet(policy.NewResource("mybucket/myobject*")), condition.NewFunctions(), ), }, } testCases := []struct { - bucketPolicy *policy.Policy + bucketPolicy *policy.BucketPolicy expectedResult *miniogopolicy.BucketAccessPolicy expectErr bool }{ @@ -238,24 +238,24 @@ func TestPolicyToBucketAccessPolicy(t *testing.T) { func TestBucketAccessPolicyToPolicy(t *testing.T) { case1PolicyInfo := &miniogopolicy.BucketAccessPolicy{ Version: policy.DefaultVersion, - Statements: getReadOnlyStatement("mybucket", "/myobject*"), + Statements: getReadOnlyStatement("mybucket", "myobject*"), } - case1Result := &policy.Policy{ + case1Result := &policy.BucketPolicy{ Version: policy.DefaultVersion, - Statements: []policy.Statement{ - policy.NewStatement("", + Statements: []policy.BPStatement{ + policy.NewBPStatement("", policy.Allow, policy.NewPrincipal("*"), policy.NewActionSet(policy.GetBucketLocationAction, policy.ListBucketAction), - policy.NewResourceSet(policy.NewResource("mybucket", "")), + policy.NewResourceSet(policy.NewResource("mybucket")), condition.NewFunctions(), ), - policy.NewStatement("", + policy.NewBPStatement("", policy.Allow, policy.NewPrincipal("*"), policy.NewActionSet(policy.GetObjectAction), - policy.NewResourceSet(policy.NewResource("mybucket", "/myobject*")), + policy.NewResourceSet(policy.NewResource("mybucket/myobject*")), condition.NewFunctions(), ), }, @@ -266,9 +266,9 @@ func TestBucketAccessPolicyToPolicy(t *testing.T) { Statements: []miniogopolicy.Statement{}, } - case2Result := &policy.Policy{ + case2Result := &policy.BucketPolicy{ Version: policy.DefaultVersion, - Statements: []policy.Statement{}, + Statements: []policy.BPStatement{}, } case3PolicyInfo := &miniogopolicy.BucketAccessPolicy{ @@ -278,7 +278,7 @@ func TestBucketAccessPolicyToPolicy(t *testing.T) { testCases := []struct { policyInfo *miniogopolicy.BucketAccessPolicy - expectedResult *policy.Policy + expectedResult *policy.BucketPolicy expectErr bool }{ {case1PolicyInfo, case1Result, false}, diff --git a/cmd/s3-zip-handlers.go b/cmd/s3-zip-handlers.go index 3544cad18..ac91cfdaa 100644 --- a/cmd/s3-zip-handlers.go +++ b/cmd/s3-zip-handlers.go @@ -32,8 +32,8 @@ import ( xhttp "github.com/minio/minio/internal/http" xioutil "github.com/minio/minio/internal/ioutil" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/bucket/policy" - xnet "github.com/minio/pkg/net" + xnet "github.com/minio/pkg/v2/net" + "github.com/minio/pkg/v2/policy" "github.com/minio/zipindex" ) @@ -103,7 +103,7 @@ func (api objectAPIHandlers) getObjectInArchiveFileHandler(ctx context.Context, // * if you don’t have the s3:ListBucket // permission, Amazon S3 will return an HTTP // status code 403 ("access denied") error.` - if globalPolicySys.IsAllowed(policy.Args{ + if globalPolicySys.IsAllowed(policy.BucketPolicyArgs{ Action: policy.ListBucketAction, BucketName: bucket, ConditionValues: getConditionValues(r, "", auth.AnonymousCredentials), @@ -409,7 +409,7 @@ func (api objectAPIHandlers) headObjectInArchiveFileHandler(ctx context.Context, // * if you don’t have the s3:ListBucket // permission, Amazon S3 will return an HTTP // status code 403 ("access denied") error.` - if globalPolicySys.IsAllowed(policy.Args{ + if globalPolicySys.IsAllowed(policy.BucketPolicyArgs{ Action: policy.ListBucketAction, BucketName: bucket, ConditionValues: getConditionValues(r, "", auth.AnonymousCredentials), diff --git a/cmd/server-main.go b/cmd/server-main.go index 71a3963db..d2a43f6fd 100644 --- a/cmd/server-main.go +++ b/cmd/server-main.go @@ -48,8 +48,8 @@ import ( "github.com/minio/minio/internal/hash/sha256" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/certs" - "github.com/minio/pkg/env" + "github.com/minio/pkg/v2/certs" + "github.com/minio/pkg/v2/env" "golang.org/x/exp/slices" ) diff --git a/cmd/server-rlimit.go b/cmd/server-rlimit.go index 33d7bbea2..6a3611b4e 100644 --- a/cmd/server-rlimit.go +++ b/cmd/server-rlimit.go @@ -23,7 +23,7 @@ import ( "github.com/minio/madmin-go/v3/kernel" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/sys" + "github.com/minio/pkg/v2/sys" ) func oldLinux() bool { diff --git a/cmd/server-startup-msg.go b/cmd/server-startup-msg.go index 67dc0050c..7ac43a94f 100644 --- a/cmd/server-startup-msg.go +++ b/cmd/server-startup-msg.go @@ -28,7 +28,7 @@ import ( "github.com/minio/madmin-go/v3" color "github.com/minio/minio/internal/color" "github.com/minio/minio/internal/logger" - xnet "github.com/minio/pkg/net" + xnet "github.com/minio/pkg/v2/net" ) // generates format string depending on the string length and padding. diff --git a/cmd/server_test.go b/cmd/server_test.go index 8463593bc..076d5ad03 100644 --- a/cmd/server_test.go +++ b/cmd/server_test.go @@ -37,7 +37,7 @@ import ( "github.com/dustin/go-humanize" "github.com/minio/minio-go/v7/pkg/set" xhttp "github.com/minio/minio/internal/http" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) // API suite container common to both ErasureSD and Erasure. @@ -390,9 +390,9 @@ func (s *TestSuiteCommon) TestBucketPolicy(c *check) { bucketPolicyReadBuf, err := io.ReadAll(response.Body) c.Assert(err, nil) // Verify if downloaded policy matches with previously uploaded. - expectedPolicy, err := policy.ParseConfig(strings.NewReader(bucketPolicyStr), bucketName) + expectedPolicy, err := policy.ParseBucketPolicyConfig(strings.NewReader(bucketPolicyStr), bucketName) c.Assert(err, nil) - gotPolicy, err := policy.ParseConfig(bytes.NewReader(bucketPolicyReadBuf), bucketName) + gotPolicy, err := policy.ParseBucketPolicyConfig(bytes.NewReader(bucketPolicyReadBuf), bucketName) c.Assert(err, nil) c.Assert(reflect.DeepEqual(expectedPolicy, gotPolicy), true) diff --git a/cmd/signature-v4-utils.go b/cmd/signature-v4-utils.go index 224df7fc6..4ba4fbe01 100644 --- a/cmd/signature-v4-utils.go +++ b/cmd/signature-v4-utils.go @@ -30,7 +30,7 @@ import ( "github.com/minio/minio/internal/hash/sha256" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" "golang.org/x/exp/slices" ) diff --git a/cmd/site-replication.go b/cmd/site-replication.go index 206dc29fb..171173d93 100644 --- a/cmd/site-replication.go +++ b/cmd/site-replication.go @@ -42,8 +42,7 @@ import ( "github.com/minio/minio/internal/auth" sreplication "github.com/minio/minio/internal/bucket/replication" "github.com/minio/minio/internal/logger" - bktpolicy "github.com/minio/pkg/bucket/policy" - iampolicy "github.com/minio/pkg/iam/policy" + "github.com/minio/pkg/v2/policy" ) const ( @@ -1168,7 +1167,7 @@ func (c *SiteReplicationSys) IAMChangeHook(ctx context.Context, item madmin.SRIA // PeerAddPolicyHandler - copies IAM policy to local. A nil policy argument, // causes the named policy to be deleted. -func (c *SiteReplicationSys) PeerAddPolicyHandler(ctx context.Context, policyName string, p *iampolicy.Policy, updatedAt time.Time) error { +func (c *SiteReplicationSys) PeerAddPolicyHandler(ctx context.Context, policyName string, p *policy.Policy, updatedAt time.Time) error { var err error // skip overwrite of local update if peer sent stale info if !updatedAt.IsZero() { @@ -1261,10 +1260,10 @@ func (c *SiteReplicationSys) PeerSvcAccChangeHandler(ctx context.Context, change } switch { case change.Create != nil: - var sp *iampolicy.Policy + var sp *policy.Policy var err error if len(change.Create.SessionPolicy) > 0 { - sp, err = iampolicy.ParseConfig(bytes.NewReader(change.Create.SessionPolicy)) + sp, err = policy.ParseConfig(bytes.NewReader(change.Create.SessionPolicy)) if err != nil { return wrapSRErr(err) } @@ -1290,10 +1289,10 @@ func (c *SiteReplicationSys) PeerSvcAccChangeHandler(ctx context.Context, change } case change.Update != nil: - var sp *iampolicy.Policy + var sp *policy.Policy var err error if len(change.Update.SessionPolicy) > 0 { - sp, err = iampolicy.ParseConfig(bytes.NewReader(change.Update.SessionPolicy)) + sp, err = policy.ParseConfig(bytes.NewReader(change.Update.SessionPolicy)) if err != nil { return wrapSRErr(err) } @@ -1527,7 +1526,7 @@ func (c *SiteReplicationSys) PeerBucketMetadataUpdateHandler(ctx context.Context } // PeerBucketPolicyHandler - copies/deletes policy to local cluster. -func (c *SiteReplicationSys) PeerBucketPolicyHandler(ctx context.Context, bucket string, policy *bktpolicy.Policy, updatedAt time.Time) error { +func (c *SiteReplicationSys) PeerBucketPolicyHandler(ctx context.Context, bucket string, policy *policy.BucketPolicy, updatedAt time.Time) error { // skip overwrite if local update is newer than peer update. if !updatedAt.IsZero() { if _, updateTm, err := globalBucketMetadataSys.GetPolicyConfig(bucket); err == nil && updateTm.After(updatedAt) { @@ -2880,10 +2879,10 @@ func (c *SiteReplicationSys) siteReplicationStatus(ctx context.Context, objAPI O if opts.Policies || opts.Entity == madmin.SRPolicyEntity { // collect IAM policy replication status across sites for p, pslc := range policyStats { - var policies []*iampolicy.Policy + var policies []*policy.Policy uPolicyCount := 0 for _, ps := range pslc { - plcy, err := iampolicy.ParseConfig(bytes.NewReader([]byte(ps.SRIAMPolicy.Policy))) + plcy, err := policy.ParseConfig(bytes.NewReader([]byte(ps.SRIAMPolicy.Policy))) if err != nil { continue } @@ -2924,7 +2923,7 @@ func (c *SiteReplicationSys) siteReplicationStatus(ctx context.Context, objAPI O for b, slc := range bucketStats { tagSet := set.NewStringSet() olockConfigSet := set.NewStringSet() - policies := make([]*bktpolicy.Policy, numSites) + policies := make([]*policy.BucketPolicy, numSites) replCfgs := make([]*sreplication.Config, numSites) quotaCfgs := make([]*madmin.BucketQuota, numSites) sseCfgSet := set.NewStringSet() @@ -2974,7 +2973,7 @@ func (c *SiteReplicationSys) siteReplicationStatus(ctx context.Context, objAPI O } } if len(s.Policy) > 0 { - plcy, err := bktpolicy.ParseConfig(bytes.NewReader(s.Policy), b) + plcy, err := policy.ParseBucketPolicyConfig(bytes.NewReader(s.Policy), b) if err != nil { continue } @@ -3125,12 +3124,12 @@ func isReplicated(cntReplicated, total int, valSet set.StringSet) bool { // isIAMPolicyReplicated returns true if count of replicated IAM policies matches total // number of sites and IAM policies are identical. -func isIAMPolicyReplicated(cntReplicated, total int, policies []*iampolicy.Policy) bool { +func isIAMPolicyReplicated(cntReplicated, total int, policies []*policy.Policy) bool { if cntReplicated > 0 && cntReplicated != total { return false } // check if policies match between sites - var prev *iampolicy.Policy + var prev *policy.Policy for i, p := range policies { if i == 0 { prev = p @@ -3233,7 +3232,7 @@ func isBktQuotaCfgReplicated(total int, quotaCfgs []*madmin.BucketQuota) bool { // isBktPolicyReplicated returns true if count of replicated bucket policies matches total // number of sites and bucket policies are identical. -func isBktPolicyReplicated(total int, policies []*bktpolicy.Policy) bool { +func isBktPolicyReplicated(total int, policies []*policy.BucketPolicy) bool { numPolicies := 0 for _, p := range policies { if p == nil { @@ -3245,7 +3244,7 @@ func isBktPolicyReplicated(total int, policies []*bktpolicy.Policy) bool { return false } // check if policies match between sites - var prev *bktpolicy.Policy + var prev *policy.BucketPolicy for i, p := range policies { if p == nil { continue diff --git a/cmd/storage-rest-client.go b/cmd/storage-rest-client.go index b565cc6ee..fa3244650 100644 --- a/cmd/storage-rest-client.go +++ b/cmd/storage-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/rest" - xnet "github.com/minio/pkg/net" + xnet "github.com/minio/pkg/v2/net" xbufio "github.com/philhofer/fwd" "github.com/tinylib/msgp/msgp" ) diff --git a/cmd/storage-rest-server.go b/cmd/storage-rest-server.go index 2dbe4398b..b33c822b1 100644 --- a/cmd/storage-rest-server.go +++ b/cmd/storage-rest-server.go @@ -45,7 +45,7 @@ import ( xjwt "github.com/minio/minio/internal/jwt" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - xnet "github.com/minio/pkg/net" + xnet "github.com/minio/pkg/v2/net" ) var errDiskStale = errors.New("drive stale") diff --git a/cmd/storage-rest_test.go b/cmd/storage-rest_test.go index 24a923cc9..1b56e8719 100644 --- a/cmd/storage-rest_test.go +++ b/cmd/storage-rest_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/minio/mux" - xnet "github.com/minio/pkg/net" + xnet "github.com/minio/pkg/v2/net" ) // Storage REST server, storageRESTReceiver and StorageRESTClient are diff --git a/cmd/sts-handlers.go b/cmd/sts-handlers.go index 0b644701f..c44b2eb6c 100644 --- a/cmd/sts-handlers.go +++ b/cmd/sts-handlers.go @@ -36,8 +36,8 @@ import ( xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - iampolicy "github.com/minio/pkg/iam/policy" - "github.com/minio/pkg/wildcard" + iampolicy "github.com/minio/pkg/v2/policy" + "github.com/minio/pkg/v2/wildcard" ) const ( diff --git a/cmd/test-utils_test.go b/cmd/test-utils_test.go index 916f403ad..635b37119 100644 --- a/cmd/test-utils_test.go +++ b/cmd/test-utils_test.go @@ -66,7 +66,7 @@ import ( "github.com/minio/minio/internal/hash" "github.com/minio/minio/internal/logger" "github.com/minio/mux" - "github.com/minio/pkg/bucket/policy" + "github.com/minio/pkg/v2/policy" ) // TestMain to set up global env. @@ -1583,7 +1583,7 @@ func prepareTestBackend(ctx context.Context, instanceType string) (ObjectLayer, // // STEP 1: Call the handler with the unsigned HTTP request (anonReq), assert for the `ErrAccessDenied` error response. func ExecObjectLayerAPIAnonTest(t *testing.T, obj ObjectLayer, testName, bucketName, objectName, instanceType string, apiRouter http.Handler, - anonReq *http.Request, bucketPolicy *policy.Policy, + anonReq *http.Request, bucketPolicy *policy.BucketPolicy, ) { anonTestStr := "Anonymous HTTP request test" unknownSignTestStr := "Unknown HTTP signature test" diff --git a/cmd/tier-handlers.go b/cmd/tier-handlers.go index 66075b963..cb8386555 100644 --- a/cmd/tier-handlers.go +++ b/cmd/tier-handlers.go @@ -27,7 +27,7 @@ import ( "github.com/minio/madmin-go/v3" "github.com/minio/minio/internal/config/storageclass" "github.com/minio/mux" - iampolicy "github.com/minio/pkg/iam/policy" + iampolicy "github.com/minio/pkg/v2/policy" ) var ( diff --git a/cmd/update.go b/cmd/update.go index a9d1f413e..2fb54a15a 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -38,8 +38,8 @@ import ( xhttp "github.com/minio/minio/internal/http" "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" "github.com/minio/selfupdate" gopsutilcpu "github.com/shirou/gopsutil/v3/cpu" ) diff --git a/cmd/utils.go b/cmd/utils.go index 5b26f9c9a..eb94459b6 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -58,10 +58,10 @@ import ( "github.com/minio/minio/internal/logger/message/audit" "github.com/minio/minio/internal/rest" "github.com/minio/mux" - "github.com/minio/pkg/certs" - "github.com/minio/pkg/env" - pkgAudit "github.com/minio/pkg/logger/message/audit" - xnet "github.com/minio/pkg/net" + "github.com/minio/pkg/v2/certs" + "github.com/minio/pkg/v2/env" + pkgAudit "github.com/minio/pkg/v2/logger/message/audit" + xnet "github.com/minio/pkg/v2/net" "golang.org/x/oauth2" ) diff --git a/cmd/xl-storage-disk-id-check.go b/cmd/xl-storage-disk-id-check.go index 95223444f..7720e3b6c 100644 --- a/cmd/xl-storage-disk-id-check.go +++ b/cmd/xl-storage-disk-id-check.go @@ -34,7 +34,7 @@ import ( "github.com/minio/minio/internal/config" xioutil "github.com/minio/minio/internal/ioutil" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/env" + "github.com/minio/pkg/v2/env" ) //go:generate stringer -type=storageMetric -trimprefix=storageMetric $GOFILE diff --git a/cmd/xl-storage-format-v2.go b/cmd/xl-storage-format-v2.go index c92cd7745..46c5e2b23 100644 --- a/cmd/xl-storage-format-v2.go +++ b/cmd/xl-storage-format-v2.go @@ -37,7 +37,7 @@ import ( "github.com/minio/minio/internal/bucket/replication" xhttp "github.com/minio/minio/internal/http" "github.com/minio/minio/internal/logger" - "github.com/minio/pkg/env" + "github.com/minio/pkg/v2/env" "github.com/tinylib/msgp/msgp" ) diff --git a/docs/debugging/reorder-disks/main.go b/docs/debugging/reorder-disks/main.go index 354190d34..ff04de990 100644 --- a/docs/debugging/reorder-disks/main.go +++ b/docs/debugging/reorder-disks/main.go @@ -30,7 +30,7 @@ import ( "strings" "syscall" - "github.com/minio/pkg/ellipses" + "github.com/minio/pkg/v2/ellipses" ) type xl struct { diff --git a/go.mod b/go.mod index eb2b1646f..1b8361c8f 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/lithammer/shortuuid/v4 v4.0.0 github.com/miekg/dns v1.1.55 github.com/minio/cli v1.24.2 - github.com/minio/console v0.37.0 + github.com/minio/console v0.38.0 github.com/minio/csvparser v1.0.0 github.com/minio/dnscache v0.1.1 github.com/minio/dperf v0.5.0 @@ -52,7 +52,7 @@ require ( github.com/minio/madmin-go/v3 v3.0.17 github.com/minio/minio-go/v7 v7.0.63 github.com/minio/mux v1.9.0 - 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/sha256-simd v1.0.1 github.com/minio/simdjson-go v0.4.5 @@ -181,8 +181,9 @@ require ( github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/minio/colorjson v1.0.5 // indirect github.com/minio/filepath v1.0.0 // indirect - github.com/minio/mc v0.0.0-20230726035150-6b8680a2f7ca // indirect + github.com/minio/mc v0.0.0-20230902212803-e2056fb05789 // indirect github.com/minio/md5-simd v1.1.2 // indirect + github.com/minio/pkg v1.7.5 // indirect github.com/minio/websocket v1.6.0 // 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 d988ee929..829e74cec 100644 --- a/go.sum +++ b/go.sum @@ -470,8 +470,8 @@ github.com/minio/cli v1.24.2 h1:J+fCUh9mhPLjN3Lj/YhklXvxj8mnyE/D6FpFduXJ2jg= github.com/minio/cli v1.24.2/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= github.com/minio/colorjson v1.0.5 h1:P//d521blE5cKDF5YvsHcpqb9TE8IwCdliSv1naPsgk= github.com/minio/colorjson v1.0.5/go.mod h1:Oq6oB83q+sL08u9wx68+91ELf0nV5G4c6l9pQcH5ElI= -github.com/minio/console v0.37.0 h1:CnLWuXT87yLOwPqzugeX5RJclg7k1y4eYcH6+TsV6ho= -github.com/minio/console v0.37.0/go.mod h1:qiLneQzsz2joHjSUc7etCryMB/vrBSB37WnpNvsxn9s= +github.com/minio/console v0.38.0 h1:NT6Jn2woFlqf9oDBMGEfSzIVVEoUI7M4UQFgup5wgRI= +github.com/minio/console v0.38.0/go.mod h1:gtrffp5bmyeD7vJyxxSwgisNv4z/u+BYTNph2DbIVgk= github.com/minio/csvparser v1.0.0 h1:xJEHcYK8ZAjeW4hNV9Zu30u+/2o4UyPnYgyjWp8b7ZU= github.com/minio/csvparser v1.0.0/go.mod h1:lKXskSLzPgC5WQyzP7maKH7Sl1cqvANXo9YCto8zbtM= github.com/minio/dnscache v0.1.1 h1:AMYLqomzskpORiUA1ciN9k7bZT1oB3YZN4cEIi88W5o= @@ -486,8 +486,8 @@ github.com/minio/kes-go v0.2.0 h1:HA33arq9s3MErbsj3PAXFVfFo4U4yw7lTKQ5kWFrpCA= github.com/minio/kes-go v0.2.0/go.mod h1:VorHLaIYis9/MxAHAtXN4d8PUMNKhIxTIlvFt0hBOEo= github.com/minio/madmin-go/v3 v3.0.17 h1:fm3TIMK7hxCpgztO2GHN6Lxq66zYPWlmrS8M9YWvoSE= github.com/minio/madmin-go/v3 v3.0.17/go.mod h1:B2EgtEGrfWx+AkXv+OAcS6IHwoIJcd1p75QfDPSPd6Q= -github.com/minio/mc v0.0.0-20230726035150-6b8680a2f7ca h1:y/dJJuWhlVYN9tqBxoHvGCpJ7olVuPa1whg+GS1m1a8= -github.com/minio/mc v0.0.0-20230726035150-6b8680a2f7ca/go.mod h1:9x/wxYmFZCP+FMVZe57igzxENRGNOFBrucj3m4NqByg= +github.com/minio/mc v0.0.0-20230902212803-e2056fb05789 h1:vMQHDxJl5JHSXtNT8JmeLWHmQTd3r6X9gG+gquxqp7A= +github.com/minio/mc v0.0.0-20230902212803-e2056fb05789/go.mod h1:M/RN4OtnloGZLgLd/HicgzoEQdYXYz0taYqZzoBqVrc= 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/v6 v6.0.46/go.mod h1:qD0lajrGW49lKZLtXKtCB4X/qkMf0a5tBvN2PaZg7Gg= @@ -497,6 +497,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 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 v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= diff --git a/internal/bucket/object/lock/lock.go b/internal/bucket/object/lock/lock.go index 4872b3f5a..bce57d949 100644 --- a/internal/bucket/object/lock/lock.go +++ b/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 diff --git a/internal/bucket/replication/destination.go b/internal/bucket/replication/destination.go index ba6469eb2..fae272f42 100644 --- a/internal/bucket/replication/destination.go +++ b/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. diff --git a/internal/bucket/versioning/versioning.go b/internal/bucket/versioning/versioning.go index bf8e227fc..8d31c0fad 100644 --- a/internal/bucket/versioning/versioning.go +++ b/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 diff --git a/internal/config/api/api.go b/internal/config/api/api.go index df8697187..5cee446a0 100644 --- a/internal/config/api/api.go +++ b/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 diff --git a/internal/config/cache/config.go b/internal/config/cache/config.go index 72b6aaee9..3ee55f71b 100644 --- a/internal/config/cache/config.go +++ b/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 ( diff --git a/internal/config/cache/lookup.go b/internal/config/cache/lookup.go index c436fa87d..5121d0b08 100644 --- a/internal/config/cache/lookup.go +++ b/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 diff --git a/internal/config/callhome/callhome.go b/internal/config/callhome/callhome.go index 489f1a7b0..fd7a27558 100644 --- a/internal/config/callhome/callhome.go +++ b/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 diff --git a/internal/config/certs.go b/internal/config/certs.go index 7749a2d7f..bf13a429b 100644 --- a/internal/config/certs.go +++ b/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 diff --git a/internal/config/compress/compress.go b/internal/config/compress/compress.go index a4fe81a4d..8e9a0b75c 100644 --- a/internal/config/compress/compress.go +++ b/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. diff --git a/internal/config/config.go b/internal/config/config.go index 40efc93e0..0cda4220a 100644 --- a/internal/config/config.go +++ b/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 diff --git a/internal/config/etcd/etcd.go b/internal/config/etcd/etcd.go index 02fda0e37..7351ee4bf 100644 --- a/internal/config/etcd/etcd.go +++ b/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" diff --git a/internal/config/heal/heal.go b/internal/config/heal/heal.go index 8824555a1..279bff4b3 100644 --- a/internal/config/heal/heal.go +++ b/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 diff --git a/internal/config/identity/ldap/config.go b/internal/config/identity/ldap/config.go index 4bb4d8249..0ed0bb480 100644 --- a/internal/config/identity/ldap/config.go +++ b/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 ( diff --git a/internal/config/identity/openid/jwt.go b/internal/config/identity/openid/jwt.go index b23a033dd..488b34e63 100644 --- a/internal/config/identity/openid/jwt.go +++ b/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 { diff --git a/internal/config/identity/openid/jwt_test.go b/internal/config/identity/openid/jwt_test.go index 73d38f944..8038ac733 100644 --- a/internal/config/identity/openid/jwt_test.go +++ b/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) { diff --git a/internal/config/identity/openid/openid.go b/internal/config/identity/openid/openid.go index 4ef5ad99f..167e60e1c 100644 --- a/internal/config/identity/openid/openid.go +++ b/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. diff --git a/internal/config/identity/openid/providercfg.go b/internal/config/identity/openid/providercfg.go index 968af6ed2..15f32806a 100644 --- a/internal/config/identity/openid/providercfg.go +++ b/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 { diff --git a/internal/config/identity/plugin/config.go b/internal/config/identity/plugin/config.go index 812cea5aa..2b3db7987 100644 --- a/internal/config/identity/plugin/config.go +++ b/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 diff --git a/internal/config/identity/tls/config.go b/internal/config/identity/tls/config.go index f2da538f9..a35926a98 100644 --- a/internal/config/identity/tls/config.go +++ b/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 ( diff --git a/internal/config/lambda/parse.go b/internal/config/lambda/parse.go index d1eaed4f8..24bc2055a 100644 --- a/internal/config/lambda/parse.go +++ b/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. diff --git a/internal/config/lambda/target/webhook.go b/internal/config/lambda/target/webhook.go index 641cb080a..9708abe72 100644 --- a/internal/config/lambda/target/webhook.go +++ b/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 diff --git a/internal/config/notify/parse.go b/internal/config/notify/parse.go index 152cce6d8..c8ff6eb3b 100644 --- a/internal/config/notify/parse.go +++ b/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 ( diff --git a/internal/config/policy/opa/config.go b/internal/config/policy/opa/config.go index ba675dd28..89be91b65 100644 --- a/internal/config/policy/opa/config.go +++ b/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 diff --git a/internal/config/policy/plugin/config.go b/internal/config/policy/plugin/config.go index 636527a96..722f92829 100644 --- a/internal/config/policy/plugin/config.go +++ b/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 diff --git a/internal/config/scanner/scanner.go b/internal/config/scanner/scanner.go index 3e11dacba..ecf733a59 100644 --- a/internal/config/scanner/scanner.go +++ b/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 diff --git a/internal/config/storageclass/storage-class.go b/internal/config/storageclass/storage-class.go index 8a3c2fb5d..5f8f4246c 100644 --- a/internal/config/storageclass/storage-class.go +++ b/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 diff --git a/internal/config/subnet/config.go b/internal/config/subnet/config.go index faa0778bb..8962fc549 100644 --- a/internal/config/subnet/config.go +++ b/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 diff --git a/internal/crypto/auto-encryption.go b/internal/crypto/auto-encryption.go index 6a0d93615..90a55b465 100644 --- a/internal/crypto/auto-encryption.go +++ b/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 ( diff --git a/internal/dsync/drwmutex.go b/internal/dsync/drwmutex.go index e8c1575b9..75ddcf4f5 100644 --- a/internal/dsync/drwmutex.go +++ b/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. diff --git a/internal/event/rules.go b/internal/event/rules.go index 4df4c32a9..1cfe7e326 100644 --- a/internal/event/rules.go +++ b/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. diff --git a/internal/event/target/amqp.go b/internal/event/target/amqp.go index fb59cdd25..918eba165 100644 --- a/internal/event/target/amqp.go +++ b/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" ) diff --git a/internal/event/target/elasticsearch.go b/internal/event/target/elasticsearch.go index ea567b61f..e6e64140c 100644 --- a/internal/event/target/elasticsearch.go +++ b/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" ) diff --git a/internal/event/target/kafka.go b/internal/event/target/kafka.go index aad308468..24f1dcc91 100644 --- a/internal/event/target/kafka.go +++ b/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" diff --git a/internal/event/target/mqtt.go b/internal/event/target/mqtt.go index aa2a2475e..b6d50483f 100644 --- a/internal/event/target/mqtt.go +++ b/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 ( diff --git a/internal/event/target/mysql.go b/internal/event/target/mysql.go index 48966f4b9..e1d744f41 100644 --- a/internal/event/target/mysql.go +++ b/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 ( diff --git a/internal/event/target/nats.go b/internal/event/target/nats.go index c39774498..be44627f8 100644 --- a/internal/event/target/nats.go +++ b/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" ) diff --git a/internal/event/target/nats_contrib_test.go b/internal/event/target/nats_contrib_test.go index a895d87be..9d2cb9501 100644 --- a/internal/event/target/nats_contrib_test.go +++ b/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" ) diff --git a/internal/event/target/nats_tls_contrib_test.go b/internal/event/target/nats_tls_contrib_test.go index 43e918ff3..a89ecb222 100644 --- a/internal/event/target/nats_tls_contrib_test.go +++ b/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" ) diff --git a/internal/event/target/nsq.go b/internal/event/target/nsq.go index 01540e9ac..38c2622ed 100644 --- a/internal/event/target/nsq.go +++ b/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 diff --git a/internal/event/target/nsq_test.go b/internal/event/target/nsq_test.go index fb5123206..0b225ac72 100644 --- a/internal/event/target/nsq_test.go +++ b/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) { diff --git a/internal/event/target/postgresql.go b/internal/event/target/postgresql.go index 736bafe33..c2af013a6 100644 --- a/internal/event/target/postgresql.go +++ b/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 ( diff --git a/internal/event/target/redis.go b/internal/event/target/redis.go index cc483404c..bcf77643b 100644 --- a/internal/event/target/redis.go +++ b/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 diff --git a/internal/event/target/webhook.go b/internal/event/target/webhook.go index 1d048b6f1..2178f0638 100644 --- a/internal/event/target/webhook.go +++ b/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 diff --git a/internal/http/server_test.go b/internal/http/server_test.go index 2b4dd36c9..c9cc7012a 100644 --- a/internal/http/server_test.go +++ b/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) { diff --git a/internal/http/transports.go b/internal/http/transports.go index ad85b4e54..f5176aafa 100644 --- a/internal/http/transports.go +++ b/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. diff --git a/internal/kms/kes.go b/internal/kms/kes.go index 14ee7775f..6d83f4faf 100644 --- a/internal/kms/kes.go +++ b/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 ( diff --git a/internal/logger/audit.go b/internal/logger/audit.go index d175144a7..41464858b 100644 --- a/internal/logger/audit.go +++ b/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" ) diff --git a/internal/logger/config.go b/internal/logger/config.go index bc4580fb1..d5c6ed285 100644 --- a/internal/logger/config.go +++ b/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" diff --git a/internal/logger/console.go b/internal/logger/console.go index 5c1aba1c6..d102454d8 100644 --- a/internal/logger/console.go +++ b/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 diff --git a/internal/logger/logger.go b/internal/logger/logger.go index 610b7c380..7727fb830 100644 --- a/internal/logger/logger.go +++ b/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 diff --git a/internal/logger/message/audit/entry.go b/internal/logger/message/audit/entry.go index 4a2f63277..91b72e085 100644 --- a/internal/logger/message/audit/entry.go +++ b/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" diff --git a/internal/logger/target/console/console.go b/internal/logger/target/console/console.go index 51e61a05a..50ef5f605 100644 --- a/internal/logger/target/console/console.go +++ b/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 diff --git a/internal/logger/target/http/http.go b/internal/logger/target/http/http.go index 9644830a5..40e033d86 100644 --- a/internal/logger/target/http/http.go +++ b/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 ( diff --git a/internal/logger/target/kafka/kafka.go b/internal/logger/target/kafka/kafka.go index 0b26ab197..9d194f2a7 100644 --- a/internal/logger/target/kafka/kafka.go +++ b/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. diff --git a/internal/rest/client.go b/internal/rest/client.go index 85f63f2ee..b71dd8823 100644 --- a/internal/rest/client.go +++ b/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. diff --git a/internal/s3select/select.go b/internal/s3select/select.go index e2f207517..e16da7a29 100644 --- a/internal/s3select/select.go +++ b/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" ) diff --git a/internal/store/store.go b/internal/store/store.go index 14b5889d8..f921fb85a 100644 --- a/internal/store/store.go +++ b/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 (