r.loginov/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Pull requests Activity

Merged in refactoring (pull request #2)

Browse source 
Refactoring

Approved-by: Pavel Korotkov
This commit is contained in:
Evgeniy Kulikov 2020-07-09 11:49:48 +00:00 committed by Pavel Korotkov
commit 0bdd3e4507
401 changed files with 629 additions and 631 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
app-graceful.go → cmd/gate/app-graceful.go
View file

0
app-healthy.go → cmd/gate/app-healthy.go
View file

0
app-logger.go → cmd/gate/app-logger.go
View file

0
app-metrics.go → cmd/gate/app-metrics.go
View file

0
app-profiler.go → cmd/gate/app-profiler.go
View file

0
app-settings.go → cmd/gate/app-settings.go
View file

2
app.go → cmd/gate/app.go
View file

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

0
main.go → cmd/gate/main.go
View file

6
cmd/acl-handlers.go → legacy/acl-handlers.go
View file

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

20
cmd/admin-handlers-config-kv.go → legacy/admin-handlers-config-kv.go
View file

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

4
cmd/admin-handlers-users.go → legacy/admin-handlers-users.go
View file

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

14
cmd/admin-handlers.go → legacy/admin-handlers.go
View file

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

2
cmd/admin-handlers_test.go → legacy/admin-handlers_test.go
View file

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

4
cmd/admin-heal-ops.go → legacy/admin-heal-ops.go
View file

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

6
cmd/admin-quota-handlers.go → legacy/admin-quota-handlers.go
View file

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

4
cmd/admin-router.go → legacy/admin-router.go
View file

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package cmd package legacy
import ( import (
"net/http" "net/http"
"github.com/gorilla/mux" "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/env"
"github.com/minio/minio/pkg/madmin" "github.com/minio/minio/pkg/madmin"
) )

2
cmd/admin-server-info.go → legacy/admin-server-info.go
View file

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

2
cmd/api-datatypes.go → legacy/api-datatypes.go
View file

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

8
cmd/api-errors.go → legacy/api-errors.go
View file

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

4
cmd/api-errors_test.go → legacy/api-errors_test.go
View file

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

6
cmd/api-headers.go → legacy/api-headers.go
View file

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

2
cmd/api-headers_test.go → legacy/api-headers_test.go
View file

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

2
cmd/api-resources.go → legacy/api-resources.go
View file

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

2
cmd/api-resources_test.go → legacy/api-resources_test.go
View file

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

6
cmd/api-response.go → legacy/api-response.go
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package cmd package legacy
import ( import (
"context" "context"
@ -27,8 +27,8 @@ import (
"strings" "strings"
"time" "time"
xhttp "github.com/minio/minio/cmd/http" xhttp "github.com/minio/minio/legacy/http"
"github.com/minio/minio/cmd/logger" "github.com/minio/minio/legacy/logger"
"github.com/minio/minio/pkg/handlers" "github.com/minio/minio/pkg/handlers"
) )

2
cmd/api-response_test.go → legacy/api-response_test.go
View file

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

4
cmd/api-router.go → legacy/api-router.go
View file

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

2
cmd/api-utils.go → legacy/api-utils.go
View file

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

2
cmd/api-utils_test.go → legacy/api-utils_test.go
View file

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

8
cmd/auth-handler.go → legacy/auth-handler.go
View file

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

2
cmd/auth-handler_test.go → legacy/auth-handler_test.go
View file

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

4
cmd/background-heal-ops.go → legacy/background-heal-ops.go
View file

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

4
cmd/background-newdisks-heal-ops.go → legacy/background-newdisks-heal-ops.go
View file

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

2
cmd/benchmark-utils_test.go → legacy/benchmark-utils_test.go
View file

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

4
cmd/bitrot-streaming.go → legacy/bitrot-streaming.go
View file

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

4
cmd/bitrot-whole.go → legacy/bitrot-whole.go
View file

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

4
cmd/bitrot.go → legacy/bitrot.go
View file

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

2
cmd/bitrot_test.go → legacy/bitrot_test.go
View file

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

8
cmd/bootstrap-peer-server.go → legacy/bootstrap-peer-server.go
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package cmd package legacy
import ( import (
"context" "context"
@ -30,9 +30,9 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/minio/minio-go/v6/pkg/set" "github.com/minio/minio-go/v6/pkg/set"
xhttp "github.com/minio/minio/cmd/http" xhttp "github.com/minio/minio/legacy/http"
"github.com/minio/minio/cmd/logger" "github.com/minio/minio/legacy/logger"
"github.com/minio/minio/cmd/rest" "github.com/minio/minio/legacy/rest"
) )
const ( const (

4
cmd/bucket-encryption-handlers.go → legacy/bucket-encryption-handlers.go
View file

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

2
cmd/bucket-encryption.go → legacy/bucket-encryption.go
View file

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

2
cmd/bucket-encryption_test.go → legacy/bucket-encryption_test.go
View file

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

11
cmd/bucket-handlers.go → legacy/bucket-handlers.go
View file

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

2
cmd/bucket-handlers_test.go → legacy/bucket-handlers_test.go
View file

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

6
cmd/bucket-lifecycle-handlers.go → legacy/bucket-lifecycle-handlers.go
View file

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

2
cmd/bucket-lifecycle-handlers_test.go → legacy/bucket-lifecycle-handlers_test.go
View file

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

2
cmd/bucket-lifecycle.go → legacy/bucket-lifecycle.go
View file

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

7
cmd/bucket-listobjects-handlers.go → legacy/bucket-listobjects-handlers.go
View file

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

2
cmd/bucket-metadata-sys.go → legacy/bucket-metadata-sys.go
View file

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

4
cmd/bucket-metadata.go → legacy/bucket-metadata.go
View file

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

2
cmd/bucket-metadata_gen.go → legacy/bucket-metadata_gen.go
View file

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

2
cmd/bucket-metadata_gen_test.go → legacy/bucket-metadata_gen_test.go
View file

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

6
cmd/bucket-notification-handlers.go → legacy/bucket-notification-handlers.go
View file

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

4
cmd/bucket-object-lock.go → legacy/bucket-object-lock.go
View file

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

4
cmd/bucket-policy-handlers.go → legacy/bucket-policy-handlers.go
View file

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

2
cmd/bucket-policy-handlers_test.go → legacy/bucket-policy-handlers_test.go
View file

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

6
cmd/bucket-policy.go → legacy/bucket-policy.go
View file

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

6
cmd/bucket-quota.go → legacy/bucket-quota.go
View file

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

2
cmd/build-constants.go → legacy/build-constants.go
View file

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

6
cmd/common-main.go → legacy/common-main.go
View file

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

4
cmd/config-common.go → legacy/config-common.go
View file

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

32
cmd/config-current.go → legacy/config-current.go
View file

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

4
cmd/config-current_test.go → legacy/config-current_test.go
View file

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

2
cmd/config-dir.go → legacy/config-dir.go
View file

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

6
cmd/config-encrypted.go → legacy/config-encrypted.go
View file

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

2
cmd/config-encrypted_test.go → legacy/config-encrypted_test.go
View file

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

22
cmd/config-migrate.go → legacy/config-migrate.go
View file

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

4
cmd/config-migrate_test.go → legacy/config-migrate_test.go
View file

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

22
cmd/config-versions.go → legacy/config-versions.go
View file

@ -14,21 +14,21 @@
* limitations under the License. * limitations under the License.
*/ */
package cmd package legacy
import ( import (
"sync" "sync"
"github.com/minio/minio/cmd/config" "github.com/minio/minio/legacy/config"
"github.com/minio/minio/cmd/config/cache" "github.com/minio/minio/legacy/config/cache"
"github.com/minio/minio/cmd/config/compress" "github.com/minio/minio/legacy/config/compress"
xldap "github.com/minio/minio/cmd/config/identity/ldap" xldap "github.com/minio/minio/legacy/config/identity/ldap"
"github.com/minio/minio/cmd/config/identity/openid" "github.com/minio/minio/legacy/config/identity/openid"
"github.com/minio/minio/cmd/config/notify" "github.com/minio/minio/legacy/config/notify"
"github.com/minio/minio/cmd/config/policy/opa" "github.com/minio/minio/legacy/config/policy/opa"
"github.com/minio/minio/cmd/config/storageclass" "github.com/minio/minio/legacy/config/storageclass"
"github.com/minio/minio/cmd/crypto" "github.com/minio/minio/legacy/crypto"
"github.com/minio/minio/cmd/logger" "github.com/minio/minio/legacy/logger"
"github.com/minio/minio/pkg/auth" "github.com/minio/minio/pkg/auth"
"github.com/minio/minio/pkg/event/target" "github.com/minio/minio/pkg/event/target"
"github.com/minio/minio/pkg/quick" "github.com/minio/minio/pkg/quick"

4
cmd/config.go → legacy/config.go
View file

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

2
cmd/config/api/api.go → legacy/config/api/api.go
View file

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

2
cmd/config/api/help.go → legacy/config/api/help.go
View file

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

0
cmd/config/bool-flag.go → legacy/config/bool-flag.go
View file

0
cmd/config/bool-flag_test.go → legacy/config/bool-flag_test.go
View file

2
cmd/config/cache/config.go → legacy/config/cache/config.go vendored
View file

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

0
cmd/config/cache/config_test.go → legacy/config/cache/config_test.go vendored
View file

2
cmd/config/cache/help.go → legacy/config/cache/help.go vendored
View file

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

2
cmd/config/cache/legacy.go → legacy/config/cache/legacy.go vendored
View file

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

2
cmd/config/cache/lookup.go → legacy/config/cache/lookup.go vendored
View file

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

0
cmd/config/certs.go → legacy/config/certs.go
View file

0
cmd/config/certs_test.go → legacy/config/certs_test.go
View file

0
cmd/config/certsinfo.go → legacy/config/certsinfo.go
View file

2
cmd/config/compress/compress.go → legacy/config/compress/compress.go
View file

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

0
cmd/config/compress/compress_test.go → legacy/config/compress/compress_test.go
View file

2
cmd/config/compress/help.go → legacy/config/compress/help.go
View file

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

2
cmd/config/compress/legacy.go → legacy/config/compress/legacy.go
View file

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

0
cmd/config/config.go → legacy/config/config.go
View file

0
cmd/config/config_test.go → legacy/config/config_test.go
View file

0
cmd/config/constants.go → legacy/config/constants.go
View file

0
cmd/config/errors-utils.go → legacy/config/errors-utils.go
View file

0
cmd/config/errors.go → legacy/config/errors.go
View file

0
cmd/config/etcd/dns/etcd_dns.go → legacy/config/etcd/dns/etcd_dns.go
View file

0
cmd/config/etcd/dns/types.go → legacy/config/etcd/dns/types.go
View file

2
cmd/config/etcd/etcd.go → legacy/config/etcd/etcd.go
View file

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

0
cmd/config/etcd/etcd_test.go → legacy/config/etcd/etcd_test.go
View file

2
cmd/config/etcd/help.go → legacy/config/etcd/help.go
View file

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

0
cmd/config/help.go → legacy/config/help.go
View file

2
cmd/config/identity/ldap/config.go → legacy/config/identity/ldap/config.go
View file

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

2
cmd/config/identity/ldap/help.go → legacy/config/identity/ldap/help.go
View file

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

2
cmd/config/identity/ldap/legacy.go → legacy/config/identity/ldap/legacy.go
View file

@ -16,7 +16,7 @@
package ldap 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. // SetIdentityLDAP - One time migration code needed, for migrating from older config to new for LDAPConfig.
func SetIdentityLDAP(s config.Config, ldapArgs Config) { func SetIdentityLDAP(s config.Config, ldapArgs Config) {

Some files were not shown because too many files have changed in this diff Show more