From 1f262daf6fe369a57d8e183b3e3758644407e485 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Tue, 1 Jun 2021 14:59:40 -0700 Subject: [PATCH] rename all remaining packages to internal/ (#12418) This is to ensure that there are no projects that try to import `minio/minio/pkg` into their own repo. Any such common packages should go to `https://github.com/minio/pkg` --- cmd/acl-handlers.go | 4 +- cmd/admin-bucket-handlers.go | 2 +- cmd/admin-handlers-config-kv.go | 18 ++++----- cmd/admin-handlers-users.go | 6 +-- cmd/admin-handlers.go | 18 ++++----- cmd/admin-handlers_test.go | 2 +- cmd/admin-heal-ops.go | 2 +- cmd/admin-server-info.go | 13 ++++++- cmd/api-errors.go | 20 +++++----- cmd/api-errors_test.go | 4 +- cmd/api-headers.go | 6 +-- cmd/api-response.go | 6 +-- cmd/api-router.go | 2 +- cmd/auth-handler.go | 14 +++---- cmd/auth-handler_test.go | 2 +- cmd/background-heal-ops.go | 2 +- cmd/background-newdisks-heal-ops.go | 4 +- cmd/bitrot-streaming.go | 6 +-- cmd/bitrot-whole.go | 2 +- cmd/bitrot.go | 2 +- cmd/bootstrap-peer-server.go | 6 +-- cmd/bucket-encryption-handlers.go | 2 +- cmd/bucket-encryption.go | 2 +- cmd/bucket-handlers.go | 22 +++++------ cmd/bucket-handlers_test.go | 2 +- cmd/bucket-lifecycle-handlers.go | 6 +-- cmd/bucket-lifecycle-handlers_test.go | 2 +- cmd/bucket-lifecycle.go | 12 +++--- cmd/bucket-lifecycle_test.go | 4 +- cmd/bucket-listobjects-handlers.go | 4 +- cmd/bucket-metadata-sys.go | 18 ++++----- cmd/bucket-metadata.go | 20 +++++----- cmd/bucket-notification-handlers.go | 4 +- cmd/bucket-object-lock.go | 10 ++--- cmd/bucket-policy-handlers.go | 2 +- cmd/bucket-policy-handlers_test.go | 2 +- cmd/bucket-policy.go | 6 +-- cmd/bucket-quota.go | 4 +- cmd/bucket-replication-stats.go | 2 +- cmd/bucket-replication.go | 14 +++---- cmd/bucket-targets.go | 8 ++-- cmd/bucket-versioning-handler.go | 4 +- cmd/bucket-versioning.go | 2 +- cmd/common-main.go | 12 +++--- cmd/config-common.go | 2 +- cmd/config-current.go | 36 +++++++++--------- cmd/config-current_test.go | 2 +- cmd/config-encrypted.go | 6 +-- cmd/config-encrypted_test.go | 2 +- cmd/config-migrate.go | 28 +++++++------- cmd/config-migrate_test.go | 2 +- cmd/config-versions.go | 22 +++++------ cmd/config.go | 4 +- cmd/consolelogger.go | 10 ++--- cmd/data-scanner.go | 16 ++++---- cmd/data-update-tracker.go | 4 +- cmd/data-update-tracker_test.go | 4 +- cmd/data-usage-cache.go | 6 +-- cmd/data-usage.go | 4 +- cmd/disk-cache-backend.go | 16 ++++---- cmd/disk-cache-utils.go | 4 +- cmd/disk-cache.go | 14 +++---- cmd/dummy-handlers.go | 2 +- cmd/encryption-v1.go | 10 ++--- cmd/encryption-v1_test.go | 4 +- cmd/endpoint-ellipses.go | 2 +- cmd/endpoint.go | 10 ++--- cmd/erasure-bucket.go | 4 +- cmd/erasure-coding.go | 2 +- cmd/erasure-common.go | 2 +- cmd/erasure-decode.go | 2 +- cmd/erasure-encode.go | 2 +- cmd/erasure-heal_test.go | 2 +- cmd/erasure-healing.go | 4 +- cmd/erasure-lowlevel-heal.go | 6 +-- cmd/erasure-metadata-utils.go | 4 +- cmd/erasure-metadata.go | 8 ++-- cmd/erasure-multipart.go | 6 +-- cmd/erasure-object.go | 16 ++++---- cmd/erasure-object_test.go | 2 +- cmd/erasure-server-pool.go | 6 +-- cmd/erasure-sets.go | 8 ++-- cmd/erasure-utils.go | 2 +- cmd/erasure.go | 10 ++--- cmd/format-disk-cache.go | 2 +- cmd/format-erasure.go | 12 +++--- cmd/format-fs.go | 6 +-- cmd/fs-v1-helpers.go | 4 +- cmd/fs-v1-helpers_contrib.go | 2 +- cmd/fs-v1-helpers_test.go | 2 +- cmd/fs-v1-metadata.go | 6 +-- cmd/fs-v1-multipart.go | 4 +- cmd/fs-v1-rwpool.go | 4 +- cmd/fs-v1-rwpool_test.go | 2 +- cmd/fs-v1.go | 14 +++---- cmd/gateway-common.go | 10 ++--- cmd/gateway-interface.go | 2 +- cmd/gateway-main.go | 6 +-- cmd/gateway-startup-msg.go | 2 +- cmd/gateway-unsupported.go | 8 ++-- cmd/gateway/azure/gateway-azure.go | 4 +- cmd/gateway/gcs/gateway-gcs.go | 4 +- cmd/gateway/hdfs/gateway-hdfs.go | 6 +-- cmd/gateway/nas/gateway-nas.go | 2 +- cmd/gateway/s3/gateway-s3-metadata.go | 4 +- cmd/gateway/s3/gateway-s3-sse.go | 2 +- cmd/gateway/s3/gateway-s3.go | 6 +-- cmd/gateway/s3/gateway-s3_test.go | 2 +- cmd/generic-handlers.go | 10 ++--- cmd/generic-handlers_test.go | 4 +- cmd/global-heal.go | 4 +- cmd/globals.go | 28 +++++++------- cmd/handler-api.go | 4 +- cmd/handler-utils.go | 8 ++-- cmd/handler-utils_test.go | 2 +- cmd/healthcheck-handler.go | 2 +- cmd/healthinfo.go | 2 +- cmd/http-stats.go | 2 +- cmd/http-tracer.go | 4 +- cmd/iam-etcd-store.go | 8 ++-- cmd/iam-object-store.go | 8 ++-- cmd/iam.go | 4 +- cmd/jwt.go | 6 +-- cmd/jwt_test.go | 4 +- cmd/listen-notification-handlers.go | 4 +- cmd/local-locker.go | 2 +- cmd/lock-rest-client.go | 8 ++-- cmd/lock-rest-client_test.go | 2 +- cmd/lock-rest-server-common_test.go | 2 +- cmd/lock-rest-server.go | 2 +- cmd/metacache-bucket.go | 4 +- cmd/metacache-manager.go | 2 +- cmd/metacache-marker.go | 2 +- cmd/metacache-server-pool.go | 2 +- cmd/metacache-set.go | 6 +-- cmd/metacache-stream.go | 2 +- cmd/metacache-walk.go | 6 +-- cmd/metacache.go | 2 +- cmd/metrics-v2.go | 2 +- cmd/metrics.go | 2 +- cmd/namespace-lock.go | 6 +-- cmd/net.go | 6 +-- cmd/notification.go | 14 +++---- cmd/object-api-common.go | 2 +- cmd/object-api-datatypes.go | 4 +- cmd/object-api-input-checks.go | 2 +- cmd/object-api-multipart_test.go | 2 +- cmd/object-api-options.go | 6 +-- cmd/object-api-putobject_test.go | 2 +- cmd/object-api-utils.go | 16 ++++---- cmd/object-api-utils_test.go | 4 +- cmd/object-handlers-common.go | 4 +- cmd/object-handlers.go | 34 ++++++++--------- cmd/object-handlers_test.go | 6 +-- cmd/object_api_suite_test.go | 2 +- cmd/os-instrumented.go | 2 +- cmd/peer-rest-client.go | 12 +++--- cmd/peer-rest-server.go | 6 +-- cmd/prepare-storage.go | 6 +-- cmd/server-main.go | 18 ++++----- cmd/server-startup-msg.go | 8 ++-- cmd/server_test.go | 2 +- cmd/signals.go | 2 +- cmd/signature-v2.go | 4 +- cmd/signature-v4-parser.go | 4 +- cmd/signature-v4-utils.go | 6 +-- cmd/signature-v4-utils_test.go | 2 +- cmd/signature-v4.go | 4 +- cmd/storage-rest-client.go | 8 ++-- cmd/storage-rest-server.go | 10 ++--- cmd/storage-rest_test.go | 4 +- cmd/streaming-signature-v4.go | 4 +- cmd/sts-datatypes.go | 2 +- cmd/sts-errors.go | 4 +- cmd/sts-handlers.go | 8 ++-- cmd/test-utils_test.go | 14 +++---- cmd/tier-handlers.go | 2 +- cmd/tier-journal.go | 2 +- cmd/tier-sweeper.go | 4 +- cmd/tier.go | 6 +-- cmd/update-notifier.go | 2 +- cmd/update-notifier_test.go | 2 +- cmd/update.go | 6 +-- cmd/utils.go | 8 ++-- cmd/web-handler-context.go | 4 +- cmd/web-handler-context_test.go | 2 +- cmd/web-handlers.go | 26 ++++++------- cmd/web-handlers_test.go | 4 +- cmd/web-router.go | 2 +- cmd/xl-storage-format-v1.go | 2 +- cmd/xl-storage-format-v2.go | 6 +-- cmd/xl-storage-format-v2_test.go | 4 +- cmd/xl-storage.go | 14 +++---- cmd/xl-storage_test.go | 2 +- docs/sts/web-identity.go | 30 --------------- go.mod | 2 +- go.sum | 4 +- {pkg => internal}/auth/credentials.go | 2 +- {pkg => internal}/auth/credentials_test.go | 0 {pkg => internal}/bpool/bpool.go | 0 {pkg => internal}/bpool/bpool_test.go | 0 .../bucket/bandwidth/measurement.go | 0 {pkg => internal}/bucket/bandwidth/monitor.go | 0 .../bucket/bandwidth/monitor_test.go | 0 {pkg => internal}/bucket/bandwidth/reader.go | 0 .../bucket/bandwidth/throttle.go | 0 .../bucket/encryption/bucket-sse-config.go | 4 +- .../encryption/bucket-sse-config_test.go | 0 .../bucket/lifecycle/action_string.go | 0 {pkg => internal}/bucket/lifecycle/and.go | 0 {pkg => internal}/bucket/lifecycle/error.go | 0 .../bucket/lifecycle/expiration.go | 0 .../bucket/lifecycle/expiration_test.go | 0 {pkg => internal}/bucket/lifecycle/filter.go | 0 .../bucket/lifecycle/filter_test.go | 0 .../bucket/lifecycle/lifecycle.go | 0 .../bucket/lifecycle/lifecycle_test.go | 0 .../bucket/lifecycle/noncurrentversion.go | 0 {pkg => internal}/bucket/lifecycle/prefix.go | 0 {pkg => internal}/bucket/lifecycle/rule.go | 0 .../bucket/lifecycle/rule_test.go | 0 {pkg => internal}/bucket/lifecycle/tag.go | 0 .../bucket/lifecycle/transition.go | 0 {pkg => internal}/bucket/object/lock/lock.go | 2 +- .../bucket/object/lock/lock_test.go | 2 +- {pkg => internal}/bucket/replication/and.go | 0 .../bucket/replication/destination.go | 0 {pkg => internal}/bucket/replication/error.go | 0 .../bucket/replication/filter.go | 0 .../bucket/replication/replication.go | 0 .../bucket/replication/replication_test.go | 0 {pkg => internal}/bucket/replication/rule.go | 0 .../bucket/replication/rule_test.go | 0 .../replication/sourceselectioncriteria.go | 0 {pkg => internal}/bucket/replication/tag.go | 0 {pkg => internal}/bucket/versioning/error.go | 0 .../bucket/versioning/versioning.go | 0 {pkg => internal}/color/color.go | 0 {cmd => internal}/config/api/api.go | 2 +- {cmd => internal}/config/api/help.go | 2 +- {cmd => internal}/config/bool-flag.go | 0 {cmd => internal}/config/bool-flag_test.go | 0 {cmd => internal}/config/cache/config.go | 2 +- {cmd => internal}/config/cache/config_test.go | 0 {cmd => internal}/config/cache/help.go | 2 +- {cmd => internal}/config/cache/legacy.go | 2 +- {cmd => internal}/config/cache/lookup.go | 2 +- {cmd => internal}/config/certs.go | 0 {cmd => internal}/config/certs_test.go | 0 {cmd => internal}/config/certsinfo.go | 2 +- {cmd => internal}/config/compress/compress.go | 2 +- .../config/compress/compress_test.go | 0 {cmd => internal}/config/compress/help.go | 2 +- {cmd => internal}/config/compress/legacy.go | 2 +- {cmd => internal}/config/config.go | 2 +- {cmd => internal}/config/config_test.go | 0 {cmd => internal}/config/constants.go | 0 {cmd => internal}/config/crypto.go | 4 +- {cmd => internal}/config/crypto_test.go | 2 +- {cmd => internal}/config/dns/etcd_dns.go | 0 {cmd => internal}/config/dns/operator_dns.go | 4 +- {cmd => internal}/config/dns/store.go | 0 {cmd => internal}/config/dns/types.go | 0 {cmd => internal}/config/errors-utils.go | 2 +- {cmd => internal}/config/errors.go | 0 {cmd => internal}/config/etcd/etcd.go | 4 +- {cmd => internal}/config/etcd/etcd_test.go | 0 {cmd => internal}/config/etcd/help.go | 2 +- {cmd => internal}/config/heal/heal.go | 2 +- {cmd => internal}/config/help.go | 0 .../config/identity/ldap/config.go | 2 +- .../config/identity/ldap/help.go | 2 +- .../config/identity/ldap/legacy.go | 2 +- .../identity/openid/ecdsa-sha3_contrib.go | 0 .../config/identity/openid/help.go | 2 +- .../config/identity/openid/jwks.go | 0 .../config/identity/openid/jwks_test.go | 0 .../config/identity/openid/jwt.go | 6 +-- .../config/identity/openid/jwt_test.go | 2 +- .../config/identity/openid/legacy.go | 2 +- .../identity/openid/rsa-sha3_contrib.go | 0 .../config/identity/openid/validators.go | 0 .../config/identity/openid/validators_test.go | 2 +- {cmd => internal}/config/legacy.go | 2 +- {cmd => internal}/config/logger.go | 0 {cmd => internal}/config/notify/config.go | 2 +- {cmd => internal}/config/notify/help.go | 4 +- {cmd => internal}/config/notify/legacy.go | 4 +- {cmd => internal}/config/notify/parse.go | 10 ++--- {cmd => internal}/config/policy/opa/config.go | 4 +- {cmd => internal}/config/policy/opa/help.go | 2 +- {cmd => internal}/config/policy/opa/legacy.go | 2 +- {cmd => internal}/config/scanner/scanner.go | 2 +- {cmd => internal}/config/storageclass/help.go | 2 +- .../config/storageclass/legacy.go | 2 +- .../config/storageclass/storage-class.go | 2 +- .../config/storageclass/storage-class_test.go | 0 {cmd => internal}/crypto/auto-encryption.go | 2 +- {cmd => internal}/crypto/doc.go | 0 {cmd => internal}/crypto/error.go | 0 {cmd => internal}/crypto/header.go | 2 +- {cmd => internal}/crypto/header_test.go | 2 +- {cmd => internal}/crypto/key.go | 4 +- {cmd => internal}/crypto/key_test.go | 2 +- {cmd => internal}/crypto/metadata.go | 2 +- {cmd => internal}/crypto/metadata_test.go | 2 +- {cmd => internal}/crypto/sse-c.go | 4 +- {cmd => internal}/crypto/sse-kms.go | 6 +-- {cmd => internal}/crypto/sse-s3.go | 6 +-- {cmd => internal}/crypto/sse.go | 6 +-- {cmd => internal}/crypto/sse_test.go | 0 {pkg => internal}/disk/directio_darwin.go | 0 {pkg => internal}/disk/directio_unix.go | 0 .../disk/directio_unsupported.go | 0 {pkg => internal}/disk/disk.go | 0 {pkg => internal}/disk/disk_test.go | 2 +- {pkg => internal}/disk/disk_unix.go | 0 {pkg => internal}/disk/disk_windows.go | 0 {pkg => internal}/disk/fdatasync_linux.go | 0 {pkg => internal}/disk/fdatasync_unix.go | 0 .../disk/fdatasync_unsupported.go | 0 {pkg => internal}/disk/health.go | 0 {pkg => internal}/disk/root_disk.go | 0 {pkg => internal}/disk/stat_bsd.go | 0 {pkg => internal}/disk/stat_freebsd.go | 0 {pkg => internal}/disk/stat_linux.go | 0 {pkg => internal}/disk/stat_linux_32bit.go | 0 {pkg => internal}/disk/stat_linux_s390x.go | 0 {pkg => internal}/disk/stat_netbsd.go | 0 {pkg => internal}/disk/stat_openbsd.go | 0 {pkg => internal}/disk/stat_solaris.go | 0 {pkg => internal}/disk/stat_windows.go | 0 {pkg => internal}/disk/type_bsd.go | 0 {pkg => internal}/disk/type_linux.go | 0 {pkg => internal}/disk/type_windows.go | 0 {pkg => internal}/dsync/.gitignore | 0 {pkg => internal}/dsync/drwmutex.go | 0 {pkg => internal}/dsync/drwmutex_test.go | 0 {pkg => internal}/dsync/dsync-server_test.go | 0 {pkg => internal}/dsync/dsync.go | 0 {pkg => internal}/dsync/dsync_test.go | 0 .../dsync/rpc-client-impl_test.go | 0 .../dsync/rpc-client-interface.go | 0 {pkg => internal}/etag/etag.go | 0 {pkg => internal}/etag/etag_test.go | 0 {pkg => internal}/etag/reader.go | 0 {pkg => internal}/event/arn.go | 0 {pkg => internal}/event/arn_test.go | 0 {pkg => internal}/event/config.go | 0 {pkg => internal}/event/config_test.go | 0 {pkg => internal}/event/errors.go | 0 {pkg => internal}/event/event.go | 0 {pkg => internal}/event/name.go | 0 {pkg => internal}/event/name_test.go | 0 {pkg => internal}/event/rules.go | 0 {pkg => internal}/event/rules_test.go | 0 {pkg => internal}/event/rulesmap.go | 0 {pkg => internal}/event/rulesmap_test.go | 0 {pkg => internal}/event/target/amqp.go | 4 +- {pkg => internal}/event/target/common.go | 0 .../event/target/elasticsearch.go | 4 +- {pkg => internal}/event/target/kafka.go | 4 +- .../target/kafka_scram_client_contrib.go | 0 {pkg => internal}/event/target/mqtt.go | 4 +- {pkg => internal}/event/target/mysql.go | 4 +- {pkg => internal}/event/target/mysql_test.go | 0 {pkg => internal}/event/target/nats.go | 4 +- .../event/target/nats_contrib_test.go | 2 +- .../event/target/nats_tls_contrib_test.go | 2 +- {pkg => internal}/event/target/nsq.go | 4 +- {pkg => internal}/event/target/nsq_test.go | 2 +- {pkg => internal}/event/target/postgresql.go | 4 +- .../event/target/postgresql_test.go | 0 {pkg => internal}/event/target/queuestore.go | 2 +- .../event/target/queuestore_test.go | 2 +- {pkg => internal}/event/target/redis.go | 4 +- {pkg => internal}/event/target/store.go | 2 +- .../contrib/certs/nats_client_cert.pem | 0 .../contrib/certs/nats_client_key.pem | 0 .../contrib/certs/nats_server_cert.pem | 0 .../contrib/certs/nats_server_key.pem | 0 .../testdata/contrib/certs/root_ca_cert.pem | 0 .../testdata/contrib/certs/root_ca_key.pem | 0 .../target/testdata/contrib/nats_tls.conf | 0 .../contrib/nats_tls_client_cert.conf | 0 {pkg => internal}/event/target/webhook.go | 4 +- {pkg => internal}/event/targetid.go | 0 {pkg => internal}/event/targetid_test.go | 0 {pkg => internal}/event/targetidset.go | 0 {pkg => internal}/event/targetidset_test.go | 0 {pkg => internal}/event/targetlist.go | 0 {pkg => internal}/event/targetlist_test.go | 0 {pkg => internal}/fips/api.go | 0 {pkg => internal}/fips/fips.go | 0 {pkg => internal}/fips/no_fips.go | 0 {pkg => internal}/handlers/forwarder.go | 0 {pkg => internal}/handlers/proxy.go | 0 {pkg => internal}/handlers/proxy_test.go | 0 {pkg => internal}/hash/errors.go | 0 {pkg => internal}/hash/reader.go | 2 +- {pkg => internal}/hash/reader_test.go | 0 {pkg => internal}/hash/sha256_fips.go | 0 {pkg => internal}/hash/sha256_nofips.go | 0 {cmd => internal}/http/close.go | 0 {cmd => internal}/http/dial_dnscache.go | 0 {cmd => internal}/http/dial_dnscache_test.go | 0 {cmd => internal}/http/dial_linux.go | 0 {cmd => internal}/http/dial_others.go | 0 {cmd => internal}/http/headers.go | 0 {cmd => internal}/http/listen_nix.go | 0 {cmd => internal}/http/listen_others.go | 0 {cmd => internal}/http/listener.go | 0 {cmd => internal}/http/listener_test.go | 0 {cmd => internal}/http/server.go | 6 +-- {cmd => internal}/http/server_test.go | 0 .../http/stats/http-traffic-recorder.go | 0 {pkg => internal}/ioutil/append-file_nix.go | 0 .../ioutil/append-file_windows.go | 2 +- {pkg => internal}/ioutil/ioutil.go | 2 +- {pkg => internal}/ioutil/ioutil_test.go | 0 {pkg => internal}/ioutil/read_file.go | 0 .../ioutil/read_file_noatime_notsupported.go | 0 .../ioutil/read_file_noatime_supported.go | 0 {pkg => internal}/ioutil/wait_pipe.go | 0 {cmd => internal}/jwt/parser.go | 0 {cmd => internal}/jwt/parser_test.go | 0 {pkg => internal}/kms/context.go | 0 {pkg => internal}/kms/dek_test.go | 0 {pkg => internal}/kms/kes.go | 0 {pkg => internal}/kms/kms.go | 0 {pkg => internal}/kms/single-key.go | 0 {pkg => internal}/kms/single-key_test.go | 0 {pkg => internal}/lock/lock.go | 0 {pkg => internal}/lock/lock_nix.go | 0 {pkg => internal}/lock/lock_solaris.go | 0 {pkg => internal}/lock/lock_test.go | 0 {pkg => internal}/lock/lock_windows.go | 0 {pkg => internal}/lock/lock_windows_test.go | 0 {cmd => internal}/logger/audit.go | 2 +- {cmd => internal}/logger/config.go | 2 +- {cmd => internal}/logger/console.go | 4 +- {cmd => internal}/logger/help.go | 2 +- {cmd => internal}/logger/legacy.go | 2 +- {cmd => internal}/logger/logger.go | 2 +- {cmd => internal}/logger/logonce.go | 0 .../logger/message/audit/entry.go | 4 +- {cmd => internal}/logger/message/log/entry.go | 0 {cmd => internal}/logger/reqinfo.go | 0 .../logger/target/console/console.go | 6 +-- {cmd => internal}/logger/target/http/http.go | 4 +- {cmd => internal}/logger/targets.go | 0 {cmd => internal}/logger/utils.go | 2 +- {pkg => internal}/lsync/lrwmutex.go | 0 {pkg => internal}/lsync/lrwmutex_test.go | 2 +- {pkg => internal}/mountinfo/mountinfo.go | 0 .../mountinfo/mountinfo_linux.go | 0 .../mountinfo/mountinfo_linux_test.go | 0 .../mountinfo/mountinfo_others.go | 0 .../mountinfo/mountinfo_windows.go | 0 {pkg => internal}/net/health.go | 0 {pkg => internal}/net/host.go | 0 {pkg => internal}/net/host_test.go | 0 {pkg => internal}/net/port.go | 0 {pkg => internal}/net/port_test.go | 0 {pkg => internal}/net/url.go | 0 {pkg => internal}/net/url_test.go | 0 {pkg => internal}/pubsub/pubsub.go | 0 {pkg => internal}/pubsub/pubsub_test.go | 0 {cmd => internal}/rest/client.go | 6 +-- {cmd => internal}/rest/client_test.go | 0 {pkg => internal}/s3select/csv/args.go | 0 {pkg => internal}/s3select/csv/errors.go | 0 {pkg => internal}/s3select/csv/reader.go | 2 +- .../s3select/csv/reader_contrib_test.go | 2 +- {pkg => internal}/s3select/csv/record.go | 2 +- .../s3select/csv/recordtransform.go | 0 .../s3select/csv/testdata/testdata.zip | Bin {pkg => internal}/s3select/errors.go | 0 {pkg => internal}/s3select/genmessage.go | 0 {pkg => internal}/s3select/json/args.go | 0 {pkg => internal}/s3select/json/errors.go | 0 {pkg => internal}/s3select/json/preader.go | 2 +- .../s3select/json/preader_test.go | 2 +- {pkg => internal}/s3select/json/reader.go | 2 +- .../s3select/json/reader_test.go | 2 +- {pkg => internal}/s3select/json/record.go | 2 +- .../s3select/json/testdata/10.json | 0 .../s3select/json/testdata/11.json | 0 .../s3select/json/testdata/12.json | 0 .../s3select/json/testdata/2.json | 0 .../s3select/json/testdata/3.json | 0 .../s3select/json/testdata/4.json | 0 .../s3select/json/testdata/5.json | 0 .../s3select/json/testdata/6.json | 0 .../s3select/json/testdata/7.json | 0 .../s3select/json/testdata/8.json | 0 .../s3select/json/testdata/9.json | 0 {pkg => internal}/s3select/message.go | 0 {pkg => internal}/s3select/parquet/args.go | 0 {pkg => internal}/s3select/parquet/errors.go | 0 {pkg => internal}/s3select/parquet/reader.go | 4 +- {pkg => internal}/s3select/progress.go | 0 {pkg => internal}/s3select/select.go | 10 ++--- .../s3select/select_benchmark_test.go | 0 {pkg => internal}/s3select/select_test.go | 0 {pkg => internal}/s3select/simdj/errors.go | 0 {pkg => internal}/s3select/simdj/reader.go | 4 +- .../s3select/simdj/reader_amd64_test.go | 4 +- {pkg => internal}/s3select/simdj/record.go | 4 +- .../testdata/parking-citations-10.json.zst | Bin {pkg => internal}/s3select/sql/aggregation.go | 0 {pkg => internal}/s3select/sql/analysis.go | 0 {pkg => internal}/s3select/sql/errors.go | 0 {pkg => internal}/s3select/sql/evaluate.go | 0 {pkg => internal}/s3select/sql/funceval.go | 0 .../s3select/sql/jsondata/books.json | 0 {pkg => internal}/s3select/sql/jsonpath.go | 0 .../s3select/sql/jsonpath_test.go | 0 {pkg => internal}/s3select/sql/parser.go | 0 {pkg => internal}/s3select/sql/parser_test.go | 0 {pkg => internal}/s3select/sql/record.go | 0 {pkg => internal}/s3select/sql/statement.go | 0 {pkg => internal}/s3select/sql/stringfuncs.go | 0 .../s3select/sql/stringfuncs_contrib_test.go | 0 .../s3select/sql/stringfuncs_test.go | 0 .../s3select/sql/timestampfuncs.go | 0 .../s3select/sql/timestampfuncs_test.go | 0 {pkg => internal}/s3select/sql/utils.go | 0 {pkg => internal}/s3select/sql/value.go | 0 .../s3select/sql/value_contrib.go | 0 {pkg => internal}/s3select/sql/value_test.go | 0 .../testdata/lineitem_shipdate.parquet | Bin .../s3select/testdata/testdata.parquet | Bin {pkg => internal}/s3select/unused-errors.go | 0 {pkg => internal}/smart/bindata.go | 0 {pkg => internal}/smart/nvme.go | 0 {pkg => internal}/smart/smart.go | 0 {pkg => internal}/smart/types.go | 0 {pkg => internal}/sync/errgroup/errgroup.go | 0 .../sync/errgroup/errgroup_test.go | 0 540 files changed, 757 insertions(+), 778 deletions(-) rename {pkg => internal}/auth/credentials.go (99%) rename {pkg => internal}/auth/credentials_test.go (100%) rename {pkg => internal}/bpool/bpool.go (100%) rename {pkg => internal}/bpool/bpool_test.go (100%) rename {pkg => internal}/bucket/bandwidth/measurement.go (100%) rename {pkg => internal}/bucket/bandwidth/monitor.go (100%) rename {pkg => internal}/bucket/bandwidth/monitor_test.go (100%) rename {pkg => internal}/bucket/bandwidth/reader.go (100%) rename {pkg => internal}/bucket/bandwidth/throttle.go (100%) rename {pkg => internal}/bucket/encryption/bucket-sse-config.go (98%) rename {pkg => internal}/bucket/encryption/bucket-sse-config_test.go (100%) rename {pkg => internal}/bucket/lifecycle/action_string.go (100%) rename {pkg => internal}/bucket/lifecycle/and.go (100%) rename {pkg => internal}/bucket/lifecycle/error.go (100%) rename {pkg => internal}/bucket/lifecycle/expiration.go (100%) rename {pkg => internal}/bucket/lifecycle/expiration_test.go (100%) rename {pkg => internal}/bucket/lifecycle/filter.go (100%) rename {pkg => internal}/bucket/lifecycle/filter_test.go (100%) rename {pkg => internal}/bucket/lifecycle/lifecycle.go (100%) rename {pkg => internal}/bucket/lifecycle/lifecycle_test.go (100%) rename {pkg => internal}/bucket/lifecycle/noncurrentversion.go (100%) rename {pkg => internal}/bucket/lifecycle/prefix.go (100%) rename {pkg => internal}/bucket/lifecycle/rule.go (100%) rename {pkg => internal}/bucket/lifecycle/rule_test.go (100%) rename {pkg => internal}/bucket/lifecycle/tag.go (100%) rename {pkg => internal}/bucket/lifecycle/transition.go (100%) rename {pkg => internal}/bucket/object/lock/lock.go (99%) rename {pkg => internal}/bucket/object/lock/lock_test.go (99%) rename {pkg => internal}/bucket/replication/and.go (100%) rename {pkg => internal}/bucket/replication/destination.go (100%) rename {pkg => internal}/bucket/replication/error.go (100%) rename {pkg => internal}/bucket/replication/filter.go (100%) rename {pkg => internal}/bucket/replication/replication.go (100%) rename {pkg => internal}/bucket/replication/replication_test.go (100%) rename {pkg => internal}/bucket/replication/rule.go (100%) rename {pkg => internal}/bucket/replication/rule_test.go (100%) rename {pkg => internal}/bucket/replication/sourceselectioncriteria.go (100%) rename {pkg => internal}/bucket/replication/tag.go (100%) rename {pkg => internal}/bucket/versioning/error.go (100%) rename {pkg => internal}/bucket/versioning/versioning.go (100%) rename {pkg => internal}/color/color.go (100%) rename {cmd => internal}/config/api/api.go (99%) rename {cmd => internal}/config/api/help.go (97%) rename {cmd => internal}/config/bool-flag.go (100%) rename {cmd => internal}/config/bool-flag_test.go (100%) rename {cmd => internal}/config/cache/config.go (99%) rename {cmd => internal}/config/cache/config_test.go (100%) rename {cmd => internal}/config/cache/help.go (98%) rename {cmd => internal}/config/cache/legacy.go (97%) rename {cmd => internal}/config/cache/lookup.go (99%) rename {cmd => internal}/config/certs.go (100%) rename {cmd => internal}/config/certs_test.go (100%) rename {cmd => internal}/config/certsinfo.go (98%) rename {cmd => internal}/config/compress/compress.go (99%) rename {cmd => internal}/config/compress/compress_test.go (100%) rename {cmd => internal}/config/compress/help.go (96%) rename {cmd => internal}/config/compress/legacy.go (97%) rename {cmd => internal}/config/config.go (99%) rename {cmd => internal}/config/config_test.go (100%) rename {cmd => internal}/config/constants.go (100%) rename {cmd => internal}/config/crypto.go (98%) rename {cmd => internal}/config/crypto_test.go (98%) rename {cmd => internal}/config/dns/etcd_dns.go (100%) rename {cmd => internal}/config/dns/operator_dns.go (98%) rename {cmd => internal}/config/dns/store.go (100%) rename {cmd => internal}/config/dns/types.go (100%) rename {cmd => internal}/config/errors-utils.go (98%) rename {cmd => internal}/config/errors.go (100%) rename {cmd => internal}/config/etcd/etcd.go (98%) rename {cmd => internal}/config/etcd/etcd_test.go (100%) rename {cmd => internal}/config/etcd/help.go (97%) rename {cmd => internal}/config/heal/heal.go (98%) rename {cmd => internal}/config/help.go (100%) rename {cmd => internal}/config/identity/ldap/config.go (99%) rename {cmd => internal}/config/identity/ldap/help.go (98%) rename {cmd => internal}/config/identity/ldap/legacy.go (96%) rename {cmd => internal}/config/identity/openid/ecdsa-sha3_contrib.go (100%) rename {cmd => internal}/config/identity/openid/help.go (97%) rename {cmd => internal}/config/identity/openid/jwks.go (100%) rename {cmd => internal}/config/identity/openid/jwks_test.go (100%) rename {cmd => internal}/config/identity/openid/jwt.go (98%) rename {cmd => internal}/config/identity/openid/jwt_test.go (99%) rename {cmd => internal}/config/identity/openid/legacy.go (96%) rename {cmd => internal}/config/identity/openid/rsa-sha3_contrib.go (100%) rename {cmd => internal}/config/identity/openid/validators.go (100%) rename {cmd => internal}/config/identity/openid/validators_test.go (98%) rename {cmd => internal}/config/legacy.go (97%) rename {cmd => internal}/config/logger.go (100%) rename {cmd => internal}/config/notify/config.go (98%) rename {cmd => internal}/config/notify/help.go (99%) rename {cmd => internal}/config/notify/legacy.go (99%) rename {cmd => internal}/config/notify/parse.go (99%) rename {cmd => internal}/config/policy/opa/config.go (98%) rename {cmd => internal}/config/policy/opa/help.go (96%) rename {cmd => internal}/config/policy/opa/legacy.go (97%) rename {cmd => internal}/config/scanner/scanner.go (98%) rename {cmd => internal}/config/storageclass/help.go (97%) rename {cmd => internal}/config/storageclass/legacy.go (96%) rename {cmd => internal}/config/storageclass/storage-class.go (99%) rename {cmd => internal}/config/storageclass/storage-class_test.go (100%) rename {cmd => internal}/crypto/auto-encryption.go (97%) rename {cmd => internal}/crypto/doc.go (100%) rename {cmd => internal}/crypto/error.go (100%) rename {cmd => internal}/crypto/header.go (98%) rename {cmd => internal}/crypto/header_test.go (99%) rename {cmd => internal}/crypto/key.go (98%) rename {cmd => internal}/crypto/key_test.go (99%) rename {cmd => internal}/crypto/metadata.go (99%) rename {cmd => internal}/crypto/metadata_test.go (99%) rename {cmd => internal}/crypto/sse-c.go (98%) rename {cmd => internal}/crypto/sse-kms.go (98%) rename {cmd => internal}/crypto/sse-s3.go (98%) rename {cmd => internal}/crypto/sse.go (97%) rename {cmd => internal}/crypto/sse_test.go (100%) rename {pkg => internal}/disk/directio_darwin.go (100%) rename {pkg => internal}/disk/directio_unix.go (100%) rename {pkg => internal}/disk/directio_unsupported.go (100%) rename {pkg => internal}/disk/disk.go (100%) rename {pkg => internal}/disk/disk_test.go (96%) rename {pkg => internal}/disk/disk_unix.go (100%) rename {pkg => internal}/disk/disk_windows.go (100%) rename {pkg => internal}/disk/fdatasync_linux.go (100%) rename {pkg => internal}/disk/fdatasync_unix.go (100%) rename {pkg => internal}/disk/fdatasync_unsupported.go (100%) rename {pkg => internal}/disk/health.go (100%) rename {pkg => internal}/disk/root_disk.go (100%) rename {pkg => internal}/disk/stat_bsd.go (100%) rename {pkg => internal}/disk/stat_freebsd.go (100%) rename {pkg => internal}/disk/stat_linux.go (100%) rename {pkg => internal}/disk/stat_linux_32bit.go (100%) rename {pkg => internal}/disk/stat_linux_s390x.go (100%) rename {pkg => internal}/disk/stat_netbsd.go (100%) rename {pkg => internal}/disk/stat_openbsd.go (100%) rename {pkg => internal}/disk/stat_solaris.go (100%) rename {pkg => internal}/disk/stat_windows.go (100%) rename {pkg => internal}/disk/type_bsd.go (100%) rename {pkg => internal}/disk/type_linux.go (100%) rename {pkg => internal}/disk/type_windows.go (100%) rename {pkg => internal}/dsync/.gitignore (100%) rename {pkg => internal}/dsync/drwmutex.go (100%) rename {pkg => internal}/dsync/drwmutex_test.go (100%) rename {pkg => internal}/dsync/dsync-server_test.go (100%) rename {pkg => internal}/dsync/dsync.go (100%) rename {pkg => internal}/dsync/dsync_test.go (100%) rename {pkg => internal}/dsync/rpc-client-impl_test.go (100%) rename {pkg => internal}/dsync/rpc-client-interface.go (100%) rename {pkg => internal}/etag/etag.go (100%) rename {pkg => internal}/etag/etag_test.go (100%) rename {pkg => internal}/etag/reader.go (100%) rename {pkg => internal}/event/arn.go (100%) rename {pkg => internal}/event/arn_test.go (100%) rename {pkg => internal}/event/config.go (100%) rename {pkg => internal}/event/config_test.go (100%) rename {pkg => internal}/event/errors.go (100%) rename {pkg => internal}/event/event.go (100%) rename {pkg => internal}/event/name.go (100%) rename {pkg => internal}/event/name_test.go (100%) rename {pkg => internal}/event/rules.go (100%) rename {pkg => internal}/event/rules_test.go (100%) rename {pkg => internal}/event/rulesmap.go (100%) rename {pkg => internal}/event/rulesmap_test.go (100%) rename {pkg => internal}/event/target/amqp.go (99%) rename {pkg => internal}/event/target/common.go (100%) rename {pkg => internal}/event/target/elasticsearch.go (99%) rename {pkg => internal}/event/target/kafka.go (99%) rename {pkg => internal}/event/target/kafka_scram_client_contrib.go (100%) rename {pkg => internal}/event/target/mqtt.go (98%) rename {pkg => internal}/event/target/mysql.go (99%) rename {pkg => internal}/event/target/mysql_test.go (100%) rename {pkg => internal}/event/target/nats.go (99%) rename {pkg => internal}/event/target/nats_contrib_test.go (98%) rename {pkg => internal}/event/target/nats_tls_contrib_test.go (97%) rename {pkg => internal}/event/target/nsq.go (98%) rename {pkg => internal}/event/target/nsq_test.go (98%) rename {pkg => internal}/event/target/postgresql.go (99%) rename {pkg => internal}/event/target/postgresql_test.go (100%) rename {pkg => internal}/event/target/queuestore.go (99%) rename {pkg => internal}/event/target/queuestore_test.go (99%) rename {pkg => internal}/event/target/redis.go (99%) rename {pkg => internal}/event/target/store.go (98%) rename {pkg => internal}/event/target/testdata/contrib/certs/nats_client_cert.pem (100%) rename {pkg => internal}/event/target/testdata/contrib/certs/nats_client_key.pem (100%) rename {pkg => internal}/event/target/testdata/contrib/certs/nats_server_cert.pem (100%) rename {pkg => internal}/event/target/testdata/contrib/certs/nats_server_key.pem (100%) rename {pkg => internal}/event/target/testdata/contrib/certs/root_ca_cert.pem (100%) rename {pkg => internal}/event/target/testdata/contrib/certs/root_ca_key.pem (100%) rename {pkg => internal}/event/target/testdata/contrib/nats_tls.conf (100%) rename {pkg => internal}/event/target/testdata/contrib/nats_tls_client_cert.conf (100%) rename {pkg => internal}/event/target/webhook.go (98%) rename {pkg => internal}/event/targetid.go (100%) rename {pkg => internal}/event/targetid_test.go (100%) rename {pkg => internal}/event/targetidset.go (100%) rename {pkg => internal}/event/targetidset_test.go (100%) rename {pkg => internal}/event/targetlist.go (100%) rename {pkg => internal}/event/targetlist_test.go (100%) rename {pkg => internal}/fips/api.go (100%) rename {pkg => internal}/fips/fips.go (100%) rename {pkg => internal}/fips/no_fips.go (100%) rename {pkg => internal}/handlers/forwarder.go (100%) rename {pkg => internal}/handlers/proxy.go (100%) rename {pkg => internal}/handlers/proxy_test.go (100%) rename {pkg => internal}/hash/errors.go (100%) rename {pkg => internal}/hash/reader.go (99%) rename {pkg => internal}/hash/reader_test.go (100%) rename {pkg => internal}/hash/sha256_fips.go (100%) rename {pkg => internal}/hash/sha256_nofips.go (100%) rename {cmd => internal}/http/close.go (100%) rename {cmd => internal}/http/dial_dnscache.go (100%) rename {cmd => internal}/http/dial_dnscache_test.go (100%) rename {cmd => internal}/http/dial_linux.go (100%) rename {cmd => internal}/http/dial_others.go (100%) rename {cmd => internal}/http/headers.go (100%) rename {cmd => internal}/http/listen_nix.go (100%) rename {cmd => internal}/http/listen_others.go (100%) rename {cmd => internal}/http/listener.go (100%) rename {cmd => internal}/http/listener_test.go (100%) rename {cmd => internal}/http/server.go (97%) rename {cmd => internal}/http/server_test.go (100%) rename {cmd => internal}/http/stats/http-traffic-recorder.go (100%) rename {pkg => internal}/ioutil/append-file_nix.go (100%) rename {pkg => internal}/ioutil/append-file_windows.go (96%) rename {pkg => internal}/ioutil/ioutil.go (99%) rename {pkg => internal}/ioutil/ioutil_test.go (100%) rename {pkg => internal}/ioutil/read_file.go (100%) rename {pkg => internal}/ioutil/read_file_noatime_notsupported.go (100%) rename {pkg => internal}/ioutil/read_file_noatime_supported.go (100%) rename {pkg => internal}/ioutil/wait_pipe.go (100%) rename {cmd => internal}/jwt/parser.go (100%) rename {cmd => internal}/jwt/parser_test.go (100%) rename {pkg => internal}/kms/context.go (100%) rename {pkg => internal}/kms/dek_test.go (100%) rename {pkg => internal}/kms/kes.go (100%) rename {pkg => internal}/kms/kms.go (100%) rename {pkg => internal}/kms/single-key.go (100%) rename {pkg => internal}/kms/single-key_test.go (100%) rename {pkg => internal}/lock/lock.go (100%) rename {pkg => internal}/lock/lock_nix.go (100%) rename {pkg => internal}/lock/lock_solaris.go (100%) rename {pkg => internal}/lock/lock_test.go (100%) rename {pkg => internal}/lock/lock_windows.go (100%) rename {pkg => internal}/lock/lock_windows_test.go (100%) rename {cmd => internal}/logger/audit.go (99%) rename {cmd => internal}/logger/config.go (99%) rename {cmd => internal}/logger/console.go (98%) rename {cmd => internal}/logger/help.go (98%) rename {cmd => internal}/logger/legacy.go (97%) rename {cmd => internal}/logger/logger.go (99%) rename {cmd => internal}/logger/logonce.go (100%) rename {cmd => internal}/logger/message/audit/entry.go (97%) rename {cmd => internal}/logger/message/log/entry.go (100%) rename {cmd => internal}/logger/reqinfo.go (100%) rename {cmd => internal}/logger/target/console/console.go (96%) rename {cmd => internal}/logger/target/http/http.go (98%) rename {cmd => internal}/logger/targets.go (100%) rename {cmd => internal}/logger/utils.go (97%) rename {pkg => internal}/lsync/lrwmutex.go (100%) rename {pkg => internal}/lsync/lrwmutex_test.go (99%) rename {pkg => internal}/mountinfo/mountinfo.go (100%) rename {pkg => internal}/mountinfo/mountinfo_linux.go (100%) rename {pkg => internal}/mountinfo/mountinfo_linux_test.go (100%) rename {pkg => internal}/mountinfo/mountinfo_others.go (100%) rename {pkg => internal}/mountinfo/mountinfo_windows.go (100%) rename {pkg => internal}/net/health.go (100%) rename {pkg => internal}/net/host.go (100%) rename {pkg => internal}/net/host_test.go (100%) rename {pkg => internal}/net/port.go (100%) rename {pkg => internal}/net/port_test.go (100%) rename {pkg => internal}/net/url.go (100%) rename {pkg => internal}/net/url_test.go (100%) rename {pkg => internal}/pubsub/pubsub.go (100%) rename {pkg => internal}/pubsub/pubsub_test.go (100%) rename {cmd => internal}/rest/client.go (98%) rename {cmd => internal}/rest/client_test.go (100%) rename {pkg => internal}/s3select/csv/args.go (100%) rename {pkg => internal}/s3select/csv/errors.go (100%) rename {pkg => internal}/s3select/csv/reader.go (99%) rename {pkg => internal}/s3select/csv/reader_contrib_test.go (99%) rename {pkg => internal}/s3select/csv/record.go (98%) rename {pkg => internal}/s3select/csv/recordtransform.go (100%) rename {pkg => internal}/s3select/csv/testdata/testdata.zip (100%) rename {pkg => internal}/s3select/errors.go (100%) rename {pkg => internal}/s3select/genmessage.go (100%) rename {pkg => internal}/s3select/json/args.go (100%) rename {pkg => internal}/s3select/json/errors.go (100%) rename {pkg => internal}/s3select/json/preader.go (99%) rename {pkg => internal}/s3select/json/preader_test.go (98%) rename {pkg => internal}/s3select/json/reader.go (98%) rename {pkg => internal}/s3select/json/reader_test.go (98%) rename {pkg => internal}/s3select/json/record.go (99%) rename {pkg => internal}/s3select/json/testdata/10.json (100%) rename {pkg => internal}/s3select/json/testdata/11.json (100%) rename {pkg => internal}/s3select/json/testdata/12.json (100%) rename {pkg => internal}/s3select/json/testdata/2.json (100%) rename {pkg => internal}/s3select/json/testdata/3.json (100%) rename {pkg => internal}/s3select/json/testdata/4.json (100%) rename {pkg => internal}/s3select/json/testdata/5.json (100%) rename {pkg => internal}/s3select/json/testdata/6.json (100%) rename {pkg => internal}/s3select/json/testdata/7.json (100%) rename {pkg => internal}/s3select/json/testdata/8.json (100%) rename {pkg => internal}/s3select/json/testdata/9.json (100%) rename {pkg => internal}/s3select/message.go (100%) rename {pkg => internal}/s3select/parquet/args.go (100%) rename {pkg => internal}/s3select/parquet/errors.go (100%) rename {pkg => internal}/s3select/parquet/reader.go (97%) rename {pkg => internal}/s3select/progress.go (100%) rename {pkg => internal}/s3select/select.go (98%) rename {pkg => internal}/s3select/select_benchmark_test.go (100%) rename {pkg => internal}/s3select/select_test.go (100%) rename {pkg => internal}/s3select/simdj/errors.go (100%) rename {pkg => internal}/s3select/simdj/reader.go (97%) rename {pkg => internal}/s3select/simdj/reader_amd64_test.go (97%) rename {pkg => internal}/s3select/simdj/record.go (98%) rename {pkg => internal}/s3select/simdj/testdata/parking-citations-10.json.zst (100%) rename {pkg => internal}/s3select/sql/aggregation.go (100%) rename {pkg => internal}/s3select/sql/analysis.go (100%) rename {pkg => internal}/s3select/sql/errors.go (100%) rename {pkg => internal}/s3select/sql/evaluate.go (100%) rename {pkg => internal}/s3select/sql/funceval.go (100%) rename {pkg => internal}/s3select/sql/jsondata/books.json (100%) rename {pkg => internal}/s3select/sql/jsonpath.go (100%) rename {pkg => internal}/s3select/sql/jsonpath_test.go (100%) rename {pkg => internal}/s3select/sql/parser.go (100%) rename {pkg => internal}/s3select/sql/parser_test.go (100%) rename {pkg => internal}/s3select/sql/record.go (100%) rename {pkg => internal}/s3select/sql/statement.go (100%) rename {pkg => internal}/s3select/sql/stringfuncs.go (100%) rename {pkg => internal}/s3select/sql/stringfuncs_contrib_test.go (100%) rename {pkg => internal}/s3select/sql/stringfuncs_test.go (100%) rename {pkg => internal}/s3select/sql/timestampfuncs.go (100%) rename {pkg => internal}/s3select/sql/timestampfuncs_test.go (100%) rename {pkg => internal}/s3select/sql/utils.go (100%) rename {pkg => internal}/s3select/sql/value.go (100%) rename {pkg => internal}/s3select/sql/value_contrib.go (100%) rename {pkg => internal}/s3select/sql/value_test.go (100%) rename {pkg => internal}/s3select/testdata/lineitem_shipdate.parquet (100%) rename {pkg => internal}/s3select/testdata/testdata.parquet (100%) rename {pkg => internal}/s3select/unused-errors.go (100%) rename {pkg => internal}/smart/bindata.go (100%) rename {pkg => internal}/smart/nvme.go (100%) rename {pkg => internal}/smart/smart.go (100%) rename {pkg => internal}/smart/types.go (100%) rename {pkg => internal}/sync/errgroup/errgroup.go (100%) rename {pkg => internal}/sync/errgroup/errgroup_test.go (100%) diff --git a/cmd/acl-handlers.go b/cmd/acl-handlers.go index 5c5810da2..d05514bd6 100644 --- a/cmd/acl-handlers.go +++ b/cmd/acl-handlers.go @@ -23,8 +23,8 @@ import ( "net/http" "github.com/gorilla/mux" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/admin-bucket-handlers.go b/cmd/admin-bucket-handlers.go index e0f300a96..0190f14d3 100644 --- a/cmd/admin-bucket-handlers.go +++ b/cmd/admin-bucket-handlers.go @@ -26,7 +26,7 @@ import ( "github.com/gorilla/mux" jsoniter "github.com/json-iterator/go" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/admin-handlers-config-kv.go b/cmd/admin-handlers-config-kv.go index 3d24373d0..4f5f2c517 100644 --- a/cmd/admin-handlers-config-kv.go +++ b/cmd/admin-handlers-config-kv.go @@ -28,15 +28,15 @@ import ( "github.com/gorilla/mux" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/config/cache" - "github.com/minio/minio/cmd/config/etcd" - xldap "github.com/minio/minio/cmd/config/identity/ldap" - "github.com/minio/minio/cmd/config/identity/openid" - "github.com/minio/minio/cmd/config/policy/opa" - "github.com/minio/minio/cmd/config/storageclass" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/config/cache" + "github.com/minio/minio/internal/config/etcd" + xldap "github.com/minio/minio/internal/config/identity/ldap" + "github.com/minio/minio/internal/config/identity/openid" + "github.com/minio/minio/internal/config/policy/opa" + "github.com/minio/minio/internal/config/storageclass" + "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/admin-handlers-users.go b/cmd/admin-handlers-users.go index ee3b6a0a5..f0c60d69f 100644 --- a/cmd/admin-handlers-users.go +++ b/cmd/admin-handlers-users.go @@ -29,9 +29,9 @@ import ( "github.com/gorilla/mux" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/config/dns" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config/dns" + "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go index 8bfb98070..5451a63b9 100644 --- a/cmd/admin-handlers.go +++ b/cmd/admin-handlers.go @@ -39,15 +39,15 @@ import ( "github.com/gorilla/mux" "github.com/minio/kes" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/config" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/logger/message/log" - "github.com/minio/minio/pkg/auth" - "github.com/minio/minio/pkg/dsync" - "github.com/minio/minio/pkg/handlers" - "github.com/minio/minio/pkg/kms" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/dsync" + "github.com/minio/minio/internal/handlers" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/logger/message/log" + xnet "github.com/minio/minio/internal/net" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/admin-handlers_test.go b/cmd/admin-handlers_test.go index 861620747..e4b316594 100644 --- a/cmd/admin-handlers_test.go +++ b/cmd/admin-handlers_test.go @@ -31,7 +31,7 @@ import ( "github.com/gorilla/mux" "github.com/minio/madmin-go" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" ) // adminErasureTestBed - encapsulates subsystems that need to be setup for diff --git a/cmd/admin-heal-ops.go b/cmd/admin-heal-ops.go index 3c2006e79..c7a0ffcbf 100644 --- a/cmd/admin-heal-ops.go +++ b/cmd/admin-heal-ops.go @@ -27,7 +27,7 @@ import ( "time" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // healStatusSummary - overall short summary of a healing sequence diff --git a/cmd/admin-server-info.go b/cmd/admin-server-info.go index d2f7b164b..9abc2c5ce 100644 --- a/cmd/admin-server-info.go +++ b/cmd/admin-server-info.go @@ -24,7 +24,7 @@ import ( "time" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // getLocalServerProperty - returns madmin.ServerProperties for only the @@ -61,6 +61,9 @@ func getLocalServerProperty(endpointServerPools EndpointServerPools, r *http.Req } } + var memstats runtime.MemStats + runtime.ReadMemStats(&memstats) + props := madmin.ServerProperties{ State: string(madmin.ItemInitializing), Endpoint: addr, @@ -68,8 +71,14 @@ func getLocalServerProperty(endpointServerPools EndpointServerPools, r *http.Req Version: Version, CommitID: CommitID, Network: network, + MemStats: madmin.MemStats{ + Alloc: memstats.Alloc, + TotalAlloc: memstats.TotalAlloc, + Mallocs: memstats.Mallocs, + Frees: memstats.Frees, + HeapAlloc: memstats.HeapAlloc, + }, } - runtime.ReadMemStats(&props.MemStats) objLayer := newObjectLayerFn() if objLayer != nil && !globalIsGateway { diff --git a/cmd/api-errors.go b/cmd/api-errors.go index e47b2df3d..03e2442ed 100644 --- a/cmd/api-errors.go +++ b/cmd/api-errors.go @@ -30,17 +30,17 @@ import ( minio "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/tags" - "github.com/minio/minio/cmd/config/dns" - "github.com/minio/minio/cmd/crypto" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" - "github.com/minio/minio/pkg/bucket/lifecycle" - "github.com/minio/minio/pkg/bucket/replication" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/bucket/lifecycle" + "github.com/minio/minio/internal/bucket/replication" + "github.com/minio/minio/internal/config/dns" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/logger" - objectlock "github.com/minio/minio/pkg/bucket/object/lock" - "github.com/minio/minio/pkg/bucket/versioning" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/hash" + objectlock "github.com/minio/minio/internal/bucket/object/lock" + "github.com/minio/minio/internal/bucket/versioning" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/hash" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/api-errors_test.go b/cmd/api-errors_test.go index 018331aa2..9e8dbe6f9 100644 --- a/cmd/api-errors_test.go +++ b/cmd/api-errors_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/minio/minio/cmd/crypto" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/hash" ) var toAPIErrorTests = []struct { diff --git a/cmd/api-headers.go b/cmd/api-headers.go index ffb872545..7ab6984da 100644 --- a/cmd/api-headers.go +++ b/cmd/api-headers.go @@ -28,9 +28,9 @@ import ( "strings" "time" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/pkg/bucket/lifecycle" + "github.com/minio/minio/internal/bucket/lifecycle" + "github.com/minio/minio/internal/crypto" + xhttp "github.com/minio/minio/internal/http" ) // Returns a hexadecimal representation of time at the diff --git a/cmd/api-response.go b/cmd/api-response.go index 1f0f3c24f..fb314d5fd 100644 --- a/cmd/api-response.go +++ b/cmd/api-response.go @@ -29,9 +29,9 @@ import ( "strings" "time" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/handlers" + "github.com/minio/minio/internal/handlers" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" ) const ( diff --git a/cmd/api-router.go b/cmd/api-router.go index a7e2dc5e8..bdaab8d39 100644 --- a/cmd/api-router.go +++ b/cmd/api-router.go @@ -22,7 +22,7 @@ import ( "net/http" "github.com/gorilla/mux" - xhttp "github.com/minio/minio/cmd/http" + xhttp "github.com/minio/minio/internal/http" "github.com/minio/pkg/wildcard" "github.com/rs/cors" ) diff --git a/cmd/auth-handler.go b/cmd/auth-handler.go index c311568fb..31b7024ea 100644 --- a/cmd/auth-handler.go +++ b/cmd/auth-handler.go @@ -32,13 +32,13 @@ import ( "sync/atomic" "time" - xhttp "github.com/minio/minio/cmd/http" - xjwt "github.com/minio/minio/cmd/jwt" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" - objectlock "github.com/minio/minio/pkg/bucket/object/lock" - "github.com/minio/minio/pkg/etag" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/auth" + objectlock "github.com/minio/minio/internal/bucket/object/lock" + "github.com/minio/minio/internal/etag" + "github.com/minio/minio/internal/hash" + xhttp "github.com/minio/minio/internal/http" + xjwt "github.com/minio/minio/internal/jwt" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/auth-handler_test.go b/cmd/auth-handler_test.go index 7fb7df765..499047279 100644 --- a/cmd/auth-handler_test.go +++ b/cmd/auth-handler_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/background-heal-ops.go b/cmd/background-heal-ops.go index b1207dcf7..49bc008fc 100644 --- a/cmd/background-heal-ops.go +++ b/cmd/background-heal-ops.go @@ -22,7 +22,7 @@ import ( "time" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // 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 95a5354d9..0041ea11a 100644 --- a/cmd/background-newdisks-heal-ops.go +++ b/cmd/background-newdisks-heal-ops.go @@ -32,8 +32,8 @@ import ( "github.com/dustin/go-humanize" "github.com/minio/madmin-go" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/color" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/console" ) diff --git a/cmd/bitrot-streaming.go b/cmd/bitrot-streaming.go index daf8304d7..54300e9ec 100644 --- a/cmd/bitrot-streaming.go +++ b/cmd/bitrot-streaming.go @@ -26,9 +26,9 @@ import ( "io" "sync" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/ioutil" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/logger" ) // Calculates bitrot in chunks and writes the hash into the stream. diff --git a/cmd/bitrot-whole.go b/cmd/bitrot-whole.go index a4c6c737a..d87f5eaa4 100644 --- a/cmd/bitrot-whole.go +++ b/cmd/bitrot-whole.go @@ -23,7 +23,7 @@ import ( "hash" "io" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // Implementation to calculate bitrot for the whole file. diff --git a/cmd/bitrot.go b/cmd/bitrot.go index 607c62043..5a4a971f6 100644 --- a/cmd/bitrot.go +++ b/cmd/bitrot.go @@ -27,7 +27,7 @@ import ( "io" "github.com/minio/highwayhash" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" "golang.org/x/crypto/blake2b" ) diff --git a/cmd/bootstrap-peer-server.go b/cmd/bootstrap-peer-server.go index dd05e6b22..b528139e2 100644 --- a/cmd/bootstrap-peer-server.go +++ b/cmd/bootstrap-peer-server.go @@ -29,9 +29,9 @@ import ( "github.com/gorilla/mux" "github.com/minio/minio-go/v7/pkg/set" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/rest" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/rest" ) const ( diff --git a/cmd/bucket-encryption-handlers.go b/cmd/bucket-encryption-handlers.go index c40a6ea64..75f450d4c 100644 --- a/cmd/bucket-encryption-handlers.go +++ b/cmd/bucket-encryption-handlers.go @@ -24,7 +24,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/bucket-encryption.go b/cmd/bucket-encryption.go index d1f2d0e1a..245b2d5f1 100644 --- a/cmd/bucket-encryption.go +++ b/cmd/bucket-encryption.go @@ -21,7 +21,7 @@ import ( "errors" "io" - bucketsse "github.com/minio/minio/pkg/bucket/encryption" + bucketsse "github.com/minio/minio/internal/bucket/encryption" ) // BucketSSEConfigSys - in-memory cache of bucket encryption config diff --git a/cmd/bucket-handlers.go b/cmd/bucket-handlers.go index 3f6bc19b4..6db466dfb 100644 --- a/cmd/bucket-handlers.go +++ b/cmd/bucket-handlers.go @@ -39,17 +39,17 @@ import ( "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio-go/v7/pkg/tags" - "github.com/minio/minio/cmd/config/dns" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - objectlock "github.com/minio/minio/pkg/bucket/object/lock" - "github.com/minio/minio/pkg/bucket/replication" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/handlers" - "github.com/minio/minio/pkg/hash" - "github.com/minio/minio/pkg/kms" - "github.com/minio/minio/pkg/sync/errgroup" + objectlock "github.com/minio/minio/internal/bucket/object/lock" + "github.com/minio/minio/internal/bucket/replication" + "github.com/minio/minio/internal/config/dns" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/handlers" + "github.com/minio/minio/internal/hash" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" "github.com/minio/pkg/bucket/policy" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/bucket-handlers_test.go b/cmd/bucket-handlers_test.go index bdd3fd9fe..faee2dd1e 100644 --- a/cmd/bucket-handlers_test.go +++ b/cmd/bucket-handlers_test.go @@ -26,7 +26,7 @@ import ( "strconv" "testing" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" ) // Wrapper for calling RemoveBucket HTTP handler tests for both Erasure multiple disks and single node setup. diff --git a/cmd/bucket-lifecycle-handlers.go b/cmd/bucket-lifecycle-handlers.go index 84ca002a2..9ceeb7aa8 100644 --- a/cmd/bucket-lifecycle-handlers.go +++ b/cmd/bucket-lifecycle-handlers.go @@ -23,9 +23,9 @@ import ( "net/http" "github.com/gorilla/mux" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bucket/lifecycle" + "github.com/minio/minio/internal/bucket/lifecycle" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/bucket-lifecycle-handlers_test.go b/cmd/bucket-lifecycle-handlers_test.go index 723902d62..28f0b85bd 100644 --- a/cmd/bucket-lifecycle-handlers_test.go +++ b/cmd/bucket-lifecycle-handlers_test.go @@ -24,7 +24,7 @@ import ( "net/http/httptest" "testing" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" ) // Test S3 Bucket lifecycle APIs with wrong credentials diff --git a/cmd/bucket-lifecycle.go b/cmd/bucket-lifecycle.go index bac908e3e..ba3e62cef 100644 --- a/cmd/bucket-lifecycle.go +++ b/cmd/bucket-lifecycle.go @@ -31,12 +31,12 @@ import ( "github.com/google/uuid" "github.com/minio/minio-go/v7/pkg/tags" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - sse "github.com/minio/minio/pkg/bucket/encryption" - "github.com/minio/minio/pkg/bucket/lifecycle" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/s3select" + sse "github.com/minio/minio/internal/bucket/encryption" + "github.com/minio/minio/internal/bucket/lifecycle" + "github.com/minio/minio/internal/event" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/s3select" ) const ( diff --git a/cmd/bucket-lifecycle_test.go b/cmd/bucket-lifecycle_test.go index 52b0bc641..f278e9684 100644 --- a/cmd/bucket-lifecycle_test.go +++ b/cmd/bucket-lifecycle_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/pkg/bucket/lifecycle" + "github.com/minio/minio/internal/bucket/lifecycle" + xhttp "github.com/minio/minio/internal/http" ) // TestParseRestoreObjStatus tests parseRestoreObjStatus diff --git a/cmd/bucket-listobjects-handlers.go b/cmd/bucket-listobjects-handlers.go index 08907721a..d772ad68e 100644 --- a/cmd/bucket-listobjects-handlers.go +++ b/cmd/bucket-listobjects-handlers.go @@ -24,9 +24,9 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/sync/errgroup" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/bucket-metadata-sys.go b/cmd/bucket-metadata-sys.go index dfaa8f9ec..6ce992dbd 100644 --- a/cmd/bucket-metadata-sys.go +++ b/cmd/bucket-metadata-sys.go @@ -26,15 +26,15 @@ import ( "github.com/minio/madmin-go" "github.com/minio/minio-go/v7/pkg/tags" - "github.com/minio/minio/cmd/logger" - bucketsse "github.com/minio/minio/pkg/bucket/encryption" - "github.com/minio/minio/pkg/bucket/lifecycle" - objectlock "github.com/minio/minio/pkg/bucket/object/lock" - "github.com/minio/minio/pkg/bucket/replication" - "github.com/minio/minio/pkg/bucket/versioning" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/kms" - "github.com/minio/minio/pkg/sync/errgroup" + bucketsse "github.com/minio/minio/internal/bucket/encryption" + "github.com/minio/minio/internal/bucket/lifecycle" + objectlock "github.com/minio/minio/internal/bucket/object/lock" + "github.com/minio/minio/internal/bucket/replication" + "github.com/minio/minio/internal/bucket/versioning" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/bucket-metadata.go b/cmd/bucket-metadata.go index a69d38a32..f2142a0f3 100644 --- a/cmd/bucket-metadata.go +++ b/cmd/bucket-metadata.go @@ -31,16 +31,16 @@ import ( "github.com/minio/madmin-go" "github.com/minio/minio-go/v7/pkg/tags" - "github.com/minio/minio/cmd/crypto" - "github.com/minio/minio/cmd/logger" - bucketsse "github.com/minio/minio/pkg/bucket/encryption" - "github.com/minio/minio/pkg/bucket/lifecycle" - objectlock "github.com/minio/minio/pkg/bucket/object/lock" - "github.com/minio/minio/pkg/bucket/replication" - "github.com/minio/minio/pkg/bucket/versioning" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/fips" - "github.com/minio/minio/pkg/kms" + bucketsse "github.com/minio/minio/internal/bucket/encryption" + "github.com/minio/minio/internal/bucket/lifecycle" + objectlock "github.com/minio/minio/internal/bucket/object/lock" + "github.com/minio/minio/internal/bucket/replication" + "github.com/minio/minio/internal/bucket/versioning" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/event" + "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/sio" ) diff --git a/cmd/bucket-notification-handlers.go b/cmd/bucket-notification-handlers.go index 0af293dbe..3844fe381 100644 --- a/cmd/bucket-notification-handlers.go +++ b/cmd/bucket-notification-handlers.go @@ -24,8 +24,8 @@ import ( "reflect" "github.com/gorilla/mux" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/event" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/bucket-object-lock.go b/cmd/bucket-object-lock.go index 4844f4c49..49d17c743 100644 --- a/cmd/bucket-object-lock.go +++ b/cmd/bucket-object-lock.go @@ -22,11 +22,11 @@ import ( "math" "net/http" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" - objectlock "github.com/minio/minio/pkg/bucket/object/lock" - "github.com/minio/minio/pkg/bucket/replication" + "github.com/minio/minio/internal/auth" + objectlock "github.com/minio/minio/internal/bucket/object/lock" + "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" ) diff --git a/cmd/bucket-policy-handlers.go b/cmd/bucket-policy-handlers.go index a81feeb43..5c5fc0dc9 100644 --- a/cmd/bucket-policy-handlers.go +++ b/cmd/bucket-policy-handlers.go @@ -24,7 +24,7 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/gorilla/mux" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/bucket-policy-handlers_test.go b/cmd/bucket-policy-handlers_test.go index 7470b7d00..3614f5d73 100644 --- a/cmd/bucket-policy-handlers_test.go +++ b/cmd/bucket-policy-handlers_test.go @@ -28,7 +28,7 @@ import ( "strings" "testing" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" "github.com/minio/pkg/bucket/policy" "github.com/minio/pkg/bucket/policy/condition" ) diff --git a/cmd/bucket-policy.go b/cmd/bucket-policy.go index b94c7ba0f..5433e4ad8 100644 --- a/cmd/bucket-policy.go +++ b/cmd/bucket-policy.go @@ -27,9 +27,9 @@ import ( jsoniter "github.com/json-iterator/go" miniogopolicy "github.com/minio/minio-go/v7/pkg/policy" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/handlers" + "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" ) diff --git a/cmd/bucket-quota.go b/cmd/bucket-quota.go index 5a617537d..d0e80fb51 100644 --- a/cmd/bucket-quota.go +++ b/cmd/bucket-quota.go @@ -24,8 +24,8 @@ import ( "time" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/event" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/logger" ) // BucketQuotaSys - map of bucket and quota configuration. diff --git a/cmd/bucket-replication-stats.go b/cmd/bucket-replication-stats.go index 027e6f3ba..0e03ecfd1 100644 --- a/cmd/bucket-replication-stats.go +++ b/cmd/bucket-replication-stats.go @@ -22,7 +22,7 @@ import ( "sync" "sync/atomic" - "github.com/minio/minio/pkg/bucket/replication" + "github.com/minio/minio/internal/bucket/replication" ) func (b *BucketReplicationStats) hasReplicationUsage() bool { diff --git a/cmd/bucket-replication.go b/cmd/bucket-replication.go index b9363ca1d..b3d72fb0c 100644 --- a/cmd/bucket-replication.go +++ b/cmd/bucket-replication.go @@ -31,13 +31,13 @@ import ( miniogo "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/encrypt" "github.com/minio/minio-go/v7/pkg/tags" - "github.com/minio/minio/cmd/config/storageclass" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bucket/bandwidth" - "github.com/minio/minio/pkg/bucket/replication" - "github.com/minio/minio/pkg/event" + "github.com/minio/minio/internal/bucket/bandwidth" + "github.com/minio/minio/internal/bucket/replication" + "github.com/minio/minio/internal/config/storageclass" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/event" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/bucket-targets.go b/cmd/bucket-targets.go index d9aad9aef..828ee8368 100644 --- a/cmd/bucket-targets.go +++ b/cmd/bucket-targets.go @@ -30,10 +30,10 @@ import ( minio "github.com/minio/minio-go/v7" miniogo "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "github.com/minio/minio/cmd/crypto" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bucket/versioning" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/bucket/versioning" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" ) const ( diff --git a/cmd/bucket-versioning-handler.go b/cmd/bucket-versioning-handler.go index 60b919c90..a2087909b 100644 --- a/cmd/bucket-versioning-handler.go +++ b/cmd/bucket-versioning-handler.go @@ -24,8 +24,8 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/gorilla/mux" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bucket/versioning" + "github.com/minio/minio/internal/bucket/versioning" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/bucket-versioning.go b/cmd/bucket-versioning.go index bc819e362..33078af93 100644 --- a/cmd/bucket-versioning.go +++ b/cmd/bucket-versioning.go @@ -17,7 +17,7 @@ package cmd -import "github.com/minio/minio/pkg/bucket/versioning" +import "github.com/minio/minio/internal/bucket/versioning" // BucketVersioningSys - policy subsystem. type BucketVersioningSys struct{} diff --git a/cmd/common-main.go b/cmd/common-main.go index 5403aa553..01b2c13fb 100644 --- a/cmd/common-main.go +++ b/cmd/common-main.go @@ -40,12 +40,12 @@ import ( "github.com/minio/cli" "github.com/minio/kes" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/cmd/config" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" - "github.com/minio/minio/pkg/handlers" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/handlers" + xhttp "github.com/minio/minio/internal/http" + "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" diff --git a/cmd/config-common.go b/cmd/config-common.go index 6929e2f7d..d0465833f 100644 --- a/cmd/config-common.go +++ b/cmd/config-common.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "net/http" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/hash" ) var errConfigNotFound = errors.New("config file not found") diff --git a/cmd/config-current.go b/cmd/config-current.go index 56b7851d6..47d24be2a 100644 --- a/cmd/config-current.go +++ b/cmd/config-current.go @@ -25,24 +25,24 @@ import ( "sync" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/config/api" - "github.com/minio/minio/cmd/config/cache" - "github.com/minio/minio/cmd/config/compress" - "github.com/minio/minio/cmd/config/dns" - "github.com/minio/minio/cmd/config/etcd" - "github.com/minio/minio/cmd/config/heal" - xldap "github.com/minio/minio/cmd/config/identity/ldap" - "github.com/minio/minio/cmd/config/identity/openid" - "github.com/minio/minio/cmd/config/notify" - "github.com/minio/minio/cmd/config/policy/opa" - "github.com/minio/minio/cmd/config/scanner" - "github.com/minio/minio/cmd/config/storageclass" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/logger/target/http" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/config/api" + "github.com/minio/minio/internal/config/cache" + "github.com/minio/minio/internal/config/compress" + "github.com/minio/minio/internal/config/dns" + "github.com/minio/minio/internal/config/etcd" + "github.com/minio/minio/internal/config/heal" + xldap "github.com/minio/minio/internal/config/identity/ldap" + "github.com/minio/minio/internal/config/identity/openid" + "github.com/minio/minio/internal/config/notify" + "github.com/minio/minio/internal/config/policy/opa" + "github.com/minio/minio/internal/config/scanner" + "github.com/minio/minio/internal/config/storageclass" + "github.com/minio/minio/internal/crypto" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/logger/target/http" "github.com/minio/pkg/env" ) diff --git a/cmd/config-current_test.go b/cmd/config-current_test.go index 3fd9a7f40..ea3cda245 100644 --- a/cmd/config-current_test.go +++ b/cmd/config-current_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" ) func TestServerConfig(t *testing.T) { diff --git a/cmd/config-encrypted.go b/cmd/config-encrypted.go index 7ba1bc8ea..c09552b11 100644 --- a/cmd/config-encrypted.go +++ b/cmd/config-encrypted.go @@ -26,9 +26,9 @@ import ( "unicode/utf8" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" etcd "go.etcd.io/etcd/client/v3" ) diff --git a/cmd/config-encrypted_test.go b/cmd/config-encrypted_test.go index 37e1ffe38..4957440d4 100644 --- a/cmd/config-encrypted_test.go +++ b/cmd/config-encrypted_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/minio/madmin-go" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" ) func TestDecryptData(t *testing.T) { diff --git a/cmd/config-migrate.go b/cmd/config-migrate.go index 1281e5bee..879281adb 100644 --- a/cmd/config-migrate.go +++ b/cmd/config-migrate.go @@ -28,20 +28,20 @@ import ( "unicode/utf8" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/config/cache" - "github.com/minio/minio/cmd/config/compress" - xldap "github.com/minio/minio/cmd/config/identity/ldap" - "github.com/minio/minio/cmd/config/identity/openid" - "github.com/minio/minio/cmd/config/notify" - "github.com/minio/minio/cmd/config/policy/opa" - "github.com/minio/minio/cmd/config/storageclass" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/event/target" - "github.com/minio/minio/pkg/kms" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/config/cache" + "github.com/minio/minio/internal/config/compress" + xldap "github.com/minio/minio/internal/config/identity/ldap" + "github.com/minio/minio/internal/config/identity/openid" + "github.com/minio/minio/internal/config/notify" + "github.com/minio/minio/internal/config/policy/opa" + "github.com/minio/minio/internal/config/storageclass" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/event/target" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" "github.com/minio/pkg/quick" ) diff --git a/cmd/config-migrate_test.go b/cmd/config-migrate_test.go index badf5263f..70ecb2b4b 100644 --- a/cmd/config-migrate_test.go +++ b/cmd/config-migrate_test.go @@ -23,7 +23,7 @@ import ( "os" "testing" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" ) // Test if config v1 is purged diff --git a/cmd/config-versions.go b/cmd/config-versions.go index 2cdc833b2..2c2298c19 100644 --- a/cmd/config-versions.go +++ b/cmd/config-versions.go @@ -20,17 +20,17 @@ package cmd import ( "sync" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/config/cache" - "github.com/minio/minio/cmd/config/compress" - xldap "github.com/minio/minio/cmd/config/identity/ldap" - "github.com/minio/minio/cmd/config/identity/openid" - "github.com/minio/minio/cmd/config/notify" - "github.com/minio/minio/cmd/config/policy/opa" - "github.com/minio/minio/cmd/config/storageclass" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" - "github.com/minio/minio/pkg/event/target" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/config/cache" + "github.com/minio/minio/internal/config/compress" + xldap "github.com/minio/minio/internal/config/identity/ldap" + "github.com/minio/minio/internal/config/identity/openid" + "github.com/minio/minio/internal/config/notify" + "github.com/minio/minio/internal/config/policy/opa" + "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" ) diff --git a/cmd/config.go b/cmd/config.go index 507a883ad..18eebf1f3 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -27,8 +27,8 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/kms" ) const ( diff --git a/cmd/consolelogger.go b/cmd/consolelogger.go index 48cef46fb..0a2088b54 100644 --- a/cmd/consolelogger.go +++ b/cmd/consolelogger.go @@ -22,11 +22,11 @@ import ( "context" "sync" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/logger/message/log" - "github.com/minio/minio/cmd/logger/target/console" - xnet "github.com/minio/minio/pkg/net" - "github.com/minio/minio/pkg/pubsub" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/logger/message/log" + "github.com/minio/minio/internal/logger/target/console" + xnet "github.com/minio/minio/internal/net" + "github.com/minio/minio/internal/pubsub" ) // number of log messages to buffer diff --git a/cmd/data-scanner.go b/cmd/data-scanner.go index 7b775c764..3157eb1ac 100644 --- a/cmd/data-scanner.go +++ b/cmd/data-scanner.go @@ -33,14 +33,14 @@ import ( "github.com/bits-and-blooms/bloom/v3" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/config/heal" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/logger/message/audit" - "github.com/minio/minio/pkg/bucket/lifecycle" - "github.com/minio/minio/pkg/bucket/replication" - "github.com/minio/minio/pkg/color" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/bucket/lifecycle" + "github.com/minio/minio/internal/bucket/replication" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/config/heal" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/hash" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/logger/message/audit" "github.com/minio/pkg/console" ) diff --git a/cmd/data-update-tracker.go b/cmd/data-update-tracker.go index 774ad3dd8..8ff3bad76 100644 --- a/cmd/data-update-tracker.go +++ b/cmd/data-update-tracker.go @@ -33,8 +33,8 @@ import ( "time" "github.com/bits-and-blooms/bloom/v3" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/color" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/console" ) diff --git a/cmd/data-update-tracker_test.go b/cmd/data-update-tracker_test.go index 97563da8a..4868bd3de 100644 --- a/cmd/data-update-tracker_test.go +++ b/cmd/data-update-tracker_test.go @@ -29,8 +29,8 @@ import ( "sync" "testing" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/logger/message/log" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/logger/message/log" ) type testLoggerI interface { diff --git a/cmd/data-usage-cache.go b/cmd/data-usage-cache.go index 63f2bb782..b6ade0e6c 100644 --- a/cmd/data-usage-cache.go +++ b/cmd/data-usage-cache.go @@ -32,9 +32,9 @@ import ( "github.com/cespare/xxhash/v2" "github.com/klauspost/compress/zstd" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bucket/lifecycle" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/bucket/lifecycle" + "github.com/minio/minio/internal/hash" + "github.com/minio/minio/internal/logger" "github.com/tinylib/msgp/msgp" ) diff --git a/cmd/data-usage.go b/cmd/data-usage.go index ba7c00e27..aac8a2973 100644 --- a/cmd/data-usage.go +++ b/cmd/data-usage.go @@ -24,8 +24,8 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/hash" + "github.com/minio/minio/internal/logger" ) const ( diff --git a/cmd/disk-cache-backend.go b/cmd/disk-cache-backend.go index 995641fd1..c68732cbb 100644 --- a/cmd/disk-cache-backend.go +++ b/cmd/disk-cache-backend.go @@ -35,14 +35,14 @@ import ( "time" "github.com/djherbis/atime" - "github.com/minio/minio/cmd/config/cache" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/disk" - "github.com/minio/minio/pkg/fips" - xioutil "github.com/minio/minio/pkg/ioutil" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/config/cache" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/disk" + "github.com/minio/minio/internal/fips" + xhttp "github.com/minio/minio/internal/http" + xioutil "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" "github.com/minio/sio" ) diff --git a/cmd/disk-cache-utils.go b/cmd/disk-cache-utils.go index 307524101..0602b5d83 100644 --- a/cmd/disk-cache-utils.go +++ b/cmd/disk-cache-utils.go @@ -30,8 +30,8 @@ import ( "strings" "time" - "github.com/minio/minio/cmd/crypto" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/kms" ) // CacheStatusType - whether the request was served from cache. diff --git a/cmd/disk-cache.go b/cmd/disk-cache.go index 7b91d17c9..713083038 100644 --- a/cmd/disk-cache.go +++ b/cmd/disk-cache.go @@ -29,13 +29,13 @@ import ( "sync/atomic" "time" - "github.com/minio/minio/cmd/config/cache" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - objectlock "github.com/minio/minio/pkg/bucket/object/lock" - "github.com/minio/minio/pkg/color" - "github.com/minio/minio/pkg/hash" - "github.com/minio/minio/pkg/sync/errgroup" + objectlock "github.com/minio/minio/internal/bucket/object/lock" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/config/cache" + "github.com/minio/minio/internal/hash" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" "github.com/minio/pkg/wildcard" ) diff --git a/cmd/dummy-handlers.go b/cmd/dummy-handlers.go index d0d2828d5..2088aa5db 100644 --- a/cmd/dummy-handlers.go +++ b/cmd/dummy-handlers.go @@ -21,7 +21,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/encryption-v1.go b/cmd/encryption-v1.go index 48dc0603b..e36e918e1 100644 --- a/cmd/encryption-v1.go +++ b/cmd/encryption-v1.go @@ -33,11 +33,11 @@ import ( "strconv" "strings" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/fips" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/fips" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" "github.com/minio/sio" ) diff --git a/cmd/encryption-v1_test.go b/cmd/encryption-v1_test.go index 3c93ce272..d1195ecad 100644 --- a/cmd/encryption-v1_test.go +++ b/cmd/encryption-v1_test.go @@ -25,8 +25,8 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/minio/minio-go/v7/pkg/encrypt" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" + "github.com/minio/minio/internal/crypto" + xhttp "github.com/minio/minio/internal/http" "github.com/minio/sio" ) diff --git a/cmd/endpoint-ellipses.go b/cmd/endpoint-ellipses.go index fc8a49ca9..1fbb787dc 100644 --- a/cmd/endpoint-ellipses.go +++ b/cmd/endpoint-ellipses.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" "github.com/minio/pkg/ellipses" "github.com/minio/pkg/env" ) diff --git a/cmd/endpoint.go b/cmd/endpoint.go index 6fec355a2..45fbe229f 100644 --- a/cmd/endpoint.go +++ b/cmd/endpoint.go @@ -35,11 +35,11 @@ import ( "github.com/dustin/go-humanize" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/cmd/config" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/mountinfo" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/config" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/mountinfo" + xnet "github.com/minio/minio/internal/net" "github.com/minio/pkg/env" ) diff --git a/cmd/erasure-bucket.go b/cmd/erasure-bucket.go index 6876ba5c3..b198d5dcb 100644 --- a/cmd/erasure-bucket.go +++ b/cmd/erasure-bucket.go @@ -22,8 +22,8 @@ import ( "errors" "github.com/minio/minio-go/v7/pkg/s3utils" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" ) // list all errors that can be ignore in a bucket operation. diff --git a/cmd/erasure-coding.go b/cmd/erasure-coding.go index d3fba3fa0..f6f76b9c1 100644 --- a/cmd/erasure-coding.go +++ b/cmd/erasure-coding.go @@ -28,7 +28,7 @@ import ( "github.com/cespare/xxhash/v2" "github.com/klauspost/reedsolomon" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // Erasure - erasure encoding details. diff --git a/cmd/erasure-common.go b/cmd/erasure-common.go index ad4b1eea9..e27cbbb63 100644 --- a/cmd/erasure-common.go +++ b/cmd/erasure-common.go @@ -21,7 +21,7 @@ import ( "context" "sync" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/sync/errgroup" ) func (er erasureObjects) getLocalDisks() (localDisks []StorageAPI) { diff --git a/cmd/erasure-decode.go b/cmd/erasure-decode.go index 3f2e626e0..6fc5fdadf 100644 --- a/cmd/erasure-decode.go +++ b/cmd/erasure-decode.go @@ -24,7 +24,7 @@ import ( "sync" "sync/atomic" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // Reads in parallel from readers. diff --git a/cmd/erasure-encode.go b/cmd/erasure-encode.go index e19583f03..0082132fb 100644 --- a/cmd/erasure-encode.go +++ b/cmd/erasure-encode.go @@ -22,7 +22,7 @@ import ( "io" "sync" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // Writes in parallel to writers diff --git a/cmd/erasure-heal_test.go b/cmd/erasure-heal_test.go index 9244ead6e..af1609178 100644 --- a/cmd/erasure-heal_test.go +++ b/cmd/erasure-heal_test.go @@ -26,7 +26,7 @@ import ( "testing" humanize "github.com/dustin/go-humanize" - "github.com/minio/minio/pkg/bpool" + "github.com/minio/minio/internal/bpool" ) var erasureHealTests = []struct { diff --git a/cmd/erasure-healing.go b/cmd/erasure-healing.go index c0c3bb2d5..73b215bb6 100644 --- a/cmd/erasure-healing.go +++ b/cmd/erasure-healing.go @@ -27,8 +27,8 @@ import ( "time" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" ) // Heals a bucket if it doesn't exist on one of the disks, additionally diff --git a/cmd/erasure-lowlevel-heal.go b/cmd/erasure-lowlevel-heal.go index b586e6176..f63253c57 100644 --- a/cmd/erasure-lowlevel-heal.go +++ b/cmd/erasure-lowlevel-heal.go @@ -21,9 +21,9 @@ import ( "context" "io" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bpool" - xioutil "github.com/minio/minio/pkg/ioutil" + "github.com/minio/minio/internal/bpool" + xioutil "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/logger" ) // Heal heals the shard files on non-nil writers. Note that the quorum passed is 1 diff --git a/cmd/erasure-metadata-utils.go b/cmd/erasure-metadata-utils.go index bbeb5cc15..16ae8118b 100644 --- a/cmd/erasure-metadata-utils.go +++ b/cmd/erasure-metadata-utils.go @@ -23,8 +23,8 @@ import ( "fmt" "hash/crc32" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" ) // Returns number of errors that occurred the most (incl. nil) and the diff --git a/cmd/erasure-metadata.go b/cmd/erasure-metadata.go index bc6fd90c7..0a39c5b62 100644 --- a/cmd/erasure-metadata.go +++ b/cmd/erasure-metadata.go @@ -26,10 +26,10 @@ import ( "sort" "time" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bucket/replication" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/bucket/replication" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" ) // Object was stored with additional erasure codes due to degraded system at upload time diff --git a/cmd/erasure-multipart.go b/cmd/erasure-multipart.go index 76ebb6444..75d79a028 100644 --- a/cmd/erasure-multipart.go +++ b/cmd/erasure-multipart.go @@ -30,9 +30,9 @@ import ( "time" "github.com/minio/minio-go/v7/pkg/set" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/sync/errgroup" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" "github.com/minio/pkg/mimedb" ) diff --git a/cmd/erasure-object.go b/cmd/erasure-object.go index 594e9a721..966697989 100644 --- a/cmd/erasure-object.go +++ b/cmd/erasure-object.go @@ -31,14 +31,14 @@ import ( "github.com/minio/madmin-go" "github.com/minio/minio-go/v7/pkg/tags" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bucket/lifecycle" - "github.com/minio/minio/pkg/bucket/replication" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/hash" - xioutil "github.com/minio/minio/pkg/ioutil" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/bucket/lifecycle" + "github.com/minio/minio/internal/bucket/replication" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/hash" + xhttp "github.com/minio/minio/internal/http" + xioutil "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" "github.com/minio/pkg/mimedb" ) diff --git a/cmd/erasure-object_test.go b/cmd/erasure-object_test.go index 3a48ddd05..a760a6a8a 100644 --- a/cmd/erasure-object_test.go +++ b/cmd/erasure-object_test.go @@ -29,7 +29,7 @@ import ( "testing" humanize "github.com/dustin/go-humanize" - "github.com/minio/minio/cmd/config/storageclass" + "github.com/minio/minio/internal/config/storageclass" ) func TestRepeatPutObjectPart(t *testing.T) { diff --git a/cmd/erasure-server-pool.go b/cmd/erasure-server-pool.go index 3435f0caf..57d9fb9a2 100644 --- a/cmd/erasure-server-pool.go +++ b/cmd/erasure-server-pool.go @@ -33,9 +33,9 @@ import ( "github.com/minio/madmin-go" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio-go/v7/pkg/tags" - "github.com/minio/minio/cmd/config/storageclass" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/config/storageclass" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" "github.com/minio/pkg/wildcard" ) diff --git a/cmd/erasure-sets.go b/cmd/erasure-sets.go index 59da06421..9968b73c0 100644 --- a/cmd/erasure-sets.go +++ b/cmd/erasure-sets.go @@ -35,10 +35,10 @@ import ( "github.com/minio/madmin-go" "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio-go/v7/pkg/tags" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bpool" - "github.com/minio/minio/pkg/dsync" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/bpool" + "github.com/minio/minio/internal/dsync" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" "github.com/minio/pkg/console" "github.com/minio/pkg/env" ) diff --git a/cmd/erasure-utils.go b/cmd/erasure-utils.go index 1f9eeb9e4..a434cb94b 100644 --- a/cmd/erasure-utils.go +++ b/cmd/erasure-utils.go @@ -24,7 +24,7 @@ import ( "io" "github.com/klauspost/reedsolomon" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // getDataBlockLen - get length of data blocks from encoded blocks. diff --git a/cmd/erasure.go b/cmd/erasure.go index b5772e8be..b798f8646 100644 --- a/cmd/erasure.go +++ b/cmd/erasure.go @@ -28,11 +28,11 @@ import ( "time" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bpool" - "github.com/minio/minio/pkg/color" - "github.com/minio/minio/pkg/dsync" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/bpool" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/dsync" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" "github.com/minio/pkg/console" ) diff --git a/cmd/format-disk-cache.go b/cmd/format-disk-cache.go index dda889101..05b2bb93c 100644 --- a/cmd/format-disk-cache.go +++ b/cmd/format-disk-cache.go @@ -30,7 +30,7 @@ import ( "strings" jsoniter "github.com/json-iterator/go" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" "github.com/minio/sio" ) diff --git a/cmd/format-erasure.go b/cmd/format-erasure.go index 122dec663..2913ee6df 100644 --- a/cmd/format-erasure.go +++ b/cmd/format-erasure.go @@ -29,12 +29,12 @@ import ( "sync" humanize "github.com/dustin/go-humanize" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/config/storageclass" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/color" - xioutil "github.com/minio/minio/pkg/ioutil" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/config/storageclass" + xioutil "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" ) const ( diff --git a/cmd/format-fs.go b/cmd/format-fs.go index f0c603990..1190c622b 100644 --- a/cmd/format-fs.go +++ b/cmd/format-fs.go @@ -26,9 +26,9 @@ import ( "path" "time" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/lock" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/lock" + "github.com/minio/minio/internal/logger" ) // FS format version strings. diff --git a/cmd/fs-v1-helpers.go b/cmd/fs-v1-helpers.go index 291d1b4d2..f16948d58 100644 --- a/cmd/fs-v1-helpers.go +++ b/cmd/fs-v1-helpers.go @@ -25,8 +25,8 @@ import ( "runtime" "strings" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/lock" + "github.com/minio/minio/internal/lock" + "github.com/minio/minio/internal/logger" ) // Removes only the file at given path does not remove diff --git a/cmd/fs-v1-helpers_contrib.go b/cmd/fs-v1-helpers_contrib.go index 588009421..5d2dd13f5 100644 --- a/cmd/fs-v1-helpers_contrib.go +++ b/cmd/fs-v1-helpers_contrib.go @@ -20,7 +20,7 @@ import ( "context" "os" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // Renames source path to destination path, fails if the destination path diff --git a/cmd/fs-v1-helpers_test.go b/cmd/fs-v1-helpers_test.go index 380b062bc..219aadf48 100644 --- a/cmd/fs-v1-helpers_test.go +++ b/cmd/fs-v1-helpers_test.go @@ -25,7 +25,7 @@ import ( "path" "testing" - "github.com/minio/minio/pkg/lock" + "github.com/minio/minio/internal/lock" ) func TestFSRenameFile(t *testing.T) { diff --git a/cmd/fs-v1-metadata.go b/cmd/fs-v1-metadata.go index 474abfbc1..67698e519 100644 --- a/cmd/fs-v1-metadata.go +++ b/cmd/fs-v1-metadata.go @@ -29,9 +29,9 @@ import ( "time" jsoniter "github.com/json-iterator/go" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/lock" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/lock" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/mimedb" ) diff --git a/cmd/fs-v1-multipart.go b/cmd/fs-v1-multipart.go index 358b4d931..80f832ee4 100644 --- a/cmd/fs-v1-multipart.go +++ b/cmd/fs-v1-multipart.go @@ -31,8 +31,8 @@ import ( "time" jsoniter "github.com/json-iterator/go" - "github.com/minio/minio/cmd/logger" - xioutil "github.com/minio/minio/pkg/ioutil" + xioutil "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/trie" ) diff --git a/cmd/fs-v1-rwpool.go b/cmd/fs-v1-rwpool.go index 0be225cdc..07e6e31ac 100644 --- a/cmd/fs-v1-rwpool.go +++ b/cmd/fs-v1-rwpool.go @@ -22,8 +22,8 @@ import ( pathutil "path" "sync" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/lock" + "github.com/minio/minio/internal/lock" + "github.com/minio/minio/internal/logger" ) // fsIOPool represents a protected list to keep track of all diff --git a/cmd/fs-v1-rwpool_test.go b/cmd/fs-v1-rwpool_test.go index f9ec49e3c..d9ee6891e 100644 --- a/cmd/fs-v1-rwpool_test.go +++ b/cmd/fs-v1-rwpool_test.go @@ -22,7 +22,7 @@ import ( "runtime" "testing" - "github.com/minio/minio/pkg/lock" + "github.com/minio/minio/internal/lock" ) // Tests long path calls. diff --git a/cmd/fs-v1.go b/cmd/fs-v1.go index 5ebe26722..7b33a188d 100644 --- a/cmd/fs-v1.go +++ b/cmd/fs-v1.go @@ -37,13 +37,13 @@ import ( "github.com/minio/madmin-go" "github.com/minio/minio-go/v7/pkg/s3utils" "github.com/minio/minio-go/v7/pkg/tags" - "github.com/minio/minio/cmd/config" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/color" - xioutil "github.com/minio/minio/pkg/ioutil" - "github.com/minio/minio/pkg/lock" - "github.com/minio/minio/pkg/mountinfo" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/config" + xhttp "github.com/minio/minio/internal/http" + xioutil "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/lock" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/mountinfo" "github.com/minio/pkg/bucket/policy" "github.com/minio/pkg/mimedb" ) diff --git a/cmd/gateway-common.go b/cmd/gateway-common.go index a0f3eff89..5f039f410 100644 --- a/cmd/gateway-common.go +++ b/cmd/gateway-common.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "github.com/minio/minio/cmd/config" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/hash" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/hash" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" "github.com/minio/pkg/env" minio "github.com/minio/minio-go/v7" diff --git a/cmd/gateway-interface.go b/cmd/gateway-interface.go index 62debc91e..b18ad0326 100644 --- a/cmd/gateway-interface.go +++ b/cmd/gateway-interface.go @@ -18,7 +18,7 @@ package cmd import ( - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" ) // GatewayMinioSysTmp prefix is used in Azure/GCS gateway for save metadata sent by Initialize Multipart Upload API. diff --git a/cmd/gateway-main.go b/cmd/gateway-main.go index 6a425732b..5921186e9 100644 --- a/cmd/gateway-main.go +++ b/cmd/gateway-main.go @@ -29,9 +29,9 @@ import ( "github.com/gorilla/mux" "github.com/minio/cli" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/color" + "github.com/minio/minio/internal/color" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/certs" "github.com/minio/pkg/env" ) diff --git a/cmd/gateway-startup-msg.go b/cmd/gateway-startup-msg.go index 81253f884..b8007e59c 100644 --- a/cmd/gateway-startup-msg.go +++ b/cmd/gateway-startup-msg.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/minio/minio/pkg/color" + "github.com/minio/minio/internal/color" ) // Prints the formatted startup message. diff --git a/cmd/gateway-unsupported.go b/cmd/gateway-unsupported.go index e9b4f6956..0de6822a6 100644 --- a/cmd/gateway-unsupported.go +++ b/cmd/gateway-unsupported.go @@ -21,12 +21,12 @@ import ( "context" "errors" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" "github.com/minio/minio-go/v7/pkg/tags" - bucketsse "github.com/minio/minio/pkg/bucket/encryption" - "github.com/minio/minio/pkg/bucket/lifecycle" - "github.com/minio/minio/pkg/bucket/versioning" + bucketsse "github.com/minio/minio/internal/bucket/encryption" + "github.com/minio/minio/internal/bucket/lifecycle" + "github.com/minio/minio/internal/bucket/versioning" "github.com/minio/pkg/bucket/policy" "github.com/minio/madmin-go" diff --git a/cmd/gateway/azure/gateway-azure.go b/cmd/gateway/azure/gateway-azure.go index 9d612e5e1..b194835c3 100644 --- a/cmd/gateway/azure/gateway-azure.go +++ b/cmd/gateway/azure/gateway-azure.go @@ -43,8 +43,8 @@ import ( "github.com/minio/madmin-go" miniogopolicy "github.com/minio/minio-go/v7/pkg/policy" minio "github.com/minio/minio/cmd" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" "github.com/minio/pkg/bucket/policy/condition" "github.com/minio/pkg/env" diff --git a/cmd/gateway/gcs/gateway-gcs.go b/cmd/gateway/gcs/gateway-gcs.go index 1aa5f34f4..326943fd4 100644 --- a/cmd/gateway/gcs/gateway-gcs.go +++ b/cmd/gateway/gcs/gateway-gcs.go @@ -40,8 +40,8 @@ import ( "github.com/minio/madmin-go" miniogopolicy "github.com/minio/minio-go/v7/pkg/policy" minio "github.com/minio/minio/cmd" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" "github.com/minio/pkg/bucket/policy/condition" "github.com/minio/pkg/env" diff --git a/cmd/gateway/hdfs/gateway-hdfs.go b/cmd/gateway/hdfs/gateway-hdfs.go index 980d37455..ff52014c8 100644 --- a/cmd/gateway/hdfs/gateway-hdfs.go +++ b/cmd/gateway/hdfs/gateway-hdfs.go @@ -41,9 +41,9 @@ import ( "github.com/minio/madmin-go" "github.com/minio/minio-go/v7/pkg/s3utils" minio "github.com/minio/minio/cmd" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" "github.com/minio/pkg/env" ) diff --git a/cmd/gateway/nas/gateway-nas.go b/cmd/gateway/nas/gateway-nas.go index 830fd24ce..faa275e1b 100644 --- a/cmd/gateway/nas/gateway-nas.go +++ b/cmd/gateway/nas/gateway-nas.go @@ -22,7 +22,7 @@ import ( "github.com/minio/cli" "github.com/minio/madmin-go" minio "github.com/minio/minio/cmd" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" ) func init() { diff --git a/cmd/gateway/s3/gateway-s3-metadata.go b/cmd/gateway/s3/gateway-s3-metadata.go index 1f46b9d31..1d98073aa 100644 --- a/cmd/gateway/s3/gateway-s3-metadata.go +++ b/cmd/gateway/s3/gateway-s3-metadata.go @@ -26,8 +26,8 @@ import ( jsoniter "github.com/json-iterator/go" minio "github.com/minio/minio/cmd" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/hash" + "github.com/minio/minio/internal/logger" ) var ( diff --git a/cmd/gateway/s3/gateway-s3-sse.go b/cmd/gateway/s3/gateway-s3-sse.go index 232341d03..a16a8f80f 100644 --- a/cmd/gateway/s3/gateway-s3-sse.go +++ b/cmd/gateway/s3/gateway-s3-sse.go @@ -29,7 +29,7 @@ import ( "github.com/minio/minio-go/v7/pkg/encrypt" minio "github.com/minio/minio/cmd" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) const ( diff --git a/cmd/gateway/s3/gateway-s3.go b/cmd/gateway/s3/gateway-s3.go index 51266b6b4..556d5da3e 100644 --- a/cmd/gateway/s3/gateway-s3.go +++ b/cmd/gateway/s3/gateway-s3.go @@ -34,9 +34,9 @@ import ( "github.com/minio/minio-go/v7/pkg/s3utils" "github.com/minio/minio-go/v7/pkg/tags" minio "github.com/minio/minio/cmd" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/gateway/s3/gateway-s3_test.go b/cmd/gateway/s3/gateway-s3_test.go index 93ef4f2f0..f8ceb275a 100644 --- a/cmd/gateway/s3/gateway-s3_test.go +++ b/cmd/gateway/s3/gateway-s3_test.go @@ -21,7 +21,7 @@ import ( "testing" miniogo "github.com/minio/minio-go/v7" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/hash" minio "github.com/minio/minio/cmd" ) diff --git a/cmd/generic-handlers.go b/cmd/generic-handlers.go index fae7ae4b6..36257329b 100644 --- a/cmd/generic-handlers.go +++ b/cmd/generic-handlers.go @@ -27,11 +27,11 @@ import ( "github.com/minio/minio-go/v7/pkg/set" humanize "github.com/dustin/go-humanize" - "github.com/minio/minio/cmd/config/dns" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/http/stats" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/config/dns" + "github.com/minio/minio/internal/crypto" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/http/stats" + "github.com/minio/minio/internal/logger" ) // Adds limiting body size middleware diff --git a/cmd/generic-handlers_test.go b/cmd/generic-handlers_test.go index 2804307b0..f36a0a5d5 100644 --- a/cmd/generic-handlers_test.go +++ b/cmd/generic-handlers_test.go @@ -24,8 +24,8 @@ import ( "strconv" "testing" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" + "github.com/minio/minio/internal/crypto" + xhttp "github.com/minio/minio/internal/http" ) // Tests getRedirectLocation function for all its criteria. diff --git a/cmd/global-heal.go b/cmd/global-heal.go index eea41d4a3..d49ef780a 100644 --- a/cmd/global-heal.go +++ b/cmd/global-heal.go @@ -25,8 +25,8 @@ import ( "time" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/color" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/console" "github.com/minio/pkg/wildcard" ) diff --git a/cmd/globals.go b/cmd/globals.go index c617a621b..c7e66708c 100644 --- a/cmd/globals.go +++ b/cmd/globals.go @@ -26,24 +26,24 @@ import ( "time" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/pkg/bucket/bandwidth" - "github.com/minio/minio/pkg/handlers" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/bucket/bandwidth" + "github.com/minio/minio/internal/handlers" + "github.com/minio/minio/internal/kms" "github.com/dustin/go-humanize" - "github.com/minio/minio/cmd/config/cache" - "github.com/minio/minio/cmd/config/compress" - "github.com/minio/minio/cmd/config/dns" - xldap "github.com/minio/minio/cmd/config/identity/ldap" - "github.com/minio/minio/cmd/config/identity/openid" - "github.com/minio/minio/cmd/config/policy/opa" - "github.com/minio/minio/cmd/config/storageclass" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config/cache" + "github.com/minio/minio/internal/config/compress" + "github.com/minio/minio/internal/config/dns" + xldap "github.com/minio/minio/internal/config/identity/ldap" + "github.com/minio/minio/internal/config/identity/openid" + "github.com/minio/minio/internal/config/policy/opa" + "github.com/minio/minio/internal/config/storageclass" + xhttp "github.com/minio/minio/internal/http" etcd "go.etcd.io/etcd/client/v3" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/pubsub" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/pubsub" "github.com/minio/pkg/certs" ) diff --git a/cmd/handler-api.go b/cmd/handler-api.go index 5f80b694a..24cd31c04 100644 --- a/cmd/handler-api.go +++ b/cmd/handler-api.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/minio/minio/cmd/config/api" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/config/api" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/sys" ) diff --git a/cmd/handler-utils.go b/cmd/handler-utils.go index 38588db43..e5410b1d7 100644 --- a/cmd/handler-utils.go +++ b/cmd/handler-utils.go @@ -33,10 +33,10 @@ import ( "strings" "github.com/minio/madmin-go" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" - "github.com/minio/minio/pkg/handlers" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/handlers" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" ) const ( diff --git a/cmd/handler-utils_test.go b/cmd/handler-utils_test.go index 7e23de120..156566632 100644 --- a/cmd/handler-utils_test.go +++ b/cmd/handler-utils_test.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" ) // Tests validate bucket LocationConstraint. diff --git a/cmd/healthcheck-handler.go b/cmd/healthcheck-handler.go index f8569c2f1..821e6446b 100644 --- a/cmd/healthcheck-handler.go +++ b/cmd/healthcheck-handler.go @@ -22,7 +22,7 @@ import ( "net/http" "strconv" - xhttp "github.com/minio/minio/cmd/http" + xhttp "github.com/minio/minio/internal/http" ) const unavailable = "offline" diff --git a/cmd/healthinfo.go b/cmd/healthinfo.go index 670e6639c..254294fc9 100644 --- a/cmd/healthinfo.go +++ b/cmd/healthinfo.go @@ -24,7 +24,7 @@ import ( "sync" "github.com/minio/madmin-go" - "github.com/minio/minio/pkg/disk" + "github.com/minio/minio/internal/disk" ) // round returns value rounding to specified decimal places. diff --git a/cmd/http-stats.go b/cmd/http-stats.go index 2ecd78bba..acf57632c 100644 --- a/cmd/http-stats.go +++ b/cmd/http-stats.go @@ -23,7 +23,7 @@ import ( "sync" "sync/atomic" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" "github.com/prometheus/client_golang/prometheus" ) diff --git a/cmd/http-tracer.go b/cmd/http-tracer.go index 2a0e8af90..b728dfa8d 100644 --- a/cmd/http-tracer.go +++ b/cmd/http-tracer.go @@ -32,8 +32,8 @@ import ( "github.com/gorilla/mux" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/handlers" + "github.com/minio/minio/internal/handlers" + "github.com/minio/minio/internal/logger" jsonrpc "github.com/minio/rpc" ) diff --git a/cmd/iam-etcd-store.go b/cmd/iam-etcd-store.go index 77611962c..0ec58563f 100644 --- a/cmd/iam-etcd-store.go +++ b/cmd/iam-etcd-store.go @@ -30,10 +30,10 @@ import ( jwtgo "github.com/dgrijalva/jwt-go" jsoniter "github.com/json-iterator/go" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" "go.etcd.io/etcd/api/v3/mvccpb" etcd "go.etcd.io/etcd/client/v3" diff --git a/cmd/iam-object-store.go b/cmd/iam-object-store.go index d01be1e19..aa8318d05 100644 --- a/cmd/iam-object-store.go +++ b/cmd/iam-object-store.go @@ -26,10 +26,10 @@ import ( "unicode/utf8" jsoniter "github.com/json-iterator/go" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/iam.go b/cmd/iam.go index ba2e15799..3f0c4d1a6 100644 --- a/cmd/iam.go +++ b/cmd/iam.go @@ -32,8 +32,8 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/minio/madmin-go" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/jwt.go b/cmd/jwt.go index 725371b52..0e6fb6abb 100644 --- a/cmd/jwt.go +++ b/cmd/jwt.go @@ -24,9 +24,9 @@ import ( jwtgo "github.com/dgrijalva/jwt-go" jwtreq "github.com/dgrijalva/jwt-go/request" - xjwt "github.com/minio/minio/cmd/jwt" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + xjwt "github.com/minio/minio/internal/jwt" + "github.com/minio/minio/internal/logger" ) const ( diff --git a/cmd/jwt_test.go b/cmd/jwt_test.go index babaebcbf..7315441a9 100644 --- a/cmd/jwt_test.go +++ b/cmd/jwt_test.go @@ -22,8 +22,8 @@ import ( "os" "testing" - xjwt "github.com/minio/minio/cmd/jwt" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + xjwt "github.com/minio/minio/internal/jwt" ) func testAuthenticate(authType string, t *testing.T) { diff --git a/cmd/listen-notification-handlers.go b/cmd/listen-notification-handlers.go index a262d8d9d..8a41df37d 100644 --- a/cmd/listen-notification-handlers.go +++ b/cmd/listen-notification-handlers.go @@ -23,8 +23,8 @@ import ( "time" "github.com/gorilla/mux" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/event" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/logger" policy "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/local-locker.go b/cmd/local-locker.go index 80a90b947..8f081ab46 100644 --- a/cmd/local-locker.go +++ b/cmd/local-locker.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/minio/minio/pkg/dsync" + "github.com/minio/minio/internal/dsync" ) // lockRequesterInfo stores various info from the client for each lock that is requested. diff --git a/cmd/lock-rest-client.go b/cmd/lock-rest-client.go index e45e101b1..dc895b6c7 100644 --- a/cmd/lock-rest-client.go +++ b/cmd/lock-rest-client.go @@ -24,10 +24,10 @@ import ( "net/url" "strconv" - "github.com/minio/minio/cmd/http" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/rest" - "github.com/minio/minio/pkg/dsync" + "github.com/minio/minio/internal/dsync" + "github.com/minio/minio/internal/http" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/rest" ) // lockRESTClient is authenticable lock REST client diff --git a/cmd/lock-rest-client_test.go b/cmd/lock-rest-client_test.go index 46f9f7889..8c441da82 100644 --- a/cmd/lock-rest-client_test.go +++ b/cmd/lock-rest-client_test.go @@ -21,7 +21,7 @@ import ( "context" "testing" - "github.com/minio/minio/pkg/dsync" + "github.com/minio/minio/internal/dsync" ) // Tests lock rpc client. diff --git a/cmd/lock-rest-server-common_test.go b/cmd/lock-rest-server-common_test.go index 623695258..8d339da0c 100644 --- a/cmd/lock-rest-server-common_test.go +++ b/cmd/lock-rest-server-common_test.go @@ -23,7 +23,7 @@ import ( "sync" "testing" - "github.com/minio/minio/pkg/dsync" + "github.com/minio/minio/internal/dsync" ) // Helper function to create a lock server for testing diff --git a/cmd/lock-rest-server.go b/cmd/lock-rest-server.go index 41d0b5ab2..1d6506d42 100644 --- a/cmd/lock-rest-server.go +++ b/cmd/lock-rest-server.go @@ -27,7 +27,7 @@ import ( "time" "github.com/gorilla/mux" - "github.com/minio/minio/pkg/dsync" + "github.com/minio/minio/internal/dsync" ) const ( diff --git a/cmd/metacache-bucket.go b/cmd/metacache-bucket.go index 3123efd92..f82425e9d 100644 --- a/cmd/metacache-bucket.go +++ b/cmd/metacache-bucket.go @@ -31,8 +31,8 @@ import ( "time" "github.com/klauspost/compress/s2" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/hash" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/console" "github.com/tinylib/msgp/msgp" ) diff --git a/cmd/metacache-manager.go b/cmd/metacache-manager.go index 9ed167c4d..8b3fb350f 100644 --- a/cmd/metacache-manager.go +++ b/cmd/metacache-manager.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // localMetacacheMgr is the *local* manager for this peer. diff --git a/cmd/metacache-marker.go b/cmd/metacache-marker.go index f0b309456..a259e0f35 100644 --- a/cmd/metacache-marker.go +++ b/cmd/metacache-marker.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // markerTagVersion is the marker version. diff --git a/cmd/metacache-server-pool.go b/cmd/metacache-server-pool.go index 1c408cd7e..7829cf926 100644 --- a/cmd/metacache-server-pool.go +++ b/cmd/metacache-server-pool.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) func renameAllBucketMetacache(epPath string) error { diff --git a/cmd/metacache-set.go b/cmd/metacache-set.go index 6cade820c..f8cfa5e1d 100644 --- a/cmd/metacache-set.go +++ b/cmd/metacache-set.go @@ -31,9 +31,9 @@ import ( "time" jsoniter "github.com/json-iterator/go" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/color" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/hash" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/console" ) diff --git a/cmd/metacache-stream.go b/cmd/metacache-stream.go index b5e8601ae..5eaa14d18 100644 --- a/cmd/metacache-stream.go +++ b/cmd/metacache-stream.go @@ -27,7 +27,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/klauspost/compress/s2" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" "github.com/tinylib/msgp/msgp" "github.com/valyala/bytebufferpool" ) diff --git a/cmd/metacache-walk.go b/cmd/metacache-walk.go index 056cc40f8..010658ac5 100644 --- a/cmd/metacache-walk.go +++ b/cmd/metacache-walk.go @@ -28,9 +28,9 @@ import ( "strings" "github.com/gorilla/mux" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - xioutil "github.com/minio/minio/pkg/ioutil" + xhttp "github.com/minio/minio/internal/http" + xioutil "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/logger" ) // WalkDirOptions provides options for WalkDir operations. diff --git a/cmd/metacache.go b/cmd/metacache.go index 4e8708141..fa84693ed 100644 --- a/cmd/metacache.go +++ b/cmd/metacache.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) type scanStatus uint8 diff --git a/cmd/metrics-v2.go b/cmd/metrics-v2.go index 684f377e1..18babd41c 100644 --- a/cmd/metrics-v2.go +++ b/cmd/metrics-v2.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" dto "github.com/prometheus/client_model/go" diff --git a/cmd/metrics.go b/cmd/metrics.go index 73ae4631f..51a8338ef 100644 --- a/cmd/metrics.go +++ b/cmd/metrics.go @@ -25,7 +25,7 @@ import ( "time" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/cmd/namespace-lock.go b/cmd/namespace-lock.go index f400841a7..d111d2ff7 100644 --- a/cmd/namespace-lock.go +++ b/cmd/namespace-lock.go @@ -29,9 +29,9 @@ import ( "fmt" "time" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/dsync" - "github.com/minio/minio/pkg/lsync" + "github.com/minio/minio/internal/dsync" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/lsync" ) // local lock servers diff --git a/cmd/net.go b/cmd/net.go index ca786d9da..2b7135e02 100644 --- a/cmd/net.go +++ b/cmd/net.go @@ -26,9 +26,9 @@ import ( "strings" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/logger" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" ) // IPv4 addresses of local host. diff --git a/cmd/notification.go b/cmd/notification.go index 8a93b102c..34577da88 100644 --- a/cmd/notification.go +++ b/cmd/notification.go @@ -36,13 +36,13 @@ import ( "github.com/klauspost/compress/zip" "github.com/minio/madmin-go" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - bucketBandwidth "github.com/minio/minio/pkg/bucket/bandwidth" - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" - "github.com/minio/minio/pkg/sync/errgroup" + bucketBandwidth "github.com/minio/minio/internal/bucket/bandwidth" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/event" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" + "github.com/minio/minio/internal/sync/errgroup" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/object-api-common.go b/cmd/object-api-common.go index 0c0441d0b..99bda79ad 100644 --- a/cmd/object-api-common.go +++ b/cmd/object-api-common.go @@ -23,7 +23,7 @@ import ( "sync" humanize "github.com/dustin/go-humanize" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/sync/errgroup" ) const ( diff --git a/cmd/object-api-datatypes.go b/cmd/object-api-datatypes.go index afdf11ebf..6a5b6d9c5 100644 --- a/cmd/object-api-datatypes.go +++ b/cmd/object-api-datatypes.go @@ -24,8 +24,8 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/minio/madmin-go" - "github.com/minio/minio/pkg/bucket/replication" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/bucket/replication" + "github.com/minio/minio/internal/hash" ) // BackendType - represents different backend types. diff --git a/cmd/object-api-input-checks.go b/cmd/object-api-input-checks.go index e1d809184..a76470fe3 100644 --- a/cmd/object-api-input-checks.go +++ b/cmd/object-api-input-checks.go @@ -24,7 +24,7 @@ import ( "github.com/google/uuid" "github.com/minio/minio-go/v7/pkg/s3utils" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // Checks on GetObject arguments, bucket and object. diff --git a/cmd/object-api-multipart_test.go b/cmd/object-api-multipart_test.go index b8e81c9ba..d2390491d 100644 --- a/cmd/object-api-multipart_test.go +++ b/cmd/object-api-multipart_test.go @@ -26,7 +26,7 @@ import ( "testing" humanize "github.com/dustin/go-humanize" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/hash" ) // Wrapper for calling NewMultipartUpload tests for both Erasure multiple disks and single node setup. diff --git a/cmd/object-api-options.go b/cmd/object-api-options.go index 9a978a2ee..c956dc3cb 100644 --- a/cmd/object-api-options.go +++ b/cmd/object-api-options.go @@ -27,9 +27,9 @@ import ( "github.com/google/uuid" "github.com/minio/minio-go/v7/pkg/encrypt" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/crypto" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" ) // set encryption options for pass through to backend in the case of gateway and UserDefined metadata diff --git a/cmd/object-api-putobject_test.go b/cmd/object-api-putobject_test.go index 36811f6c0..4be2cd187 100644 --- a/cmd/object-api-putobject_test.go +++ b/cmd/object-api-putobject_test.go @@ -29,7 +29,7 @@ import ( "testing" humanize "github.com/dustin/go-humanize" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/hash" ) func md5Header(data []byte) map[string]string { diff --git a/cmd/object-api-utils.go b/cmd/object-api-utils.go index 5df429935..3197b77f8 100644 --- a/cmd/object-api-utils.go +++ b/cmd/object-api-utils.go @@ -39,14 +39,14 @@ import ( "github.com/klauspost/compress/s2" "github.com/klauspost/readahead" "github.com/minio/minio-go/v7/pkg/s3utils" - "github.com/minio/minio/cmd/config/compress" - "github.com/minio/minio/cmd/config/dns" - "github.com/minio/minio/cmd/config/storageclass" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/hash" - "github.com/minio/minio/pkg/ioutil" + "github.com/minio/minio/internal/config/compress" + "github.com/minio/minio/internal/config/dns" + "github.com/minio/minio/internal/config/storageclass" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/hash" + 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" ) diff --git a/cmd/object-api-utils_test.go b/cmd/object-api-utils_test.go index ffd12f787..ab2529746 100644 --- a/cmd/object-api-utils_test.go +++ b/cmd/object-api-utils_test.go @@ -27,8 +27,8 @@ import ( "testing" "github.com/klauspost/compress/s2" - "github.com/minio/minio/cmd/config/compress" - "github.com/minio/minio/cmd/crypto" + "github.com/minio/minio/internal/config/compress" + "github.com/minio/minio/internal/crypto" "github.com/minio/pkg/trie" ) diff --git a/cmd/object-handlers-common.go b/cmd/object-handlers-common.go index ded352a44..fbb65fcd9 100644 --- a/cmd/object-handlers-common.go +++ b/cmd/object-handlers-common.go @@ -25,8 +25,8 @@ import ( "strconv" "time" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/pkg/bucket/lifecycle" + "github.com/minio/minio/internal/bucket/lifecycle" + xhttp "github.com/minio/minio/internal/http" ) var ( diff --git a/cmd/object-handlers.go b/cmd/object-handlers.go index e3611cf48..e9c07ae1b 100644 --- a/cmd/object-handlers.go +++ b/cmd/object-handlers.go @@ -40,23 +40,23 @@ import ( "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/encrypt" "github.com/minio/minio-go/v7/pkg/tags" - "github.com/minio/minio/cmd/config/dns" - "github.com/minio/minio/cmd/config/storageclass" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bucket/lifecycle" - objectlock "github.com/minio/minio/pkg/bucket/object/lock" - "github.com/minio/minio/pkg/bucket/replication" - "github.com/minio/minio/pkg/etag" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/fips" - "github.com/minio/minio/pkg/handlers" - "github.com/minio/minio/pkg/hash" - "github.com/minio/minio/pkg/ioutil" - "github.com/minio/minio/pkg/kms" - xnet "github.com/minio/minio/pkg/net" - "github.com/minio/minio/pkg/s3select" + "github.com/minio/minio/internal/bucket/lifecycle" + objectlock "github.com/minio/minio/internal/bucket/object/lock" + "github.com/minio/minio/internal/bucket/replication" + "github.com/minio/minio/internal/config/dns" + "github.com/minio/minio/internal/config/storageclass" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/etag" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/fips" + "github.com/minio/minio/internal/handlers" + "github.com/minio/minio/internal/hash" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" + "github.com/minio/minio/internal/s3select" "github.com/minio/pkg/bucket/policy" iampolicy "github.com/minio/pkg/iam/policy" "github.com/minio/sio" diff --git a/cmd/object-handlers_test.go b/cmd/object-handlers_test.go index add6cdbf7..158fbebbb 100644 --- a/cmd/object-handlers_test.go +++ b/cmd/object-handlers_test.go @@ -38,9 +38,9 @@ import ( "testing" humanize "github.com/dustin/go-humanize" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/pkg/auth" - ioutilx "github.com/minio/minio/pkg/ioutil" + "github.com/minio/minio/internal/auth" + xhttp "github.com/minio/minio/internal/http" + ioutilx "github.com/minio/minio/internal/ioutil" ) // Type to capture different modifications to API request to simulate failure cases. diff --git a/cmd/object_api_suite_test.go b/cmd/object_api_suite_test.go index d8cb13a8b..6ad35ab6e 100644 --- a/cmd/object_api_suite_test.go +++ b/cmd/object_api_suite_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/dustin/go-humanize" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/kms" ) // Return pointer to testOneByteReadEOF{} diff --git a/cmd/os-instrumented.go b/cmd/os-instrumented.go index 184ea1407..38ab7c79d 100644 --- a/cmd/os-instrumented.go +++ b/cmd/os-instrumented.go @@ -23,7 +23,7 @@ import ( "time" "github.com/minio/madmin-go" - "github.com/minio/minio/pkg/disk" + "github.com/minio/minio/internal/disk" ) //go:generate stringer -type=osMetric -trimprefix=osMetric $GOFILE diff --git a/cmd/peer-rest-client.go b/cmd/peer-rest-client.go index 620dfb28c..25213ba8f 100644 --- a/cmd/peer-rest-client.go +++ b/cmd/peer-rest-client.go @@ -34,12 +34,12 @@ import ( "github.com/dustin/go-humanize" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/http" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/rest" - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/http" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" + "github.com/minio/minio/internal/rest" "github.com/tinylib/msgp/msgp" ) diff --git a/cmd/peer-rest-server.go b/cmd/peer-rest-server.go index 41a5a8f72..d55367899 100644 --- a/cmd/peer-rest-server.go +++ b/cmd/peer-rest-server.go @@ -31,9 +31,9 @@ import ( "github.com/gorilla/mux" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" - b "github.com/minio/minio/pkg/bucket/bandwidth" - "github.com/minio/minio/pkg/event" + b "github.com/minio/minio/internal/bucket/bandwidth" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/logger" "github.com/tinylib/msgp/msgp" ) diff --git a/cmd/prepare-storage.go b/cmd/prepare-storage.go index 8eb8d78c8..95d7597ec 100644 --- a/cmd/prepare-storage.go +++ b/cmd/prepare-storage.go @@ -29,9 +29,9 @@ import ( "time" "github.com/dustin/go-humanize" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/sync/errgroup" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/sync/errgroup" ) var printEndpointError = func() func(Endpoint, error, bool) { diff --git a/cmd/server-main.go b/cmd/server-main.go index 37662af8d..4429a688a 100644 --- a/cmd/server-main.go +++ b/cmd/server-main.go @@ -34,15 +34,15 @@ import ( "github.com/minio/cli" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/config" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/rest" - "github.com/minio/minio/pkg/auth" - "github.com/minio/minio/pkg/bucket/bandwidth" - "github.com/minio/minio/pkg/color" - "github.com/minio/minio/pkg/fips" - "github.com/minio/minio/pkg/sync/errgroup" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/bucket/bandwidth" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/fips" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/rest" + "github.com/minio/minio/internal/sync/errgroup" "github.com/minio/pkg/certs" "github.com/minio/pkg/env" ) diff --git a/cmd/server-startup-msg.go b/cmd/server-startup-msg.go index d23fad59e..00c15af70 100644 --- a/cmd/server-startup-msg.go +++ b/cmd/server-startup-msg.go @@ -26,10 +26,10 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/logger" - color "github.com/minio/minio/pkg/color" - xnet "github.com/minio/minio/pkg/net" + color "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" ) // Documentation links, these are part of message printing code. diff --git a/cmd/server_test.go b/cmd/server_test.go index e8eeaf752..ce53d48af 100644 --- a/cmd/server_test.go +++ b/cmd/server_test.go @@ -34,7 +34,7 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/minio/minio-go/v7/pkg/set" - xhttp "github.com/minio/minio/cmd/http" + xhttp "github.com/minio/minio/internal/http" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/signals.go b/cmd/signals.go index b7ececab7..5f46a0378 100644 --- a/cmd/signals.go +++ b/cmd/signals.go @@ -24,7 +24,7 @@ import ( "os" "strings" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) func handleSignals() { diff --git a/cmd/signature-v2.go b/cmd/signature-v2.go index 474a2e096..7aee99a3b 100644 --- a/cmd/signature-v2.go +++ b/cmd/signature-v2.go @@ -29,9 +29,9 @@ import ( "strconv" "strings" - xhttp "github.com/minio/minio/cmd/http" + xhttp "github.com/minio/minio/internal/http" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" ) // Whitelist resource list that will be used in query string for signature-V2 calculation. diff --git a/cmd/signature-v4-parser.go b/cmd/signature-v4-parser.go index 05fab42ba..0e8b05ce8 100644 --- a/cmd/signature-v4-parser.go +++ b/cmd/signature-v4-parser.go @@ -23,8 +23,8 @@ import ( "strings" "time" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + xhttp "github.com/minio/minio/internal/http" ) // credentialHeader data type represents structured form of Credential diff --git a/cmd/signature-v4-utils.go b/cmd/signature-v4-utils.go index 6a86883e1..7647376f0 100644 --- a/cmd/signature-v4-utils.go +++ b/cmd/signature-v4-utils.go @@ -28,9 +28,9 @@ import ( "strconv" "strings" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" ) // http Header "x-amz-content-sha256" == "UNSIGNED-PAYLOAD" indicates that the diff --git a/cmd/signature-v4-utils_test.go b/cmd/signature-v4-utils_test.go index 931c453b6..1784a7d7c 100644 --- a/cmd/signature-v4-utils_test.go +++ b/cmd/signature-v4-utils_test.go @@ -21,7 +21,7 @@ import ( "net/http" "testing" - xhttp "github.com/minio/minio/cmd/http" + xhttp "github.com/minio/minio/internal/http" ) // TestSkipContentSha256Cksum - Test validate the logic which decides whether diff --git a/cmd/signature-v4.go b/cmd/signature-v4.go index 7897ba90f..b6b70e33a 100644 --- a/cmd/signature-v4.go +++ b/cmd/signature-v4.go @@ -39,8 +39,8 @@ import ( "github.com/minio/minio-go/v7/pkg/s3utils" "github.com/minio/minio-go/v7/pkg/set" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + xhttp "github.com/minio/minio/internal/http" ) // AWS Signature Version '4' constants. diff --git a/cmd/storage-rest-client.go b/cmd/storage-rest-client.go index 9d373d182..8887502f4 100644 --- a/cmd/storage-rest-client.go +++ b/cmd/storage-rest-client.go @@ -32,10 +32,10 @@ import ( "sync" "time" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/rest" - xnet "github.com/minio/minio/pkg/net" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" + "github.com/minio/minio/internal/rest" 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 2911c6c19..f2843f0aa 100644 --- a/cmd/storage-rest-server.go +++ b/cmd/storage-rest-server.go @@ -39,11 +39,11 @@ import ( jwtreq "github.com/dgrijalva/jwt-go/request" "github.com/gorilla/mux" - "github.com/minio/minio/cmd/config" - xhttp "github.com/minio/minio/cmd/http" - xjwt "github.com/minio/minio/cmd/jwt" - "github.com/minio/minio/cmd/logger" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/config" + xhttp "github.com/minio/minio/internal/http" + xjwt "github.com/minio/minio/internal/jwt" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" ) var errDiskStale = errors.New("disk stale") diff --git a/cmd/storage-rest_test.go b/cmd/storage-rest_test.go index 5674414b5..8ee5e9063 100644 --- a/cmd/storage-rest_test.go +++ b/cmd/storage-rest_test.go @@ -26,8 +26,8 @@ import ( "testing" "github.com/gorilla/mux" - "github.com/minio/minio/cmd/config" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/config" + xnet "github.com/minio/minio/internal/net" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/cmd/streaming-signature-v4.go b/cmd/streaming-signature-v4.go index d6f35ed1a..16be98964 100644 --- a/cmd/streaming-signature-v4.go +++ b/cmd/streaming-signature-v4.go @@ -31,8 +31,8 @@ import ( "time" humanize "github.com/dustin/go-humanize" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + xhttp "github.com/minio/minio/internal/http" ) // Streaming AWS Signature Version '4' constants. diff --git a/cmd/sts-datatypes.go b/cmd/sts-datatypes.go index 1f7d7cac4..ef80431e8 100644 --- a/cmd/sts-datatypes.go +++ b/cmd/sts-datatypes.go @@ -20,7 +20,7 @@ package cmd import ( "encoding/xml" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" ) // AssumedRoleUser - The identifiers for the temporary security credentials that diff --git a/cmd/sts-errors.go b/cmd/sts-errors.go index 6bc220ce5..b87f080e1 100644 --- a/cmd/sts-errors.go +++ b/cmd/sts-errors.go @@ -22,8 +22,8 @@ import ( "encoding/xml" "net/http" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" ) // writeSTSErrorRespone writes error headers diff --git a/cmd/sts-handlers.go b/cmd/sts-handlers.go index 323ab508e..94627adc1 100644 --- a/cmd/sts-handlers.go +++ b/cmd/sts-handlers.go @@ -27,10 +27,10 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/minio/minio/cmd/config/identity/openid" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config/identity/openid" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" "github.com/minio/pkg/wildcard" ) diff --git a/cmd/test-utils_test.go b/cmd/test-utils_test.go index 5a3b48965..5844ffdf5 100644 --- a/cmd/test-utils_test.go +++ b/cmd/test-utils_test.go @@ -59,13 +59,13 @@ import ( "github.com/gorilla/mux" "github.com/minio/minio-go/v7/pkg/s3utils" "github.com/minio/minio-go/v7/pkg/signer" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/rest" - "github.com/minio/minio/pkg/auth" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/hash" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/rest" "github.com/minio/pkg/bucket/policy" ) diff --git a/cmd/tier-handlers.go b/cmd/tier-handlers.go index 17c9aba54..8d94950e7 100644 --- a/cmd/tier-handlers.go +++ b/cmd/tier-handlers.go @@ -25,7 +25,7 @@ import ( "github.com/gorilla/mux" jsoniter "github.com/json-iterator/go" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/tier-journal.go b/cmd/tier-journal.go index b3a810219..87aa5af7d 100644 --- a/cmd/tier-journal.go +++ b/cmd/tier-journal.go @@ -28,7 +28,7 @@ import ( "sync" "time" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" "github.com/tinylib/msgp/msgp" ) diff --git a/cmd/tier-sweeper.go b/cmd/tier-sweeper.go index a2abf52a7..9b5944a94 100644 --- a/cmd/tier-sweeper.go +++ b/cmd/tier-sweeper.go @@ -21,8 +21,8 @@ import ( "net/http" "strings" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/pkg/bucket/lifecycle" + "github.com/minio/minio/internal/bucket/lifecycle" + xhttp "github.com/minio/minio/internal/http" ) // objSweeper determines if a transitioned object needs to be removed from the remote tier. diff --git a/cmd/tier.go b/cmd/tier.go index e4e88c8a2..af797da65 100644 --- a/cmd/tier.go +++ b/cmd/tier.go @@ -29,9 +29,9 @@ import ( "sync" "github.com/minio/madmin-go" - "github.com/minio/minio/cmd/crypto" - "github.com/minio/minio/pkg/hash" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/hash" + "github.com/minio/minio/internal/kms" ) //go:generate msgp -file $GOFILE diff --git a/cmd/update-notifier.go b/cmd/update-notifier.go index 9338d1b55..cc726c546 100644 --- a/cmd/update-notifier.go +++ b/cmd/update-notifier.go @@ -26,7 +26,7 @@ import ( "github.com/cheggaaa/pb" humanize "github.com/dustin/go-humanize" - "github.com/minio/minio/pkg/color" + "github.com/minio/minio/internal/color" ) // prepareUpdateMessage - prepares the update message, only if a diff --git a/cmd/update-notifier_test.go b/cmd/update-notifier_test.go index c73e08c9c..799489163 100644 --- a/cmd/update-notifier_test.go +++ b/cmd/update-notifier_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/minio/minio/pkg/color" + "github.com/minio/minio/internal/color" ) // Tests update notifier string builder. diff --git a/cmd/update.go b/cmd/update.go index e29ff81ac..cb5a9bdc0 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -35,9 +35,9 @@ import ( "strings" "time" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - xnet "github.com/minio/minio/pkg/net" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" "github.com/minio/pkg/env" "github.com/minio/selfupdate" ) diff --git a/cmd/utils.go b/cmd/utils.go index 63289a546..8e8d1d1d8 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -44,10 +44,10 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/gorilla/mux" "github.com/minio/madmin-go" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/rest" - "github.com/minio/minio/pkg/handlers" + "github.com/minio/minio/internal/handlers" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/rest" "github.com/minio/pkg/certs" ) diff --git a/cmd/web-handler-context.go b/cmd/web-handler-context.go index 41236a904..4f0e578be 100644 --- a/cmd/web-handler-context.go +++ b/cmd/web-handler-context.go @@ -23,8 +23,8 @@ import ( "fmt" "net/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/handlers" + "github.com/minio/minio/internal/handlers" + "github.com/minio/minio/internal/logger" ) const ( diff --git a/cmd/web-handler-context_test.go b/cmd/web-handler-context_test.go index 0e1865675..2c36c9b00 100644 --- a/cmd/web-handler-context_test.go +++ b/cmd/web-handler-context_test.go @@ -22,7 +22,7 @@ import ( "net/http" "testing" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) func TestKeyValueMap(t *testing.T) { diff --git a/cmd/web-handlers.go b/cmd/web-handlers.go index 7868b125b..12ea6980a 100644 --- a/cmd/web-handlers.go +++ b/cmd/web-handlers.go @@ -41,19 +41,19 @@ import ( miniogopolicy "github.com/minio/minio-go/v7/pkg/policy" "github.com/minio/minio-go/v7/pkg/s3utils" - "github.com/minio/minio/cmd/config/dns" - "github.com/minio/minio/cmd/config/identity/openid" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/auth" - objectlock "github.com/minio/minio/pkg/bucket/object/lock" - "github.com/minio/minio/pkg/bucket/replication" - "github.com/minio/minio/pkg/etag" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/handlers" - "github.com/minio/minio/pkg/hash" - "github.com/minio/minio/pkg/ioutil" + "github.com/minio/minio/internal/auth" + objectlock "github.com/minio/minio/internal/bucket/object/lock" + "github.com/minio/minio/internal/bucket/replication" + "github.com/minio/minio/internal/config/dns" + "github.com/minio/minio/internal/config/identity/openid" + "github.com/minio/minio/internal/crypto" + "github.com/minio/minio/internal/etag" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/handlers" + "github.com/minio/minio/internal/hash" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/bucket/policy" iampolicy "github.com/minio/pkg/iam/policy" "github.com/minio/rpc/json2" diff --git a/cmd/web-handlers_test.go b/cmd/web-handlers_test.go index 8555f7445..fa4e27aec 100644 --- a/cmd/web-handlers_test.go +++ b/cmd/web-handlers_test.go @@ -36,8 +36,8 @@ import ( jwtgo "github.com/dgrijalva/jwt-go" humanize "github.com/dustin/go-humanize" - xjwt "github.com/minio/minio/cmd/jwt" - "github.com/minio/minio/pkg/hash" + "github.com/minio/minio/internal/hash" + xjwt "github.com/minio/minio/internal/jwt" ) // Implement a dummy flush writer. diff --git a/cmd/web-router.go b/cmd/web-router.go index 429d38392..2d50292a3 100644 --- a/cmd/web-router.go +++ b/cmd/web-router.go @@ -26,7 +26,7 @@ import ( "github.com/gorilla/mux" "github.com/minio/minio/browser" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" jsonrpc "github.com/minio/rpc" "github.com/minio/rpc/json2" ) diff --git a/cmd/xl-storage-format-v1.go b/cmd/xl-storage-format-v1.go index 9c95f20e4..dc7e2f5ad 100644 --- a/cmd/xl-storage-format-v1.go +++ b/cmd/xl-storage-format-v1.go @@ -24,7 +24,7 @@ import ( "time" jsoniter "github.com/json-iterator/go" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) // XL constants. diff --git a/cmd/xl-storage-format-v2.go b/cmd/xl-storage-format-v2.go index 5fdfbb146..9e7866c92 100644 --- a/cmd/xl-storage-format-v2.go +++ b/cmd/xl-storage-format-v2.go @@ -29,9 +29,9 @@ import ( "github.com/cespare/xxhash/v2" "github.com/google/uuid" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bucket/lifecycle" + "github.com/minio/minio/internal/bucket/lifecycle" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" "github.com/tinylib/msgp/msgp" ) diff --git a/cmd/xl-storage-format-v2_test.go b/cmd/xl-storage-format-v2_test.go index d462666d4..bf8360011 100644 --- a/cmd/xl-storage-format-v2_test.go +++ b/cmd/xl-storage-format-v2_test.go @@ -23,8 +23,8 @@ import ( "time" "github.com/google/uuid" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/pkg/bucket/lifecycle" + "github.com/minio/minio/internal/bucket/lifecycle" + xhttp "github.com/minio/minio/internal/http" ) func TestXLV2FormatData(t *testing.T) { diff --git a/cmd/xl-storage.go b/cmd/xl-storage.go index 44c8fac49..e5df9c425 100644 --- a/cmd/xl-storage.go +++ b/cmd/xl-storage.go @@ -40,13 +40,13 @@ import ( "github.com/google/uuid" jsoniter "github.com/json-iterator/go" "github.com/klauspost/readahead" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/config/storageclass" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/bucket/lifecycle" - "github.com/minio/minio/pkg/color" - "github.com/minio/minio/pkg/disk" - xioutil "github.com/minio/minio/pkg/ioutil" + "github.com/minio/minio/internal/bucket/lifecycle" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/config/storageclass" + "github.com/minio/minio/internal/disk" + xioutil "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/console" "github.com/minio/pkg/env" ) diff --git a/cmd/xl-storage_test.go b/cmd/xl-storage_test.go index 2b2b83418..0c2a7e6c8 100644 --- a/cmd/xl-storage_test.go +++ b/cmd/xl-storage_test.go @@ -31,7 +31,7 @@ import ( "syscall" "testing" - "github.com/minio/minio/cmd/config/storageclass" + "github.com/minio/minio/internal/config/storageclass" ) func TestCheckPathLength(t *testing.T) { diff --git a/docs/sts/web-identity.go b/docs/sts/web-identity.go index 1be3b3a82..023d3407e 100644 --- a/docs/sts/web-identity.go +++ b/docs/sts/web-identity.go @@ -24,7 +24,6 @@ import ( "crypto/rand" "encoding/base64" "encoding/json" - "encoding/xml" "errors" "flag" "fmt" @@ -38,37 +37,8 @@ import ( "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "github.com/minio/minio/pkg/auth" ) -// AssumedRoleUser - The identifiers for the temporary security credentials that -// the operation returns. Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumedRoleUser -type AssumedRoleUser struct { - Arn string - AssumedRoleID string `xml:"AssumeRoleId"` - // contains filtered or unexported fields -} - -// AssumeRoleWithWebIdentityResponse contains the result of successful AssumeRoleWithWebIdentity request. -type AssumeRoleWithWebIdentityResponse struct { - XMLName xml.Name `xml:"https://sts.amazonaws.com/doc/2011-06-15/ AssumeRoleWithWebIdentityResponse" json:"-"` - Result WebIdentityResult `xml:"AssumeRoleWithWebIdentityResult"` - ResponseMetadata struct { - RequestID string `xml:"RequestId,omitempty"` - } `xml:"ResponseMetadata,omitempty"` -} - -// WebIdentityResult - Contains the response to a successful AssumeRoleWithWebIdentity -// request, including temporary credentials that can be used to make MinIO API requests. -type WebIdentityResult struct { - AssumedRoleUser AssumedRoleUser `xml:",omitempty"` - Audience string `xml:",omitempty"` - Credentials auth.Credentials `xml:",omitempty"` - PackedPolicySize int `xml:",omitempty"` - Provider string `xml:",omitempty"` - SubjectFromWebIdentityToken string `xml:",omitempty"` -} - // Returns a base64 encoded random 32 byte string. func randomState() string { b := make([]byte, 32) diff --git a/go.mod b/go.mod index 99bec0f12..4d71d5250 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/minio/csvparser v1.0.0 github.com/minio/highwayhash v1.0.2 github.com/minio/kes v0.14.0 - github.com/minio/madmin-go v1.0.8 + github.com/minio/madmin-go v1.0.9 github.com/minio/minio-go/v7 v7.0.11-0.20210302210017-6ae69c73ce78 github.com/minio/parquet-go v1.0.0 github.com/minio/pkg v1.0.3 diff --git a/go.sum b/go.sum index b1d8306e6..4a8f18c8a 100644 --- a/go.sum +++ b/go.sum @@ -483,8 +483,8 @@ github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/minio/kes v0.14.0 h1:plCGm4LwR++T1P1sXsJbyFRX54CE1WRuo9PAPj6MC3Q= github.com/minio/kes v0.14.0/go.mod h1:OUensXz2BpgMfiogslKxv7Anyx/wj+6bFC6qA7BQcfA= -github.com/minio/madmin-go v1.0.8 h1:/hbeP6VqHNAk6syR8HMVVrUE0Uu1tmkDVdeY2z2WaA4= -github.com/minio/madmin-go v1.0.8/go.mod h1:BK+z4XRx7Y1v8SFWXsuLNqQqnq5BO/axJ8IDJfgyvfs= +github.com/minio/madmin-go v1.0.9 h1:zXZMppnqboIyELPirHcU6qxrnJkVwj2k7rLIB0T12sY= +github.com/minio/madmin-go v1.0.9/go.mod h1:BK+z4XRx7Y1v8SFWXsuLNqQqnq5BO/axJ8IDJfgyvfs= github.com/minio/md5-simd v1.1.0 h1:QPfiOqlZH+Cj9teu0t9b1nTBfPbyTl16Of5MeuShdK4= github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw= github.com/minio/minio-go/v7 v7.0.10/go.mod h1:td4gW1ldOsj1PbSNS+WYK43j+P1XVhX/8W8awaYlBFo= diff --git a/pkg/auth/credentials.go b/internal/auth/credentials.go similarity index 99% rename from pkg/auth/credentials.go rename to internal/auth/credentials.go index 888022c3d..ba0d28024 100644 --- a/pkg/auth/credentials.go +++ b/internal/auth/credentials.go @@ -29,7 +29,7 @@ import ( "time" jwtgo "github.com/dgrijalva/jwt-go" - "github.com/minio/minio/cmd/jwt" + "github.com/minio/minio/internal/jwt" ) const ( diff --git a/pkg/auth/credentials_test.go b/internal/auth/credentials_test.go similarity index 100% rename from pkg/auth/credentials_test.go rename to internal/auth/credentials_test.go diff --git a/pkg/bpool/bpool.go b/internal/bpool/bpool.go similarity index 100% rename from pkg/bpool/bpool.go rename to internal/bpool/bpool.go diff --git a/pkg/bpool/bpool_test.go b/internal/bpool/bpool_test.go similarity index 100% rename from pkg/bpool/bpool_test.go rename to internal/bpool/bpool_test.go diff --git a/pkg/bucket/bandwidth/measurement.go b/internal/bucket/bandwidth/measurement.go similarity index 100% rename from pkg/bucket/bandwidth/measurement.go rename to internal/bucket/bandwidth/measurement.go diff --git a/pkg/bucket/bandwidth/monitor.go b/internal/bucket/bandwidth/monitor.go similarity index 100% rename from pkg/bucket/bandwidth/monitor.go rename to internal/bucket/bandwidth/monitor.go diff --git a/pkg/bucket/bandwidth/monitor_test.go b/internal/bucket/bandwidth/monitor_test.go similarity index 100% rename from pkg/bucket/bandwidth/monitor_test.go rename to internal/bucket/bandwidth/monitor_test.go diff --git a/pkg/bucket/bandwidth/reader.go b/internal/bucket/bandwidth/reader.go similarity index 100% rename from pkg/bucket/bandwidth/reader.go rename to internal/bucket/bandwidth/reader.go diff --git a/pkg/bucket/bandwidth/throttle.go b/internal/bucket/bandwidth/throttle.go similarity index 100% rename from pkg/bucket/bandwidth/throttle.go rename to internal/bucket/bandwidth/throttle.go diff --git a/pkg/bucket/encryption/bucket-sse-config.go b/internal/bucket/encryption/bucket-sse-config.go similarity index 98% rename from pkg/bucket/encryption/bucket-sse-config.go rename to internal/bucket/encryption/bucket-sse-config.go index bfb287554..00806ea1a 100644 --- a/pkg/bucket/encryption/bucket-sse-config.go +++ b/internal/bucket/encryption/bucket-sse-config.go @@ -23,8 +23,8 @@ import ( "io" "net/http" - "github.com/minio/minio/cmd/crypto" - xhttp "github.com/minio/minio/cmd/http" + "github.com/minio/minio/internal/crypto" + xhttp "github.com/minio/minio/internal/http" ) const ( diff --git a/pkg/bucket/encryption/bucket-sse-config_test.go b/internal/bucket/encryption/bucket-sse-config_test.go similarity index 100% rename from pkg/bucket/encryption/bucket-sse-config_test.go rename to internal/bucket/encryption/bucket-sse-config_test.go diff --git a/pkg/bucket/lifecycle/action_string.go b/internal/bucket/lifecycle/action_string.go similarity index 100% rename from pkg/bucket/lifecycle/action_string.go rename to internal/bucket/lifecycle/action_string.go diff --git a/pkg/bucket/lifecycle/and.go b/internal/bucket/lifecycle/and.go similarity index 100% rename from pkg/bucket/lifecycle/and.go rename to internal/bucket/lifecycle/and.go diff --git a/pkg/bucket/lifecycle/error.go b/internal/bucket/lifecycle/error.go similarity index 100% rename from pkg/bucket/lifecycle/error.go rename to internal/bucket/lifecycle/error.go diff --git a/pkg/bucket/lifecycle/expiration.go b/internal/bucket/lifecycle/expiration.go similarity index 100% rename from pkg/bucket/lifecycle/expiration.go rename to internal/bucket/lifecycle/expiration.go diff --git a/pkg/bucket/lifecycle/expiration_test.go b/internal/bucket/lifecycle/expiration_test.go similarity index 100% rename from pkg/bucket/lifecycle/expiration_test.go rename to internal/bucket/lifecycle/expiration_test.go diff --git a/pkg/bucket/lifecycle/filter.go b/internal/bucket/lifecycle/filter.go similarity index 100% rename from pkg/bucket/lifecycle/filter.go rename to internal/bucket/lifecycle/filter.go diff --git a/pkg/bucket/lifecycle/filter_test.go b/internal/bucket/lifecycle/filter_test.go similarity index 100% rename from pkg/bucket/lifecycle/filter_test.go rename to internal/bucket/lifecycle/filter_test.go diff --git a/pkg/bucket/lifecycle/lifecycle.go b/internal/bucket/lifecycle/lifecycle.go similarity index 100% rename from pkg/bucket/lifecycle/lifecycle.go rename to internal/bucket/lifecycle/lifecycle.go diff --git a/pkg/bucket/lifecycle/lifecycle_test.go b/internal/bucket/lifecycle/lifecycle_test.go similarity index 100% rename from pkg/bucket/lifecycle/lifecycle_test.go rename to internal/bucket/lifecycle/lifecycle_test.go diff --git a/pkg/bucket/lifecycle/noncurrentversion.go b/internal/bucket/lifecycle/noncurrentversion.go similarity index 100% rename from pkg/bucket/lifecycle/noncurrentversion.go rename to internal/bucket/lifecycle/noncurrentversion.go diff --git a/pkg/bucket/lifecycle/prefix.go b/internal/bucket/lifecycle/prefix.go similarity index 100% rename from pkg/bucket/lifecycle/prefix.go rename to internal/bucket/lifecycle/prefix.go diff --git a/pkg/bucket/lifecycle/rule.go b/internal/bucket/lifecycle/rule.go similarity index 100% rename from pkg/bucket/lifecycle/rule.go rename to internal/bucket/lifecycle/rule.go diff --git a/pkg/bucket/lifecycle/rule_test.go b/internal/bucket/lifecycle/rule_test.go similarity index 100% rename from pkg/bucket/lifecycle/rule_test.go rename to internal/bucket/lifecycle/rule_test.go diff --git a/pkg/bucket/lifecycle/tag.go b/internal/bucket/lifecycle/tag.go similarity index 100% rename from pkg/bucket/lifecycle/tag.go rename to internal/bucket/lifecycle/tag.go diff --git a/pkg/bucket/lifecycle/transition.go b/internal/bucket/lifecycle/transition.go similarity index 100% rename from pkg/bucket/lifecycle/transition.go rename to internal/bucket/lifecycle/transition.go diff --git a/pkg/bucket/object/lock/lock.go b/internal/bucket/object/lock/lock.go similarity index 99% rename from pkg/bucket/object/lock/lock.go rename to internal/bucket/object/lock/lock.go index 449ef5b08..07e7696d9 100644 --- a/pkg/bucket/object/lock/lock.go +++ b/internal/bucket/object/lock/lock.go @@ -28,7 +28,7 @@ import ( "time" "github.com/beevik/ntp" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" "github.com/minio/pkg/env" ) diff --git a/pkg/bucket/object/lock/lock_test.go b/internal/bucket/object/lock/lock_test.go similarity index 99% rename from pkg/bucket/object/lock/lock_test.go rename to internal/bucket/object/lock/lock_test.go index 7682c712e..f1bf2c604 100644 --- a/pkg/bucket/object/lock/lock_test.go +++ b/internal/bucket/object/lock/lock_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - xhttp "github.com/minio/minio/cmd/http" + xhttp "github.com/minio/minio/internal/http" ) func TestParseMode(t *testing.T) { diff --git a/pkg/bucket/replication/and.go b/internal/bucket/replication/and.go similarity index 100% rename from pkg/bucket/replication/and.go rename to internal/bucket/replication/and.go diff --git a/pkg/bucket/replication/destination.go b/internal/bucket/replication/destination.go similarity index 100% rename from pkg/bucket/replication/destination.go rename to internal/bucket/replication/destination.go diff --git a/pkg/bucket/replication/error.go b/internal/bucket/replication/error.go similarity index 100% rename from pkg/bucket/replication/error.go rename to internal/bucket/replication/error.go diff --git a/pkg/bucket/replication/filter.go b/internal/bucket/replication/filter.go similarity index 100% rename from pkg/bucket/replication/filter.go rename to internal/bucket/replication/filter.go diff --git a/pkg/bucket/replication/replication.go b/internal/bucket/replication/replication.go similarity index 100% rename from pkg/bucket/replication/replication.go rename to internal/bucket/replication/replication.go diff --git a/pkg/bucket/replication/replication_test.go b/internal/bucket/replication/replication_test.go similarity index 100% rename from pkg/bucket/replication/replication_test.go rename to internal/bucket/replication/replication_test.go diff --git a/pkg/bucket/replication/rule.go b/internal/bucket/replication/rule.go similarity index 100% rename from pkg/bucket/replication/rule.go rename to internal/bucket/replication/rule.go diff --git a/pkg/bucket/replication/rule_test.go b/internal/bucket/replication/rule_test.go similarity index 100% rename from pkg/bucket/replication/rule_test.go rename to internal/bucket/replication/rule_test.go diff --git a/pkg/bucket/replication/sourceselectioncriteria.go b/internal/bucket/replication/sourceselectioncriteria.go similarity index 100% rename from pkg/bucket/replication/sourceselectioncriteria.go rename to internal/bucket/replication/sourceselectioncriteria.go diff --git a/pkg/bucket/replication/tag.go b/internal/bucket/replication/tag.go similarity index 100% rename from pkg/bucket/replication/tag.go rename to internal/bucket/replication/tag.go diff --git a/pkg/bucket/versioning/error.go b/internal/bucket/versioning/error.go similarity index 100% rename from pkg/bucket/versioning/error.go rename to internal/bucket/versioning/error.go diff --git a/pkg/bucket/versioning/versioning.go b/internal/bucket/versioning/versioning.go similarity index 100% rename from pkg/bucket/versioning/versioning.go rename to internal/bucket/versioning/versioning.go diff --git a/pkg/color/color.go b/internal/color/color.go similarity index 100% rename from pkg/color/color.go rename to internal/color/color.go diff --git a/cmd/config/api/api.go b/internal/config/api/api.go similarity index 99% rename from cmd/config/api/api.go rename to internal/config/api/api.go index 1f32cdbc1..6d529b1c3 100644 --- a/cmd/config/api/api.go +++ b/internal/config/api/api.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" "github.com/minio/pkg/env" ) diff --git a/cmd/config/api/help.go b/internal/config/api/help.go similarity index 97% rename from cmd/config/api/help.go rename to internal/config/api/help.go index e8f63d901..2e04c39d9 100644 --- a/cmd/config/api/help.go +++ b/internal/config/api/help.go @@ -17,7 +17,7 @@ package api -import "github.com/minio/minio/cmd/config" +import "github.com/minio/minio/internal/config" // Help template for storageclass feature. var ( diff --git a/cmd/config/bool-flag.go b/internal/config/bool-flag.go similarity index 100% rename from cmd/config/bool-flag.go rename to internal/config/bool-flag.go diff --git a/cmd/config/bool-flag_test.go b/internal/config/bool-flag_test.go similarity index 100% rename from cmd/config/bool-flag_test.go rename to internal/config/bool-flag_test.go diff --git a/cmd/config/cache/config.go b/internal/config/cache/config.go similarity index 99% rename from cmd/config/cache/config.go rename to internal/config/cache/config.go index 4e32aa1c0..d38c199f2 100644 --- a/cmd/config/cache/config.go +++ b/internal/config/cache/config.go @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" "github.com/minio/pkg/ellipses" ) diff --git a/cmd/config/cache/config_test.go b/internal/config/cache/config_test.go similarity index 100% rename from cmd/config/cache/config_test.go rename to internal/config/cache/config_test.go diff --git a/cmd/config/cache/help.go b/internal/config/cache/help.go similarity index 98% rename from cmd/config/cache/help.go rename to internal/config/cache/help.go index d16cec476..8083af2da 100644 --- a/cmd/config/cache/help.go +++ b/internal/config/cache/help.go @@ -17,7 +17,7 @@ package cache -import "github.com/minio/minio/cmd/config" +import "github.com/minio/minio/internal/config" // Help template for caching feature. var ( diff --git a/cmd/config/cache/legacy.go b/internal/config/cache/legacy.go similarity index 97% rename from cmd/config/cache/legacy.go rename to internal/config/cache/legacy.go index 4d9166356..5969bb29b 100644 --- a/cmd/config/cache/legacy.go +++ b/internal/config/cache/legacy.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" ) const ( diff --git a/cmd/config/cache/lookup.go b/internal/config/cache/lookup.go similarity index 99% rename from cmd/config/cache/lookup.go rename to internal/config/cache/lookup.go index eedb143f9..5a32c3592 100644 --- a/cmd/config/cache/lookup.go +++ b/internal/config/cache/lookup.go @@ -21,7 +21,7 @@ import ( "errors" "strconv" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" "github.com/minio/pkg/env" ) diff --git a/cmd/config/certs.go b/internal/config/certs.go similarity index 100% rename from cmd/config/certs.go rename to internal/config/certs.go diff --git a/cmd/config/certs_test.go b/internal/config/certs_test.go similarity index 100% rename from cmd/config/certs_test.go rename to internal/config/certs_test.go diff --git a/cmd/config/certsinfo.go b/internal/config/certsinfo.go similarity index 98% rename from cmd/config/certsinfo.go rename to internal/config/certsinfo.go index 2bb53de49..edc0ea7aa 100644 --- a/cmd/config/certsinfo.go +++ b/internal/config/certsinfo.go @@ -24,7 +24,7 @@ import ( "net/http" "strings" - color "github.com/minio/minio/pkg/color" + color "github.com/minio/minio/internal/color" ) // Extra ASN1 OIDs that we may need to handle diff --git a/cmd/config/compress/compress.go b/internal/config/compress/compress.go similarity index 99% rename from cmd/config/compress/compress.go rename to internal/config/compress/compress.go index c7481c7ab..ffd04bacf 100644 --- a/cmd/config/compress/compress.go +++ b/internal/config/compress/compress.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" "github.com/minio/pkg/env" ) diff --git a/cmd/config/compress/compress_test.go b/internal/config/compress/compress_test.go similarity index 100% rename from cmd/config/compress/compress_test.go rename to internal/config/compress/compress_test.go diff --git a/cmd/config/compress/help.go b/internal/config/compress/help.go similarity index 96% rename from cmd/config/compress/help.go rename to internal/config/compress/help.go index 2e2af6a0e..75a7fa854 100644 --- a/cmd/config/compress/help.go +++ b/internal/config/compress/help.go @@ -17,7 +17,7 @@ package compress -import "github.com/minio/minio/cmd/config" +import "github.com/minio/minio/internal/config" // Help template for compress feature. var ( diff --git a/cmd/config/compress/legacy.go b/internal/config/compress/legacy.go similarity index 97% rename from cmd/config/compress/legacy.go rename to internal/config/compress/legacy.go index 352ae7a88..15bf5f126 100644 --- a/cmd/config/compress/legacy.go +++ b/internal/config/compress/legacy.go @@ -20,7 +20,7 @@ package compress import ( "strings" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" ) // Legacy envs. diff --git a/cmd/config/config.go b/internal/config/config.go similarity index 99% rename from cmd/config/config.go rename to internal/config/config.go index 9f76cc7fa..6c17716b9 100644 --- a/cmd/config/config.go +++ b/internal/config/config.go @@ -26,7 +26,7 @@ import ( "github.com/minio/madmin-go" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/pkg/auth" + "github.com/minio/minio/internal/auth" "github.com/minio/pkg/env" ) diff --git a/cmd/config/config_test.go b/internal/config/config_test.go similarity index 100% rename from cmd/config/config_test.go rename to internal/config/config_test.go diff --git a/cmd/config/constants.go b/internal/config/constants.go similarity index 100% rename from cmd/config/constants.go rename to internal/config/constants.go diff --git a/cmd/config/crypto.go b/internal/config/crypto.go similarity index 98% rename from cmd/config/crypto.go rename to internal/config/crypto.go index 8a8ab78d4..f27b2e577 100644 --- a/cmd/config/crypto.go +++ b/internal/config/crypto.go @@ -26,8 +26,8 @@ import ( "io" jsoniter "github.com/json-iterator/go" - "github.com/minio/minio/pkg/fips" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/fips" + "github.com/minio/minio/internal/kms" "github.com/secure-io/sio-go" "github.com/secure-io/sio-go/sioutil" ) diff --git a/cmd/config/crypto_test.go b/internal/config/crypto_test.go similarity index 98% rename from cmd/config/crypto_test.go rename to internal/config/crypto_test.go index 85b4f5ab7..7c7534fc6 100644 --- a/cmd/config/crypto_test.go +++ b/internal/config/crypto_test.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "testing" - "github.com/minio/minio/pkg/kms" + "github.com/minio/minio/internal/kms" ) var encryptDecryptTests = []struct { diff --git a/cmd/config/dns/etcd_dns.go b/internal/config/dns/etcd_dns.go similarity index 100% rename from cmd/config/dns/etcd_dns.go rename to internal/config/dns/etcd_dns.go diff --git a/cmd/config/dns/operator_dns.go b/internal/config/dns/operator_dns.go similarity index 98% rename from cmd/config/dns/operator_dns.go rename to internal/config/dns/operator_dns.go index a0ae71313..0dbf802b2 100644 --- a/cmd/config/dns/operator_dns.go +++ b/internal/config/dns/operator_dns.go @@ -32,8 +32,8 @@ import ( "time" "github.com/dgrijalva/jwt-go" - "github.com/minio/minio/cmd/config" - xhttp "github.com/minio/minio/cmd/http" + "github.com/minio/minio/internal/config" + xhttp "github.com/minio/minio/internal/http" ) var ( diff --git a/cmd/config/dns/store.go b/internal/config/dns/store.go similarity index 100% rename from cmd/config/dns/store.go rename to internal/config/dns/store.go diff --git a/cmd/config/dns/types.go b/internal/config/dns/types.go similarity index 100% rename from cmd/config/dns/types.go rename to internal/config/dns/types.go diff --git a/cmd/config/errors-utils.go b/internal/config/errors-utils.go similarity index 98% rename from cmd/config/errors-utils.go rename to internal/config/errors-utils.go index 836b179d1..1ba2da979 100644 --- a/cmd/config/errors-utils.go +++ b/internal/config/errors-utils.go @@ -23,7 +23,7 @@ import ( "net" "syscall" - "github.com/minio/minio/pkg/color" + "github.com/minio/minio/internal/color" ) // Err is a structure which contains all information diff --git a/cmd/config/errors.go b/internal/config/errors.go similarity index 100% rename from cmd/config/errors.go rename to internal/config/errors.go diff --git a/cmd/config/etcd/etcd.go b/internal/config/etcd/etcd.go similarity index 98% rename from cmd/config/etcd/etcd.go rename to internal/config/etcd/etcd.go index 0f8100cc1..8831e9ab6 100644 --- a/cmd/config/etcd/etcd.go +++ b/internal/config/etcd/etcd.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "github.com/minio/minio/cmd/config" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/config" + xnet "github.com/minio/minio/internal/net" "github.com/minio/pkg/env" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/namespace" diff --git a/cmd/config/etcd/etcd_test.go b/internal/config/etcd/etcd_test.go similarity index 100% rename from cmd/config/etcd/etcd_test.go rename to internal/config/etcd/etcd_test.go diff --git a/cmd/config/etcd/help.go b/internal/config/etcd/help.go similarity index 97% rename from cmd/config/etcd/help.go rename to internal/config/etcd/help.go index 1264f7f54..670ec893b 100644 --- a/cmd/config/etcd/help.go +++ b/internal/config/etcd/help.go @@ -17,7 +17,7 @@ package etcd -import "github.com/minio/minio/cmd/config" +import "github.com/minio/minio/internal/config" // etcd config documented in default config var ( diff --git a/cmd/config/heal/heal.go b/internal/config/heal/heal.go similarity index 98% rename from cmd/config/heal/heal.go rename to internal/config/heal/heal.go index be32c5d24..e82001783 100644 --- a/cmd/config/heal/heal.go +++ b/internal/config/heal/heal.go @@ -22,7 +22,7 @@ import ( "strconv" "time" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" "github.com/minio/pkg/env" ) diff --git a/cmd/config/help.go b/internal/config/help.go similarity index 100% rename from cmd/config/help.go rename to internal/config/help.go diff --git a/cmd/config/identity/ldap/config.go b/internal/config/identity/ldap/config.go similarity index 99% rename from cmd/config/identity/ldap/config.go rename to internal/config/identity/ldap/config.go index fca835df2..3fac0dd49 100644 --- a/cmd/config/identity/ldap/config.go +++ b/internal/config/identity/ldap/config.go @@ -28,7 +28,7 @@ import ( "time" ldap "github.com/go-ldap/ldap/v3" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" "github.com/minio/pkg/env" ) diff --git a/cmd/config/identity/ldap/help.go b/internal/config/identity/ldap/help.go similarity index 98% rename from cmd/config/identity/ldap/help.go rename to internal/config/identity/ldap/help.go index b22486841..fcc1d9c8e 100644 --- a/cmd/config/identity/ldap/help.go +++ b/internal/config/identity/ldap/help.go @@ -17,7 +17,7 @@ package ldap -import "github.com/minio/minio/cmd/config" +import "github.com/minio/minio/internal/config" // Help template for LDAP identity feature. var ( diff --git a/cmd/config/identity/ldap/legacy.go b/internal/config/identity/ldap/legacy.go similarity index 96% rename from cmd/config/identity/ldap/legacy.go rename to internal/config/identity/ldap/legacy.go index 508f65124..1532e8436 100644 --- a/cmd/config/identity/ldap/legacy.go +++ b/internal/config/identity/ldap/legacy.go @@ -17,7 +17,7 @@ package ldap -import "github.com/minio/minio/cmd/config" +import "github.com/minio/minio/internal/config" // SetIdentityLDAP - One time migration code needed, for migrating from older config to new for LDAPConfig. func SetIdentityLDAP(s config.Config, ldapArgs Config) { diff --git a/cmd/config/identity/openid/ecdsa-sha3_contrib.go b/internal/config/identity/openid/ecdsa-sha3_contrib.go similarity index 100% rename from cmd/config/identity/openid/ecdsa-sha3_contrib.go rename to internal/config/identity/openid/ecdsa-sha3_contrib.go diff --git a/cmd/config/identity/openid/help.go b/internal/config/identity/openid/help.go similarity index 97% rename from cmd/config/identity/openid/help.go rename to internal/config/identity/openid/help.go index 1749c6f2c..ba391df2d 100644 --- a/cmd/config/identity/openid/help.go +++ b/internal/config/identity/openid/help.go @@ -17,7 +17,7 @@ package openid -import "github.com/minio/minio/cmd/config" +import "github.com/minio/minio/internal/config" // Help template for OpenID identity feature. var ( diff --git a/cmd/config/identity/openid/jwks.go b/internal/config/identity/openid/jwks.go similarity index 100% rename from cmd/config/identity/openid/jwks.go rename to internal/config/identity/openid/jwks.go diff --git a/cmd/config/identity/openid/jwks_test.go b/internal/config/identity/openid/jwks_test.go similarity index 100% rename from cmd/config/identity/openid/jwks_test.go rename to internal/config/identity/openid/jwks_test.go diff --git a/cmd/config/identity/openid/jwt.go b/internal/config/identity/openid/jwt.go similarity index 98% rename from cmd/config/identity/openid/jwt.go rename to internal/config/identity/openid/jwt.go index 64aaa72b4..a5ef7427f 100644 --- a/cmd/config/identity/openid/jwt.go +++ b/internal/config/identity/openid/jwt.go @@ -30,9 +30,9 @@ import ( "time" jwtgo "github.com/dgrijalva/jwt-go" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/pkg/auth" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/auth" + "github.com/minio/minio/internal/config" + xnet "github.com/minio/minio/internal/net" "github.com/minio/pkg/env" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/config/identity/openid/jwt_test.go b/internal/config/identity/openid/jwt_test.go similarity index 99% rename from cmd/config/identity/openid/jwt_test.go rename to internal/config/identity/openid/jwt_test.go index 30b00c59f..63be13f38 100644 --- a/cmd/config/identity/openid/jwt_test.go +++ b/internal/config/identity/openid/jwt_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - xnet "github.com/minio/minio/pkg/net" + xnet "github.com/minio/minio/internal/net" ) func TestUpdateClaimsExpiry(t *testing.T) { diff --git a/cmd/config/identity/openid/legacy.go b/internal/config/identity/openid/legacy.go similarity index 96% rename from cmd/config/identity/openid/legacy.go rename to internal/config/identity/openid/legacy.go index 629a40895..b92ae75db 100644 --- a/cmd/config/identity/openid/legacy.go +++ b/internal/config/identity/openid/legacy.go @@ -17,7 +17,7 @@ package openid -import "github.com/minio/minio/cmd/config" +import "github.com/minio/minio/internal/config" // Legacy envs const ( diff --git a/cmd/config/identity/openid/rsa-sha3_contrib.go b/internal/config/identity/openid/rsa-sha3_contrib.go similarity index 100% rename from cmd/config/identity/openid/rsa-sha3_contrib.go rename to internal/config/identity/openid/rsa-sha3_contrib.go diff --git a/cmd/config/identity/openid/validators.go b/internal/config/identity/openid/validators.go similarity index 100% rename from cmd/config/identity/openid/validators.go rename to internal/config/identity/openid/validators.go diff --git a/cmd/config/identity/openid/validators_test.go b/internal/config/identity/openid/validators_test.go similarity index 98% rename from cmd/config/identity/openid/validators_test.go rename to internal/config/identity/openid/validators_test.go index a3f671795..1761be5a6 100644 --- a/cmd/config/identity/openid/validators_test.go +++ b/internal/config/identity/openid/validators_test.go @@ -22,7 +22,7 @@ import ( "net/http/httptest" "testing" - xnet "github.com/minio/minio/pkg/net" + xnet "github.com/minio/minio/internal/net" ) type errorValidator struct{} diff --git a/cmd/config/legacy.go b/internal/config/legacy.go similarity index 97% rename from cmd/config/legacy.go rename to internal/config/legacy.go index c3e89c930..5afde7a8d 100644 --- a/cmd/config/legacy.go +++ b/internal/config/legacy.go @@ -17,7 +17,7 @@ package config -import "github.com/minio/minio/pkg/auth" +import "github.com/minio/minio/internal/auth" //// One time migration code section diff --git a/cmd/config/logger.go b/internal/config/logger.go similarity index 100% rename from cmd/config/logger.go rename to internal/config/logger.go diff --git a/cmd/config/notify/config.go b/internal/config/notify/config.go similarity index 98% rename from cmd/config/notify/config.go rename to internal/config/notify/config.go index 29d20e295..cfb852c99 100644 --- a/cmd/config/notify/config.go +++ b/internal/config/notify/config.go @@ -18,7 +18,7 @@ package notify import ( - "github.com/minio/minio/pkg/event/target" + "github.com/minio/minio/internal/event/target" ) // Config - notification target configuration structure, holds diff --git a/cmd/config/notify/help.go b/internal/config/notify/help.go similarity index 99% rename from cmd/config/notify/help.go rename to internal/config/notify/help.go index 16ae2bac0..95881c74e 100644 --- a/cmd/config/notify/help.go +++ b/internal/config/notify/help.go @@ -18,8 +18,8 @@ package notify import ( - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/pkg/event/target" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/event/target" ) const ( diff --git a/cmd/config/notify/legacy.go b/internal/config/notify/legacy.go similarity index 99% rename from cmd/config/notify/legacy.go rename to internal/config/notify/legacy.go index 1e22e62be..c92d9d801 100644 --- a/cmd/config/notify/legacy.go +++ b/internal/config/notify/legacy.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/pkg/event/target" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/event/target" ) // SetNotifyKafka - helper for config migration from older config. diff --git a/cmd/config/notify/parse.go b/internal/config/notify/parse.go similarity index 99% rename from cmd/config/notify/parse.go rename to internal/config/notify/parse.go index 83b4ae3e4..1d5cb5d3d 100644 --- a/cmd/config/notify/parse.go +++ b/internal/config/notify/parse.go @@ -27,11 +27,11 @@ import ( "strings" "time" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/event" - "github.com/minio/minio/pkg/event/target" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/event" + "github.com/minio/minio/internal/event/target" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" "github.com/minio/pkg/env" ) diff --git a/cmd/config/policy/opa/config.go b/internal/config/policy/opa/config.go similarity index 98% rename from cmd/config/policy/opa/config.go rename to internal/config/policy/opa/config.go index 8b86847ca..cef08c0e1 100644 --- a/cmd/config/policy/opa/config.go +++ b/internal/config/policy/opa/config.go @@ -24,8 +24,8 @@ import ( "io/ioutil" "net/http" - "github.com/minio/minio/cmd/config" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/config" + xnet "github.com/minio/minio/internal/net" "github.com/minio/pkg/env" iampolicy "github.com/minio/pkg/iam/policy" ) diff --git a/cmd/config/policy/opa/help.go b/internal/config/policy/opa/help.go similarity index 96% rename from cmd/config/policy/opa/help.go rename to internal/config/policy/opa/help.go index 77b2fb2e8..18a09e408 100644 --- a/cmd/config/policy/opa/help.go +++ b/internal/config/policy/opa/help.go @@ -17,7 +17,7 @@ package opa -import "github.com/minio/minio/cmd/config" +import "github.com/minio/minio/internal/config" // Help template for OPA policy feature. var ( diff --git a/cmd/config/policy/opa/legacy.go b/internal/config/policy/opa/legacy.go similarity index 97% rename from cmd/config/policy/opa/legacy.go rename to internal/config/policy/opa/legacy.go index b01f21ff1..b0055e53d 100644 --- a/cmd/config/policy/opa/legacy.go +++ b/internal/config/policy/opa/legacy.go @@ -18,7 +18,7 @@ package opa import ( - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" ) // Legacy OPA envs diff --git a/cmd/config/scanner/scanner.go b/internal/config/scanner/scanner.go similarity index 98% rename from cmd/config/scanner/scanner.go rename to internal/config/scanner/scanner.go index 5db137250..d4c891a9c 100644 --- a/cmd/config/scanner/scanner.go +++ b/internal/config/scanner/scanner.go @@ -21,7 +21,7 @@ import ( "strconv" "time" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" "github.com/minio/pkg/env" ) diff --git a/cmd/config/storageclass/help.go b/internal/config/storageclass/help.go similarity index 97% rename from cmd/config/storageclass/help.go rename to internal/config/storageclass/help.go index 7f2c66887..f3c4df970 100644 --- a/cmd/config/storageclass/help.go +++ b/internal/config/storageclass/help.go @@ -17,7 +17,7 @@ package storageclass -import "github.com/minio/minio/cmd/config" +import "github.com/minio/minio/internal/config" // Help template for storageclass feature. var ( diff --git a/cmd/config/storageclass/legacy.go b/internal/config/storageclass/legacy.go similarity index 96% rename from cmd/config/storageclass/legacy.go rename to internal/config/storageclass/legacy.go index 1ac94d1e0..447e97623 100644 --- a/cmd/config/storageclass/legacy.go +++ b/internal/config/storageclass/legacy.go @@ -18,7 +18,7 @@ package storageclass import ( - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" ) // SetStorageClass - One time migration code needed, for migrating from older config to new for StorageClass. diff --git a/cmd/config/storageclass/storage-class.go b/internal/config/storageclass/storage-class.go similarity index 99% rename from cmd/config/storageclass/storage-class.go rename to internal/config/storageclass/storage-class.go index fbe19ff94..5619c0331 100644 --- a/cmd/config/storageclass/storage-class.go +++ b/internal/config/storageclass/storage-class.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" "github.com/minio/pkg/env" ) diff --git a/cmd/config/storageclass/storage-class_test.go b/internal/config/storageclass/storage-class_test.go similarity index 100% rename from cmd/config/storageclass/storage-class_test.go rename to internal/config/storageclass/storage-class_test.go diff --git a/cmd/crypto/auto-encryption.go b/internal/crypto/auto-encryption.go similarity index 97% rename from cmd/crypto/auto-encryption.go rename to internal/crypto/auto-encryption.go index 7606bcb35..6a0d93615 100644 --- a/cmd/crypto/auto-encryption.go +++ b/internal/crypto/auto-encryption.go @@ -18,7 +18,7 @@ package crypto import ( - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" "github.com/minio/pkg/env" ) diff --git a/cmd/crypto/doc.go b/internal/crypto/doc.go similarity index 100% rename from cmd/crypto/doc.go rename to internal/crypto/doc.go diff --git a/cmd/crypto/error.go b/internal/crypto/error.go similarity index 100% rename from cmd/crypto/error.go rename to internal/crypto/error.go diff --git a/cmd/crypto/header.go b/internal/crypto/header.go similarity index 98% rename from cmd/crypto/header.go rename to internal/crypto/header.go index 0ab384782..58903c46a 100644 --- a/cmd/crypto/header.go +++ b/internal/crypto/header.go @@ -23,7 +23,7 @@ import ( "encoding/base64" "net/http" - xhttp "github.com/minio/minio/cmd/http" + xhttp "github.com/minio/minio/internal/http" ) // RemoveSensitiveHeaders removes confidential encryption diff --git a/cmd/crypto/header_test.go b/internal/crypto/header_test.go similarity index 99% rename from cmd/crypto/header_test.go rename to internal/crypto/header_test.go index bbd1646b2..02ab3cd8a 100644 --- a/cmd/crypto/header_test.go +++ b/internal/crypto/header_test.go @@ -23,7 +23,7 @@ import ( "sort" "testing" - xhttp "github.com/minio/minio/cmd/http" + xhttp "github.com/minio/minio/internal/http" ) func TestIsRequested(t *testing.T) { diff --git a/cmd/crypto/key.go b/internal/crypto/key.go similarity index 98% rename from cmd/crypto/key.go rename to internal/crypto/key.go index c7bbec6d0..3fc247386 100644 --- a/cmd/crypto/key.go +++ b/internal/crypto/key.go @@ -28,8 +28,8 @@ import ( "io" "path" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/fips" + "github.com/minio/minio/internal/fips" + "github.com/minio/minio/internal/logger" "github.com/minio/sio" ) diff --git a/cmd/crypto/key_test.go b/internal/crypto/key_test.go similarity index 99% rename from cmd/crypto/key_test.go rename to internal/crypto/key_test.go index 18578594f..f924fa438 100644 --- a/cmd/crypto/key_test.go +++ b/internal/crypto/key_test.go @@ -24,7 +24,7 @@ import ( "io" "testing" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) var shortRandom = func(limit int64) io.Reader { return io.LimitReader(rand.Reader, limit) } diff --git a/cmd/crypto/metadata.go b/internal/crypto/metadata.go similarity index 99% rename from cmd/crypto/metadata.go rename to internal/crypto/metadata.go index d34a0a04d..68867fcc3 100644 --- a/cmd/crypto/metadata.go +++ b/internal/crypto/metadata.go @@ -18,7 +18,7 @@ package crypto import ( - xhttp "github.com/minio/minio/cmd/http" + xhttp "github.com/minio/minio/internal/http" ) const ( diff --git a/cmd/crypto/metadata_test.go b/internal/crypto/metadata_test.go similarity index 99% rename from cmd/crypto/metadata_test.go rename to internal/crypto/metadata_test.go index ffec38039..96d46af75 100644 --- a/cmd/crypto/metadata_test.go +++ b/internal/crypto/metadata_test.go @@ -23,7 +23,7 @@ import ( "encoding/hex" "testing" - "github.com/minio/minio/cmd/logger" + "github.com/minio/minio/internal/logger" ) var isMultipartTests = []struct { diff --git a/cmd/crypto/sse-c.go b/internal/crypto/sse-c.go similarity index 98% rename from cmd/crypto/sse-c.go rename to internal/crypto/sse-c.go index ee1597578..9e86d96fe 100644 --- a/cmd/crypto/sse-c.go +++ b/internal/crypto/sse-c.go @@ -24,8 +24,8 @@ import ( "encoding/base64" "net/http" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" ) type ssec struct{} diff --git a/cmd/crypto/sse-kms.go b/internal/crypto/sse-kms.go similarity index 98% rename from cmd/crypto/sse-kms.go rename to internal/crypto/sse-kms.go index 485919efc..7c0aa8f83 100644 --- a/cmd/crypto/sse-kms.go +++ b/internal/crypto/sse-kms.go @@ -26,9 +26,9 @@ import ( "strings" jsoniter "github.com/json-iterator/go" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/kms" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" ) type ssekms struct{} diff --git a/cmd/crypto/sse-s3.go b/internal/crypto/sse-s3.go similarity index 98% rename from cmd/crypto/sse-s3.go rename to internal/crypto/sse-s3.go index 7fc50bc90..2091b357f 100644 --- a/cmd/crypto/sse-s3.go +++ b/internal/crypto/sse-s3.go @@ -25,9 +25,9 @@ import ( "path" "strings" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/kms" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/kms" + "github.com/minio/minio/internal/logger" ) type sses3 struct{} diff --git a/cmd/crypto/sse.go b/internal/crypto/sse.go similarity index 97% rename from cmd/crypto/sse.go rename to internal/crypto/sse.go index 0f7ecab5a..59635d835 100644 --- a/cmd/crypto/sse.go +++ b/internal/crypto/sse.go @@ -24,9 +24,9 @@ import ( "io" "net/http" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/pkg/fips" - "github.com/minio/minio/pkg/ioutil" + "github.com/minio/minio/internal/fips" + "github.com/minio/minio/internal/ioutil" + "github.com/minio/minio/internal/logger" "github.com/minio/sio" ) diff --git a/cmd/crypto/sse_test.go b/internal/crypto/sse_test.go similarity index 100% rename from cmd/crypto/sse_test.go rename to internal/crypto/sse_test.go diff --git a/pkg/disk/directio_darwin.go b/internal/disk/directio_darwin.go similarity index 100% rename from pkg/disk/directio_darwin.go rename to internal/disk/directio_darwin.go diff --git a/pkg/disk/directio_unix.go b/internal/disk/directio_unix.go similarity index 100% rename from pkg/disk/directio_unix.go rename to internal/disk/directio_unix.go diff --git a/pkg/disk/directio_unsupported.go b/internal/disk/directio_unsupported.go similarity index 100% rename from pkg/disk/directio_unsupported.go rename to internal/disk/directio_unsupported.go diff --git a/pkg/disk/disk.go b/internal/disk/disk.go similarity index 100% rename from pkg/disk/disk.go rename to internal/disk/disk.go diff --git a/pkg/disk/disk_test.go b/internal/disk/disk_test.go similarity index 96% rename from pkg/disk/disk_test.go rename to internal/disk/disk_test.go index ec1b197d4..eafe08fa4 100644 --- a/pkg/disk/disk_test.go +++ b/internal/disk/disk_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/minio/minio/pkg/disk" + "github.com/minio/minio/internal/disk" ) func TestFree(t *testing.T) { diff --git a/pkg/disk/disk_unix.go b/internal/disk/disk_unix.go similarity index 100% rename from pkg/disk/disk_unix.go rename to internal/disk/disk_unix.go diff --git a/pkg/disk/disk_windows.go b/internal/disk/disk_windows.go similarity index 100% rename from pkg/disk/disk_windows.go rename to internal/disk/disk_windows.go diff --git a/pkg/disk/fdatasync_linux.go b/internal/disk/fdatasync_linux.go similarity index 100% rename from pkg/disk/fdatasync_linux.go rename to internal/disk/fdatasync_linux.go diff --git a/pkg/disk/fdatasync_unix.go b/internal/disk/fdatasync_unix.go similarity index 100% rename from pkg/disk/fdatasync_unix.go rename to internal/disk/fdatasync_unix.go diff --git a/pkg/disk/fdatasync_unsupported.go b/internal/disk/fdatasync_unsupported.go similarity index 100% rename from pkg/disk/fdatasync_unsupported.go rename to internal/disk/fdatasync_unsupported.go diff --git a/pkg/disk/health.go b/internal/disk/health.go similarity index 100% rename from pkg/disk/health.go rename to internal/disk/health.go diff --git a/pkg/disk/root_disk.go b/internal/disk/root_disk.go similarity index 100% rename from pkg/disk/root_disk.go rename to internal/disk/root_disk.go diff --git a/pkg/disk/stat_bsd.go b/internal/disk/stat_bsd.go similarity index 100% rename from pkg/disk/stat_bsd.go rename to internal/disk/stat_bsd.go diff --git a/pkg/disk/stat_freebsd.go b/internal/disk/stat_freebsd.go similarity index 100% rename from pkg/disk/stat_freebsd.go rename to internal/disk/stat_freebsd.go diff --git a/pkg/disk/stat_linux.go b/internal/disk/stat_linux.go similarity index 100% rename from pkg/disk/stat_linux.go rename to internal/disk/stat_linux.go diff --git a/pkg/disk/stat_linux_32bit.go b/internal/disk/stat_linux_32bit.go similarity index 100% rename from pkg/disk/stat_linux_32bit.go rename to internal/disk/stat_linux_32bit.go diff --git a/pkg/disk/stat_linux_s390x.go b/internal/disk/stat_linux_s390x.go similarity index 100% rename from pkg/disk/stat_linux_s390x.go rename to internal/disk/stat_linux_s390x.go diff --git a/pkg/disk/stat_netbsd.go b/internal/disk/stat_netbsd.go similarity index 100% rename from pkg/disk/stat_netbsd.go rename to internal/disk/stat_netbsd.go diff --git a/pkg/disk/stat_openbsd.go b/internal/disk/stat_openbsd.go similarity index 100% rename from pkg/disk/stat_openbsd.go rename to internal/disk/stat_openbsd.go diff --git a/pkg/disk/stat_solaris.go b/internal/disk/stat_solaris.go similarity index 100% rename from pkg/disk/stat_solaris.go rename to internal/disk/stat_solaris.go diff --git a/pkg/disk/stat_windows.go b/internal/disk/stat_windows.go similarity index 100% rename from pkg/disk/stat_windows.go rename to internal/disk/stat_windows.go diff --git a/pkg/disk/type_bsd.go b/internal/disk/type_bsd.go similarity index 100% rename from pkg/disk/type_bsd.go rename to internal/disk/type_bsd.go diff --git a/pkg/disk/type_linux.go b/internal/disk/type_linux.go similarity index 100% rename from pkg/disk/type_linux.go rename to internal/disk/type_linux.go diff --git a/pkg/disk/type_windows.go b/internal/disk/type_windows.go similarity index 100% rename from pkg/disk/type_windows.go rename to internal/disk/type_windows.go diff --git a/pkg/dsync/.gitignore b/internal/dsync/.gitignore similarity index 100% rename from pkg/dsync/.gitignore rename to internal/dsync/.gitignore diff --git a/pkg/dsync/drwmutex.go b/internal/dsync/drwmutex.go similarity index 100% rename from pkg/dsync/drwmutex.go rename to internal/dsync/drwmutex.go diff --git a/pkg/dsync/drwmutex_test.go b/internal/dsync/drwmutex_test.go similarity index 100% rename from pkg/dsync/drwmutex_test.go rename to internal/dsync/drwmutex_test.go diff --git a/pkg/dsync/dsync-server_test.go b/internal/dsync/dsync-server_test.go similarity index 100% rename from pkg/dsync/dsync-server_test.go rename to internal/dsync/dsync-server_test.go diff --git a/pkg/dsync/dsync.go b/internal/dsync/dsync.go similarity index 100% rename from pkg/dsync/dsync.go rename to internal/dsync/dsync.go diff --git a/pkg/dsync/dsync_test.go b/internal/dsync/dsync_test.go similarity index 100% rename from pkg/dsync/dsync_test.go rename to internal/dsync/dsync_test.go diff --git a/pkg/dsync/rpc-client-impl_test.go b/internal/dsync/rpc-client-impl_test.go similarity index 100% rename from pkg/dsync/rpc-client-impl_test.go rename to internal/dsync/rpc-client-impl_test.go diff --git a/pkg/dsync/rpc-client-interface.go b/internal/dsync/rpc-client-interface.go similarity index 100% rename from pkg/dsync/rpc-client-interface.go rename to internal/dsync/rpc-client-interface.go diff --git a/pkg/etag/etag.go b/internal/etag/etag.go similarity index 100% rename from pkg/etag/etag.go rename to internal/etag/etag.go diff --git a/pkg/etag/etag_test.go b/internal/etag/etag_test.go similarity index 100% rename from pkg/etag/etag_test.go rename to internal/etag/etag_test.go diff --git a/pkg/etag/reader.go b/internal/etag/reader.go similarity index 100% rename from pkg/etag/reader.go rename to internal/etag/reader.go diff --git a/pkg/event/arn.go b/internal/event/arn.go similarity index 100% rename from pkg/event/arn.go rename to internal/event/arn.go diff --git a/pkg/event/arn_test.go b/internal/event/arn_test.go similarity index 100% rename from pkg/event/arn_test.go rename to internal/event/arn_test.go diff --git a/pkg/event/config.go b/internal/event/config.go similarity index 100% rename from pkg/event/config.go rename to internal/event/config.go diff --git a/pkg/event/config_test.go b/internal/event/config_test.go similarity index 100% rename from pkg/event/config_test.go rename to internal/event/config_test.go diff --git a/pkg/event/errors.go b/internal/event/errors.go similarity index 100% rename from pkg/event/errors.go rename to internal/event/errors.go diff --git a/pkg/event/event.go b/internal/event/event.go similarity index 100% rename from pkg/event/event.go rename to internal/event/event.go diff --git a/pkg/event/name.go b/internal/event/name.go similarity index 100% rename from pkg/event/name.go rename to internal/event/name.go diff --git a/pkg/event/name_test.go b/internal/event/name_test.go similarity index 100% rename from pkg/event/name_test.go rename to internal/event/name_test.go diff --git a/pkg/event/rules.go b/internal/event/rules.go similarity index 100% rename from pkg/event/rules.go rename to internal/event/rules.go diff --git a/pkg/event/rules_test.go b/internal/event/rules_test.go similarity index 100% rename from pkg/event/rules_test.go rename to internal/event/rules_test.go diff --git a/pkg/event/rulesmap.go b/internal/event/rulesmap.go similarity index 100% rename from pkg/event/rulesmap.go rename to internal/event/rulesmap.go diff --git a/pkg/event/rulesmap_test.go b/internal/event/rulesmap_test.go similarity index 100% rename from pkg/event/rulesmap_test.go rename to internal/event/rulesmap_test.go diff --git a/pkg/event/target/amqp.go b/internal/event/target/amqp.go similarity index 99% rename from pkg/event/target/amqp.go rename to internal/event/target/amqp.go index 5667801c2..f12d350e5 100644 --- a/pkg/event/target/amqp.go +++ b/internal/event/target/amqp.go @@ -27,8 +27,8 @@ import ( "path/filepath" "sync" - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/event" + xnet "github.com/minio/minio/internal/net" "github.com/streadway/amqp" ) diff --git a/pkg/event/target/common.go b/internal/event/target/common.go similarity index 100% rename from pkg/event/target/common.go rename to internal/event/target/common.go diff --git a/pkg/event/target/elasticsearch.go b/internal/event/target/elasticsearch.go similarity index 99% rename from pkg/event/target/elasticsearch.go rename to internal/event/target/elasticsearch.go index b8a0d7de7..738dbcdbf 100644 --- a/pkg/event/target/elasticsearch.go +++ b/internal/event/target/elasticsearch.go @@ -33,8 +33,8 @@ import ( "strings" "time" - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/event" + xnet "github.com/minio/minio/internal/net" "github.com/pkg/errors" elasticsearch7 "github.com/elastic/go-elasticsearch/v7" diff --git a/pkg/event/target/kafka.go b/internal/event/target/kafka.go similarity index 99% rename from pkg/event/target/kafka.go rename to internal/event/target/kafka.go index 9aaa16b77..245c7a671 100644 --- a/pkg/event/target/kafka.go +++ b/internal/event/target/kafka.go @@ -28,8 +28,8 @@ import ( "os" "path/filepath" - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/event" + xnet "github.com/minio/minio/internal/net" sarama "github.com/Shopify/sarama" saramatls "github.com/Shopify/sarama/tools/tls" diff --git a/pkg/event/target/kafka_scram_client_contrib.go b/internal/event/target/kafka_scram_client_contrib.go similarity index 100% rename from pkg/event/target/kafka_scram_client_contrib.go rename to internal/event/target/kafka_scram_client_contrib.go diff --git a/pkg/event/target/mqtt.go b/internal/event/target/mqtt.go similarity index 98% rename from pkg/event/target/mqtt.go rename to internal/event/target/mqtt.go index 5ce348097..36bd01073 100644 --- a/pkg/event/target/mqtt.go +++ b/internal/event/target/mqtt.go @@ -30,8 +30,8 @@ import ( "time" mqtt "github.com/eclipse/paho.mqtt.golang" - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/event" + xnet "github.com/minio/minio/internal/net" ) const ( diff --git a/pkg/event/target/mysql.go b/internal/event/target/mysql.go similarity index 99% rename from pkg/event/target/mysql.go rename to internal/event/target/mysql.go index f7b7fb23b..acc5d535f 100644 --- a/pkg/event/target/mysql.go +++ b/internal/event/target/mysql.go @@ -31,8 +31,8 @@ import ( "time" "github.com/go-sql-driver/mysql" - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/event" + xnet "github.com/minio/minio/internal/net" ) const ( diff --git a/pkg/event/target/mysql_test.go b/internal/event/target/mysql_test.go similarity index 100% rename from pkg/event/target/mysql_test.go rename to internal/event/target/mysql_test.go diff --git a/pkg/event/target/nats.go b/internal/event/target/nats.go similarity index 99% rename from pkg/event/target/nats.go rename to internal/event/target/nats.go index 1134a4c54..4aae502e1 100644 --- a/pkg/event/target/nats.go +++ b/internal/event/target/nats.go @@ -27,8 +27,8 @@ import ( "os" "path/filepath" - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/event" + xnet "github.com/minio/minio/internal/net" "github.com/nats-io/nats.go" "github.com/nats-io/stan.go" ) diff --git a/pkg/event/target/nats_contrib_test.go b/internal/event/target/nats_contrib_test.go similarity index 98% rename from pkg/event/target/nats_contrib_test.go rename to internal/event/target/nats_contrib_test.go index 1217e4f82..ff929b973 100644 --- a/pkg/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/minio/pkg/net" + xnet "github.com/minio/minio/internal/net" natsserver "github.com/nats-io/nats-server/v2/test" ) diff --git a/pkg/event/target/nats_tls_contrib_test.go b/internal/event/target/nats_tls_contrib_test.go similarity index 97% rename from pkg/event/target/nats_tls_contrib_test.go rename to internal/event/target/nats_tls_contrib_test.go index 6847d636c..06ba205fb 100644 --- a/pkg/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/minio/pkg/net" + xnet "github.com/minio/minio/internal/net" natsserver "github.com/nats-io/nats-server/v2/test" ) diff --git a/pkg/event/target/nsq.go b/internal/event/target/nsq.go similarity index 98% rename from pkg/event/target/nsq.go rename to internal/event/target/nsq.go index bb8266424..b22b7554b 100644 --- a/pkg/event/target/nsq.go +++ b/internal/event/target/nsq.go @@ -28,8 +28,8 @@ import ( "github.com/nsqio/go-nsq" - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/event" + xnet "github.com/minio/minio/internal/net" ) // NSQ constants diff --git a/pkg/event/target/nsq_test.go b/internal/event/target/nsq_test.go similarity index 98% rename from pkg/event/target/nsq_test.go rename to internal/event/target/nsq_test.go index 809f64578..8153d4a49 100644 --- a/pkg/event/target/nsq_test.go +++ b/internal/event/target/nsq_test.go @@ -20,7 +20,7 @@ package target import ( "testing" - xnet "github.com/minio/minio/pkg/net" + xnet "github.com/minio/minio/internal/net" ) func TestNSQArgs_Validate(t *testing.T) { diff --git a/pkg/event/target/postgresql.go b/internal/event/target/postgresql.go similarity index 99% rename from pkg/event/target/postgresql.go rename to internal/event/target/postgresql.go index a5ee13741..349369924 100644 --- a/pkg/event/target/postgresql.go +++ b/internal/event/target/postgresql.go @@ -32,8 +32,8 @@ import ( _ "github.com/lib/pq" // Register postgres driver - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/event" + xnet "github.com/minio/minio/internal/net" ) const ( diff --git a/pkg/event/target/postgresql_test.go b/internal/event/target/postgresql_test.go similarity index 100% rename from pkg/event/target/postgresql_test.go rename to internal/event/target/postgresql_test.go diff --git a/pkg/event/target/queuestore.go b/internal/event/target/queuestore.go similarity index 99% rename from pkg/event/target/queuestore.go rename to internal/event/target/queuestore.go index f85aefde4..127b9286a 100644 --- a/pkg/event/target/queuestore.go +++ b/internal/event/target/queuestore.go @@ -26,7 +26,7 @@ import ( "sort" "sync" - "github.com/minio/minio/pkg/event" + "github.com/minio/minio/internal/event" "github.com/minio/pkg/sys" ) diff --git a/pkg/event/target/queuestore_test.go b/internal/event/target/queuestore_test.go similarity index 99% rename from pkg/event/target/queuestore_test.go rename to internal/event/target/queuestore_test.go index 7569b8a26..79751a3d6 100644 --- a/pkg/event/target/queuestore_test.go +++ b/internal/event/target/queuestore_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/minio/minio/pkg/event" + "github.com/minio/minio/internal/event" ) // TestDir diff --git a/pkg/event/target/redis.go b/internal/event/target/redis.go similarity index 99% rename from pkg/event/target/redis.go rename to internal/event/target/redis.go index 9436be34c..3cb0d2ab1 100644 --- a/pkg/event/target/redis.go +++ b/internal/event/target/redis.go @@ -29,8 +29,8 @@ import ( "time" "github.com/gomodule/redigo/redis" - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/event" + xnet "github.com/minio/minio/internal/net" ) // Redis constants diff --git a/pkg/event/target/store.go b/internal/event/target/store.go similarity index 98% rename from pkg/event/target/store.go rename to internal/event/target/store.go index 244e9a642..fbf024e83 100644 --- a/pkg/event/target/store.go +++ b/internal/event/target/store.go @@ -25,7 +25,7 @@ import ( "syscall" "time" - "github.com/minio/minio/pkg/event" + "github.com/minio/minio/internal/event" ) const retryInterval = 3 * time.Second diff --git a/pkg/event/target/testdata/contrib/certs/nats_client_cert.pem b/internal/event/target/testdata/contrib/certs/nats_client_cert.pem similarity index 100% rename from pkg/event/target/testdata/contrib/certs/nats_client_cert.pem rename to internal/event/target/testdata/contrib/certs/nats_client_cert.pem diff --git a/pkg/event/target/testdata/contrib/certs/nats_client_key.pem b/internal/event/target/testdata/contrib/certs/nats_client_key.pem similarity index 100% rename from pkg/event/target/testdata/contrib/certs/nats_client_key.pem rename to internal/event/target/testdata/contrib/certs/nats_client_key.pem diff --git a/pkg/event/target/testdata/contrib/certs/nats_server_cert.pem b/internal/event/target/testdata/contrib/certs/nats_server_cert.pem similarity index 100% rename from pkg/event/target/testdata/contrib/certs/nats_server_cert.pem rename to internal/event/target/testdata/contrib/certs/nats_server_cert.pem diff --git a/pkg/event/target/testdata/contrib/certs/nats_server_key.pem b/internal/event/target/testdata/contrib/certs/nats_server_key.pem similarity index 100% rename from pkg/event/target/testdata/contrib/certs/nats_server_key.pem rename to internal/event/target/testdata/contrib/certs/nats_server_key.pem diff --git a/pkg/event/target/testdata/contrib/certs/root_ca_cert.pem b/internal/event/target/testdata/contrib/certs/root_ca_cert.pem similarity index 100% rename from pkg/event/target/testdata/contrib/certs/root_ca_cert.pem rename to internal/event/target/testdata/contrib/certs/root_ca_cert.pem diff --git a/pkg/event/target/testdata/contrib/certs/root_ca_key.pem b/internal/event/target/testdata/contrib/certs/root_ca_key.pem similarity index 100% rename from pkg/event/target/testdata/contrib/certs/root_ca_key.pem rename to internal/event/target/testdata/contrib/certs/root_ca_key.pem diff --git a/pkg/event/target/testdata/contrib/nats_tls.conf b/internal/event/target/testdata/contrib/nats_tls.conf similarity index 100% rename from pkg/event/target/testdata/contrib/nats_tls.conf rename to internal/event/target/testdata/contrib/nats_tls.conf diff --git a/pkg/event/target/testdata/contrib/nats_tls_client_cert.conf b/internal/event/target/testdata/contrib/nats_tls_client_cert.conf similarity index 100% rename from pkg/event/target/testdata/contrib/nats_tls_client_cert.conf rename to internal/event/target/testdata/contrib/nats_tls_client_cert.conf diff --git a/pkg/event/target/webhook.go b/internal/event/target/webhook.go similarity index 98% rename from pkg/event/target/webhook.go rename to internal/event/target/webhook.go index 597616bb5..b64703d6c 100644 --- a/pkg/event/target/webhook.go +++ b/internal/event/target/webhook.go @@ -32,8 +32,8 @@ import ( "path/filepath" "time" - "github.com/minio/minio/pkg/event" - xnet "github.com/minio/minio/pkg/net" + "github.com/minio/minio/internal/event" + xnet "github.com/minio/minio/internal/net" "github.com/minio/pkg/certs" ) diff --git a/pkg/event/targetid.go b/internal/event/targetid.go similarity index 100% rename from pkg/event/targetid.go rename to internal/event/targetid.go diff --git a/pkg/event/targetid_test.go b/internal/event/targetid_test.go similarity index 100% rename from pkg/event/targetid_test.go rename to internal/event/targetid_test.go diff --git a/pkg/event/targetidset.go b/internal/event/targetidset.go similarity index 100% rename from pkg/event/targetidset.go rename to internal/event/targetidset.go diff --git a/pkg/event/targetidset_test.go b/internal/event/targetidset_test.go similarity index 100% rename from pkg/event/targetidset_test.go rename to internal/event/targetidset_test.go diff --git a/pkg/event/targetlist.go b/internal/event/targetlist.go similarity index 100% rename from pkg/event/targetlist.go rename to internal/event/targetlist.go diff --git a/pkg/event/targetlist_test.go b/internal/event/targetlist_test.go similarity index 100% rename from pkg/event/targetlist_test.go rename to internal/event/targetlist_test.go diff --git a/pkg/fips/api.go b/internal/fips/api.go similarity index 100% rename from pkg/fips/api.go rename to internal/fips/api.go diff --git a/pkg/fips/fips.go b/internal/fips/fips.go similarity index 100% rename from pkg/fips/fips.go rename to internal/fips/fips.go diff --git a/pkg/fips/no_fips.go b/internal/fips/no_fips.go similarity index 100% rename from pkg/fips/no_fips.go rename to internal/fips/no_fips.go diff --git a/pkg/handlers/forwarder.go b/internal/handlers/forwarder.go similarity index 100% rename from pkg/handlers/forwarder.go rename to internal/handlers/forwarder.go diff --git a/pkg/handlers/proxy.go b/internal/handlers/proxy.go similarity index 100% rename from pkg/handlers/proxy.go rename to internal/handlers/proxy.go diff --git a/pkg/handlers/proxy_test.go b/internal/handlers/proxy_test.go similarity index 100% rename from pkg/handlers/proxy_test.go rename to internal/handlers/proxy_test.go diff --git a/pkg/hash/errors.go b/internal/hash/errors.go similarity index 100% rename from pkg/hash/errors.go rename to internal/hash/errors.go diff --git a/pkg/hash/reader.go b/internal/hash/reader.go similarity index 99% rename from pkg/hash/reader.go rename to internal/hash/reader.go index 8e203babb..1048ce72c 100644 --- a/pkg/hash/reader.go +++ b/internal/hash/reader.go @@ -25,7 +25,7 @@ import ( "hash" "io" - "github.com/minio/minio/pkg/etag" + "github.com/minio/minio/internal/etag" ) // A Reader wraps an io.Reader and computes the MD5 checksum diff --git a/pkg/hash/reader_test.go b/internal/hash/reader_test.go similarity index 100% rename from pkg/hash/reader_test.go rename to internal/hash/reader_test.go diff --git a/pkg/hash/sha256_fips.go b/internal/hash/sha256_fips.go similarity index 100% rename from pkg/hash/sha256_fips.go rename to internal/hash/sha256_fips.go diff --git a/pkg/hash/sha256_nofips.go b/internal/hash/sha256_nofips.go similarity index 100% rename from pkg/hash/sha256_nofips.go rename to internal/hash/sha256_nofips.go diff --git a/cmd/http/close.go b/internal/http/close.go similarity index 100% rename from cmd/http/close.go rename to internal/http/close.go diff --git a/cmd/http/dial_dnscache.go b/internal/http/dial_dnscache.go similarity index 100% rename from cmd/http/dial_dnscache.go rename to internal/http/dial_dnscache.go diff --git a/cmd/http/dial_dnscache_test.go b/internal/http/dial_dnscache_test.go similarity index 100% rename from cmd/http/dial_dnscache_test.go rename to internal/http/dial_dnscache_test.go diff --git a/cmd/http/dial_linux.go b/internal/http/dial_linux.go similarity index 100% rename from cmd/http/dial_linux.go rename to internal/http/dial_linux.go diff --git a/cmd/http/dial_others.go b/internal/http/dial_others.go similarity index 100% rename from cmd/http/dial_others.go rename to internal/http/dial_others.go diff --git a/cmd/http/headers.go b/internal/http/headers.go similarity index 100% rename from cmd/http/headers.go rename to internal/http/headers.go diff --git a/cmd/http/listen_nix.go b/internal/http/listen_nix.go similarity index 100% rename from cmd/http/listen_nix.go rename to internal/http/listen_nix.go diff --git a/cmd/http/listen_others.go b/internal/http/listen_others.go similarity index 100% rename from cmd/http/listen_others.go rename to internal/http/listen_others.go diff --git a/cmd/http/listener.go b/internal/http/listener.go similarity index 100% rename from cmd/http/listener.go rename to internal/http/listener.go diff --git a/cmd/http/listener_test.go b/internal/http/listener_test.go similarity index 100% rename from cmd/http/listener_test.go rename to internal/http/listener_test.go diff --git a/cmd/http/server.go b/internal/http/server.go similarity index 97% rename from cmd/http/server.go rename to internal/http/server.go index cab87b251..ace99a574 100644 --- a/cmd/http/server.go +++ b/internal/http/server.go @@ -30,9 +30,9 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/cmd/config" - "github.com/minio/minio/cmd/config/api" - "github.com/minio/minio/pkg/fips" + "github.com/minio/minio/internal/config" + "github.com/minio/minio/internal/config/api" + "github.com/minio/minio/internal/fips" "github.com/minio/pkg/certs" "github.com/minio/pkg/env" ) diff --git a/cmd/http/server_test.go b/internal/http/server_test.go similarity index 100% rename from cmd/http/server_test.go rename to internal/http/server_test.go diff --git a/cmd/http/stats/http-traffic-recorder.go b/internal/http/stats/http-traffic-recorder.go similarity index 100% rename from cmd/http/stats/http-traffic-recorder.go rename to internal/http/stats/http-traffic-recorder.go diff --git a/pkg/ioutil/append-file_nix.go b/internal/ioutil/append-file_nix.go similarity index 100% rename from pkg/ioutil/append-file_nix.go rename to internal/ioutil/append-file_nix.go diff --git a/pkg/ioutil/append-file_windows.go b/internal/ioutil/append-file_windows.go similarity index 96% rename from pkg/ioutil/append-file_windows.go rename to internal/ioutil/append-file_windows.go index 729f3930c..5430d3fb0 100644 --- a/pkg/ioutil/append-file_windows.go +++ b/internal/ioutil/append-file_windows.go @@ -21,7 +21,7 @@ import ( "io" "os" - "github.com/minio/minio/pkg/lock" + "github.com/minio/minio/internal/lock" ) // AppendFile - appends the file "src" to the file "dst" diff --git a/pkg/ioutil/ioutil.go b/internal/ioutil/ioutil.go similarity index 99% rename from pkg/ioutil/ioutil.go rename to internal/ioutil/ioutil.go index ee15c0963..5d7f57a98 100644 --- a/pkg/ioutil/ioutil.go +++ b/internal/ioutil/ioutil.go @@ -26,7 +26,7 @@ import ( "os" "time" - "github.com/minio/minio/pkg/disk" + "github.com/minio/minio/internal/disk" ) // WriteOnCloser implements io.WriteCloser and always diff --git a/pkg/ioutil/ioutil_test.go b/internal/ioutil/ioutil_test.go similarity index 100% rename from pkg/ioutil/ioutil_test.go rename to internal/ioutil/ioutil_test.go diff --git a/pkg/ioutil/read_file.go b/internal/ioutil/read_file.go similarity index 100% rename from pkg/ioutil/read_file.go rename to internal/ioutil/read_file.go diff --git a/pkg/ioutil/read_file_noatime_notsupported.go b/internal/ioutil/read_file_noatime_notsupported.go similarity index 100% rename from pkg/ioutil/read_file_noatime_notsupported.go rename to internal/ioutil/read_file_noatime_notsupported.go diff --git a/pkg/ioutil/read_file_noatime_supported.go b/internal/ioutil/read_file_noatime_supported.go similarity index 100% rename from pkg/ioutil/read_file_noatime_supported.go rename to internal/ioutil/read_file_noatime_supported.go diff --git a/pkg/ioutil/wait_pipe.go b/internal/ioutil/wait_pipe.go similarity index 100% rename from pkg/ioutil/wait_pipe.go rename to internal/ioutil/wait_pipe.go diff --git a/cmd/jwt/parser.go b/internal/jwt/parser.go similarity index 100% rename from cmd/jwt/parser.go rename to internal/jwt/parser.go diff --git a/cmd/jwt/parser_test.go b/internal/jwt/parser_test.go similarity index 100% rename from cmd/jwt/parser_test.go rename to internal/jwt/parser_test.go diff --git a/pkg/kms/context.go b/internal/kms/context.go similarity index 100% rename from pkg/kms/context.go rename to internal/kms/context.go diff --git a/pkg/kms/dek_test.go b/internal/kms/dek_test.go similarity index 100% rename from pkg/kms/dek_test.go rename to internal/kms/dek_test.go diff --git a/pkg/kms/kes.go b/internal/kms/kes.go similarity index 100% rename from pkg/kms/kes.go rename to internal/kms/kes.go diff --git a/pkg/kms/kms.go b/internal/kms/kms.go similarity index 100% rename from pkg/kms/kms.go rename to internal/kms/kms.go diff --git a/pkg/kms/single-key.go b/internal/kms/single-key.go similarity index 100% rename from pkg/kms/single-key.go rename to internal/kms/single-key.go diff --git a/pkg/kms/single-key_test.go b/internal/kms/single-key_test.go similarity index 100% rename from pkg/kms/single-key_test.go rename to internal/kms/single-key_test.go diff --git a/pkg/lock/lock.go b/internal/lock/lock.go similarity index 100% rename from pkg/lock/lock.go rename to internal/lock/lock.go diff --git a/pkg/lock/lock_nix.go b/internal/lock/lock_nix.go similarity index 100% rename from pkg/lock/lock_nix.go rename to internal/lock/lock_nix.go diff --git a/pkg/lock/lock_solaris.go b/internal/lock/lock_solaris.go similarity index 100% rename from pkg/lock/lock_solaris.go rename to internal/lock/lock_solaris.go diff --git a/pkg/lock/lock_test.go b/internal/lock/lock_test.go similarity index 100% rename from pkg/lock/lock_test.go rename to internal/lock/lock_test.go diff --git a/pkg/lock/lock_windows.go b/internal/lock/lock_windows.go similarity index 100% rename from pkg/lock/lock_windows.go rename to internal/lock/lock_windows.go diff --git a/pkg/lock/lock_windows_test.go b/internal/lock/lock_windows_test.go similarity index 100% rename from pkg/lock/lock_windows_test.go rename to internal/lock/lock_windows_test.go diff --git a/cmd/logger/audit.go b/internal/logger/audit.go similarity index 99% rename from cmd/logger/audit.go rename to internal/logger/audit.go index 0e1ccc388..cd607f541 100644 --- a/cmd/logger/audit.go +++ b/internal/logger/audit.go @@ -26,7 +26,7 @@ import ( "strconv" "time" - "github.com/minio/minio/cmd/logger/message/audit" + "github.com/minio/minio/internal/logger/message/audit" ) // ResponseWriter - is a wrapper to trap the http response status code. diff --git a/cmd/logger/config.go b/internal/logger/config.go similarity index 99% rename from cmd/logger/config.go rename to internal/logger/config.go index 62db81f11..300e43c8f 100644 --- a/cmd/logger/config.go +++ b/internal/logger/config.go @@ -20,7 +20,7 @@ package logger import ( "strings" - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" "github.com/minio/pkg/env" ) diff --git a/cmd/logger/console.go b/internal/logger/console.go similarity index 98% rename from cmd/logger/console.go rename to internal/logger/console.go index fca9864c4..a1506f3cc 100644 --- a/cmd/logger/console.go +++ b/internal/logger/console.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/minio/minio/cmd/logger/message/log" - "github.com/minio/minio/pkg/color" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/logger/message/log" c "github.com/minio/pkg/console" ) diff --git a/cmd/logger/help.go b/internal/logger/help.go similarity index 98% rename from cmd/logger/help.go rename to internal/logger/help.go index 3aca902bf..0bbbf4b1e 100644 --- a/cmd/logger/help.go +++ b/internal/logger/help.go @@ -18,7 +18,7 @@ package logger import ( - "github.com/minio/minio/cmd/config" + "github.com/minio/minio/internal/config" ) // Help template for logger http and audit diff --git a/cmd/logger/legacy.go b/internal/logger/legacy.go similarity index 97% rename from cmd/logger/legacy.go rename to internal/logger/legacy.go index d84833a0b..55a278c6e 100644 --- a/cmd/logger/legacy.go +++ b/internal/logger/legacy.go @@ -17,7 +17,7 @@ package logger -import "github.com/minio/minio/cmd/config" +import "github.com/minio/minio/internal/config" // Legacy envs const ( diff --git a/cmd/logger/logger.go b/internal/logger/logger.go similarity index 99% rename from cmd/logger/logger.go rename to internal/logger/logger.go index dd8e7f10f..10ee389d1 100644 --- a/cmd/logger/logger.go +++ b/internal/logger/logger.go @@ -33,7 +33,7 @@ import ( "github.com/minio/highwayhash" "github.com/minio/minio-go/v7/pkg/set" - "github.com/minio/minio/cmd/logger/message/log" + "github.com/minio/minio/internal/logger/message/log" ) var ( diff --git a/cmd/logger/logonce.go b/internal/logger/logonce.go similarity index 100% rename from cmd/logger/logonce.go rename to internal/logger/logonce.go diff --git a/cmd/logger/message/audit/entry.go b/internal/logger/message/audit/entry.go similarity index 97% rename from cmd/logger/message/audit/entry.go rename to internal/logger/message/audit/entry.go index 20c04adad..a7808887b 100644 --- a/cmd/logger/message/audit/entry.go +++ b/internal/logger/message/audit/entry.go @@ -22,8 +22,8 @@ import ( "strings" "time" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/pkg/handlers" + "github.com/minio/minio/internal/handlers" + xhttp "github.com/minio/minio/internal/http" ) // Version - represents the current version of audit log structure. diff --git a/cmd/logger/message/log/entry.go b/internal/logger/message/log/entry.go similarity index 100% rename from cmd/logger/message/log/entry.go rename to internal/logger/message/log/entry.go diff --git a/cmd/logger/reqinfo.go b/internal/logger/reqinfo.go similarity index 100% rename from cmd/logger/reqinfo.go rename to internal/logger/reqinfo.go diff --git a/cmd/logger/target/console/console.go b/internal/logger/target/console/console.go similarity index 96% rename from cmd/logger/target/console/console.go rename to internal/logger/target/console/console.go index fa55204e1..60737f3f7 100644 --- a/cmd/logger/target/console/console.go +++ b/internal/logger/target/console/console.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/minio/minio/cmd/logger" - "github.com/minio/minio/cmd/logger/message/log" - "github.com/minio/minio/pkg/color" + "github.com/minio/minio/internal/color" + "github.com/minio/minio/internal/logger" + "github.com/minio/minio/internal/logger/message/log" "github.com/minio/pkg/console" ) diff --git a/cmd/logger/target/http/http.go b/internal/logger/target/http/http.go similarity index 98% rename from cmd/logger/target/http/http.go rename to internal/logger/target/http/http.go index dc7505543..706e6226b 100644 --- a/cmd/logger/target/http/http.go +++ b/internal/logger/target/http/http.go @@ -27,8 +27,8 @@ import ( "strings" "time" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" ) // Timeout for the webhook http call diff --git a/cmd/logger/targets.go b/internal/logger/targets.go similarity index 100% rename from cmd/logger/targets.go rename to internal/logger/targets.go diff --git a/cmd/logger/utils.go b/internal/logger/utils.go similarity index 97% rename from cmd/logger/utils.go rename to internal/logger/utils.go index 6a3832499..301cf0d63 100644 --- a/cmd/logger/utils.go +++ b/internal/logger/utils.go @@ -22,7 +22,7 @@ import ( "regexp" "runtime" - "github.com/minio/minio/pkg/color" + "github.com/minio/minio/internal/color" ) var ansiRE = regexp.MustCompile("(\x1b[^m]*m)") diff --git a/pkg/lsync/lrwmutex.go b/internal/lsync/lrwmutex.go similarity index 100% rename from pkg/lsync/lrwmutex.go rename to internal/lsync/lrwmutex.go diff --git a/pkg/lsync/lrwmutex_test.go b/internal/lsync/lrwmutex_test.go similarity index 99% rename from pkg/lsync/lrwmutex_test.go rename to internal/lsync/lrwmutex_test.go index 1306c6b4b..0592044a3 100644 --- a/pkg/lsync/lrwmutex_test.go +++ b/internal/lsync/lrwmutex_test.go @@ -27,7 +27,7 @@ import ( "runtime" - . "github.com/minio/minio/pkg/lsync" + . "github.com/minio/minio/internal/lsync" ) func testSimpleWriteLock(t *testing.T, duration time.Duration) (locked bool) { diff --git a/pkg/mountinfo/mountinfo.go b/internal/mountinfo/mountinfo.go similarity index 100% rename from pkg/mountinfo/mountinfo.go rename to internal/mountinfo/mountinfo.go diff --git a/pkg/mountinfo/mountinfo_linux.go b/internal/mountinfo/mountinfo_linux.go similarity index 100% rename from pkg/mountinfo/mountinfo_linux.go rename to internal/mountinfo/mountinfo_linux.go diff --git a/pkg/mountinfo/mountinfo_linux_test.go b/internal/mountinfo/mountinfo_linux_test.go similarity index 100% rename from pkg/mountinfo/mountinfo_linux_test.go rename to internal/mountinfo/mountinfo_linux_test.go diff --git a/pkg/mountinfo/mountinfo_others.go b/internal/mountinfo/mountinfo_others.go similarity index 100% rename from pkg/mountinfo/mountinfo_others.go rename to internal/mountinfo/mountinfo_others.go diff --git a/pkg/mountinfo/mountinfo_windows.go b/internal/mountinfo/mountinfo_windows.go similarity index 100% rename from pkg/mountinfo/mountinfo_windows.go rename to internal/mountinfo/mountinfo_windows.go diff --git a/pkg/net/health.go b/internal/net/health.go similarity index 100% rename from pkg/net/health.go rename to internal/net/health.go diff --git a/pkg/net/host.go b/internal/net/host.go similarity index 100% rename from pkg/net/host.go rename to internal/net/host.go diff --git a/pkg/net/host_test.go b/internal/net/host_test.go similarity index 100% rename from pkg/net/host_test.go rename to internal/net/host_test.go diff --git a/pkg/net/port.go b/internal/net/port.go similarity index 100% rename from pkg/net/port.go rename to internal/net/port.go diff --git a/pkg/net/port_test.go b/internal/net/port_test.go similarity index 100% rename from pkg/net/port_test.go rename to internal/net/port_test.go diff --git a/pkg/net/url.go b/internal/net/url.go similarity index 100% rename from pkg/net/url.go rename to internal/net/url.go diff --git a/pkg/net/url_test.go b/internal/net/url_test.go similarity index 100% rename from pkg/net/url_test.go rename to internal/net/url_test.go diff --git a/pkg/pubsub/pubsub.go b/internal/pubsub/pubsub.go similarity index 100% rename from pkg/pubsub/pubsub.go rename to internal/pubsub/pubsub.go diff --git a/pkg/pubsub/pubsub_test.go b/internal/pubsub/pubsub_test.go similarity index 100% rename from pkg/pubsub/pubsub_test.go rename to internal/pubsub/pubsub_test.go diff --git a/cmd/rest/client.go b/internal/rest/client.go similarity index 98% rename from cmd/rest/client.go rename to internal/rest/client.go index c82772aa2..228ecb282 100644 --- a/cmd/rest/client.go +++ b/internal/rest/client.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" - xhttp "github.com/minio/minio/cmd/http" - "github.com/minio/minio/cmd/logger" - xnet "github.com/minio/minio/pkg/net" + xhttp "github.com/minio/minio/internal/http" + "github.com/minio/minio/internal/logger" + xnet "github.com/minio/minio/internal/net" ) // DefaultTimeout - default REST timeout is 10 seconds. diff --git a/cmd/rest/client_test.go b/internal/rest/client_test.go similarity index 100% rename from cmd/rest/client_test.go rename to internal/rest/client_test.go diff --git a/pkg/s3select/csv/args.go b/internal/s3select/csv/args.go similarity index 100% rename from pkg/s3select/csv/args.go rename to internal/s3select/csv/args.go diff --git a/pkg/s3select/csv/errors.go b/internal/s3select/csv/errors.go similarity index 100% rename from pkg/s3select/csv/errors.go rename to internal/s3select/csv/errors.go diff --git a/pkg/s3select/csv/reader.go b/internal/s3select/csv/reader.go similarity index 99% rename from pkg/s3select/csv/reader.go rename to internal/s3select/csv/reader.go index 0b2be9035..452484aa2 100644 --- a/pkg/s3select/csv/reader.go +++ b/internal/s3select/csv/reader.go @@ -27,7 +27,7 @@ import ( "unicode/utf8" csv "github.com/minio/csvparser" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/sql" ) // Reader - CSV record reader for S3Select. diff --git a/pkg/s3select/csv/reader_contrib_test.go b/internal/s3select/csv/reader_contrib_test.go similarity index 99% rename from pkg/s3select/csv/reader_contrib_test.go rename to internal/s3select/csv/reader_contrib_test.go index 98fa131a9..51ef863b2 100644 --- a/pkg/s3select/csv/reader_contrib_test.go +++ b/internal/s3select/csv/reader_contrib_test.go @@ -28,7 +28,7 @@ import ( "testing" "github.com/klauspost/compress/zip" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/sql" ) func TestRead(t *testing.T) { diff --git a/pkg/s3select/csv/record.go b/internal/s3select/csv/record.go similarity index 98% rename from pkg/s3select/csv/record.go rename to internal/s3select/csv/record.go index c24d8d3f2..f9c4e6269 100644 --- a/pkg/s3select/csv/record.go +++ b/internal/s3select/csv/record.go @@ -25,7 +25,7 @@ import ( "github.com/bcicen/jstream" csv "github.com/minio/csvparser" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/sql" ) // Record - is a CSV record. diff --git a/pkg/s3select/csv/recordtransform.go b/internal/s3select/csv/recordtransform.go similarity index 100% rename from pkg/s3select/csv/recordtransform.go rename to internal/s3select/csv/recordtransform.go diff --git a/pkg/s3select/csv/testdata/testdata.zip b/internal/s3select/csv/testdata/testdata.zip similarity index 100% rename from pkg/s3select/csv/testdata/testdata.zip rename to internal/s3select/csv/testdata/testdata.zip diff --git a/pkg/s3select/errors.go b/internal/s3select/errors.go similarity index 100% rename from pkg/s3select/errors.go rename to internal/s3select/errors.go diff --git a/pkg/s3select/genmessage.go b/internal/s3select/genmessage.go similarity index 100% rename from pkg/s3select/genmessage.go rename to internal/s3select/genmessage.go diff --git a/pkg/s3select/json/args.go b/internal/s3select/json/args.go similarity index 100% rename from pkg/s3select/json/args.go rename to internal/s3select/json/args.go diff --git a/pkg/s3select/json/errors.go b/internal/s3select/json/errors.go similarity index 100% rename from pkg/s3select/json/errors.go rename to internal/s3select/json/errors.go diff --git a/pkg/s3select/json/preader.go b/internal/s3select/json/preader.go similarity index 99% rename from pkg/s3select/json/preader.go rename to internal/s3select/json/preader.go index fb2808869..b378ae0d2 100644 --- a/pkg/s3select/json/preader.go +++ b/internal/s3select/json/preader.go @@ -25,7 +25,7 @@ import ( "sync" "github.com/bcicen/jstream" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/sql" ) // PReader - JSON record reader for S3Select. diff --git a/pkg/s3select/json/preader_test.go b/internal/s3select/json/preader_test.go similarity index 98% rename from pkg/s3select/json/preader_test.go rename to internal/s3select/json/preader_test.go index a8e321798..5cbc2dd0b 100644 --- a/pkg/s3select/json/preader_test.go +++ b/internal/s3select/json/preader_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "testing" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/sql" ) func TestNewPReader(t *testing.T) { diff --git a/pkg/s3select/json/reader.go b/internal/s3select/json/reader.go similarity index 98% rename from pkg/s3select/json/reader.go rename to internal/s3select/json/reader.go index 8f7dab1b2..d6f13b093 100644 --- a/pkg/s3select/json/reader.go +++ b/internal/s3select/json/reader.go @@ -22,7 +22,7 @@ import ( "io" "sync" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/sql" "github.com/bcicen/jstream" ) diff --git a/pkg/s3select/json/reader_test.go b/internal/s3select/json/reader_test.go similarity index 98% rename from pkg/s3select/json/reader_test.go rename to internal/s3select/json/reader_test.go index 8cdd06f8d..70cad7f5f 100644 --- a/pkg/s3select/json/reader_test.go +++ b/internal/s3select/json/reader_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "testing" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/sql" ) func TestNewReader(t *testing.T) { diff --git a/pkg/s3select/json/record.go b/internal/s3select/json/record.go similarity index 99% rename from pkg/s3select/json/record.go rename to internal/s3select/json/record.go index 470d38642..1047fedf7 100644 --- a/pkg/s3select/json/record.go +++ b/internal/s3select/json/record.go @@ -28,7 +28,7 @@ import ( "github.com/bcicen/jstream" csv "github.com/minio/csvparser" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/sql" ) // RawJSON is a byte-slice that contains valid JSON diff --git a/pkg/s3select/json/testdata/10.json b/internal/s3select/json/testdata/10.json similarity index 100% rename from pkg/s3select/json/testdata/10.json rename to internal/s3select/json/testdata/10.json diff --git a/pkg/s3select/json/testdata/11.json b/internal/s3select/json/testdata/11.json similarity index 100% rename from pkg/s3select/json/testdata/11.json rename to internal/s3select/json/testdata/11.json diff --git a/pkg/s3select/json/testdata/12.json b/internal/s3select/json/testdata/12.json similarity index 100% rename from pkg/s3select/json/testdata/12.json rename to internal/s3select/json/testdata/12.json diff --git a/pkg/s3select/json/testdata/2.json b/internal/s3select/json/testdata/2.json similarity index 100% rename from pkg/s3select/json/testdata/2.json rename to internal/s3select/json/testdata/2.json diff --git a/pkg/s3select/json/testdata/3.json b/internal/s3select/json/testdata/3.json similarity index 100% rename from pkg/s3select/json/testdata/3.json rename to internal/s3select/json/testdata/3.json diff --git a/pkg/s3select/json/testdata/4.json b/internal/s3select/json/testdata/4.json similarity index 100% rename from pkg/s3select/json/testdata/4.json rename to internal/s3select/json/testdata/4.json diff --git a/pkg/s3select/json/testdata/5.json b/internal/s3select/json/testdata/5.json similarity index 100% rename from pkg/s3select/json/testdata/5.json rename to internal/s3select/json/testdata/5.json diff --git a/pkg/s3select/json/testdata/6.json b/internal/s3select/json/testdata/6.json similarity index 100% rename from pkg/s3select/json/testdata/6.json rename to internal/s3select/json/testdata/6.json diff --git a/pkg/s3select/json/testdata/7.json b/internal/s3select/json/testdata/7.json similarity index 100% rename from pkg/s3select/json/testdata/7.json rename to internal/s3select/json/testdata/7.json diff --git a/pkg/s3select/json/testdata/8.json b/internal/s3select/json/testdata/8.json similarity index 100% rename from pkg/s3select/json/testdata/8.json rename to internal/s3select/json/testdata/8.json diff --git a/pkg/s3select/json/testdata/9.json b/internal/s3select/json/testdata/9.json similarity index 100% rename from pkg/s3select/json/testdata/9.json rename to internal/s3select/json/testdata/9.json diff --git a/pkg/s3select/message.go b/internal/s3select/message.go similarity index 100% rename from pkg/s3select/message.go rename to internal/s3select/message.go diff --git a/pkg/s3select/parquet/args.go b/internal/s3select/parquet/args.go similarity index 100% rename from pkg/s3select/parquet/args.go rename to internal/s3select/parquet/args.go diff --git a/pkg/s3select/parquet/errors.go b/internal/s3select/parquet/errors.go similarity index 100% rename from pkg/s3select/parquet/errors.go rename to internal/s3select/parquet/errors.go diff --git a/pkg/s3select/parquet/reader.go b/internal/s3select/parquet/reader.go similarity index 97% rename from pkg/s3select/parquet/reader.go rename to internal/s3select/parquet/reader.go index 832c39740..19cf07ffb 100644 --- a/pkg/s3select/parquet/reader.go +++ b/internal/s3select/parquet/reader.go @@ -23,8 +23,8 @@ import ( "time" "github.com/bcicen/jstream" - jsonfmt "github.com/minio/minio/pkg/s3select/json" - "github.com/minio/minio/pkg/s3select/sql" + jsonfmt "github.com/minio/minio/internal/s3select/json" + "github.com/minio/minio/internal/s3select/sql" parquetgo "github.com/minio/parquet-go" parquetgen "github.com/minio/parquet-go/gen-go/parquet" ) diff --git a/pkg/s3select/progress.go b/internal/s3select/progress.go similarity index 100% rename from pkg/s3select/progress.go rename to internal/s3select/progress.go diff --git a/pkg/s3select/select.go b/internal/s3select/select.go similarity index 98% rename from pkg/s3select/select.go rename to internal/s3select/select.go index f68c86b4c..56f07d81b 100644 --- a/pkg/s3select/select.go +++ b/internal/s3select/select.go @@ -31,11 +31,11 @@ import ( "strings" "sync" - "github.com/minio/minio/pkg/s3select/csv" - "github.com/minio/minio/pkg/s3select/json" - "github.com/minio/minio/pkg/s3select/parquet" - "github.com/minio/minio/pkg/s3select/simdj" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/csv" + "github.com/minio/minio/internal/s3select/json" + "github.com/minio/minio/internal/s3select/parquet" + "github.com/minio/minio/internal/s3select/simdj" + "github.com/minio/minio/internal/s3select/sql" "github.com/minio/simdjson-go" ) diff --git a/pkg/s3select/select_benchmark_test.go b/internal/s3select/select_benchmark_test.go similarity index 100% rename from pkg/s3select/select_benchmark_test.go rename to internal/s3select/select_benchmark_test.go diff --git a/pkg/s3select/select_test.go b/internal/s3select/select_test.go similarity index 100% rename from pkg/s3select/select_test.go rename to internal/s3select/select_test.go diff --git a/pkg/s3select/simdj/errors.go b/internal/s3select/simdj/errors.go similarity index 100% rename from pkg/s3select/simdj/errors.go rename to internal/s3select/simdj/errors.go diff --git a/pkg/s3select/simdj/reader.go b/internal/s3select/simdj/reader.go similarity index 97% rename from pkg/s3select/simdj/reader.go rename to internal/s3select/simdj/reader.go index fcf1ad5b2..7e1cc63c6 100644 --- a/pkg/s3select/simdj/reader.go +++ b/internal/s3select/simdj/reader.go @@ -22,8 +22,8 @@ import ( "io" "sync" - "github.com/minio/minio/pkg/s3select/json" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/json" + "github.com/minio/minio/internal/s3select/sql" "github.com/minio/simdjson-go" ) diff --git a/pkg/s3select/simdj/reader_amd64_test.go b/internal/s3select/simdj/reader_amd64_test.go similarity index 97% rename from pkg/s3select/simdj/reader_amd64_test.go rename to internal/s3select/simdj/reader_amd64_test.go index 892e09bda..9b320f80f 100644 --- a/pkg/s3select/simdj/reader_amd64_test.go +++ b/internal/s3select/simdj/reader_amd64_test.go @@ -25,8 +25,8 @@ import ( "testing" "github.com/klauspost/compress/zstd" - "github.com/minio/minio/pkg/s3select/json" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/json" + "github.com/minio/minio/internal/s3select/sql" "github.com/minio/simdjson-go" ) diff --git a/pkg/s3select/simdj/record.go b/internal/s3select/simdj/record.go similarity index 98% rename from pkg/s3select/simdj/record.go rename to internal/s3select/simdj/record.go index bc30ecb9f..3cf91de6f 100644 --- a/pkg/s3select/simdj/record.go +++ b/internal/s3select/simdj/record.go @@ -23,8 +23,8 @@ import ( "github.com/bcicen/jstream" csv "github.com/minio/csvparser" - "github.com/minio/minio/pkg/s3select/json" - "github.com/minio/minio/pkg/s3select/sql" + "github.com/minio/minio/internal/s3select/json" + "github.com/minio/minio/internal/s3select/sql" "github.com/minio/simdjson-go" ) diff --git a/pkg/s3select/simdj/testdata/parking-citations-10.json.zst b/internal/s3select/simdj/testdata/parking-citations-10.json.zst similarity index 100% rename from pkg/s3select/simdj/testdata/parking-citations-10.json.zst rename to internal/s3select/simdj/testdata/parking-citations-10.json.zst diff --git a/pkg/s3select/sql/aggregation.go b/internal/s3select/sql/aggregation.go similarity index 100% rename from pkg/s3select/sql/aggregation.go rename to internal/s3select/sql/aggregation.go diff --git a/pkg/s3select/sql/analysis.go b/internal/s3select/sql/analysis.go similarity index 100% rename from pkg/s3select/sql/analysis.go rename to internal/s3select/sql/analysis.go diff --git a/pkg/s3select/sql/errors.go b/internal/s3select/sql/errors.go similarity index 100% rename from pkg/s3select/sql/errors.go rename to internal/s3select/sql/errors.go diff --git a/pkg/s3select/sql/evaluate.go b/internal/s3select/sql/evaluate.go similarity index 100% rename from pkg/s3select/sql/evaluate.go rename to internal/s3select/sql/evaluate.go diff --git a/pkg/s3select/sql/funceval.go b/internal/s3select/sql/funceval.go similarity index 100% rename from pkg/s3select/sql/funceval.go rename to internal/s3select/sql/funceval.go diff --git a/pkg/s3select/sql/jsondata/books.json b/internal/s3select/sql/jsondata/books.json similarity index 100% rename from pkg/s3select/sql/jsondata/books.json rename to internal/s3select/sql/jsondata/books.json diff --git a/pkg/s3select/sql/jsonpath.go b/internal/s3select/sql/jsonpath.go similarity index 100% rename from pkg/s3select/sql/jsonpath.go rename to internal/s3select/sql/jsonpath.go diff --git a/pkg/s3select/sql/jsonpath_test.go b/internal/s3select/sql/jsonpath_test.go similarity index 100% rename from pkg/s3select/sql/jsonpath_test.go rename to internal/s3select/sql/jsonpath_test.go diff --git a/pkg/s3select/sql/parser.go b/internal/s3select/sql/parser.go similarity index 100% rename from pkg/s3select/sql/parser.go rename to internal/s3select/sql/parser.go diff --git a/pkg/s3select/sql/parser_test.go b/internal/s3select/sql/parser_test.go similarity index 100% rename from pkg/s3select/sql/parser_test.go rename to internal/s3select/sql/parser_test.go diff --git a/pkg/s3select/sql/record.go b/internal/s3select/sql/record.go similarity index 100% rename from pkg/s3select/sql/record.go rename to internal/s3select/sql/record.go diff --git a/pkg/s3select/sql/statement.go b/internal/s3select/sql/statement.go similarity index 100% rename from pkg/s3select/sql/statement.go rename to internal/s3select/sql/statement.go diff --git a/pkg/s3select/sql/stringfuncs.go b/internal/s3select/sql/stringfuncs.go similarity index 100% rename from pkg/s3select/sql/stringfuncs.go rename to internal/s3select/sql/stringfuncs.go diff --git a/pkg/s3select/sql/stringfuncs_contrib_test.go b/internal/s3select/sql/stringfuncs_contrib_test.go similarity index 100% rename from pkg/s3select/sql/stringfuncs_contrib_test.go rename to internal/s3select/sql/stringfuncs_contrib_test.go diff --git a/pkg/s3select/sql/stringfuncs_test.go b/internal/s3select/sql/stringfuncs_test.go similarity index 100% rename from pkg/s3select/sql/stringfuncs_test.go rename to internal/s3select/sql/stringfuncs_test.go diff --git a/pkg/s3select/sql/timestampfuncs.go b/internal/s3select/sql/timestampfuncs.go similarity index 100% rename from pkg/s3select/sql/timestampfuncs.go rename to internal/s3select/sql/timestampfuncs.go diff --git a/pkg/s3select/sql/timestampfuncs_test.go b/internal/s3select/sql/timestampfuncs_test.go similarity index 100% rename from pkg/s3select/sql/timestampfuncs_test.go rename to internal/s3select/sql/timestampfuncs_test.go diff --git a/pkg/s3select/sql/utils.go b/internal/s3select/sql/utils.go similarity index 100% rename from pkg/s3select/sql/utils.go rename to internal/s3select/sql/utils.go diff --git a/pkg/s3select/sql/value.go b/internal/s3select/sql/value.go similarity index 100% rename from pkg/s3select/sql/value.go rename to internal/s3select/sql/value.go diff --git a/pkg/s3select/sql/value_contrib.go b/internal/s3select/sql/value_contrib.go similarity index 100% rename from pkg/s3select/sql/value_contrib.go rename to internal/s3select/sql/value_contrib.go diff --git a/pkg/s3select/sql/value_test.go b/internal/s3select/sql/value_test.go similarity index 100% rename from pkg/s3select/sql/value_test.go rename to internal/s3select/sql/value_test.go diff --git a/pkg/s3select/testdata/lineitem_shipdate.parquet b/internal/s3select/testdata/lineitem_shipdate.parquet similarity index 100% rename from pkg/s3select/testdata/lineitem_shipdate.parquet rename to internal/s3select/testdata/lineitem_shipdate.parquet diff --git a/pkg/s3select/testdata/testdata.parquet b/internal/s3select/testdata/testdata.parquet similarity index 100% rename from pkg/s3select/testdata/testdata.parquet rename to internal/s3select/testdata/testdata.parquet diff --git a/pkg/s3select/unused-errors.go b/internal/s3select/unused-errors.go similarity index 100% rename from pkg/s3select/unused-errors.go rename to internal/s3select/unused-errors.go diff --git a/pkg/smart/bindata.go b/internal/smart/bindata.go similarity index 100% rename from pkg/smart/bindata.go rename to internal/smart/bindata.go diff --git a/pkg/smart/nvme.go b/internal/smart/nvme.go similarity index 100% rename from pkg/smart/nvme.go rename to internal/smart/nvme.go diff --git a/pkg/smart/smart.go b/internal/smart/smart.go similarity index 100% rename from pkg/smart/smart.go rename to internal/smart/smart.go diff --git a/pkg/smart/types.go b/internal/smart/types.go similarity index 100% rename from pkg/smart/types.go rename to internal/smart/types.go diff --git a/pkg/sync/errgroup/errgroup.go b/internal/sync/errgroup/errgroup.go similarity index 100% rename from pkg/sync/errgroup/errgroup.go rename to internal/sync/errgroup/errgroup.go diff --git a/pkg/sync/errgroup/errgroup_test.go b/internal/sync/errgroup/errgroup_test.go similarity index 100% rename from pkg/sync/errgroup/errgroup_test.go rename to internal/sync/errgroup/errgroup_test.go