Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Module #32

Merged
merged 1 commit into from
Apr 6, 2020
Merged

Fix Module #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/mcs/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"path/filepath"
"sort"

"github.com/minio/m3/mcs/pkg"
"github.com/minio/mcs/pkg"

"github.com/minio/minio/pkg/console"
"github.com/minio/minio/pkg/trie"
Expand Down
4 changes: 2 additions & 2 deletions cmd/mcs/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/go-openapi/loads"
"github.com/jessevdk/go-flags"
"github.com/minio/cli"
"github.com/minio/m3/mcs/restapi"
"github.com/minio/m3/mcs/restapi/operations"
"github.com/minio/mcs/restapi"
"github.com/minio/mcs/restapi/operations"
)

// starts the server
Expand Down
2 changes: 1 addition & 1 deletion cmd/mcs/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"

"github.com/minio/cli"
"github.com/minio/m3/mcs/pkg"
"github.com/minio/mcs/pkg"
)

// starts the server
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/minio/m3/mcs
module github.com/minio/mcs

go 1.14

Expand Down
6 changes: 3 additions & 3 deletions restapi/admin_arns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (

"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/swag"
"github.com/minio/m3/mcs/models"
"github.com/minio/m3/mcs/restapi/operations"
"github.com/minio/m3/mcs/restapi/operations/admin_api"
"github.com/minio/mcs/models"
"github.com/minio/mcs/restapi/operations"
"github.com/minio/mcs/restapi/operations/admin_api"
)

func registerAdminArnsHandlers(api *operations.McsAPI) {
Expand Down
6 changes: 3 additions & 3 deletions restapi/admin_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"github.com/go-openapi/errors"
"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/swag"
"github.com/minio/m3/mcs/models"
"github.com/minio/m3/mcs/restapi/operations"
"github.com/minio/mcs/models"
"github.com/minio/mcs/restapi/operations"

"github.com/minio/m3/mcs/restapi/operations/admin_api"
"github.com/minio/mcs/restapi/operations/admin_api"
)

func registerConfigHandlers(api *operations.McsAPI) {
Expand Down
2 changes: 1 addition & 1 deletion restapi/admin_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"

"github.com/go-openapi/swag"
"github.com/minio/m3/mcs/models"
"github.com/minio/mcs/models"
"github.com/minio/minio/pkg/madmin"

"errors"
Expand Down
6 changes: 3 additions & 3 deletions restapi/admin_groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import (
"github.com/go-openapi/errors"
"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/swag"
"github.com/minio/m3/mcs/restapi/operations"
"github.com/minio/mcs/restapi/operations"
"github.com/minio/minio/pkg/madmin"

"github.com/minio/m3/mcs/restapi/operations/admin_api"
"github.com/minio/mcs/restapi/operations/admin_api"

"github.com/minio/m3/mcs/models"
"github.com/minio/mcs/models"
)

func registerGroupsHandlers(api *operations.McsAPI) {
Expand Down
6 changes: 3 additions & 3 deletions restapi/admin_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (

"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/swag"
"github.com/minio/m3/mcs/models"
"github.com/minio/m3/mcs/restapi/operations"
"github.com/minio/m3/mcs/restapi/operations/admin_api"
"github.com/minio/mcs/models"
"github.com/minio/mcs/restapi/operations"
"github.com/minio/mcs/restapi/operations/admin_api"
)

func registerAdminInfoHandlers(api *operations.McsAPI) {
Expand Down
6 changes: 3 additions & 3 deletions restapi/admin_policies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (

"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/swag"
"github.com/minio/m3/mcs/models"
"github.com/minio/m3/mcs/restapi/operations"
"github.com/minio/m3/mcs/restapi/operations/admin_api"
"github.com/minio/mcs/models"
"github.com/minio/mcs/restapi/operations"
"github.com/minio/mcs/restapi/operations/admin_api"
)

func registersPoliciesHandler(api *operations.McsAPI) {
Expand Down
2 changes: 1 addition & 1 deletion restapi/admin_policies_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"errors"

"github.com/minio/m3/mcs/models"
"github.com/minio/mcs/models"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions restapi/admin_profiling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"github.com/go-openapi/runtime"
"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/swag"
"github.com/minio/m3/mcs/models"
"github.com/minio/m3/mcs/restapi/operations"
"github.com/minio/m3/mcs/restapi/operations/admin_api"
"github.com/minio/mcs/models"
"github.com/minio/mcs/restapi/operations"
"github.com/minio/mcs/restapi/operations/admin_api"
"github.com/minio/minio/pkg/madmin"
)

Expand Down
2 changes: 1 addition & 1 deletion restapi/admin_profiling_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"errors"

"github.com/minio/m3/mcs/models"
"github.com/minio/mcs/models"
"github.com/minio/minio/pkg/madmin"
"github.com/stretchr/testify/assert"
)
Expand Down
6 changes: 3 additions & 3 deletions restapi/admin_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (

"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/swag"
"github.com/minio/m3/mcs/models"
"github.com/minio/m3/mcs/restapi/operations"
"github.com/minio/mcs/models"
"github.com/minio/mcs/restapi/operations"

"github.com/minio/m3/mcs/restapi/operations/admin_api"
"github.com/minio/mcs/restapi/operations/admin_api"
)

func registerServiceHandlers(api *operations.McsAPI) {
Expand Down
6 changes: 3 additions & 3 deletions restapi/admin_users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (

"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/swag"
"github.com/minio/m3/mcs/restapi/operations"
"github.com/minio/mcs/restapi/operations"

"github.com/minio/m3/mcs/restapi/operations/admin_api"
"github.com/minio/mcs/restapi/operations/admin_api"

"github.com/minio/m3/mcs/models"
"github.com/minio/mcs/models"
)

func registerUsersHandlers(api *operations.McsAPI) {
Expand Down
8 changes: 4 additions & 4 deletions restapi/configure_mcs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ import (
"net/http"
"strings"

"github.com/minio/m3/mcs/restapi/sessions"
"github.com/minio/mcs/restapi/sessions"

"github.com/minio/m3/mcs/models"
"github.com/minio/mcs/models"

assetfs "github.com/elazarl/go-bindata-assetfs"

portalUI "github.com/minio/m3/mcs/portal-ui"
portalUI "github.com/minio/mcs/portal-ui"

"github.com/go-openapi/errors"
"github.com/go-openapi/runtime"
"github.com/minio/m3/mcs/restapi/operations"
"github.com/minio/mcs/restapi/operations"
)

//go:generate swagger generate server --target ../../mcs --name Mcs --spec ../swagger.yml
Expand Down
2 changes: 1 addition & 1 deletion restapi/operations/admin_api/add_group.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/add_group_parameters.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/add_group_responses.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/add_policy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/add_policy_parameters.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/add_policy_responses.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/add_user.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/add_user_parameters.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/add_user_responses.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/admin_info.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/admin_info_responses.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/arn_list.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/arn_list_responses.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/config_info.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/config_info_responses.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/group_info.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/group_info_responses.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/list_config.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/list_config_responses.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/list_groups.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/list_groups_responses.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/operations/admin_api/list_policies.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading