Merged in refactoring (pull request #2)

Refactoring

Approved-by: Pavel Korotkov

cmd/gate/app.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	minio "github.com/minio/minio/cmd"
+	minio "github.com/minio/minio/legacy"
 	"github.com/minio/minio/neofs/layer"
 	"github.com/minio/minio/neofs/pool"
 	"github.com/minio/minio/pkg/auth"

legacy/acl-handlers.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
@@ -23,8 +23,8 @@ import (
 	"net/url"
 
 	"github.com/gorilla/mux"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 

legacy/admin-handlers-config-kv.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -26,15 +26,15 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"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/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/etcd"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"

legacy/admin-handlers-users.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -24,7 +24,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"

legacy/admin-handlers.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -36,12 +36,12 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/notify"
-	"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/message/log"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/message/log"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/handlers"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"

legacy/admin-handlers_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"

legacy/admin-heal-ops.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 

legacy/admin-quota-handlers.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -22,8 +22,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 )

legacy/admin-router.go

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/madmin"
 )

legacy/admin-server-info.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"

legacy/api-datatypes.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"

legacy/api-errors.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -29,9 +29,9 @@ import (
 
 	minio "github.com/minio/minio-go/v6"
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"

legacy/api-errors_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/crypto"
 	"github.com/minio/minio/pkg/hash"
 )
 

legacy/api-headers.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,8 +27,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 // Returns a hexadecimal representation of time at the

legacy/api-headers_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"

legacy/api-resources.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/base64"

legacy/api-resources_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/url"

legacy/api-response.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -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/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/handlers"
 )
 

legacy/api-response_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"

legacy/api-router.go

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 func newHTTPServerFn() *xhttp.Server {

legacy/api-utils.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"strings"

legacy/api-utils_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"

legacy/auth-handler.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -30,9 +30,9 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	xjwt "github.com/minio/minio/cmd/jwt"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	xjwt "github.com/minio/minio/legacy/jwt"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"

legacy/auth-handler_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"

legacy/background-heal-ops.go

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 

legacy/background-newdisks-heal-ops.go

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 const defaultMonitorNewDiskInterval = time.Minute * 10

legacy/benchmark-utils_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"

legacy/bitrot-streaming.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -23,7 +23,7 @@ import (
 	"hash"
 	"io"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 type errHashMismatch struct {

legacy/bitrot-whole.go

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"hash"
 	"io"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // Implementation to calculate bitrot for the whole file.

legacy/bitrot.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
@@ -22,7 +22,7 @@ import (
 	"io"
 
 	"github.com/minio/highwayhash"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	sha256 "github.com/minio/sha256-simd"
 	"golang.org/x/crypto/blake2b"
 )

legacy/bitrot_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"io"

legacy/bootstrap-peer-server.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -30,9 +30,9 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/minio/minio-go/v6/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/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/rest"
 )
 
 const (

legacy/bucket-encryption-handlers.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
@@ -23,7 +23,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 

legacy/bucket-encryption.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"

legacy/bucket-encryption_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"

legacy/bucket-handlers.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/base64"
@@ -28,13 +28,12 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-
 	"github.com/minio/minio-go/v6/pkg/set"
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/event"

legacy/bucket-handlers_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"

legacy/bucket-lifecycle-handlers.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
@@ -22,8 +22,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/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	"github.com/minio/minio/pkg/bucket/policy"
 )

legacy/bucket-lifecycle-handlers_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"

legacy/bucket-lifecycle.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"github.com/minio/minio/pkg/bucket/lifecycle"

legacy/bucket-listobjects-handlers.go

@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
-
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 

legacy/bucket-metadata-sys.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"

legacy/bucket-metadata.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/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"

legacy/bucket-metadata_gen.go

@@ -1,4 +1,4 @@
-package cmd
+package legacy
 
 // Code generated by github.com/tinylib/msgp DO NOT EDIT.
 

legacy/bucket-metadata_gen_test.go

@@ -1,4 +1,4 @@
-package cmd
+package legacy
 
 // Code generated by github.com/tinylib/msgp DO NOT EDIT.
 

legacy/bucket-notification-handlers.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -25,8 +25,8 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/event"
 )

legacy/bucket-object-lock.go

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"math"
 	"net/http"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"

legacy/bucket-policy-handlers.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -23,7 +23,7 @@ import (
 
 	humanize "github.com/dustin/go-humanize"
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 

legacy/bucket-policy-handlers_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"

legacy/bucket-policy.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -26,8 +26,8 @@ import (
 
 	jsoniter "github.com/json-iterator/go"
 	miniogopolicy "github.com/minio/minio-go/v6/pkg/policy"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/handlers"
 )

legacy/bucket-quota.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/madmin"

legacy/build-constants.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 // DO NOT EDIT THIS FILE DIRECTLY. These are build-time constants
 // set through ‘buildscripts/gen-ldflags.go’.

legacy/common-main.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/x509"
@@ -29,8 +29,8 @@ import (
 	dns2 "github.com/miekg/dns"
 	"github.com/minio/cli"
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/certs"
 	"github.com/minio/minio/pkg/env"

legacy/config-common.go

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
 	"context"
 	"errors"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/hash"
 )
 

legacy/config-current.go

@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
 	"strings"
 	"sync"
 
-	"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/etcd"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	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/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/legacy/config"
+	"github.com/minio/minio/legacy/config/api"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/compress"
+	"github.com/minio/minio/legacy/config/etcd"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/target/http"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/madmin"
 )

legacy/config-current_test.go

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"os"
 	"testing"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 func TestServerConfig(t *testing.T) {

legacy/config-dir.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"

legacy/config-encrypted.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -25,8 +25,8 @@ import (
 	"unicode/utf8"
 
 	etcd "github.com/coreos/etcd/clientv3"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/madmin"
 )

legacy/config-encrypted_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"

legacy/config-migrate.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -25,16 +25,16 @@ import (
 	"path/filepath"
 	"strings"
 
-	"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/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/compress"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/event/target"

legacy/config-migrate_test.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
@@ -22,7 +22,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // Test if config v1 is purged

legacy/config-versions.go

@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 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/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/compress"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/event/target"
 	"github.com/minio/minio/pkg/quick"

legacy/config.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/madmin"
 )
 

legacy/config/api/api.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 

legacy/config/api/help.go

@@ -16,7 +16,7 @@
 
 package api
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for storageclass feature.
 var (

legacy/config/cache/config.go

@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/ellipses"
 )
 

legacy/config/cache/help.go

@@ -16,7 +16,7 @@
 
 package cache
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for caching feature.
 var (

legacy/config/cache/legacy.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 const (

legacy/config/cache/lookup.go

@@ -20,7 +20,7 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 

legacy/config/compress/compress.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 

legacy/config/compress/help.go

@@ -16,7 +16,7 @@
 
 package compress
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for compress feature.
 var (

legacy/config/compress/legacy.go

@@ -19,7 +19,7 @@ package compress
 import (
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // Legacy envs.

legacy/config/etcd/etcd.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/namespace"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	xnet "github.com/minio/minio/pkg/net"
 )

legacy/config/etcd/help.go

@@ -16,7 +16,7 @@
 
 package etcd
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // etcd config documented in default config
 var (

legacy/config/identity/ldap/config.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	ldap "gopkg.in/ldap.v3"
 )

legacy/config/identity/ldap/help.go

@@ -16,7 +16,7 @@
 
 package ldap
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for LDAP identity feature.
 var (

legacy/config/identity/ldap/legacy.go

@@ -16,7 +16,7 @@
 
 package ldap
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // SetIdentityLDAP - One time migration code needed, for migrating from older config to new for LDAPConfig.
 func SetIdentityLDAP(s config.Config, ldapArgs Config) {