diff --git a/operatorapi/embedded_spec.go b/operatorapi/embedded_spec.go index a1fcc67ca..e0a1b0846 100644 --- a/operatorapi/embedded_spec.go +++ b/operatorapi/embedded_spec.go @@ -208,7 +208,7 @@ func init() { "get": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Returns login strategy, form or sso.", "operationId": "LoginDetail", @@ -232,7 +232,7 @@ func init() { "post": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Identity Provider oauth2 callback endpoint.", "operationId": "LoginOauth2Auth", @@ -263,7 +263,7 @@ func init() { "post": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Login to Operator Console.", "operationId": "LoginOperator", @@ -293,7 +293,7 @@ func init() { "/logout": { "post": { "tags": [ - "UserAPI" + "Auth" ], "summary": "Logout from Operator.", "operationId": "Logout", @@ -1665,7 +1665,7 @@ func init() { "/session": { "get": { "tags": [ - "UserAPI" + "Auth" ], "summary": "Endpoint to check if your session is still valid", "operationId": "SessionCheck", @@ -4278,7 +4278,7 @@ func init() { "get": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Returns login strategy, form or sso.", "operationId": "LoginDetail", @@ -4302,7 +4302,7 @@ func init() { "post": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Identity Provider oauth2 callback endpoint.", "operationId": "LoginOauth2Auth", @@ -4333,7 +4333,7 @@ func init() { "post": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Login to Operator Console.", "operationId": "LoginOperator", @@ -4363,7 +4363,7 @@ func init() { "/logout": { "post": { "tags": [ - "UserAPI" + "Auth" ], "summary": "Logout from Operator.", "operationId": "Logout", @@ -5735,7 +5735,7 @@ func init() { "/session": { "get": { "tags": [ - "UserAPI" + "Auth" ], "summary": "Endpoint to check if your session is still valid", "operationId": "SessionCheck", diff --git a/operatorapi/login.go b/operatorapi/login.go index 53ed118fa..8693dc7e5 100644 --- a/operatorapi/login.go +++ b/operatorapi/login.go @@ -33,44 +33,45 @@ import ( "github.com/minio/console/models" opauth "github.com/minio/console/operatorapi/auth" "github.com/minio/console/operatorapi/operations" - "github.com/minio/console/operatorapi/operations/user_api" + authApi "github.com/minio/console/operatorapi/operations/auth" + "github.com/minio/console/pkg/auth" "github.com/minio/console/pkg/auth/idp/oauth2" ) func registerLoginHandlers(api *operations.OperatorAPI) { // GET login strategy - api.UserAPILoginDetailHandler = user_api.LoginDetailHandlerFunc(func(params user_api.LoginDetailParams) middleware.Responder { + api.AuthLoginDetailHandler = authApi.LoginDetailHandlerFunc(func(params authApi.LoginDetailParams) middleware.Responder { loginDetails, err := getLoginDetailsResponse(params.HTTPRequest) if err != nil { - return user_api.NewLoginDetailDefault(int(err.Code)).WithPayload(err) + return authApi.NewLoginDetailDefault(int(err.Code)).WithPayload(err) } - return user_api.NewLoginDetailOK().WithPayload(loginDetails) + return authApi.NewLoginDetailOK().WithPayload(loginDetails) }) // POST login using k8s service account token - api.UserAPILoginOperatorHandler = user_api.LoginOperatorHandlerFunc(func(params user_api.LoginOperatorParams) middleware.Responder { + api.AuthLoginOperatorHandler = authApi.LoginOperatorHandlerFunc(func(params authApi.LoginOperatorParams) middleware.Responder { loginResponse, err := getLoginOperatorResponse(params.Body) if err != nil { - return user_api.NewLoginOperatorDefault(int(err.Code)).WithPayload(err) + return authApi.NewLoginOperatorDefault(int(err.Code)).WithPayload(err) } // Custom response writer to set the session cookies return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) { cookie := restapi.NewSessionCookieForConsole(loginResponse.SessionID) http.SetCookie(w, &cookie) - user_api.NewLoginOperatorNoContent().WriteResponse(w, p) + authApi.NewLoginOperatorNoContent().WriteResponse(w, p) }) }) // POST login using external IDP - api.UserAPILoginOauth2AuthHandler = user_api.LoginOauth2AuthHandlerFunc(func(params user_api.LoginOauth2AuthParams) middleware.Responder { + api.AuthLoginOauth2AuthHandler = authApi.LoginOauth2AuthHandlerFunc(func(params authApi.LoginOauth2AuthParams) middleware.Responder { loginResponse, err := getLoginOauth2AuthResponse(params.HTTPRequest, params.Body) if err != nil { - return user_api.NewLoginOauth2AuthDefault(int(err.Code)).WithPayload(err) + return authApi.NewLoginOauth2AuthDefault(int(err.Code)).WithPayload(err) } // Custom response writer to set the session cookies return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) { cookie := restapi.NewSessionCookieForConsole(loginResponse.SessionID) http.SetCookie(w, &cookie) - user_api.NewLoginOauth2AuthNoContent().WriteResponse(w, p) + authApi.NewLoginOauth2AuthNoContent().WriteResponse(w, p) }) }) } diff --git a/operatorapi/logout.go b/operatorapi/logout.go index 30af26c1f..3d1552ed5 100644 --- a/operatorapi/logout.go +++ b/operatorapi/logout.go @@ -23,20 +23,20 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/operatorapi/operations" - "github.com/minio/console/operatorapi/operations/user_api" + authApi "github.com/minio/console/operatorapi/operations/auth" "github.com/minio/console/restapi" ) func registerLogoutHandlers(api *operations.OperatorAPI) { // logout from console - api.UserAPILogoutHandler = user_api.LogoutHandlerFunc(func(params user_api.LogoutParams, session *models.Principal) middleware.Responder { + api.AuthLogoutHandler = authApi.LogoutHandlerFunc(func(params authApi.LogoutParams, session *models.Principal) middleware.Responder { // Custom response writer to expire the session cookies return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) { expiredCookie := restapi.ExpireSessionCookie() // this will tell the browser to clear the cookie and invalidate user session // additionally we are deleting the cookie from the client side http.SetCookie(w, &expiredCookie) - user_api.NewLogoutOK().WriteResponse(w, p) + authApi.NewLogoutOK().WriteResponse(w, p) }) }) } diff --git a/operatorapi/operations/user_api/login_detail.go b/operatorapi/operations/auth/login_detail.go similarity index 96% rename from operatorapi/operations/user_api/login_detail.go rename to operatorapi/operations/auth/login_detail.go index 5f7234c01..62a6286ca 100644 --- a/operatorapi/operations/user_api/login_detail.go +++ b/operatorapi/operations/auth/login_detail.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -46,7 +46,7 @@ func NewLoginDetail(ctx *middleware.Context, handler LoginDetailHandler) *LoginD return &LoginDetail{Context: ctx, Handler: handler} } -/* LoginDetail swagger:route GET /login UserAPI loginDetail +/* LoginDetail swagger:route GET /login Auth loginDetail Returns login strategy, form or sso. diff --git a/operatorapi/operations/user_api/login_detail_parameters.go b/operatorapi/operations/auth/login_detail_parameters.go similarity index 99% rename from operatorapi/operations/user_api/login_detail_parameters.go rename to operatorapi/operations/auth/login_detail_parameters.go index 607384fb4..37449b568 100644 --- a/operatorapi/operations/user_api/login_detail_parameters.go +++ b/operatorapi/operations/auth/login_detail_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/operatorapi/operations/user_api/login_detail_responses.go b/operatorapi/operations/auth/login_detail_responses.go similarity index 99% rename from operatorapi/operations/user_api/login_detail_responses.go rename to operatorapi/operations/auth/login_detail_responses.go index d136f2097..28f53c75a 100644 --- a/operatorapi/operations/user_api/login_detail_responses.go +++ b/operatorapi/operations/auth/login_detail_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/login_detail_urlbuilder.go b/operatorapi/operations/auth/login_detail_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/login_detail_urlbuilder.go rename to operatorapi/operations/auth/login_detail_urlbuilder.go index 7b84165f4..f8f9e41a7 100644 --- a/restapi/operations/user_api/login_detail_urlbuilder.go +++ b/operatorapi/operations/auth/login_detail_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/operatorapi/operations/user_api/login_oauth2_auth.go b/operatorapi/operations/auth/login_oauth2_auth.go similarity index 96% rename from operatorapi/operations/user_api/login_oauth2_auth.go rename to operatorapi/operations/auth/login_oauth2_auth.go index 175784824..e7d00271b 100644 --- a/operatorapi/operations/user_api/login_oauth2_auth.go +++ b/operatorapi/operations/auth/login_oauth2_auth.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -46,7 +46,7 @@ func NewLoginOauth2Auth(ctx *middleware.Context, handler LoginOauth2AuthHandler) return &LoginOauth2Auth{Context: ctx, Handler: handler} } -/* LoginOauth2Auth swagger:route POST /login/oauth2/auth UserAPI loginOauth2Auth +/* LoginOauth2Auth swagger:route POST /login/oauth2/auth Auth loginOauth2Auth Identity Provider oauth2 callback endpoint. diff --git a/restapi/operations/user_api/login_oauth2_auth_parameters.go b/operatorapi/operations/auth/login_oauth2_auth_parameters.go similarity index 99% rename from restapi/operations/user_api/login_oauth2_auth_parameters.go rename to operatorapi/operations/auth/login_oauth2_auth_parameters.go index 070117c25..83d1275c4 100644 --- a/restapi/operations/user_api/login_oauth2_auth_parameters.go +++ b/operatorapi/operations/auth/login_oauth2_auth_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/login_oauth2_auth_responses.go b/operatorapi/operations/auth/login_oauth2_auth_responses.go similarity index 99% rename from restapi/operations/user_api/login_oauth2_auth_responses.go rename to operatorapi/operations/auth/login_oauth2_auth_responses.go index 6afe498a9..e089f66ab 100644 --- a/restapi/operations/user_api/login_oauth2_auth_responses.go +++ b/operatorapi/operations/auth/login_oauth2_auth_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/login_oauth2_auth_urlbuilder.go b/operatorapi/operations/auth/login_oauth2_auth_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/login_oauth2_auth_urlbuilder.go rename to operatorapi/operations/auth/login_oauth2_auth_urlbuilder.go index 6e9b324e8..769a9a892 100644 --- a/restapi/operations/user_api/login_oauth2_auth_urlbuilder.go +++ b/operatorapi/operations/auth/login_oauth2_auth_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/operatorapi/operations/user_api/login_operator.go b/operatorapi/operations/auth/login_operator.go similarity index 96% rename from operatorapi/operations/user_api/login_operator.go rename to operatorapi/operations/auth/login_operator.go index 30a1b5482..470ddd4f6 100644 --- a/operatorapi/operations/user_api/login_operator.go +++ b/operatorapi/operations/auth/login_operator.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -46,7 +46,7 @@ func NewLoginOperator(ctx *middleware.Context, handler LoginOperatorHandler) *Lo return &LoginOperator{Context: ctx, Handler: handler} } -/* LoginOperator swagger:route POST /login/operator UserAPI loginOperator +/* LoginOperator swagger:route POST /login/operator Auth loginOperator Login to Operator Console. diff --git a/operatorapi/operations/user_api/login_operator_parameters.go b/operatorapi/operations/auth/login_operator_parameters.go similarity index 99% rename from operatorapi/operations/user_api/login_operator_parameters.go rename to operatorapi/operations/auth/login_operator_parameters.go index 76b71bcf8..156a42937 100644 --- a/operatorapi/operations/user_api/login_operator_parameters.go +++ b/operatorapi/operations/auth/login_operator_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/operatorapi/operations/user_api/login_operator_responses.go b/operatorapi/operations/auth/login_operator_responses.go similarity index 99% rename from operatorapi/operations/user_api/login_operator_responses.go rename to operatorapi/operations/auth/login_operator_responses.go index 0bda5dc39..5fd4bf36c 100644 --- a/operatorapi/operations/user_api/login_operator_responses.go +++ b/operatorapi/operations/auth/login_operator_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/operatorapi/operations/user_api/login_operator_urlbuilder.go b/operatorapi/operations/auth/login_operator_urlbuilder.go similarity index 99% rename from operatorapi/operations/user_api/login_operator_urlbuilder.go rename to operatorapi/operations/auth/login_operator_urlbuilder.go index e12dc3b14..c0d177f22 100644 --- a/operatorapi/operations/user_api/login_operator_urlbuilder.go +++ b/operatorapi/operations/auth/login_operator_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/operatorapi/operations/user_api/logout.go b/operatorapi/operations/auth/logout.go similarity index 97% rename from operatorapi/operations/user_api/logout.go rename to operatorapi/operations/auth/logout.go index 49dc87ad2..72c0eed50 100644 --- a/operatorapi/operations/user_api/logout.go +++ b/operatorapi/operations/auth/logout.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewLogout(ctx *middleware.Context, handler LogoutHandler) *Logout { return &Logout{Context: ctx, Handler: handler} } -/* Logout swagger:route POST /logout UserAPI logout +/* Logout swagger:route POST /logout Auth logout Logout from Operator. diff --git a/restapi/operations/user_api/logout_parameters.go b/operatorapi/operations/auth/logout_parameters.go similarity index 99% rename from restapi/operations/user_api/logout_parameters.go rename to operatorapi/operations/auth/logout_parameters.go index c7a4ebbd4..3c8e1840f 100644 --- a/restapi/operations/user_api/logout_parameters.go +++ b/operatorapi/operations/auth/logout_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/operatorapi/operations/user_api/logout_responses.go b/operatorapi/operations/auth/logout_responses.go similarity index 99% rename from operatorapi/operations/user_api/logout_responses.go rename to operatorapi/operations/auth/logout_responses.go index 9a2e694f3..273cd5099 100644 --- a/operatorapi/operations/user_api/logout_responses.go +++ b/operatorapi/operations/auth/logout_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/logout_urlbuilder.go b/operatorapi/operations/auth/logout_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/logout_urlbuilder.go rename to operatorapi/operations/auth/logout_urlbuilder.go index ff8f58434..d5e9d4319 100644 --- a/restapi/operations/user_api/logout_urlbuilder.go +++ b/operatorapi/operations/auth/logout_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/session_check.go b/operatorapi/operations/auth/session_check.go similarity index 97% rename from restapi/operations/user_api/session_check.go rename to operatorapi/operations/auth/session_check.go index 12d57823b..41781ea48 100644 --- a/restapi/operations/user_api/session_check.go +++ b/operatorapi/operations/auth/session_check.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSessionCheck(ctx *middleware.Context, handler SessionCheckHandler) *Sess return &SessionCheck{Context: ctx, Handler: handler} } -/* SessionCheck swagger:route GET /session UserAPI sessionCheck +/* SessionCheck swagger:route GET /session Auth sessionCheck Endpoint to check if your session is still valid diff --git a/operatorapi/operations/user_api/session_check_parameters.go b/operatorapi/operations/auth/session_check_parameters.go similarity index 99% rename from operatorapi/operations/user_api/session_check_parameters.go rename to operatorapi/operations/auth/session_check_parameters.go index d35dd2547..17708d93f 100644 --- a/operatorapi/operations/user_api/session_check_parameters.go +++ b/operatorapi/operations/auth/session_check_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/operatorapi/operations/user_api/session_check_responses.go b/operatorapi/operations/auth/session_check_responses.go similarity index 99% rename from operatorapi/operations/user_api/session_check_responses.go rename to operatorapi/operations/auth/session_check_responses.go index 6d0588357..c394d514d 100644 --- a/operatorapi/operations/user_api/session_check_responses.go +++ b/operatorapi/operations/auth/session_check_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/operatorapi/operations/user_api/session_check_urlbuilder.go b/operatorapi/operations/auth/session_check_urlbuilder.go similarity index 99% rename from operatorapi/operations/user_api/session_check_urlbuilder.go rename to operatorapi/operations/auth/session_check_urlbuilder.go index ba4ff8607..8a0cbbd8d 100644 --- a/operatorapi/operations/user_api/session_check_urlbuilder.go +++ b/operatorapi/operations/auth/session_check_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/operatorapi/operations/operator_api.go b/operatorapi/operations/operator_api.go index 5f87f81ed..d44a36a04 100644 --- a/operatorapi/operations/operator_api.go +++ b/operatorapi/operations/operator_api.go @@ -37,6 +37,7 @@ import ( "github.com/go-openapi/swag" "github.com/minio/console/models" + "github.com/minio/console/operatorapi/operations/auth" "github.com/minio/console/operatorapi/operations/operator_api" "github.com/minio/console/operatorapi/operations/user_api" ) @@ -141,23 +142,23 @@ func NewOperatorAPI(spec *loads.Document) *OperatorAPI { OperatorAPIListTenantsHandler: operator_api.ListTenantsHandlerFunc(func(params operator_api.ListTenantsParams, principal *models.Principal) middleware.Responder { return middleware.NotImplemented("operation operator_api.ListTenants has not yet been implemented") }), - UserAPILoginDetailHandler: user_api.LoginDetailHandlerFunc(func(params user_api.LoginDetailParams) middleware.Responder { - return middleware.NotImplemented("operation user_api.LoginDetail has not yet been implemented") + AuthLoginDetailHandler: auth.LoginDetailHandlerFunc(func(params auth.LoginDetailParams) middleware.Responder { + return middleware.NotImplemented("operation auth.LoginDetail has not yet been implemented") }), - UserAPILoginOauth2AuthHandler: user_api.LoginOauth2AuthHandlerFunc(func(params user_api.LoginOauth2AuthParams) middleware.Responder { - return middleware.NotImplemented("operation user_api.LoginOauth2Auth has not yet been implemented") + AuthLoginOauth2AuthHandler: auth.LoginOauth2AuthHandlerFunc(func(params auth.LoginOauth2AuthParams) middleware.Responder { + return middleware.NotImplemented("operation auth.LoginOauth2Auth has not yet been implemented") }), - UserAPILoginOperatorHandler: user_api.LoginOperatorHandlerFunc(func(params user_api.LoginOperatorParams) middleware.Responder { - return middleware.NotImplemented("operation user_api.LoginOperator has not yet been implemented") + AuthLoginOperatorHandler: auth.LoginOperatorHandlerFunc(func(params auth.LoginOperatorParams) middleware.Responder { + return middleware.NotImplemented("operation auth.LoginOperator has not yet been implemented") }), - UserAPILogoutHandler: user_api.LogoutHandlerFunc(func(params user_api.LogoutParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.Logout has not yet been implemented") + AuthLogoutHandler: auth.LogoutHandlerFunc(func(params auth.LogoutParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation auth.Logout has not yet been implemented") }), OperatorAPIPutTenantYAMLHandler: operator_api.PutTenantYAMLHandlerFunc(func(params operator_api.PutTenantYAMLParams, principal *models.Principal) middleware.Responder { return middleware.NotImplemented("operation operator_api.PutTenantYAML has not yet been implemented") }), - UserAPISessionCheckHandler: user_api.SessionCheckHandlerFunc(func(params user_api.SessionCheckParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.SessionCheck has not yet been implemented") + AuthSessionCheckHandler: auth.SessionCheckHandlerFunc(func(params auth.SessionCheckParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation auth.SessionCheck has not yet been implemented") }), OperatorAPISetTenantLogsHandler: operator_api.SetTenantLogsHandlerFunc(func(params operator_api.SetTenantLogsParams, principal *models.Principal) middleware.Responder { return middleware.NotImplemented("operation operator_api.SetTenantLogs has not yet been implemented") @@ -317,18 +318,18 @@ type OperatorAPI struct { OperatorAPIListPVCsForTenantHandler operator_api.ListPVCsForTenantHandler // OperatorAPIListTenantsHandler sets the operation handler for the list tenants operation OperatorAPIListTenantsHandler operator_api.ListTenantsHandler - // UserAPILoginDetailHandler sets the operation handler for the login detail operation - UserAPILoginDetailHandler user_api.LoginDetailHandler - // UserAPILoginOauth2AuthHandler sets the operation handler for the login oauth2 auth operation - UserAPILoginOauth2AuthHandler user_api.LoginOauth2AuthHandler - // UserAPILoginOperatorHandler sets the operation handler for the login operator operation - UserAPILoginOperatorHandler user_api.LoginOperatorHandler - // UserAPILogoutHandler sets the operation handler for the logout operation - UserAPILogoutHandler user_api.LogoutHandler + // AuthLoginDetailHandler sets the operation handler for the login detail operation + AuthLoginDetailHandler auth.LoginDetailHandler + // AuthLoginOauth2AuthHandler sets the operation handler for the login oauth2 auth operation + AuthLoginOauth2AuthHandler auth.LoginOauth2AuthHandler + // AuthLoginOperatorHandler sets the operation handler for the login operator operation + AuthLoginOperatorHandler auth.LoginOperatorHandler + // AuthLogoutHandler sets the operation handler for the logout operation + AuthLogoutHandler auth.LogoutHandler // OperatorAPIPutTenantYAMLHandler sets the operation handler for the put tenant y a m l operation OperatorAPIPutTenantYAMLHandler operator_api.PutTenantYAMLHandler - // UserAPISessionCheckHandler sets the operation handler for the session check operation - UserAPISessionCheckHandler user_api.SessionCheckHandler + // AuthSessionCheckHandler sets the operation handler for the session check operation + AuthSessionCheckHandler auth.SessionCheckHandler // OperatorAPISetTenantLogsHandler sets the operation handler for the set tenant logs operation OperatorAPISetTenantLogsHandler operator_api.SetTenantLogsHandler // OperatorAPISetTenantMonitoringHandler sets the operation handler for the set tenant monitoring operation @@ -526,23 +527,23 @@ func (o *OperatorAPI) Validate() error { if o.OperatorAPIListTenantsHandler == nil { unregistered = append(unregistered, "operator_api.ListTenantsHandler") } - if o.UserAPILoginDetailHandler == nil { - unregistered = append(unregistered, "user_api.LoginDetailHandler") + if o.AuthLoginDetailHandler == nil { + unregistered = append(unregistered, "auth.LoginDetailHandler") } - if o.UserAPILoginOauth2AuthHandler == nil { - unregistered = append(unregistered, "user_api.LoginOauth2AuthHandler") + if o.AuthLoginOauth2AuthHandler == nil { + unregistered = append(unregistered, "auth.LoginOauth2AuthHandler") } - if o.UserAPILoginOperatorHandler == nil { - unregistered = append(unregistered, "user_api.LoginOperatorHandler") + if o.AuthLoginOperatorHandler == nil { + unregistered = append(unregistered, "auth.LoginOperatorHandler") } - if o.UserAPILogoutHandler == nil { - unregistered = append(unregistered, "user_api.LogoutHandler") + if o.AuthLogoutHandler == nil { + unregistered = append(unregistered, "auth.LogoutHandler") } if o.OperatorAPIPutTenantYAMLHandler == nil { unregistered = append(unregistered, "operator_api.PutTenantYAMLHandler") } - if o.UserAPISessionCheckHandler == nil { - unregistered = append(unregistered, "user_api.SessionCheckHandler") + if o.AuthSessionCheckHandler == nil { + unregistered = append(unregistered, "auth.SessionCheckHandler") } if o.OperatorAPISetTenantLogsHandler == nil { unregistered = append(unregistered, "operator_api.SetTenantLogsHandler") @@ -806,19 +807,19 @@ func (o *OperatorAPI) initHandlerCache() { if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/login"] = user_api.NewLoginDetail(o.context, o.UserAPILoginDetailHandler) + o.handlers["GET"]["/login"] = auth.NewLoginDetail(o.context, o.AuthLoginDetailHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/login/oauth2/auth"] = user_api.NewLoginOauth2Auth(o.context, o.UserAPILoginOauth2AuthHandler) + o.handlers["POST"]["/login/oauth2/auth"] = auth.NewLoginOauth2Auth(o.context, o.AuthLoginOauth2AuthHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/login/operator"] = user_api.NewLoginOperator(o.context, o.UserAPILoginOperatorHandler) + o.handlers["POST"]["/login/operator"] = auth.NewLoginOperator(o.context, o.AuthLoginOperatorHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/logout"] = user_api.NewLogout(o.context, o.UserAPILogoutHandler) + o.handlers["POST"]["/logout"] = auth.NewLogout(o.context, o.AuthLogoutHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } @@ -826,7 +827,7 @@ func (o *OperatorAPI) initHandlerCache() { if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/session"] = user_api.NewSessionCheck(o.context, o.UserAPISessionCheckHandler) + o.handlers["GET"]["/session"] = auth.NewSessionCheck(o.context, o.AuthSessionCheckHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } diff --git a/operatorapi/session.go b/operatorapi/session.go index 6bfaf9bbf..f9a6a7c14 100644 --- a/operatorapi/session.go +++ b/operatorapi/session.go @@ -22,17 +22,17 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/operatorapi/operations" - "github.com/minio/console/operatorapi/operations/user_api" + authApi "github.com/minio/console/operatorapi/operations/auth" ) func registerSessionHandlers(api *operations.OperatorAPI) { // session check - api.UserAPISessionCheckHandler = user_api.SessionCheckHandlerFunc(func(params user_api.SessionCheckParams, session *models.Principal) middleware.Responder { + api.AuthSessionCheckHandler = authApi.SessionCheckHandlerFunc(func(params authApi.SessionCheckParams, session *models.Principal) middleware.Responder { sessionResp, err := getSessionResponse(session) if err != nil { - return user_api.NewSessionCheckDefault(int(err.Code)).WithPayload(err) + return authApi.NewSessionCheckDefault(int(err.Code)).WithPayload(err) } - return user_api.NewSessionCheckOK().WithPayload(sessionResp) + return authApi.NewSessionCheckOK().WithPayload(sessionResp) }) } diff --git a/restapi/admin_arns.go b/restapi/admin_arns.go index bd9e9b9fb..0ab0b85f9 100644 --- a/restapi/admin_arns.go +++ b/restapi/admin_arns.go @@ -19,20 +19,21 @@ package restapi import ( "context" + systemApi "github.com/minio/console/restapi/operations/system" + "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" ) func registerAdminArnsHandlers(api *operations.ConsoleAPI) { // return a list of arns - api.AdminAPIArnListHandler = admin_api.ArnListHandlerFunc(func(params admin_api.ArnListParams, session *models.Principal) middleware.Responder { + api.SystemArnListHandler = systemApi.ArnListHandlerFunc(func(params systemApi.ArnListParams, session *models.Principal) middleware.Responder { arnsResp, err := getArnsResponse(session) if err != nil { - return admin_api.NewArnListDefault(int(err.Code)).WithPayload(err) + return systemApi.NewArnListDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewArnListOK().WithPayload(arnsResp) + return systemApi.NewArnListOK().WithPayload(arnsResp) }) } diff --git a/restapi/admin_config.go b/restapi/admin_config.go index 47b1aa11c..728d9536e 100644 --- a/restapi/admin_config.go +++ b/restapi/admin_config.go @@ -27,41 +27,41 @@ import ( "github.com/minio/console/restapi/operations" madmin "github.com/minio/madmin-go" - "github.com/minio/console/restapi/operations/admin_api" + cfgApi "github.com/minio/console/restapi/operations/configuration" ) func registerConfigHandlers(api *operations.ConsoleAPI) { // List Configurations - api.AdminAPIListConfigHandler = admin_api.ListConfigHandlerFunc(func(params admin_api.ListConfigParams, session *models.Principal) middleware.Responder { + api.ConfigurationListConfigHandler = cfgApi.ListConfigHandlerFunc(func(params cfgApi.ListConfigParams, session *models.Principal) middleware.Responder { configListResp, err := getListConfigResponse(session) if err != nil { - return admin_api.NewListConfigDefault(int(err.Code)).WithPayload(err) + return cfgApi.NewListConfigDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewListConfigOK().WithPayload(configListResp) + return cfgApi.NewListConfigOK().WithPayload(configListResp) }) // Configuration Info - api.AdminAPIConfigInfoHandler = admin_api.ConfigInfoHandlerFunc(func(params admin_api.ConfigInfoParams, session *models.Principal) middleware.Responder { + api.ConfigurationConfigInfoHandler = cfgApi.ConfigInfoHandlerFunc(func(params cfgApi.ConfigInfoParams, session *models.Principal) middleware.Responder { config, err := getConfigResponse(session, params) if err != nil { - return admin_api.NewConfigInfoDefault(int(err.Code)).WithPayload(err) + return cfgApi.NewConfigInfoDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewConfigInfoOK().WithPayload(config) + return cfgApi.NewConfigInfoOK().WithPayload(config) }) // Set Configuration - api.AdminAPISetConfigHandler = admin_api.SetConfigHandlerFunc(func(params admin_api.SetConfigParams, session *models.Principal) middleware.Responder { + api.ConfigurationSetConfigHandler = cfgApi.SetConfigHandlerFunc(func(params cfgApi.SetConfigParams, session *models.Principal) middleware.Responder { resp, err := setConfigResponse(session, params.Name, params.Body) if err != nil { - return admin_api.NewSetConfigDefault(int(err.Code)).WithPayload(err) + return cfgApi.NewSetConfigDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewSetConfigOK().WithPayload(resp) + return cfgApi.NewSetConfigOK().WithPayload(resp) }) // Reset Configuration - api.AdminAPIResetConfigHandler = admin_api.ResetConfigHandlerFunc(func(params admin_api.ResetConfigParams, session *models.Principal) middleware.Responder { + api.ConfigurationResetConfigHandler = cfgApi.ResetConfigHandlerFunc(func(params cfgApi.ResetConfigParams, session *models.Principal) middleware.Responder { resp, err := resetConfigResponse(session, params.Name) if err != nil { - return admin_api.NewResetConfigDefault(int(err.Code)).WithPayload(err) + return cfgApi.NewResetConfigDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewResetConfigOK().WithPayload(resp) + return cfgApi.NewResetConfigOK().WithPayload(resp) }) } @@ -133,7 +133,7 @@ func getConfig(ctx context.Context, client MinioAdmin, name string) ([]*models.C } // getConfigResponse performs getConfig() and serializes it to the handler's output -func getConfigResponse(session *models.Principal, params admin_api.ConfigInfoParams) (*models.Configuration, *models.Error) { +func getConfigResponse(session *models.Principal, params cfgApi.ConfigInfoParams) (*models.Configuration, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) diff --git a/restapi/admin_groups.go b/restapi/admin_groups.go index aff779070..c7b75e31c 100644 --- a/restapi/admin_groups.go +++ b/restapi/admin_groups.go @@ -24,49 +24,49 @@ import ( "github.com/minio/console/restapi/operations" "github.com/minio/madmin-go" - "github.com/minio/console/restapi/operations/admin_api" + groupApi "github.com/minio/console/restapi/operations/group" "github.com/minio/console/models" ) func registerGroupsHandlers(api *operations.ConsoleAPI) { // List Groups - api.AdminAPIListGroupsHandler = admin_api.ListGroupsHandlerFunc(func(params admin_api.ListGroupsParams, session *models.Principal) middleware.Responder { + api.GroupListGroupsHandler = groupApi.ListGroupsHandlerFunc(func(params groupApi.ListGroupsParams, session *models.Principal) middleware.Responder { listGroupsResponse, err := getListGroupsResponse(session) if err != nil { - return admin_api.NewListGroupsDefault(int(err.Code)).WithPayload(err) + return groupApi.NewListGroupsDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewListGroupsOK().WithPayload(listGroupsResponse) + return groupApi.NewListGroupsOK().WithPayload(listGroupsResponse) }) // Group Info - api.AdminAPIGroupInfoHandler = admin_api.GroupInfoHandlerFunc(func(params admin_api.GroupInfoParams, session *models.Principal) middleware.Responder { + api.GroupGroupInfoHandler = groupApi.GroupInfoHandlerFunc(func(params groupApi.GroupInfoParams, session *models.Principal) middleware.Responder { groupInfo, err := getGroupInfoResponse(session, params) if err != nil { - return admin_api.NewGroupInfoDefault(int(err.Code)).WithPayload(err) + return groupApi.NewGroupInfoDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewGroupInfoOK().WithPayload(groupInfo) + return groupApi.NewGroupInfoOK().WithPayload(groupInfo) }) // Add Group - api.AdminAPIAddGroupHandler = admin_api.AddGroupHandlerFunc(func(params admin_api.AddGroupParams, session *models.Principal) middleware.Responder { + api.GroupAddGroupHandler = groupApi.AddGroupHandlerFunc(func(params groupApi.AddGroupParams, session *models.Principal) middleware.Responder { if err := getAddGroupResponse(session, params.Body); err != nil { - return admin_api.NewAddGroupDefault(int(err.Code)).WithPayload(err) + return groupApi.NewAddGroupDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewAddGroupCreated() + return groupApi.NewAddGroupCreated() }) // Remove Group - api.AdminAPIRemoveGroupHandler = admin_api.RemoveGroupHandlerFunc(func(params admin_api.RemoveGroupParams, session *models.Principal) middleware.Responder { + api.GroupRemoveGroupHandler = groupApi.RemoveGroupHandlerFunc(func(params groupApi.RemoveGroupParams, session *models.Principal) middleware.Responder { if err := getRemoveGroupResponse(session, params); err != nil { - return admin_api.NewRemoveGroupDefault(int(err.Code)).WithPayload(err) + return groupApi.NewRemoveGroupDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewRemoveGroupNoContent() + return groupApi.NewRemoveGroupNoContent() }) // Update Group - api.AdminAPIUpdateGroupHandler = admin_api.UpdateGroupHandlerFunc(func(params admin_api.UpdateGroupParams, session *models.Principal) middleware.Responder { + api.GroupUpdateGroupHandler = groupApi.UpdateGroupHandlerFunc(func(params groupApi.UpdateGroupParams, session *models.Principal) middleware.Responder { groupUpdateResp, err := getUpdateGroupResponse(session, params) if err != nil { - return admin_api.NewUpdateGroupDefault(int(err.Code)).WithPayload(err) + return groupApi.NewUpdateGroupDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewUpdateGroupOK().WithPayload(groupUpdateResp) + return groupApi.NewUpdateGroupOK().WithPayload(groupUpdateResp) }) } @@ -106,7 +106,7 @@ func groupInfo(ctx context.Context, client MinioAdmin, group string) (*madmin.Gr } // getGroupInfoResponse performs groupInfo() and serializes it to the handler's output -func getGroupInfoResponse(session *models.Principal, params admin_api.GroupInfoParams) (*models.Group, *models.Error) { +func getGroupInfoResponse(session *models.Principal, params groupApi.GroupInfoParams) (*models.Group, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) @@ -190,7 +190,7 @@ func removeGroup(ctx context.Context, client MinioAdmin, group string) error { } // getRemoveGroupResponse performs removeGroup() and serializes it to the handler's output -func getRemoveGroupResponse(session *models.Principal, params admin_api.RemoveGroupParams) *models.Error { +func getRemoveGroupResponse(session *models.Principal, params groupApi.RemoveGroupParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() if params.Name == "" { @@ -264,7 +264,7 @@ func setGroupStatus(ctx context.Context, client MinioAdmin, group, status string // getUpdateGroupResponse updates a group by adding or removing it's members depending on the request, // also sets the group's status if status in the request is different than the current one. // Then serializes the output to be used by the handler. -func getUpdateGroupResponse(session *models.Principal, params admin_api.UpdateGroupParams) (*models.Group, *models.Error) { +func getUpdateGroupResponse(session *models.Principal, params groupApi.UpdateGroupParams) (*models.Group, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() if params.Name == "" { diff --git a/restapi/admin_info.go b/restapi/admin_info.go index 634a8a395..91693f2b9 100644 --- a/restapi/admin_info.go +++ b/restapi/admin_info.go @@ -34,25 +34,25 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" + systemApi "github.com/minio/console/restapi/operations/system" ) func registerAdminInfoHandlers(api *operations.ConsoleAPI) { // return usage stats - api.AdminAPIAdminInfoHandler = admin_api.AdminInfoHandlerFunc(func(params admin_api.AdminInfoParams, session *models.Principal) middleware.Responder { + api.SystemAdminInfoHandler = systemApi.AdminInfoHandlerFunc(func(params systemApi.AdminInfoParams, session *models.Principal) middleware.Responder { infoResp, err := getAdminInfoResponse(session, params) if err != nil { - return admin_api.NewAdminInfoDefault(int(err.Code)).WithPayload(err) + return systemApi.NewAdminInfoDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewAdminInfoOK().WithPayload(infoResp) + return systemApi.NewAdminInfoOK().WithPayload(infoResp) }) // return single widget results - api.AdminAPIDashboardWidgetDetailsHandler = admin_api.DashboardWidgetDetailsHandlerFunc(func(params admin_api.DashboardWidgetDetailsParams, session *models.Principal) middleware.Responder { + api.SystemDashboardWidgetDetailsHandler = systemApi.DashboardWidgetDetailsHandlerFunc(func(params systemApi.DashboardWidgetDetailsParams, session *models.Principal) middleware.Responder { infoResp, err := getAdminInfoWidgetResponse(params) if err != nil { - return admin_api.NewDashboardWidgetDetailsDefault(int(err.Code)).WithPayload(err) + return systemApi.NewDashboardWidgetDetailsDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewDashboardWidgetDetailsOK().WithPayload(infoResp) + return systemApi.NewDashboardWidgetDetailsOK().WithPayload(infoResp) }) } @@ -825,7 +825,7 @@ type LabelResults struct { } // getAdminInfoResponse returns the response containing total buckets, objects and usage. -func getAdminInfoResponse(session *models.Principal, params admin_api.AdminInfoParams) (*models.AdminInfoResponse, *models.Error) { +func getAdminInfoResponse(session *models.Principal, params systemApi.AdminInfoParams) (*models.AdminInfoResponse, *models.Error) { prometheusURL := "" if !*params.DefaultOnly { @@ -961,7 +961,7 @@ func testPrometheusURL(url string) bool { return response.StatusCode == http.StatusOK } -func getAdminInfoWidgetResponse(params admin_api.DashboardWidgetDetailsParams) (*models.WidgetDetails, *models.Error) { +func getAdminInfoWidgetResponse(params systemApi.DashboardWidgetDetailsParams) (*models.WidgetDetails, *models.Error) { prometheusURL := getPrometheusURL() prometheusJobID := getPrometheusJobID() diff --git a/restapi/admin_inspect.go b/restapi/admin_inspect.go index 9217455c7..8e740f79d 100644 --- a/restapi/admin_inspect.go +++ b/restapi/admin_inspect.go @@ -30,25 +30,25 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" + inspectApi "github.com/minio/console/restapi/operations/inspect" "github.com/minio/madmin-go" "github.com/secure-io/sio-go" ) func registerInspectHandler(api *operations.ConsoleAPI) { - api.AdminAPIInspectHandler = admin_api.InspectHandlerFunc(func(params admin_api.InspectParams, principal *models.Principal) middleware.Responder { + api.InspectInspectHandler = inspectApi.InspectHandlerFunc(func(params inspectApi.InspectParams, principal *models.Principal) middleware.Responder { k, r, err := getInspectResult(principal, ¶ms) isEncryptOn := params.Encrypt != nil && *params.Encrypt if err != nil { - return admin_api.NewInspectDefault(int(err.Code)).WithPayload(err) + return inspectApi.NewInspectDefault(int(err.Code)).WithPayload(err) } return middleware.ResponderFunc(processInspectResponse(isEncryptOn, k, r)) }) } -func getInspectResult(session *models.Principal, params *admin_api.InspectParams) (*[32]byte, io.ReadCloser, *models.Error) { +func getInspectResult(session *models.Principal, params *inspectApi.InspectParams) (*[32]byte, io.ReadCloser, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) diff --git a/restapi/admin_nodes.go b/restapi/admin_nodes.go index 1a116792d..72d2d7c5b 100644 --- a/restapi/admin_nodes.go +++ b/restapi/admin_nodes.go @@ -22,17 +22,17 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" + systemApi "github.com/minio/console/restapi/operations/system" ) func registerNodesHandler(api *operations.ConsoleAPI) { - api.AdminAPIListNodesHandler = admin_api.ListNodesHandlerFunc(func(params admin_api.ListNodesParams, session *models.Principal) middleware.Responder { + api.SystemListNodesHandler = systemApi.ListNodesHandlerFunc(func(params systemApi.ListNodesParams, session *models.Principal) middleware.Responder { listNodesResponse, err := getListNodesResponse(session) if err != nil { - return admin_api.NewListNodesDefault(int(err.Code)).WithPayload(err) + return systemApi.NewListNodesDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewListNodesOK().WithPayload(listNodesResponse) + return systemApi.NewListNodesOK().WithPayload(listNodesResponse) }) } diff --git a/restapi/admin_notification_endpoints.go b/restapi/admin_notification_endpoints.go index 90f0ee976..9ab9c5f49 100644 --- a/restapi/admin_notification_endpoints.go +++ b/restapi/admin_notification_endpoints.go @@ -23,25 +23,25 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" + configurationApi "github.com/minio/console/restapi/operations/configuration" ) func registerAdminNotificationEndpointsHandlers(api *operations.ConsoleAPI) { // return a list of notification endpoints - api.AdminAPINotificationEndpointListHandler = admin_api.NotificationEndpointListHandlerFunc(func(params admin_api.NotificationEndpointListParams, session *models.Principal) middleware.Responder { + api.ConfigurationNotificationEndpointListHandler = configurationApi.NotificationEndpointListHandlerFunc(func(params configurationApi.NotificationEndpointListParams, session *models.Principal) middleware.Responder { notifEndpoints, err := getNotificationEndpointsResponse(session) if err != nil { - return admin_api.NewNotificationEndpointListDefault(int(err.Code)).WithPayload(err) + return configurationApi.NewNotificationEndpointListDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewNotificationEndpointListOK().WithPayload(notifEndpoints) + return configurationApi.NewNotificationEndpointListOK().WithPayload(notifEndpoints) }) // add a new notification endpoints - api.AdminAPIAddNotificationEndpointHandler = admin_api.AddNotificationEndpointHandlerFunc(func(params admin_api.AddNotificationEndpointParams, session *models.Principal) middleware.Responder { + api.ConfigurationAddNotificationEndpointHandler = configurationApi.AddNotificationEndpointHandlerFunc(func(params configurationApi.AddNotificationEndpointParams, session *models.Principal) middleware.Responder { notifEndpoints, err := getAddNotificationEndpointResponse(session, ¶ms) if err != nil { - return admin_api.NewAddNotificationEndpointDefault(int(err.Code)).WithPayload(err) + return configurationApi.NewAddNotificationEndpointDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewAddNotificationEndpointCreated().WithPayload(notifEndpoints) + return configurationApi.NewAddNotificationEndpointCreated().WithPayload(notifEndpoints) }) } @@ -93,7 +93,7 @@ func getNotificationEndpointsResponse(session *models.Principal) (*models.NotifE return notfEndpointResp, nil } -func addNotificationEndpoint(ctx context.Context, client MinioAdmin, params *admin_api.AddNotificationEndpointParams) (*models.SetNotificationEndpointResponse, error) { +func addNotificationEndpoint(ctx context.Context, client MinioAdmin, params *configurationApi.AddNotificationEndpointParams) (*models.SetNotificationEndpointResponse, error) { configs := []*models.ConfigurationKV{} var configName string @@ -145,7 +145,7 @@ func addNotificationEndpoint(ctx context.Context, client MinioAdmin, params *adm } // getNotificationEndpointsResponse returns a list of notification endpoints in the instance -func getAddNotificationEndpointResponse(session *models.Principal, params *admin_api.AddNotificationEndpointParams) (*models.SetNotificationEndpointResponse, *models.Error) { +func getAddNotificationEndpointResponse(session *models.Principal, params *configurationApi.AddNotificationEndpointParams) (*models.SetNotificationEndpointResponse, *models.Error) { mAdmin, err := NewMinioAdminClient(session) if err != nil { return nil, prepareError(err) diff --git a/restapi/admin_notification_endpoints_test.go b/restapi/admin_notification_endpoints_test.go index e209d28af..898573d69 100644 --- a/restapi/admin_notification_endpoints_test.go +++ b/restapi/admin_notification_endpoints_test.go @@ -25,7 +25,7 @@ import ( "github.com/go-openapi/swag" "github.com/minio/console/models" - "github.com/minio/console/restapi/operations/admin_api" + cfgApi "github.com/minio/console/restapi/operations/configuration" ) func Test_addNotificationEndpoint(t *testing.T) { @@ -34,7 +34,7 @@ func Test_addNotificationEndpoint(t *testing.T) { type args struct { ctx context.Context client MinioAdmin - params *admin_api.AddNotificationEndpointParams + params *cfgApi.AddNotificationEndpointParams } tests := []struct { name string @@ -48,7 +48,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -81,7 +81,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -105,7 +105,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -138,7 +138,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -167,7 +167,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -196,7 +196,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -227,7 +227,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -260,7 +260,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -293,7 +293,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -324,7 +324,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -353,7 +353,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -384,7 +384,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), @@ -408,7 +408,7 @@ func Test_addNotificationEndpoint(t *testing.T) { args: args{ ctx: context.Background(), client: client, - params: &admin_api.AddNotificationEndpointParams{ + params: &cfgApi.AddNotificationEndpointParams{ HTTPRequest: nil, Body: &models.NotificationEndpoint{ AccountID: swag.String("1"), diff --git a/restapi/admin_policies.go b/restapi/admin_policies.go index 97456c44c..d133a48ec 100644 --- a/restapi/admin_policies.go +++ b/restapi/admin_policies.go @@ -24,100 +24,102 @@ import ( "sort" "strings" + bucketApi "github.com/minio/console/restapi/operations/bucket" + policyApi "github.com/minio/console/restapi/operations/policy" + "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" iampolicy "github.com/minio/pkg/iam/policy" ) func registersPoliciesHandler(api *operations.ConsoleAPI) { // List Policies - api.AdminAPIListPoliciesHandler = admin_api.ListPoliciesHandlerFunc(func(params admin_api.ListPoliciesParams, session *models.Principal) middleware.Responder { + api.PolicyListPoliciesHandler = policyApi.ListPoliciesHandlerFunc(func(params policyApi.ListPoliciesParams, session *models.Principal) middleware.Responder { listPoliciesResponse, err := getListPoliciesResponse(session) if err != nil { - return admin_api.NewListPoliciesDefault(int(err.Code)).WithPayload(err) + return policyApi.NewListPoliciesDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewListPoliciesOK().WithPayload(listPoliciesResponse) + return policyApi.NewListPoliciesOK().WithPayload(listPoliciesResponse) }) // Policy Info - api.AdminAPIPolicyInfoHandler = admin_api.PolicyInfoHandlerFunc(func(params admin_api.PolicyInfoParams, session *models.Principal) middleware.Responder { + api.PolicyPolicyInfoHandler = policyApi.PolicyInfoHandlerFunc(func(params policyApi.PolicyInfoParams, session *models.Principal) middleware.Responder { policyInfo, err := getPolicyInfoResponse(session, params) if err != nil { - return admin_api.NewPolicyInfoDefault(int(err.Code)).WithPayload(err) + return policyApi.NewPolicyInfoDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewPolicyInfoOK().WithPayload(policyInfo) + return policyApi.NewPolicyInfoOK().WithPayload(policyInfo) }) // Add Policy - api.AdminAPIAddPolicyHandler = admin_api.AddPolicyHandlerFunc(func(params admin_api.AddPolicyParams, session *models.Principal) middleware.Responder { + api.PolicyAddPolicyHandler = policyApi.AddPolicyHandlerFunc(func(params policyApi.AddPolicyParams, session *models.Principal) middleware.Responder { policyResponse, err := getAddPolicyResponse(session, params.Body) if err != nil { - return admin_api.NewAddPolicyDefault(int(err.Code)).WithPayload(err) + return policyApi.NewAddPolicyDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewAddPolicyCreated().WithPayload(policyResponse) + return policyApi.NewAddPolicyCreated().WithPayload(policyResponse) }) // Remove Policy - api.AdminAPIRemovePolicyHandler = admin_api.RemovePolicyHandlerFunc(func(params admin_api.RemovePolicyParams, session *models.Principal) middleware.Responder { + api.PolicyRemovePolicyHandler = policyApi.RemovePolicyHandlerFunc(func(params policyApi.RemovePolicyParams, session *models.Principal) middleware.Responder { if err := getRemovePolicyResponse(session, params); err != nil { - return admin_api.NewRemovePolicyDefault(int(err.Code)).WithPayload(err) + return policyApi.NewRemovePolicyDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewRemovePolicyNoContent() + return policyApi.NewRemovePolicyNoContent() }) // Set Policy - api.AdminAPISetPolicyHandler = admin_api.SetPolicyHandlerFunc(func(params admin_api.SetPolicyParams, session *models.Principal) middleware.Responder { + api.PolicySetPolicyHandler = policyApi.SetPolicyHandlerFunc(func(params policyApi.SetPolicyParams, session *models.Principal) middleware.Responder { if err := getSetPolicyResponse(session, params.Body); err != nil { - return admin_api.NewSetPolicyDefault(int(err.Code)).WithPayload(err) + return policyApi.NewSetPolicyDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewSetPolicyNoContent() + return policyApi.NewSetPolicyNoContent() }) // Set Policy Multiple User/Groups - api.AdminAPISetPolicyMultipleHandler = admin_api.SetPolicyMultipleHandlerFunc(func(params admin_api.SetPolicyMultipleParams, session *models.Principal) middleware.Responder { + api.PolicySetPolicyMultipleHandler = policyApi.SetPolicyMultipleHandlerFunc(func(params policyApi.SetPolicyMultipleParams, session *models.Principal) middleware.Responder { if err := getSetPolicyMultipleResponse(session, params.Body); err != nil { - return admin_api.NewSetPolicyMultipleDefault(int(err.Code)).WithPayload(err) + return policyApi.NewSetPolicyMultipleDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewSetPolicyMultipleNoContent() + return policyApi.NewSetPolicyMultipleNoContent() }) - api.AdminAPIListPoliciesWithBucketHandler = admin_api.ListPoliciesWithBucketHandlerFunc(func(params admin_api.ListPoliciesWithBucketParams, session *models.Principal) middleware.Responder { + api.BucketListPoliciesWithBucketHandler = bucketApi.ListPoliciesWithBucketHandlerFunc(func(params bucketApi.ListPoliciesWithBucketParams, session *models.Principal) middleware.Responder { policyResponse, err := getListPoliciesWithBucketResponse(session, params.Bucket) if err != nil { - return admin_api.NewListPoliciesWithBucketDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewListPoliciesWithBucketDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewListPoliciesWithBucketOK().WithPayload(policyResponse) + return bucketApi.NewListPoliciesWithBucketOK().WithPayload(policyResponse) }) - api.AdminAPIListAccessRulesWithBucketHandler = admin_api.ListAccessRulesWithBucketHandlerFunc(func(params admin_api.ListAccessRulesWithBucketParams, session *models.Principal) middleware.Responder { + api.BucketListAccessRulesWithBucketHandler = bucketApi.ListAccessRulesWithBucketHandlerFunc(func(params bucketApi.ListAccessRulesWithBucketParams, session *models.Principal) middleware.Responder { policyResponse, err := getListAccessRulesWithBucketResponse(session, params.Bucket) if err != nil { - return admin_api.NewListAccessRulesWithBucketDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewListAccessRulesWithBucketDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewListAccessRulesWithBucketOK().WithPayload(policyResponse) + return bucketApi.NewListAccessRulesWithBucketOK().WithPayload(policyResponse) }) - api.AdminAPISetAccessRuleWithBucketHandler = admin_api.SetAccessRuleWithBucketHandlerFunc(func(params admin_api.SetAccessRuleWithBucketParams, session *models.Principal) middleware.Responder { + api.BucketSetAccessRuleWithBucketHandler = bucketApi.SetAccessRuleWithBucketHandlerFunc(func(params bucketApi.SetAccessRuleWithBucketParams, session *models.Principal) middleware.Responder { policyResponse, err := getSetAccessRuleWithBucketResponse(session, params.Bucket, params.Prefixaccess) if err != nil { - return admin_api.NewSetAccessRuleWithBucketDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewSetAccessRuleWithBucketDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewSetAccessRuleWithBucketOK().WithPayload(policyResponse) + return bucketApi.NewSetAccessRuleWithBucketOK().WithPayload(policyResponse) }) - api.AdminAPIDeleteAccessRuleWithBucketHandler = admin_api.DeleteAccessRuleWithBucketHandlerFunc(func(params admin_api.DeleteAccessRuleWithBucketParams, session *models.Principal) middleware.Responder { + api.BucketDeleteAccessRuleWithBucketHandler = bucketApi.DeleteAccessRuleWithBucketHandlerFunc(func(params bucketApi.DeleteAccessRuleWithBucketParams, session *models.Principal) middleware.Responder { policyResponse, err := getDeleteAccessRuleWithBucketResponse(session, params.Bucket, params.Prefix) if err != nil { - return admin_api.NewDeleteAccessRuleWithBucketDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewDeleteAccessRuleWithBucketDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewDeleteAccessRuleWithBucketOK().WithPayload(policyResponse) + return bucketApi.NewDeleteAccessRuleWithBucketOK().WithPayload(policyResponse) }) - api.AdminAPIListUsersForPolicyHandler = admin_api.ListUsersForPolicyHandlerFunc(func(params admin_api.ListUsersForPolicyParams, session *models.Principal) middleware.Responder { + api.PolicyListUsersForPolicyHandler = policyApi.ListUsersForPolicyHandlerFunc(func(params policyApi.ListUsersForPolicyParams, session *models.Principal) middleware.Responder { policyUsersResponse, err := getListUsersForPolicyResponse(session, params.Policy) if err != nil { - return admin_api.NewListUsersForPolicyDefault(int(err.Code)).WithPayload(err) + return policyApi.NewListUsersForPolicyDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewListUsersForPolicyOK().WithPayload(policyUsersResponse) + return policyApi.NewListUsersForPolicyOK().WithPayload(policyUsersResponse) }) - api.AdminAPIListGroupsForPolicyHandler = admin_api.ListGroupsForPolicyHandlerFunc(func(params admin_api.ListGroupsForPolicyParams, session *models.Principal) middleware.Responder { + api.PolicyListGroupsForPolicyHandler = policyApi.ListGroupsForPolicyHandlerFunc(func(params policyApi.ListGroupsForPolicyParams, session *models.Principal) middleware.Responder { policyGroupsResponse, err := getListGroupsForPolicyResponse(session, params.Policy) if err != nil { - return admin_api.NewListGroupsForPolicyDefault(int(err.Code)).WithPayload(err) + return policyApi.NewListGroupsForPolicyDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewListGroupsForPolicyOK().WithPayload(policyGroupsResponse) + return policyApi.NewListGroupsForPolicyOK().WithPayload(policyGroupsResponse) }) } @@ -343,7 +345,7 @@ func removePolicy(ctx context.Context, client MinioAdmin, name string) error { } // getRemovePolicyResponse() performs removePolicy() and serializes it to the handler's output -func getRemovePolicyResponse(session *models.Principal, params admin_api.RemovePolicyParams) *models.Error { +func getRemovePolicyResponse(session *models.Principal, params policyApi.RemovePolicyParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() if params.Name == "" { @@ -421,7 +423,7 @@ func policyInfo(ctx context.Context, client MinioAdmin, name string) (*models.Po } // getPolicyInfoResponse performs policyInfo() and serializes it to the handler's output -func getPolicyInfoResponse(session *models.Principal, params admin_api.PolicyInfoParams) (*models.Policy, *models.Error) { +func getPolicyInfoResponse(session *models.Principal, params policyApi.PolicyInfoParams) (*models.Policy, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) diff --git a/restapi/admin_profiling.go b/restapi/admin_profiling.go index b9e2f220b..f2e4f3467 100644 --- a/restapi/admin_profiling.go +++ b/restapi/admin_profiling.go @@ -25,24 +25,24 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" + profileApi "github.com/minio/console/restapi/operations/profile" "github.com/minio/madmin-go" ) func registerProfilingHandler(api *operations.ConsoleAPI) { // Start Profiling - api.AdminAPIProfilingStartHandler = admin_api.ProfilingStartHandlerFunc(func(params admin_api.ProfilingStartParams, session *models.Principal) middleware.Responder { + api.ProfileProfilingStartHandler = profileApi.ProfilingStartHandlerFunc(func(params profileApi.ProfilingStartParams, session *models.Principal) middleware.Responder { profilingStartResponse, err := getProfilingStartResponse(session, params.Body) if err != nil { - return admin_api.NewProfilingStartDefault(int(err.Code)).WithPayload(err) + return profileApi.NewProfilingStartDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewProfilingStartCreated().WithPayload(profilingStartResponse) + return profileApi.NewProfilingStartCreated().WithPayload(profilingStartResponse) }) // Stop and download profiling data - api.AdminAPIProfilingStopHandler = admin_api.ProfilingStopHandlerFunc(func(params admin_api.ProfilingStopParams, session *models.Principal) middleware.Responder { + api.ProfileProfilingStopHandler = profileApi.ProfilingStopHandlerFunc(func(params profileApi.ProfilingStopParams, session *models.Principal) middleware.Responder { profilingStopResponse, err := getProfilingStopResponse(session) if err != nil { - return admin_api.NewProfilingStopDefault(int(err.Code)).WithPayload(err) + return profileApi.NewProfilingStopDefault(int(err.Code)).WithPayload(err) } // Custom response writer to set the content-disposition header to tell the // HTTP client the name and extension of the file we are returning diff --git a/restapi/admin_remote_buckets.go b/restapi/admin_remote_buckets.go index aaca3692c..37ac73071 100644 --- a/restapi/admin_remote_buckets.go +++ b/restapi/admin_remote_buckets.go @@ -30,7 +30,7 @@ import ( "github.com/go-openapi/swag" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + bucketApi "github.com/minio/console/restapi/operations/bucket" "github.com/minio/minio-go/v7/pkg/replication" ) @@ -42,103 +42,103 @@ type RemoteBucketResult struct { func registerAdminBucketRemoteHandlers(api *operations.ConsoleAPI) { // return list of remote buckets - api.UserAPIListRemoteBucketsHandler = user_api.ListRemoteBucketsHandlerFunc(func(params user_api.ListRemoteBucketsParams, session *models.Principal) middleware.Responder { + api.BucketListRemoteBucketsHandler = bucketApi.ListRemoteBucketsHandlerFunc(func(params bucketApi.ListRemoteBucketsParams, session *models.Principal) middleware.Responder { listResp, err := getListRemoteBucketsResponse(session) if err != nil { - return user_api.NewListRemoteBucketsDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) + return bucketApi.NewListRemoteBucketsDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } - return user_api.NewListRemoteBucketsOK().WithPayload(listResp) + return bucketApi.NewListRemoteBucketsOK().WithPayload(listResp) }) // return information about a specific bucket - api.UserAPIRemoteBucketDetailsHandler = user_api.RemoteBucketDetailsHandlerFunc(func(params user_api.RemoteBucketDetailsParams, session *models.Principal) middleware.Responder { + api.BucketRemoteBucketDetailsHandler = bucketApi.RemoteBucketDetailsHandlerFunc(func(params bucketApi.RemoteBucketDetailsParams, session *models.Principal) middleware.Responder { response, err := getRemoteBucketDetailsResponse(session, params) if err != nil { - return user_api.NewRemoteBucketDetailsDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) + return bucketApi.NewRemoteBucketDetailsDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } - return user_api.NewRemoteBucketDetailsOK().WithPayload(response) + return bucketApi.NewRemoteBucketDetailsOK().WithPayload(response) }) // delete remote bucket - api.UserAPIDeleteRemoteBucketHandler = user_api.DeleteRemoteBucketHandlerFunc(func(params user_api.DeleteRemoteBucketParams, session *models.Principal) middleware.Responder { + api.BucketDeleteRemoteBucketHandler = bucketApi.DeleteRemoteBucketHandlerFunc(func(params bucketApi.DeleteRemoteBucketParams, session *models.Principal) middleware.Responder { err := getDeleteRemoteBucketResponse(session, params) if err != nil { - return user_api.NewDeleteRemoteBucketDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) + return bucketApi.NewDeleteRemoteBucketDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } - return user_api.NewDeleteRemoteBucketNoContent() + return bucketApi.NewDeleteRemoteBucketNoContent() }) // set remote bucket - api.UserAPIAddRemoteBucketHandler = user_api.AddRemoteBucketHandlerFunc(func(params user_api.AddRemoteBucketParams, session *models.Principal) middleware.Responder { + api.BucketAddRemoteBucketHandler = bucketApi.AddRemoteBucketHandlerFunc(func(params bucketApi.AddRemoteBucketParams, session *models.Principal) middleware.Responder { err := getAddRemoteBucketResponse(session, params) if err != nil { - return user_api.NewAddRemoteBucketDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) + return bucketApi.NewAddRemoteBucketDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } - return user_api.NewAddRemoteBucketCreated() + return bucketApi.NewAddRemoteBucketCreated() }) // set multi-bucket replication - api.UserAPISetMultiBucketReplicationHandler = user_api.SetMultiBucketReplicationHandlerFunc(func(params user_api.SetMultiBucketReplicationParams, session *models.Principal) middleware.Responder { + api.BucketSetMultiBucketReplicationHandler = bucketApi.SetMultiBucketReplicationHandlerFunc(func(params bucketApi.SetMultiBucketReplicationParams, session *models.Principal) middleware.Responder { response, err := setMultiBucketReplicationResponse(session, params) if err != nil { - return user_api.NewSetMultiBucketReplicationDefault(500).WithPayload(err) + return bucketApi.NewSetMultiBucketReplicationDefault(500).WithPayload(err) } - return user_api.NewSetMultiBucketReplicationOK().WithPayload(response) + return bucketApi.NewSetMultiBucketReplicationOK().WithPayload(response) }) // list external buckets - api.UserAPIListExternalBucketsHandler = user_api.ListExternalBucketsHandlerFunc(func(params user_api.ListExternalBucketsParams, session *models.Principal) middleware.Responder { + api.BucketListExternalBucketsHandler = bucketApi.ListExternalBucketsHandlerFunc(func(params bucketApi.ListExternalBucketsParams, session *models.Principal) middleware.Responder { response, err := listExternalBucketsResponse(params) if err != nil { - return user_api.NewListExternalBucketsDefault(500).WithPayload(err) + return bucketApi.NewListExternalBucketsDefault(500).WithPayload(err) } - return user_api.NewListExternalBucketsOK().WithPayload(response) + return bucketApi.NewListExternalBucketsOK().WithPayload(response) }) // delete replication rule - api.UserAPIDeleteBucketReplicationRuleHandler = user_api.DeleteBucketReplicationRuleHandlerFunc(func(params user_api.DeleteBucketReplicationRuleParams, session *models.Principal) middleware.Responder { + api.BucketDeleteBucketReplicationRuleHandler = bucketApi.DeleteBucketReplicationRuleHandlerFunc(func(params bucketApi.DeleteBucketReplicationRuleParams, session *models.Principal) middleware.Responder { err := deleteReplicationRuleResponse(session, params) if err != nil { - return user_api.NewDeleteBucketReplicationRuleDefault(500).WithPayload(err) + return bucketApi.NewDeleteBucketReplicationRuleDefault(500).WithPayload(err) } - return user_api.NewDeleteBucketReplicationRuleNoContent() + return bucketApi.NewDeleteBucketReplicationRuleNoContent() }) // delete all replication rules for a bucket - api.UserAPIDeleteAllReplicationRulesHandler = user_api.DeleteAllReplicationRulesHandlerFunc(func(params user_api.DeleteAllReplicationRulesParams, session *models.Principal) middleware.Responder { + api.BucketDeleteAllReplicationRulesHandler = bucketApi.DeleteAllReplicationRulesHandlerFunc(func(params bucketApi.DeleteAllReplicationRulesParams, session *models.Principal) middleware.Responder { err := deleteBucketReplicationRulesResponse(session, params) if err != nil { - return user_api.NewDeleteAllReplicationRulesDefault(500).WithPayload(err) + return bucketApi.NewDeleteAllReplicationRulesDefault(500).WithPayload(err) } - return user_api.NewDeleteAllReplicationRulesNoContent() + return bucketApi.NewDeleteAllReplicationRulesNoContent() }) // delete selected replication rules for a bucket - api.UserAPIDeleteSelectedReplicationRulesHandler = user_api.DeleteSelectedReplicationRulesHandlerFunc(func(params user_api.DeleteSelectedReplicationRulesParams, session *models.Principal) middleware.Responder { + api.BucketDeleteSelectedReplicationRulesHandler = bucketApi.DeleteSelectedReplicationRulesHandlerFunc(func(params bucketApi.DeleteSelectedReplicationRulesParams, session *models.Principal) middleware.Responder { err := deleteSelectedReplicationRulesResponse(session, params) if err != nil { - return user_api.NewDeleteSelectedReplicationRulesDefault(500).WithPayload(err) + return bucketApi.NewDeleteSelectedReplicationRulesDefault(500).WithPayload(err) } - return user_api.NewDeleteSelectedReplicationRulesNoContent() + return bucketApi.NewDeleteSelectedReplicationRulesNoContent() }) //update local bucket replication config item - api.UserAPIUpdateMultiBucketReplicationHandler = user_api.UpdateMultiBucketReplicationHandlerFunc(func(params user_api.UpdateMultiBucketReplicationParams, session *models.Principal) middleware.Responder { + api.BucketUpdateMultiBucketReplicationHandler = bucketApi.UpdateMultiBucketReplicationHandlerFunc(func(params bucketApi.UpdateMultiBucketReplicationParams, session *models.Principal) middleware.Responder { err := updateBucketReplicationResponse(session, params) if err != nil { - return user_api.NewUpdateMultiBucketReplicationDefault(500).WithPayload(err) + return bucketApi.NewUpdateMultiBucketReplicationDefault(500).WithPayload(err) } - return user_api.NewUpdateMultiBucketReplicationCreated() + return bucketApi.NewUpdateMultiBucketReplicationCreated() }) } @@ -162,7 +162,7 @@ func getListRemoteBucketsResponse(session *models.Principal) (*models.ListRemote }, nil } -func getRemoteBucketDetailsResponse(session *models.Principal, params user_api.RemoteBucketDetailsParams) (*models.RemoteBucket, error) { +func getRemoteBucketDetailsResponse(session *models.Principal, params bucketApi.RemoteBucketDetailsParams) (*models.RemoteBucket, error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) @@ -179,7 +179,7 @@ func getRemoteBucketDetailsResponse(session *models.Principal, params user_api.R return bucket, nil } -func getDeleteRemoteBucketResponse(session *models.Principal, params user_api.DeleteRemoteBucketParams) error { +func getDeleteRemoteBucketResponse(session *models.Principal, params bucketApi.DeleteRemoteBucketParams) error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) @@ -196,7 +196,7 @@ func getDeleteRemoteBucketResponse(session *models.Principal, params user_api.De return err } -func getAddRemoteBucketResponse(session *models.Principal, params user_api.AddRemoteBucketParams) error { +func getAddRemoteBucketResponse(session *models.Principal, params bucketApi.AddRemoteBucketParams) error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) @@ -438,7 +438,7 @@ func editBucketReplicationItem(ctx context.Context, session *models.Principal, m return nil } -func setMultiBucketReplication(ctx context.Context, session *models.Principal, client MinioAdmin, minClient minioClient, params user_api.SetMultiBucketReplicationParams) []RemoteBucketResult { +func setMultiBucketReplication(ctx context.Context, session *models.Principal, client MinioAdmin, minClient minioClient, params bucketApi.SetMultiBucketReplicationParams) []RemoteBucketResult { bucketsRelation := params.Body.BucketsRelation // Parallel remote bucket adding @@ -515,7 +515,7 @@ func setMultiBucketReplication(ctx context.Context, session *models.Principal, c return resultsList } -func setMultiBucketReplicationResponse(session *models.Principal, params user_api.SetMultiBucketReplicationParams) (*models.MultiBucketResponseState, *models.Error) { +func setMultiBucketReplicationResponse(session *models.Principal, params bucketApi.SetMultiBucketReplicationParams) (*models.MultiBucketResponseState, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -561,7 +561,7 @@ func setMultiBucketReplicationResponse(session *models.Principal, params user_ap return &resultsParsed, nil } -func listExternalBucketsResponse(params user_api.ListExternalBucketsParams) (*models.ListBucketsResponse, *models.Error) { +func listExternalBucketsResponse(params bucketApi.ListExternalBucketsParams) (*models.ListBucketsResponse, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() remoteAdmin, err := newAdminFromCreds(*params.Body.AccessKey, *params.Body.SecretKey, *params.Body.TargetURL, *params.Body.UseTLS) @@ -755,7 +755,7 @@ func deleteSelectedReplicationRules(ctx context.Context, session *models.Princip return nil } -func deleteReplicationRuleResponse(session *models.Principal, params user_api.DeleteBucketReplicationRuleParams) *models.Error { +func deleteReplicationRuleResponse(session *models.Principal, params bucketApi.DeleteBucketReplicationRuleParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -767,7 +767,7 @@ func deleteReplicationRuleResponse(session *models.Principal, params user_api.De return nil } -func deleteBucketReplicationRulesResponse(session *models.Principal, params user_api.DeleteAllReplicationRulesParams) *models.Error { +func deleteBucketReplicationRulesResponse(session *models.Principal, params bucketApi.DeleteAllReplicationRulesParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -779,7 +779,7 @@ func deleteBucketReplicationRulesResponse(session *models.Principal, params user return nil } -func deleteSelectedReplicationRulesResponse(session *models.Principal, params user_api.DeleteSelectedReplicationRulesParams) *models.Error { +func deleteSelectedReplicationRulesResponse(session *models.Principal, params bucketApi.DeleteSelectedReplicationRulesParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -791,7 +791,7 @@ func deleteSelectedReplicationRulesResponse(session *models.Principal, params us return nil } -func updateBucketReplicationResponse(session *models.Principal, params user_api.UpdateMultiBucketReplicationParams) *models.Error { +func updateBucketReplicationResponse(session *models.Principal, params bucketApi.UpdateMultiBucketReplicationParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() diff --git a/restapi/admin_replication_status.go b/restapi/admin_replication_status.go index 9f48e92dc..b9eacda43 100644 --- a/restapi/admin_replication_status.go +++ b/restapi/admin_replication_status.go @@ -22,23 +22,23 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" + siteRepApi "github.com/minio/console/restapi/operations/site_replication" "github.com/minio/madmin-go" ) func registerSiteReplicationStatusHandler(api *operations.ConsoleAPI) { - api.AdminAPIGetSiteReplicationStatusHandler = admin_api.GetSiteReplicationStatusHandlerFunc(func(params admin_api.GetSiteReplicationStatusParams, session *models.Principal) middleware.Responder { + api.SiteReplicationGetSiteReplicationStatusHandler = siteRepApi.GetSiteReplicationStatusHandlerFunc(func(params siteRepApi.GetSiteReplicationStatusParams, session *models.Principal) middleware.Responder { rInfo, err := getSRStatusResponse(session, params) if err != nil { - return admin_api.NewGetSiteReplicationStatusDefault(500).WithPayload(prepareError(err)) + return siteRepApi.NewGetSiteReplicationStatusDefault(500).WithPayload(prepareError(err)) } - return admin_api.NewGetSiteReplicationStatusOK().WithPayload(rInfo) + return siteRepApi.NewGetSiteReplicationStatusOK().WithPayload(rInfo) }) } -func getSRStatusResponse(session *models.Principal, params admin_api.GetSiteReplicationStatusParams) (info *models.SiteReplicationStatusResponse, err error) { +func getSRStatusResponse(session *models.Principal, params siteRepApi.GetSiteReplicationStatusParams) (info *models.SiteReplicationStatusResponse, err error) { mAdmin, err := NewMinioAdminClient(session) if err != nil { @@ -55,7 +55,7 @@ func getSRStatusResponse(session *models.Principal, params admin_api.GetSiteRepl return res, nil } -func getSRStats(ctx context.Context, client MinioAdmin, params admin_api.GetSiteReplicationStatusParams) (info *models.SiteReplicationStatusResponse, err error) { +func getSRStats(ctx context.Context, client MinioAdmin, params siteRepApi.GetSiteReplicationStatusParams) (info *models.SiteReplicationStatusResponse, err error) { srParams := madmin.SRStatusOptions{ Buckets: *params.Buckets, diff --git a/restapi/admin_service.go b/restapi/admin_service.go index 96322cc77..0e767e1b1 100644 --- a/restapi/admin_service.go +++ b/restapi/admin_service.go @@ -24,16 +24,16 @@ import ( "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" + svcApi "github.com/minio/console/restapi/operations/service" ) func registerServiceHandlers(api *operations.ConsoleAPI) { // Restart Service - api.AdminAPIRestartServiceHandler = admin_api.RestartServiceHandlerFunc(func(params admin_api.RestartServiceParams, session *models.Principal) middleware.Responder { + api.ServiceRestartServiceHandler = svcApi.RestartServiceHandlerFunc(func(params svcApi.RestartServiceParams, session *models.Principal) middleware.Responder { if err := getRestartServiceResponse(session); err != nil { - return admin_api.NewRestartServiceDefault(int(err.Code)).WithPayload(err) + return svcApi.NewRestartServiceDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewRestartServiceNoContent() + return svcApi.NewRestartServiceNoContent() }) } diff --git a/restapi/admin_site_replication.go b/restapi/admin_site_replication.go index 8fed4fd05..83d7c0f6f 100644 --- a/restapi/admin_site_replication.go +++ b/restapi/admin_site_replication.go @@ -22,45 +22,45 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" + siteRepApi "github.com/minio/console/restapi/operations/site_replication" "github.com/minio/madmin-go" ) func registerSiteReplicationHandler(api *operations.ConsoleAPI) { - api.AdminAPIGetSiteReplicationInfoHandler = admin_api.GetSiteReplicationInfoHandlerFunc(func(params admin_api.GetSiteReplicationInfoParams, session *models.Principal) middleware.Responder { + api.SiteReplicationGetSiteReplicationInfoHandler = siteRepApi.GetSiteReplicationInfoHandlerFunc(func(params siteRepApi.GetSiteReplicationInfoParams, session *models.Principal) middleware.Responder { rInfo, err := getSRInfoResponse(session) if err != nil { - return admin_api.NewGetSiteReplicationInfoDefault(500).WithPayload(prepareError(err)) + return siteRepApi.NewGetSiteReplicationInfoDefault(500).WithPayload(prepareError(err)) } - return admin_api.NewGetSiteReplicationInfoOK().WithPayload(rInfo) + return siteRepApi.NewGetSiteReplicationInfoOK().WithPayload(rInfo) }) - api.AdminAPISiteReplicationInfoAddHandler = admin_api.SiteReplicationInfoAddHandlerFunc(func(params admin_api.SiteReplicationInfoAddParams, session *models.Principal) middleware.Responder { + api.SiteReplicationSiteReplicationInfoAddHandler = siteRepApi.SiteReplicationInfoAddHandlerFunc(func(params siteRepApi.SiteReplicationInfoAddParams, session *models.Principal) middleware.Responder { eInfo, err := getSRAddResponse(session, ¶ms) if err != nil { - return admin_api.NewSiteReplicationInfoAddDefault(500).WithPayload(err) + return siteRepApi.NewSiteReplicationInfoAddDefault(500).WithPayload(err) } - return admin_api.NewSiteReplicationInfoAddOK().WithPayload(eInfo) + return siteRepApi.NewSiteReplicationInfoAddOK().WithPayload(eInfo) }) - api.AdminAPISiteReplicationRemoveHandler = admin_api.SiteReplicationRemoveHandlerFunc(func(params admin_api.SiteReplicationRemoveParams, session *models.Principal) middleware.Responder { + api.SiteReplicationSiteReplicationRemoveHandler = siteRepApi.SiteReplicationRemoveHandlerFunc(func(params siteRepApi.SiteReplicationRemoveParams, session *models.Principal) middleware.Responder { remRes, err := getSRRemoveResponse(session, ¶ms) if err != nil { - return admin_api.NewSiteReplicationRemoveDefault(500).WithPayload(err) + return siteRepApi.NewSiteReplicationRemoveDefault(500).WithPayload(err) } - return admin_api.NewSiteReplicationRemoveNoContent().WithPayload(remRes) + return siteRepApi.NewSiteReplicationRemoveNoContent().WithPayload(remRes) }) - api.AdminAPISiteReplicationEditHandler = admin_api.SiteReplicationEditHandlerFunc(func(params admin_api.SiteReplicationEditParams, session *models.Principal) middleware.Responder { + api.SiteReplicationSiteReplicationEditHandler = siteRepApi.SiteReplicationEditHandlerFunc(func(params siteRepApi.SiteReplicationEditParams, session *models.Principal) middleware.Responder { eInfo, err := getSREditResponse(session, ¶ms) if err != nil { - return admin_api.NewSiteReplicationRemoveDefault(500).WithPayload(err) + return siteRepApi.NewSiteReplicationRemoveDefault(500).WithPayload(err) } - return admin_api.NewSiteReplicationEditOK().WithPayload(eInfo) + return siteRepApi.NewSiteReplicationEditOK().WithPayload(eInfo) }) } @@ -82,7 +82,7 @@ func getSRInfoResponse(session *models.Principal) (info *models.SiteReplicationI return res, nil } -func getSRAddResponse(session *models.Principal, params *admin_api.SiteReplicationInfoAddParams) (*models.SiteReplicationAddResponse, *models.Error) { +func getSRAddResponse(session *models.Principal, params *siteRepApi.SiteReplicationInfoAddParams) (*models.SiteReplicationAddResponse, *models.Error) { mAdmin, err := NewMinioAdminClient(session) if err != nil { @@ -99,7 +99,7 @@ func getSRAddResponse(session *models.Principal, params *admin_api.SiteReplicati return res, nil } -func getSREditResponse(session *models.Principal, params *admin_api.SiteReplicationEditParams) (*models.PeerSiteEditResponse, *models.Error) { +func getSREditResponse(session *models.Principal, params *siteRepApi.SiteReplicationEditParams) (*models.PeerSiteEditResponse, *models.Error) { mAdmin, err := NewMinioAdminClient(session) if err != nil { return nil, prepareError(err) @@ -116,7 +116,7 @@ func getSREditResponse(session *models.Principal, params *admin_api.SiteReplicat return eRes, nil } -func getSRRemoveResponse(session *models.Principal, params *admin_api.SiteReplicationRemoveParams) (*models.PeerSiteRemoveResponse, *models.Error) { +func getSRRemoveResponse(session *models.Principal, params *siteRepApi.SiteReplicationRemoveParams) (*models.PeerSiteRemoveResponse, *models.Error) { mAdmin, err := NewMinioAdminClient(session) if err != nil { return nil, prepareError(err) @@ -159,7 +159,7 @@ func getSRConfig(ctx context.Context, client MinioAdmin) (info *models.SiteRepli return res, nil } -func addSiteReplication(ctx context.Context, client MinioAdmin, params *admin_api.SiteReplicationInfoAddParams) (info *models.SiteReplicationAddResponse, err error) { +func addSiteReplication(ctx context.Context, client MinioAdmin, params *siteRepApi.SiteReplicationInfoAddParams) (info *models.SiteReplicationAddResponse, err error) { var rSites []madmin.PeerSite if len(params.Body) > 0 { @@ -188,7 +188,7 @@ func addSiteReplication(ctx context.Context, client MinioAdmin, params *admin_ap return res, nil } -func editSiteReplication(ctx context.Context, client MinioAdmin, params *admin_api.SiteReplicationEditParams) (info *models.PeerSiteEditResponse, err error) { +func editSiteReplication(ctx context.Context, client MinioAdmin, params *siteRepApi.SiteReplicationEditParams) (info *models.PeerSiteEditResponse, err error) { peerSiteInfo := &madmin.PeerInfo{ Endpoint: params.Body.Endpoint, //only endpoint can be edited. @@ -207,7 +207,7 @@ func editSiteReplication(ctx context.Context, client MinioAdmin, params *admin_a } return editRes, nil } -func removeSiteReplication(ctx context.Context, client MinioAdmin, params *admin_api.SiteReplicationRemoveParams) (info *models.PeerSiteRemoveResponse, err error) { +func removeSiteReplication(ctx context.Context, client MinioAdmin, params *siteRepApi.SiteReplicationRemoveParams) (info *models.PeerSiteRemoveResponse, err error) { delAll := params.Body.All siteNames := params.Body.Sites diff --git a/restapi/admin_subnet.go b/restapi/admin_subnet.go index cc3fcad6a..c46e3dfee 100644 --- a/restapi/admin_subnet.go +++ b/restapi/admin_subnet.go @@ -30,50 +30,50 @@ import ( "github.com/minio/console/models" "github.com/minio/console/pkg/subnet" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" + subnetApi "github.com/minio/console/restapi/operations/subnet" "github.com/minio/madmin-go" ) func registerSubnetHandlers(api *operations.ConsoleAPI) { // Get subnet login handler - api.AdminAPISubnetLoginHandler = admin_api.SubnetLoginHandlerFunc(func(params admin_api.SubnetLoginParams, session *models.Principal) middleware.Responder { + api.SubnetSubnetLoginHandler = subnetApi.SubnetLoginHandlerFunc(func(params subnetApi.SubnetLoginParams, session *models.Principal) middleware.Responder { resp, err := GetSubnetLoginResponse(session, params) if err != nil { - return admin_api.NewSubnetLoginDefault(int(err.Code)).WithPayload(err) + return subnetApi.NewSubnetLoginDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewSubnetLoginOK().WithPayload(resp) + return subnetApi.NewSubnetLoginOK().WithPayload(resp) }) // Get subnet login with MFA handler - api.AdminAPISubnetLoginMFAHandler = admin_api.SubnetLoginMFAHandlerFunc(func(params admin_api.SubnetLoginMFAParams, session *models.Principal) middleware.Responder { + api.SubnetSubnetLoginMFAHandler = subnetApi.SubnetLoginMFAHandlerFunc(func(params subnetApi.SubnetLoginMFAParams, session *models.Principal) middleware.Responder { resp, err := GetSubnetLoginWithMFAResponse(session, params) if err != nil { - return admin_api.NewSubnetLoginMFADefault(int(err.Code)).WithPayload(err) + return subnetApi.NewSubnetLoginMFADefault(int(err.Code)).WithPayload(err) } - return admin_api.NewSubnetLoginMFAOK().WithPayload(resp) + return subnetApi.NewSubnetLoginMFAOK().WithPayload(resp) }) // Get subnet register - api.AdminAPISubnetRegisterHandler = admin_api.SubnetRegisterHandlerFunc(func(params admin_api.SubnetRegisterParams, session *models.Principal) middleware.Responder { + api.SubnetSubnetRegisterHandler = subnetApi.SubnetRegisterHandlerFunc(func(params subnetApi.SubnetRegisterParams, session *models.Principal) middleware.Responder { err := GetSubnetRegisterResponse(session, params) if err != nil { - return admin_api.NewSubnetRegisterDefault(int(err.Code)).WithPayload(err) + return subnetApi.NewSubnetRegisterDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewSubnetRegisterOK() + return subnetApi.NewSubnetRegisterOK() }) // Get subnet info - api.AdminAPISubnetInfoHandler = admin_api.SubnetInfoHandlerFunc(func(params admin_api.SubnetInfoParams, session *models.Principal) middleware.Responder { + api.SubnetSubnetInfoHandler = subnetApi.SubnetInfoHandlerFunc(func(params subnetApi.SubnetInfoParams, session *models.Principal) middleware.Responder { resp, err := GetSubnetInfoResponse(session) if err != nil { - return admin_api.NewSubnetInfoDefault(int(err.Code)).WithPayload(err) + return subnetApi.NewSubnetInfoDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewSubnetInfoOK().WithPayload(resp) + return subnetApi.NewSubnetInfoOK().WithPayload(resp) }) // Get subnet registration token - api.AdminAPISubnetRegTokenHandler = admin_api.SubnetRegTokenHandlerFunc(func(params admin_api.SubnetRegTokenParams, session *models.Principal) middleware.Responder { + api.SubnetSubnetRegTokenHandler = subnetApi.SubnetRegTokenHandlerFunc(func(params subnetApi.SubnetRegTokenParams, session *models.Principal) middleware.Responder { resp, err := GetSubnetRegTokenResponse(session) if err != nil { - return admin_api.NewSubnetRegTokenDefault(int(err.Code)).WithPayload(err) + return subnetApi.NewSubnetRegTokenDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewSubnetRegTokenOK().WithPayload(resp) + return subnetApi.NewSubnetRegTokenOK().WithPayload(resp) }) } @@ -116,7 +116,7 @@ func SubnetLogin(client utils.HTTPClientI, username, password string) (string, s return "", "", errors.New("something went wrong") } -func GetSubnetLoginResponse(session *models.Principal, params admin_api.SubnetLoginParams) (*models.SubnetLoginResponse, *models.Error) { +func GetSubnetLoginResponse(session *models.Principal, params subnetApi.SubnetLoginParams) (*models.SubnetLoginResponse, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) @@ -212,7 +212,7 @@ func GetSubnetHTTPClient(ctx context.Context, minioClient MinioAdmin) (*utils.HT return clientI, nil } -func GetSubnetLoginWithMFAResponse(session *models.Principal, params admin_api.SubnetLoginMFAParams) (*models.SubnetLoginResponse, *models.Error) { +func GetSubnetLoginWithMFAResponse(session *models.Principal, params subnetApi.SubnetLoginMFAParams) (*models.SubnetLoginResponse, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) @@ -257,7 +257,7 @@ func GetSubnetKeyFromMinIOConfig(ctx context.Context, minioClient MinioAdmin) (* return &res, nil } -func GetSubnetRegister(ctx context.Context, minioClient MinioAdmin, httpClient utils.HTTPClientI, params admin_api.SubnetRegisterParams) error { +func GetSubnetRegister(ctx context.Context, minioClient MinioAdmin, httpClient utils.HTTPClientI, params subnetApi.SubnetRegisterParams) error { serverInfo, err := minioClient.serverInfo(ctx) if err != nil { return err @@ -279,7 +279,7 @@ func GetSubnetRegister(ctx context.Context, minioClient MinioAdmin, httpClient u return nil } -func GetSubnetRegisterResponse(session *models.Principal, params admin_api.SubnetRegisterParams) *models.Error { +func GetSubnetRegisterResponse(session *models.Principal, params subnetApi.SubnetRegisterParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) diff --git a/restapi/admin_tiers.go b/restapi/admin_tiers.go index 78a796b3e..697004c83 100644 --- a/restapi/admin_tiers.go +++ b/restapi/admin_tiers.go @@ -25,42 +25,42 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" + tieringApi "github.com/minio/console/restapi/operations/tiering" "github.com/minio/madmin-go" ) func registerAdminTiersHandlers(api *operations.ConsoleAPI) { // return a list of notification endpoints - api.AdminAPITiersListHandler = admin_api.TiersListHandlerFunc(func(params admin_api.TiersListParams, session *models.Principal) middleware.Responder { + api.TieringTiersListHandler = tieringApi.TiersListHandlerFunc(func(params tieringApi.TiersListParams, session *models.Principal) middleware.Responder { tierList, err := getTiersResponse(session) if err != nil { - return admin_api.NewTiersListDefault(int(err.Code)).WithPayload(err) + return tieringApi.NewTiersListDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewTiersListOK().WithPayload(tierList) + return tieringApi.NewTiersListOK().WithPayload(tierList) }) // add a new tiers - api.AdminAPIAddTierHandler = admin_api.AddTierHandlerFunc(func(params admin_api.AddTierParams, session *models.Principal) middleware.Responder { + api.TieringAddTierHandler = tieringApi.AddTierHandlerFunc(func(params tieringApi.AddTierParams, session *models.Principal) middleware.Responder { err := getAddTierResponse(session, ¶ms) if err != nil { - return admin_api.NewAddTierDefault(int(err.Code)).WithPayload(err) + return tieringApi.NewAddTierDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewAddTierCreated() + return tieringApi.NewAddTierCreated() }) // get a tier - api.AdminAPIGetTierHandler = admin_api.GetTierHandlerFunc(func(params admin_api.GetTierParams, session *models.Principal) middleware.Responder { + api.TieringGetTierHandler = tieringApi.GetTierHandlerFunc(func(params tieringApi.GetTierParams, session *models.Principal) middleware.Responder { notifEndpoints, err := getGetTierResponse(session, ¶ms) if err != nil { - return admin_api.NewGetTierDefault(int(err.Code)).WithPayload(err) + return tieringApi.NewGetTierDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewGetTierOK().WithPayload(notifEndpoints) + return tieringApi.NewGetTierOK().WithPayload(notifEndpoints) }) // edit credentials for a tier - api.AdminAPIEditTierCredentialsHandler = admin_api.EditTierCredentialsHandlerFunc(func(params admin_api.EditTierCredentialsParams, session *models.Principal) middleware.Responder { + api.TieringEditTierCredentialsHandler = tieringApi.EditTierCredentialsHandlerFunc(func(params tieringApi.EditTierCredentialsParams, session *models.Principal) middleware.Responder { err := getEditTierCredentialsResponse(session, ¶ms) if err != nil { - return admin_api.NewEditTierCredentialsDefault(int(err.Code)).WithPayload(err) + return tieringApi.NewEditTierCredentialsDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewEditTierCredentialsOK() + return tieringApi.NewEditTierCredentialsOK() }) } @@ -160,7 +160,7 @@ func getTiersResponse(session *models.Principal) (*models.TierListResponse, *mod return tiersResp, nil } -func addTier(ctx context.Context, client MinioAdmin, params *admin_api.AddTierParams) error { +func addTier(ctx context.Context, client MinioAdmin, params *tieringApi.AddTierParams) error { var cfg *madmin.TierConfig var err error @@ -231,7 +231,7 @@ func addTier(ctx context.Context, client MinioAdmin, params *admin_api.AddTierPa } // getAddTierResponse returns the response of admin tier -func getAddTierResponse(session *models.Principal, params *admin_api.AddTierParams) *models.Error { +func getAddTierResponse(session *models.Principal, params *tieringApi.AddTierParams) *models.Error { mAdmin, err := NewMinioAdminClient(session) if err != nil { return prepareError(err) @@ -249,7 +249,7 @@ func getAddTierResponse(session *models.Principal, params *admin_api.AddTierPara return nil } -func getTier(ctx context.Context, client MinioAdmin, params *admin_api.GetTierParams) (*models.Tier, error) { +func getTier(ctx context.Context, client MinioAdmin, params *tieringApi.GetTierParams) (*models.Tier, error) { tiers, err := client.listTiers(ctx) if err != nil { @@ -313,7 +313,7 @@ func getTier(ctx context.Context, client MinioAdmin, params *admin_api.GetTierPa } // getGetTierResponse returns a tier -func getGetTierResponse(session *models.Principal, params *admin_api.GetTierParams) (*models.Tier, *models.Error) { +func getGetTierResponse(session *models.Principal, params *tieringApi.GetTierParams) (*models.Tier, *models.Error) { mAdmin, err := NewMinioAdminClient(session) if err != nil { return nil, prepareError(err) @@ -332,7 +332,7 @@ func getGetTierResponse(session *models.Principal, params *admin_api.GetTierPara return addTierResp, nil } -func editTierCredentials(ctx context.Context, client MinioAdmin, params *admin_api.EditTierCredentialsParams) error { +func editTierCredentials(ctx context.Context, client MinioAdmin, params *tieringApi.EditTierCredentialsParams) error { base64Text := make([]byte, base64.StdEncoding.EncodedLen(len(params.Body.Creds))) l, err := base64.StdEncoding.Decode(base64Text, []byte(params.Body.Creds)) @@ -349,7 +349,7 @@ func editTierCredentials(ctx context.Context, client MinioAdmin, params *admin_a } // getEditTierCredentialsResponse returns the result of editing credentials for a tier -func getEditTierCredentialsResponse(session *models.Principal, params *admin_api.EditTierCredentialsParams) *models.Error { +func getEditTierCredentialsResponse(session *models.Principal, params *tieringApi.EditTierCredentialsParams) *models.Error { mAdmin, err := NewMinioAdminClient(session) if err != nil { return prepareError(err) diff --git a/restapi/admin_tiers_test.go b/restapi/admin_tiers_test.go index 07951d4e5..19e1f563f 100644 --- a/restapi/admin_tiers_test.go +++ b/restapi/admin_tiers_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/minio/console/models" - "github.com/minio/console/restapi/operations/admin_api" + tieringApi "github.com/minio/console/restapi/operations/tiering" "github.com/minio/madmin-go" "github.com/stretchr/testify/assert" ) @@ -198,7 +198,7 @@ func TestAddTier(t *testing.T) { return nil } - paramsToAdd := admin_api.AddTierParams{ + paramsToAdd := tieringApi.AddTierParams{ Body: &models.Tier{ Type: "S3", S3: &models.TierS3{ @@ -240,7 +240,7 @@ func TestUpdateTierCreds(t *testing.T) { return nil } - params := &admin_api.EditTierCredentialsParams{ + params := &tieringApi.EditTierCredentialsParams{ Name: "TESTTIER", Body: &models.TierCredentialsRequest{ AccessKey: "New Key", diff --git a/restapi/admin_users.go b/restapi/admin_users.go index 1081e74df..4b61be325 100644 --- a/restapi/admin_users.go +++ b/restapi/admin_users.go @@ -28,7 +28,9 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" + accountApi "github.com/minio/console/restapi/operations/account" + bucketApi "github.com/minio/console/restapi/operations/bucket" + userApi "github.com/minio/console/restapi/operations/user" "github.com/minio/madmin-go" iampolicy "github.com/minio/pkg/iam/policy" ) @@ -42,79 +44,79 @@ const ( func registerUsersHandlers(api *operations.ConsoleAPI) { // List Users - api.AdminAPIListUsersHandler = admin_api.ListUsersHandlerFunc(func(params admin_api.ListUsersParams, session *models.Principal) middleware.Responder { + api.UserListUsersHandler = userApi.ListUsersHandlerFunc(func(params userApi.ListUsersParams, session *models.Principal) middleware.Responder { listUsersResponse, err := getListUsersResponse(session) if err != nil { - return admin_api.NewListUsersDefault(int(err.Code)).WithPayload(err) + return userApi.NewListUsersDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewListUsersOK().WithPayload(listUsersResponse) + return userApi.NewListUsersOK().WithPayload(listUsersResponse) }) // Add User - api.AdminAPIAddUserHandler = admin_api.AddUserHandlerFunc(func(params admin_api.AddUserParams, session *models.Principal) middleware.Responder { + api.UserAddUserHandler = userApi.AddUserHandlerFunc(func(params userApi.AddUserParams, session *models.Principal) middleware.Responder { userResponse, err := getUserAddResponse(session, params) if err != nil { - return admin_api.NewAddUserDefault(int(err.Code)).WithPayload(err) + return userApi.NewAddUserDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewAddUserCreated().WithPayload(userResponse) + return userApi.NewAddUserCreated().WithPayload(userResponse) }) // Remove User - api.AdminAPIRemoveUserHandler = admin_api.RemoveUserHandlerFunc(func(params admin_api.RemoveUserParams, session *models.Principal) middleware.Responder { + api.UserRemoveUserHandler = userApi.RemoveUserHandlerFunc(func(params userApi.RemoveUserParams, session *models.Principal) middleware.Responder { err := getRemoveUserResponse(session, params) if err != nil { - return admin_api.NewRemoveUserDefault(int(err.Code)).WithPayload(err) + return userApi.NewRemoveUserDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewRemoveUserNoContent() + return userApi.NewRemoveUserNoContent() }) // Update User-Groups - api.AdminAPIUpdateUserGroupsHandler = admin_api.UpdateUserGroupsHandlerFunc(func(params admin_api.UpdateUserGroupsParams, session *models.Principal) middleware.Responder { + api.UserUpdateUserGroupsHandler = userApi.UpdateUserGroupsHandlerFunc(func(params userApi.UpdateUserGroupsParams, session *models.Principal) middleware.Responder { userUpdateResponse, err := getUpdateUserGroupsResponse(session, params) if err != nil { - return admin_api.NewUpdateUserGroupsDefault(int(err.Code)).WithPayload(err) + return userApi.NewUpdateUserGroupsDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewUpdateUserGroupsOK().WithPayload(userUpdateResponse) + return userApi.NewUpdateUserGroupsOK().WithPayload(userUpdateResponse) }) // Get User - api.AdminAPIGetUserInfoHandler = admin_api.GetUserInfoHandlerFunc(func(params admin_api.GetUserInfoParams, session *models.Principal) middleware.Responder { + api.UserGetUserInfoHandler = userApi.GetUserInfoHandlerFunc(func(params userApi.GetUserInfoParams, session *models.Principal) middleware.Responder { userInfoResponse, err := getUserInfoResponse(session, params) if err != nil { - return admin_api.NewGetUserInfoDefault(int(err.Code)).WithPayload(err) + return userApi.NewGetUserInfoDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewGetUserInfoOK().WithPayload(userInfoResponse) + return userApi.NewGetUserInfoOK().WithPayload(userInfoResponse) }) // Update User - api.AdminAPIUpdateUserInfoHandler = admin_api.UpdateUserInfoHandlerFunc(func(params admin_api.UpdateUserInfoParams, session *models.Principal) middleware.Responder { + api.UserUpdateUserInfoHandler = userApi.UpdateUserInfoHandlerFunc(func(params userApi.UpdateUserInfoParams, session *models.Principal) middleware.Responder { userUpdateResponse, err := getUpdateUserResponse(session, params) if err != nil { - return admin_api.NewUpdateUserInfoDefault(int(err.Code)).WithPayload(err) + return userApi.NewUpdateUserInfoDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewUpdateUserInfoOK().WithPayload(userUpdateResponse) + return userApi.NewUpdateUserInfoOK().WithPayload(userUpdateResponse) }) // Update User-Groups Bulk - api.AdminAPIBulkUpdateUsersGroupsHandler = admin_api.BulkUpdateUsersGroupsHandlerFunc(func(params admin_api.BulkUpdateUsersGroupsParams, session *models.Principal) middleware.Responder { + api.UserBulkUpdateUsersGroupsHandler = userApi.BulkUpdateUsersGroupsHandlerFunc(func(params userApi.BulkUpdateUsersGroupsParams, session *models.Principal) middleware.Responder { err := getAddUsersListToGroupsResponse(session, params) if err != nil { - return admin_api.NewBulkUpdateUsersGroupsDefault(int(err.Code)).WithPayload(err) + return userApi.NewBulkUpdateUsersGroupsDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewBulkUpdateUsersGroupsOK() + return userApi.NewBulkUpdateUsersGroupsOK() }) - api.AdminAPIListUsersWithAccessToBucketHandler = admin_api.ListUsersWithAccessToBucketHandlerFunc(func(params admin_api.ListUsersWithAccessToBucketParams, session *models.Principal) middleware.Responder { + api.BucketListUsersWithAccessToBucketHandler = bucketApi.ListUsersWithAccessToBucketHandlerFunc(func(params bucketApi.ListUsersWithAccessToBucketParams, session *models.Principal) middleware.Responder { response, err := getListUsersWithAccessToBucketResponse(session, params.Bucket) if err != nil { - return admin_api.NewListUsersWithAccessToBucketDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewListUsersWithAccessToBucketDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewListUsersWithAccessToBucketOK().WithPayload(response) + return bucketApi.NewListUsersWithAccessToBucketOK().WithPayload(response) }) // Change User Password - api.AdminAPIChangeUserPasswordHandler = admin_api.ChangeUserPasswordHandlerFunc(func(params admin_api.ChangeUserPasswordParams, session *models.Principal) middleware.Responder { + api.AccountChangeUserPasswordHandler = accountApi.ChangeUserPasswordHandlerFunc(func(params accountApi.ChangeUserPasswordParams, session *models.Principal) middleware.Responder { err := getChangeUserPasswordResponse(session, params) if err != nil { - return admin_api.NewChangeUserPasswordDefault(int(err.Code)).WithPayload(err) + return accountApi.NewChangeUserPasswordDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewChangeUserPasswordCreated() + return accountApi.NewChangeUserPasswordCreated() }) } @@ -205,7 +207,7 @@ func addUser(ctx context.Context, client MinioAdmin, accessKey, secretKey *strin return userRet, nil } -func getUserAddResponse(session *models.Principal, params admin_api.AddUserParams) (*models.User, *models.Error) { +func getUserAddResponse(session *models.Principal, params userApi.AddUserParams) (*models.User, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) @@ -242,7 +244,7 @@ func removeUser(ctx context.Context, client MinioAdmin, accessKey string) error return client.removeUser(ctx, accessKey) } -func getRemoveUserResponse(session *models.Principal, params admin_api.RemoveUserParams) *models.Error { +func getRemoveUserResponse(session *models.Principal, params userApi.RemoveUserParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -276,7 +278,7 @@ func getUserInfo(ctx context.Context, client MinioAdmin, accessKey string) (*mad return &userInfo, nil } -func getUserInfoResponse(session *models.Principal, params admin_api.GetUserInfoParams) (*models.User, *models.Error) { +func getUserInfoResponse(session *models.Principal, params userApi.GetUserInfoParams) (*models.User, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -422,7 +424,7 @@ func updateUserGroups(ctx context.Context, client MinioAdmin, user string, group return userReturn, nil } -func getUpdateUserGroupsResponse(session *models.Principal, params admin_api.UpdateUserGroupsParams) (*models.User, *models.Error) { +func getUpdateUserGroupsResponse(session *models.Principal, params userApi.UpdateUserGroupsParams) (*models.User, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -459,7 +461,7 @@ func setUserStatus(ctx context.Context, client MinioAdmin, user string, status s return client.setUserStatus(ctx, user, setStatus) } -func getUpdateUserResponse(session *models.Principal, params admin_api.UpdateUserInfoParams) (*models.User, *models.Error) { +func getUpdateUserResponse(session *models.Principal, params userApi.UpdateUserInfoParams) (*models.User, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -531,7 +533,7 @@ func addUsersListToGroups(ctx context.Context, client MinioAdmin, usersToUpdate return nil } -func getAddUsersListToGroupsResponse(session *models.Principal, params admin_api.BulkUpdateUsersGroupsParams) *models.Error { +func getAddUsersListToGroupsResponse(session *models.Principal, params userApi.BulkUpdateUsersGroupsParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -662,7 +664,7 @@ func changeUserPassword(ctx context.Context, client MinioAdmin, selectedUser str } // getChangeUserPasswordResponse will change the password of selctedUser to newSecretKey -func getChangeUserPasswordResponse(session *models.Principal, params admin_api.ChangeUserPasswordParams) *models.Error { +func getChangeUserPasswordResponse(session *models.Principal, params accountApi.ChangeUserPasswordParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mAdmin, err := NewMinioAdminClient(session) diff --git a/restapi/embedded_spec.go b/restapi/embedded_spec.go index 315ada570..0be5114a6 100644 --- a/restapi/embedded_spec.go +++ b/restapi/embedded_spec.go @@ -55,7 +55,7 @@ func init() { "/account/change-password": { "post": { "tags": [ - "UserAPI" + "Account" ], "summary": "Change password of currently logged in user.", "operationId": "AccountChangePassword", @@ -85,7 +85,7 @@ func init() { "/account/change-user-password": { "post": { "tags": [ - "AdminAPI" + "Account" ], "summary": "Change password of currently logged in user.", "operationId": "ChangeUserPassword", @@ -115,7 +115,7 @@ func init() { "/admin/arns": { "get": { "tags": [ - "AdminAPI" + "System" ], "summary": "Returns a list of active ARNs in the instance", "operationId": "ArnList", @@ -138,7 +138,7 @@ func init() { "/admin/info": { "get": { "tags": [ - "AdminAPI" + "System" ], "summary": "Returns information about the deployment", "operationId": "AdminInfo", @@ -169,7 +169,7 @@ func init() { "/admin/info/widgets/{widgetId}": { "get": { "tags": [ - "AdminAPI" + "System" ], "summary": "Returns information about the deployment", "operationId": "DashboardWidgetDetails", @@ -220,7 +220,7 @@ func init() { "application/octet-stream" ], "tags": [ - "AdminAPI" + "Inspect" ], "summary": "Inspect Files on Drive", "operationId": "Inspect", @@ -262,7 +262,7 @@ func init() { "/admin/notification_endpoints": { "get": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "Returns a list of active notification endpoints", "operationId": "NotificationEndpointList", @@ -283,7 +283,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "Allows to configure a new notification endpoint", "operationId": "AddNotificationEndpoint", @@ -316,7 +316,7 @@ func init() { "/admin/site-replication": { "get": { "tags": [ - "AdminAPI" + "SiteReplication" ], "summary": "Get list of Replication Sites", "operationId": "GetSiteReplicationInfo", @@ -337,7 +337,7 @@ func init() { }, "put": { "tags": [ - "AdminAPI" + "SiteReplication" ], "summary": "Edit a Replication Site", "operationId": "SiteReplicationEdit", @@ -368,7 +368,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "SiteReplication" ], "summary": "Add a Replication Site", "operationId": "SiteReplicationInfoAdd", @@ -399,7 +399,7 @@ func init() { }, "delete": { "tags": [ - "AdminAPI" + "SiteReplication" ], "summary": "Remove a Replication Site", "operationId": "SiteReplicationRemove", @@ -432,7 +432,7 @@ func init() { "/admin/site-replication/status": { "get": { "tags": [ - "AdminAPI" + "SiteReplication" ], "summary": "Display overall site replication status", "operationId": "GetSiteReplicationStatus", @@ -497,7 +497,7 @@ func init() { "/admin/tiers": { "get": { "tags": [ - "AdminAPI" + "Tiering" ], "summary": "Returns a list of tiers for ilm", "operationId": "TiersList", @@ -518,7 +518,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "Tiering" ], "summary": "Allows to configure a new tier", "operationId": "AddTier", @@ -548,7 +548,7 @@ func init() { "/admin/tiers/{type}/{name}": { "get": { "tags": [ - "AdminAPI" + "Tiering" ], "summary": "Get Tier", "operationId": "GetTier", @@ -590,7 +590,7 @@ func init() { "/admin/tiers/{type}/{name}/credentials": { "put": { "tags": [ - "AdminAPI" + "Tiering" ], "summary": "Edit Tier Credentials", "operationId": "EditTierCredentials", @@ -637,7 +637,7 @@ func init() { "/bucket-policy/{bucket}": { "get": { "tags": [ - "AdminAPI" + "Bucket" ], "summary": "List Policies With Given Bucket", "operationId": "ListPoliciesWithBucket", @@ -680,7 +680,7 @@ func init() { "/bucket-users/{bucket}": { "get": { "tags": [ - "AdminAPI" + "Bucket" ], "summary": "List Users With Access to a Given Bucket", "operationId": "ListUsersWithAccessToBucket", @@ -726,7 +726,7 @@ func init() { "/bucket/{bucket}/access-rules": { "get": { "tags": [ - "AdminAPI" + "Bucket" ], "summary": "List Access Rules With Given Bucket", "operationId": "ListAccessRulesWithBucket", @@ -767,7 +767,7 @@ func init() { }, "put": { "tags": [ - "AdminAPI" + "Bucket" ], "summary": "Add Access Rule To Given Bucket", "operationId": "SetAccessRuleWithBucket", @@ -804,7 +804,7 @@ func init() { }, "delete": { "tags": [ - "AdminAPI" + "Bucket" ], "summary": "Delete Access Rule From Given Bucket", "operationId": "DeleteAccessRuleWithBucket", @@ -843,7 +843,7 @@ func init() { "/buckets": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "List Buckets", "operationId": "ListBuckets", @@ -864,7 +864,7 @@ func init() { }, "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Make bucket", "operationId": "MakeBucket", @@ -894,7 +894,7 @@ func init() { "/buckets-replication": { "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Sets Multi Bucket Replication in multiple Buckets", "operationId": "SetMultiBucketReplication", @@ -927,7 +927,7 @@ func init() { "/buckets/multi-lifecycle": { "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Add Multi Bucket Lifecycle", "operationId": "AddMultiBucketLifecycle", @@ -960,7 +960,7 @@ func init() { "/buckets/{bucket_name}/delete-all-replication-rules": { "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Deletes all replication rules from a bucket", "operationId": "DeleteAllReplicationRules", @@ -988,7 +988,7 @@ func init() { "/buckets/{bucket_name}/delete-objects": { "post": { "tags": [ - "UserAPI" + "Object" ], "summary": "Delete Multiple Objects", "operationId": "DeleteMultipleObjects", @@ -1032,7 +1032,7 @@ func init() { "/buckets/{bucket_name}/delete-selected-replication-rules": { "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Deletes selected replication rules from a bucket", "operationId": "DeleteSelectedReplicationRules", @@ -1068,7 +1068,7 @@ func init() { "/buckets/{bucket_name}/encryption/disable": { "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Disable bucket encryption.", "operationId": "DisableBucketEncryption", @@ -1096,7 +1096,7 @@ func init() { "/buckets/{bucket_name}/encryption/enable": { "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Enable bucket encryption.", "operationId": "EnableBucketEncryption", @@ -1132,7 +1132,7 @@ func init() { "/buckets/{bucket_name}/encryption/info": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Get bucket encryption information.", "operationId": "GetBucketEncryptionInfo", @@ -1163,7 +1163,7 @@ func init() { "/buckets/{bucket_name}/events": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "List Bucket Events", "operationId": "ListBucketEvents", @@ -1204,7 +1204,7 @@ func init() { }, "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Create Bucket Event", "operationId": "CreateBucketEvent", @@ -1240,7 +1240,7 @@ func init() { "/buckets/{bucket_name}/events/{arn}": { "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Delete Bucket Event", "operationId": "DeleteBucketEvent", @@ -1282,7 +1282,7 @@ func init() { "/buckets/{bucket_name}/lifecycle": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Lifecycle", "operationId": "GetBucketLifecycle", @@ -1311,7 +1311,7 @@ func init() { }, "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Add Bucket Lifecycle", "operationId": "AddBucketLifecycle", @@ -1347,7 +1347,7 @@ func init() { "/buckets/{bucket_name}/lifecycle/{lifecycle_id}": { "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Update Lifecycle rule", "operationId": "UpdateBucketLifecycle", @@ -1387,7 +1387,7 @@ func init() { }, "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Delete Lifecycle rule", "operationId": "DeleteBucketLifecycleRule", @@ -1421,7 +1421,7 @@ func init() { "/buckets/{bucket_name}/object-locking": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Returns the status of object locking support on the bucket", "operationId": "GetBucketObjectLockingStatus", @@ -1452,7 +1452,7 @@ func init() { "/buckets/{bucket_name}/objects": { "get": { "tags": [ - "UserAPI" + "Object" ], "summary": "List Objects", "operationId": "ListObjects", @@ -1501,7 +1501,7 @@ func init() { }, "delete": { "tags": [ - "UserAPI" + "Object" ], "summary": "Delete Object", "operationId": "DeleteObject", @@ -1558,7 +1558,7 @@ func init() { "application/octet-stream" ], "tags": [ - "UserAPI" + "Object" ], "summary": "Download Object", "operationId": "Download Object", @@ -1606,7 +1606,7 @@ func init() { "/buckets/{bucket_name}/objects/legalhold": { "put": { "tags": [ - "UserAPI" + "Object" ], "summary": "Put Object's legalhold status", "operationId": "PutObjectLegalHold", @@ -1654,7 +1654,7 @@ func init() { "/buckets/{bucket_name}/objects/metadata": { "get": { "tags": [ - "UserAPI" + "Object" ], "summary": "Gets the metadata of an object", "operationId": "GetObjectMetadata", @@ -1691,7 +1691,7 @@ func init() { "/buckets/{bucket_name}/objects/restore": { "put": { "tags": [ - "UserAPI" + "Object" ], "summary": "Restore Object to a selected version", "operationId": "PutObjectRestore", @@ -1731,7 +1731,7 @@ func init() { "/buckets/{bucket_name}/objects/retention": { "put": { "tags": [ - "UserAPI" + "Object" ], "summary": "Put Object's retention status", "operationId": "PutObjectRetention", @@ -1777,7 +1777,7 @@ func init() { }, "delete": { "tags": [ - "UserAPI" + "Object" ], "summary": "Delete Object retention from an object", "operationId": "DeleteObjectRetention", @@ -1817,7 +1817,7 @@ func init() { "/buckets/{bucket_name}/objects/share": { "get": { "tags": [ - "UserAPI" + "Object" ], "summary": "Shares an Object on a url", "operationId": "ShareObject", @@ -1865,7 +1865,7 @@ func init() { "/buckets/{bucket_name}/objects/tags": { "put": { "tags": [ - "UserAPI" + "Object" ], "summary": "Put Object's tags", "operationId": "PutObjectTags", @@ -1916,7 +1916,7 @@ func init() { "multipart/form-data" ], "tags": [ - "UserAPI" + "Object" ], "summary": "Uploads an Object.", "parameters": [ @@ -1948,7 +1948,7 @@ func init() { "/buckets/{bucket_name}/replication": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Replication", "operationId": "GetBucketReplication", @@ -1979,7 +1979,7 @@ func init() { "/buckets/{bucket_name}/replication/{rule_id}": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Replication", "operationId": "GetBucketReplicationRule", @@ -2014,7 +2014,7 @@ func init() { }, "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Update Replication rule", "operationId": "UpdateMultiBucketReplication", @@ -2054,7 +2054,7 @@ func init() { }, "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Replication Rule Delete", "operationId": "DeleteBucketReplicationRule", @@ -2088,7 +2088,7 @@ func init() { "/buckets/{bucket_name}/retention": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Get Bucket's retention config", "operationId": "GetBucketRetentionConfig", @@ -2117,7 +2117,7 @@ func init() { }, "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Set Bucket's retention config", "operationId": "SetBucketRetentionConfig", @@ -2153,7 +2153,7 @@ func init() { "/buckets/{bucket_name}/rewind/{date}": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Get objects in a bucket for a rewind date", "operationId": "GetBucketRewind", @@ -2195,7 +2195,7 @@ func init() { "/buckets/{bucket_name}/tags": { "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Put Bucket's tags", "operationId": "PutBucketTags", @@ -2231,7 +2231,7 @@ func init() { "/buckets/{bucket_name}/versioning": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Versioning", "operationId": "GetBucketVersioning", @@ -2260,7 +2260,7 @@ func init() { }, "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Set Bucket Versioning", "operationId": "SetBucketVersioning", @@ -2296,7 +2296,7 @@ func init() { "/buckets/{name}": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Info", "operationId": "BucketInfo", @@ -2325,7 +2325,7 @@ func init() { }, "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Delete Bucket", "operationId": "DeleteBucket", @@ -2353,7 +2353,7 @@ func init() { "/buckets/{name}/quota": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Get Bucket Quota", "operationId": "GetBucketQuota", @@ -2382,7 +2382,7 @@ func init() { }, "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Quota", "operationId": "SetBucketQuota", @@ -2421,7 +2421,7 @@ func init() { "/buckets/{name}/set-policy": { "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Set Policy", "operationId": "BucketSetPolicy", @@ -2461,7 +2461,7 @@ func init() { "get": { "security": [], "tags": [ - "UserAPI" + "System" ], "summary": "Checks the current MinIO version against the latest", "operationId": "CheckMinIOVersion", @@ -2484,7 +2484,7 @@ func init() { "/configs": { "get": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "List Configurations", "operationId": "ListConfig", @@ -2521,7 +2521,7 @@ func init() { "/configs/{name}": { "get": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "Configuration info", "operationId": "ConfigInfo", @@ -2550,7 +2550,7 @@ func init() { }, "put": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "Set Configuration", "operationId": "SetConfig", @@ -2589,7 +2589,7 @@ func init() { "/configs/{name}/reset": { "get": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "Configuration reset", "operationId": "ResetConfig", @@ -2620,7 +2620,7 @@ func init() { "/group": { "get": { "tags": [ - "AdminAPI" + "Group" ], "summary": "Group info", "operationId": "GroupInfo", @@ -2649,7 +2649,7 @@ func init() { }, "put": { "tags": [ - "AdminAPI" + "Group" ], "summary": "Update Group Members or Status", "operationId": "UpdateGroup", @@ -2686,7 +2686,7 @@ func init() { }, "delete": { "tags": [ - "AdminAPI" + "Group" ], "summary": "Remove group", "operationId": "RemoveGroup", @@ -2714,7 +2714,7 @@ func init() { "/groups": { "get": { "tags": [ - "AdminAPI" + "Group" ], "summary": "List Groups", "operationId": "ListGroups", @@ -2749,7 +2749,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "Group" ], "summary": "Add Group", "operationId": "AddGroup", @@ -2779,7 +2779,7 @@ func init() { "/list-external-buckets": { "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Lists an External list of buckets using custom credentials", "operationId": "ListExternalBuckets", @@ -2813,7 +2813,7 @@ func init() { "get": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Returns login strategy, form or sso.", "operationId": "LoginDetail", @@ -2835,7 +2835,7 @@ func init() { "post": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Login to Console", "operationId": "Login", @@ -2866,7 +2866,7 @@ func init() { "post": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Identity Provider oauth2 callback endpoint.", "operationId": "LoginOauth2Auth", @@ -2896,7 +2896,7 @@ func init() { "/logout": { "post": { "tags": [ - "UserAPI" + "Auth" ], "summary": "Logout from Console.", "operationId": "Logout", @@ -2916,7 +2916,7 @@ func init() { "/logs/search": { "get": { "tags": [ - "UserAPI" + "Logging" ], "summary": "Search the logs", "operationId": "LogSearch", @@ -2980,7 +2980,7 @@ func init() { "/nodes": { "get": { "tags": [ - "AdminAPI" + "System" ], "summary": "Lists Nodes", "operationId": "ListNodes", @@ -3006,7 +3006,7 @@ func init() { "/policies": { "get": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "List Policies", "operationId": "ListPolicies", @@ -3041,7 +3041,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "Add Policy", "operationId": "AddPolicy", @@ -3074,7 +3074,7 @@ func init() { "/policies/{policy}/groups": { "get": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "List Groups for a Policy", "operationId": "ListGroupsForPolicy", @@ -3108,7 +3108,7 @@ func init() { "/policies/{policy}/users": { "get": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "List Users for a Policy", "operationId": "ListUsersForPolicy", @@ -3142,7 +3142,7 @@ func init() { "/policy": { "get": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "Policy info", "operationId": "PolicyInfo", @@ -3171,7 +3171,7 @@ func init() { }, "delete": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "Remove policy", "operationId": "RemovePolicy", @@ -3199,7 +3199,7 @@ func init() { "/profiling/start": { "post": { "tags": [ - "AdminAPI" + "Profile" ], "summary": "Start recording profile data", "operationId": "ProfilingStart", @@ -3235,7 +3235,7 @@ func init() { "application/zip" ], "tags": [ - "AdminAPI" + "Profile" ], "summary": "Stop and download profile data", "operationId": "ProfilingStop", @@ -3258,7 +3258,7 @@ func init() { "/remote-buckets": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "List Remote Buckets", "operationId": "ListRemoteBuckets", @@ -3279,7 +3279,7 @@ func init() { }, "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Add Remote Bucket", "operationId": "AddRemoteBucket", @@ -3309,7 +3309,7 @@ func init() { "/remote-buckets/{name}": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Remote Bucket Details", "operationId": "RemoteBucketDetails", @@ -3340,7 +3340,7 @@ func init() { "/remote-buckets/{source-bucket-name}/{arn}": { "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Delete Remote Bucket", "operationId": "DeleteRemoteBucket", @@ -3374,7 +3374,7 @@ func init() { "/service-account-credentials": { "post": { "tags": [ - "AdminAPI" + "ServiceAccount" ], "summary": "Create Service Account With Credentials", "operationId": "CreateServiceAccountCreds", @@ -3407,7 +3407,7 @@ func init() { "/service-accounts": { "get": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "List User's Service Accounts", "operationId": "ListUserServiceAccounts", @@ -3442,7 +3442,7 @@ func init() { }, "post": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "Create Service Account", "operationId": "CreateServiceAccount", @@ -3475,7 +3475,7 @@ func init() { "/service-accounts/delete-multi": { "delete": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "Delete Multiple Service Accounts", "operationId": "DeleteMultipleServiceAccounts", @@ -3508,7 +3508,7 @@ func init() { "/service-accounts/{access_key}": { "delete": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "Delete Service Account", "operationId": "DeleteServiceAccount", @@ -3536,7 +3536,7 @@ func init() { "/service-accounts/{access_key}/policy": { "get": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "Get Service Account Policy", "operationId": "GetServiceAccountPolicy", @@ -3565,7 +3565,7 @@ func init() { }, "put": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "Set Service Account Policy", "operationId": "SetServiceAccountPolicy", @@ -3601,7 +3601,7 @@ func init() { "/service/restart": { "post": { "tags": [ - "AdminAPI" + "Service" ], "summary": "Restart Service", "operationId": "RestartService", @@ -3621,7 +3621,7 @@ func init() { "/session": { "get": { "tags": [ - "UserAPI" + "Auth" ], "summary": "Endpoint to check if your session is still valid", "operationId": "SessionCheck", @@ -3644,7 +3644,7 @@ func init() { "/set-policy": { "put": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "Set policy", "operationId": "SetPolicy", @@ -3674,7 +3674,7 @@ func init() { "/set-policy-multi": { "put": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "Set policy to multiple users/groups", "operationId": "SetPolicyMultiple", @@ -3704,7 +3704,7 @@ func init() { "/subnet/info": { "get": { "tags": [ - "AdminAPI" + "Subnet" ], "summary": "Subnet info", "operationId": "SubnetInfo", @@ -3727,7 +3727,7 @@ func init() { "/subnet/login": { "post": { "tags": [ - "AdminAPI" + "Subnet" ], "summary": "Login to subnet", "operationId": "SubnetLogin", @@ -3760,7 +3760,7 @@ func init() { "/subnet/login/mfa": { "post": { "tags": [ - "AdminAPI" + "Subnet" ], "summary": "Login to subnet using mfa", "operationId": "SubnetLoginMFA", @@ -3793,7 +3793,7 @@ func init() { "/subnet/register": { "post": { "tags": [ - "AdminAPI" + "Subnet" ], "summary": "Register cluster with Subnet", "operationId": "SubnetRegister", @@ -3823,7 +3823,7 @@ func init() { "/subnet/registration-token": { "get": { "tags": [ - "AdminAPI" + "Subnet" ], "summary": "Subnet registraton token", "operationId": "SubnetRegToken", @@ -3846,7 +3846,7 @@ func init() { "/user": { "get": { "tags": [ - "AdminAPI" + "User" ], "summary": "Get User Info", "operationId": "GetUserInfo", @@ -3875,7 +3875,7 @@ func init() { }, "put": { "tags": [ - "AdminAPI" + "User" ], "summary": "Update User Info", "operationId": "UpdateUserInfo", @@ -3912,7 +3912,7 @@ func init() { }, "delete": { "tags": [ - "AdminAPI" + "User" ], "summary": "Remove user", "operationId": "RemoveUser", @@ -3940,7 +3940,7 @@ func init() { "/user/groups": { "put": { "tags": [ - "AdminAPI" + "User" ], "summary": "Update Groups for a user", "operationId": "UpdateUserGroups", @@ -3979,7 +3979,7 @@ func init() { "/user/{name}/service-account-credentials": { "post": { "tags": [ - "AdminAPI" + "User" ], "summary": "Create Service Account for User With Credentials", "operationId": "CreateServiceAccountCredentials", @@ -4018,7 +4018,7 @@ func init() { "/user/{name}/service-accounts": { "get": { "tags": [ - "AdminAPI" + "User" ], "summary": "returns a list of service accounts for a user", "operationId": "ListAUserServiceAccounts", @@ -4047,7 +4047,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "User" ], "summary": "Create Service Account for User", "operationId": "CreateAUserServiceAccount", @@ -4086,7 +4086,7 @@ func init() { "/users": { "get": { "tags": [ - "AdminAPI" + "User" ], "summary": "List Users", "operationId": "ListUsers", @@ -4121,7 +4121,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "User" ], "summary": "Add User", "operationId": "AddUser", @@ -4154,7 +4154,7 @@ func init() { "/users-groups-bulk": { "put": { "tags": [ - "AdminAPI" + "User" ], "summary": "Bulk functionality to Add Users to Groups", "operationId": "BulkUpdateUsersGroups", @@ -6980,7 +6980,7 @@ func init() { "/account/change-password": { "post": { "tags": [ - "UserAPI" + "Account" ], "summary": "Change password of currently logged in user.", "operationId": "AccountChangePassword", @@ -7010,7 +7010,7 @@ func init() { "/account/change-user-password": { "post": { "tags": [ - "AdminAPI" + "Account" ], "summary": "Change password of currently logged in user.", "operationId": "ChangeUserPassword", @@ -7040,7 +7040,7 @@ func init() { "/admin/arns": { "get": { "tags": [ - "AdminAPI" + "System" ], "summary": "Returns a list of active ARNs in the instance", "operationId": "ArnList", @@ -7063,7 +7063,7 @@ func init() { "/admin/info": { "get": { "tags": [ - "AdminAPI" + "System" ], "summary": "Returns information about the deployment", "operationId": "AdminInfo", @@ -7094,7 +7094,7 @@ func init() { "/admin/info/widgets/{widgetId}": { "get": { "tags": [ - "AdminAPI" + "System" ], "summary": "Returns information about the deployment", "operationId": "DashboardWidgetDetails", @@ -7145,7 +7145,7 @@ func init() { "application/octet-stream" ], "tags": [ - "AdminAPI" + "Inspect" ], "summary": "Inspect Files on Drive", "operationId": "Inspect", @@ -7187,7 +7187,7 @@ func init() { "/admin/notification_endpoints": { "get": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "Returns a list of active notification endpoints", "operationId": "NotificationEndpointList", @@ -7208,7 +7208,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "Allows to configure a new notification endpoint", "operationId": "AddNotificationEndpoint", @@ -7241,7 +7241,7 @@ func init() { "/admin/site-replication": { "get": { "tags": [ - "AdminAPI" + "SiteReplication" ], "summary": "Get list of Replication Sites", "operationId": "GetSiteReplicationInfo", @@ -7262,7 +7262,7 @@ func init() { }, "put": { "tags": [ - "AdminAPI" + "SiteReplication" ], "summary": "Edit a Replication Site", "operationId": "SiteReplicationEdit", @@ -7293,7 +7293,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "SiteReplication" ], "summary": "Add a Replication Site", "operationId": "SiteReplicationInfoAdd", @@ -7324,7 +7324,7 @@ func init() { }, "delete": { "tags": [ - "AdminAPI" + "SiteReplication" ], "summary": "Remove a Replication Site", "operationId": "SiteReplicationRemove", @@ -7357,7 +7357,7 @@ func init() { "/admin/site-replication/status": { "get": { "tags": [ - "AdminAPI" + "SiteReplication" ], "summary": "Display overall site replication status", "operationId": "GetSiteReplicationStatus", @@ -7422,7 +7422,7 @@ func init() { "/admin/tiers": { "get": { "tags": [ - "AdminAPI" + "Tiering" ], "summary": "Returns a list of tiers for ilm", "operationId": "TiersList", @@ -7443,7 +7443,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "Tiering" ], "summary": "Allows to configure a new tier", "operationId": "AddTier", @@ -7473,7 +7473,7 @@ func init() { "/admin/tiers/{type}/{name}": { "get": { "tags": [ - "AdminAPI" + "Tiering" ], "summary": "Get Tier", "operationId": "GetTier", @@ -7515,7 +7515,7 @@ func init() { "/admin/tiers/{type}/{name}/credentials": { "put": { "tags": [ - "AdminAPI" + "Tiering" ], "summary": "Edit Tier Credentials", "operationId": "EditTierCredentials", @@ -7562,7 +7562,7 @@ func init() { "/bucket-policy/{bucket}": { "get": { "tags": [ - "AdminAPI" + "Bucket" ], "summary": "List Policies With Given Bucket", "operationId": "ListPoliciesWithBucket", @@ -7605,7 +7605,7 @@ func init() { "/bucket-users/{bucket}": { "get": { "tags": [ - "AdminAPI" + "Bucket" ], "summary": "List Users With Access to a Given Bucket", "operationId": "ListUsersWithAccessToBucket", @@ -7651,7 +7651,7 @@ func init() { "/bucket/{bucket}/access-rules": { "get": { "tags": [ - "AdminAPI" + "Bucket" ], "summary": "List Access Rules With Given Bucket", "operationId": "ListAccessRulesWithBucket", @@ -7692,7 +7692,7 @@ func init() { }, "put": { "tags": [ - "AdminAPI" + "Bucket" ], "summary": "Add Access Rule To Given Bucket", "operationId": "SetAccessRuleWithBucket", @@ -7729,7 +7729,7 @@ func init() { }, "delete": { "tags": [ - "AdminAPI" + "Bucket" ], "summary": "Delete Access Rule From Given Bucket", "operationId": "DeleteAccessRuleWithBucket", @@ -7768,7 +7768,7 @@ func init() { "/buckets": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "List Buckets", "operationId": "ListBuckets", @@ -7789,7 +7789,7 @@ func init() { }, "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Make bucket", "operationId": "MakeBucket", @@ -7819,7 +7819,7 @@ func init() { "/buckets-replication": { "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Sets Multi Bucket Replication in multiple Buckets", "operationId": "SetMultiBucketReplication", @@ -7852,7 +7852,7 @@ func init() { "/buckets/multi-lifecycle": { "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Add Multi Bucket Lifecycle", "operationId": "AddMultiBucketLifecycle", @@ -7885,7 +7885,7 @@ func init() { "/buckets/{bucket_name}/delete-all-replication-rules": { "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Deletes all replication rules from a bucket", "operationId": "DeleteAllReplicationRules", @@ -7913,7 +7913,7 @@ func init() { "/buckets/{bucket_name}/delete-objects": { "post": { "tags": [ - "UserAPI" + "Object" ], "summary": "Delete Multiple Objects", "operationId": "DeleteMultipleObjects", @@ -7957,7 +7957,7 @@ func init() { "/buckets/{bucket_name}/delete-selected-replication-rules": { "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Deletes selected replication rules from a bucket", "operationId": "DeleteSelectedReplicationRules", @@ -7993,7 +7993,7 @@ func init() { "/buckets/{bucket_name}/encryption/disable": { "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Disable bucket encryption.", "operationId": "DisableBucketEncryption", @@ -8021,7 +8021,7 @@ func init() { "/buckets/{bucket_name}/encryption/enable": { "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Enable bucket encryption.", "operationId": "EnableBucketEncryption", @@ -8057,7 +8057,7 @@ func init() { "/buckets/{bucket_name}/encryption/info": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Get bucket encryption information.", "operationId": "GetBucketEncryptionInfo", @@ -8088,7 +8088,7 @@ func init() { "/buckets/{bucket_name}/events": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "List Bucket Events", "operationId": "ListBucketEvents", @@ -8129,7 +8129,7 @@ func init() { }, "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Create Bucket Event", "operationId": "CreateBucketEvent", @@ -8165,7 +8165,7 @@ func init() { "/buckets/{bucket_name}/events/{arn}": { "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Delete Bucket Event", "operationId": "DeleteBucketEvent", @@ -8207,7 +8207,7 @@ func init() { "/buckets/{bucket_name}/lifecycle": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Lifecycle", "operationId": "GetBucketLifecycle", @@ -8236,7 +8236,7 @@ func init() { }, "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Add Bucket Lifecycle", "operationId": "AddBucketLifecycle", @@ -8272,7 +8272,7 @@ func init() { "/buckets/{bucket_name}/lifecycle/{lifecycle_id}": { "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Update Lifecycle rule", "operationId": "UpdateBucketLifecycle", @@ -8312,7 +8312,7 @@ func init() { }, "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Delete Lifecycle rule", "operationId": "DeleteBucketLifecycleRule", @@ -8346,7 +8346,7 @@ func init() { "/buckets/{bucket_name}/object-locking": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Returns the status of object locking support on the bucket", "operationId": "GetBucketObjectLockingStatus", @@ -8377,7 +8377,7 @@ func init() { "/buckets/{bucket_name}/objects": { "get": { "tags": [ - "UserAPI" + "Object" ], "summary": "List Objects", "operationId": "ListObjects", @@ -8426,7 +8426,7 @@ func init() { }, "delete": { "tags": [ - "UserAPI" + "Object" ], "summary": "Delete Object", "operationId": "DeleteObject", @@ -8483,7 +8483,7 @@ func init() { "application/octet-stream" ], "tags": [ - "UserAPI" + "Object" ], "summary": "Download Object", "operationId": "Download Object", @@ -8531,7 +8531,7 @@ func init() { "/buckets/{bucket_name}/objects/legalhold": { "put": { "tags": [ - "UserAPI" + "Object" ], "summary": "Put Object's legalhold status", "operationId": "PutObjectLegalHold", @@ -8579,7 +8579,7 @@ func init() { "/buckets/{bucket_name}/objects/metadata": { "get": { "tags": [ - "UserAPI" + "Object" ], "summary": "Gets the metadata of an object", "operationId": "GetObjectMetadata", @@ -8616,7 +8616,7 @@ func init() { "/buckets/{bucket_name}/objects/restore": { "put": { "tags": [ - "UserAPI" + "Object" ], "summary": "Restore Object to a selected version", "operationId": "PutObjectRestore", @@ -8656,7 +8656,7 @@ func init() { "/buckets/{bucket_name}/objects/retention": { "put": { "tags": [ - "UserAPI" + "Object" ], "summary": "Put Object's retention status", "operationId": "PutObjectRetention", @@ -8702,7 +8702,7 @@ func init() { }, "delete": { "tags": [ - "UserAPI" + "Object" ], "summary": "Delete Object retention from an object", "operationId": "DeleteObjectRetention", @@ -8742,7 +8742,7 @@ func init() { "/buckets/{bucket_name}/objects/share": { "get": { "tags": [ - "UserAPI" + "Object" ], "summary": "Shares an Object on a url", "operationId": "ShareObject", @@ -8790,7 +8790,7 @@ func init() { "/buckets/{bucket_name}/objects/tags": { "put": { "tags": [ - "UserAPI" + "Object" ], "summary": "Put Object's tags", "operationId": "PutObjectTags", @@ -8841,7 +8841,7 @@ func init() { "multipart/form-data" ], "tags": [ - "UserAPI" + "Object" ], "summary": "Uploads an Object.", "parameters": [ @@ -8873,7 +8873,7 @@ func init() { "/buckets/{bucket_name}/replication": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Replication", "operationId": "GetBucketReplication", @@ -8904,7 +8904,7 @@ func init() { "/buckets/{bucket_name}/replication/{rule_id}": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Replication", "operationId": "GetBucketReplicationRule", @@ -8939,7 +8939,7 @@ func init() { }, "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Update Replication rule", "operationId": "UpdateMultiBucketReplication", @@ -8979,7 +8979,7 @@ func init() { }, "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Replication Rule Delete", "operationId": "DeleteBucketReplicationRule", @@ -9013,7 +9013,7 @@ func init() { "/buckets/{bucket_name}/retention": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Get Bucket's retention config", "operationId": "GetBucketRetentionConfig", @@ -9042,7 +9042,7 @@ func init() { }, "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Set Bucket's retention config", "operationId": "SetBucketRetentionConfig", @@ -9078,7 +9078,7 @@ func init() { "/buckets/{bucket_name}/rewind/{date}": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Get objects in a bucket for a rewind date", "operationId": "GetBucketRewind", @@ -9120,7 +9120,7 @@ func init() { "/buckets/{bucket_name}/tags": { "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Put Bucket's tags", "operationId": "PutBucketTags", @@ -9156,7 +9156,7 @@ func init() { "/buckets/{bucket_name}/versioning": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Versioning", "operationId": "GetBucketVersioning", @@ -9185,7 +9185,7 @@ func init() { }, "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Set Bucket Versioning", "operationId": "SetBucketVersioning", @@ -9221,7 +9221,7 @@ func init() { "/buckets/{name}": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Info", "operationId": "BucketInfo", @@ -9250,7 +9250,7 @@ func init() { }, "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Delete Bucket", "operationId": "DeleteBucket", @@ -9278,7 +9278,7 @@ func init() { "/buckets/{name}/quota": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Get Bucket Quota", "operationId": "GetBucketQuota", @@ -9307,7 +9307,7 @@ func init() { }, "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Quota", "operationId": "SetBucketQuota", @@ -9346,7 +9346,7 @@ func init() { "/buckets/{name}/set-policy": { "put": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Bucket Set Policy", "operationId": "BucketSetPolicy", @@ -9386,7 +9386,7 @@ func init() { "get": { "security": [], "tags": [ - "UserAPI" + "System" ], "summary": "Checks the current MinIO version against the latest", "operationId": "CheckMinIOVersion", @@ -9409,7 +9409,7 @@ func init() { "/configs": { "get": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "List Configurations", "operationId": "ListConfig", @@ -9446,7 +9446,7 @@ func init() { "/configs/{name}": { "get": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "Configuration info", "operationId": "ConfigInfo", @@ -9475,7 +9475,7 @@ func init() { }, "put": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "Set Configuration", "operationId": "SetConfig", @@ -9514,7 +9514,7 @@ func init() { "/configs/{name}/reset": { "get": { "tags": [ - "AdminAPI" + "Configuration" ], "summary": "Configuration reset", "operationId": "ResetConfig", @@ -9545,7 +9545,7 @@ func init() { "/group": { "get": { "tags": [ - "AdminAPI" + "Group" ], "summary": "Group info", "operationId": "GroupInfo", @@ -9574,7 +9574,7 @@ func init() { }, "put": { "tags": [ - "AdminAPI" + "Group" ], "summary": "Update Group Members or Status", "operationId": "UpdateGroup", @@ -9611,7 +9611,7 @@ func init() { }, "delete": { "tags": [ - "AdminAPI" + "Group" ], "summary": "Remove group", "operationId": "RemoveGroup", @@ -9639,7 +9639,7 @@ func init() { "/groups": { "get": { "tags": [ - "AdminAPI" + "Group" ], "summary": "List Groups", "operationId": "ListGroups", @@ -9674,7 +9674,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "Group" ], "summary": "Add Group", "operationId": "AddGroup", @@ -9704,7 +9704,7 @@ func init() { "/list-external-buckets": { "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Lists an External list of buckets using custom credentials", "operationId": "ListExternalBuckets", @@ -9738,7 +9738,7 @@ func init() { "get": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Returns login strategy, form or sso.", "operationId": "LoginDetail", @@ -9760,7 +9760,7 @@ func init() { "post": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Login to Console", "operationId": "Login", @@ -9791,7 +9791,7 @@ func init() { "post": { "security": [], "tags": [ - "UserAPI" + "Auth" ], "summary": "Identity Provider oauth2 callback endpoint.", "operationId": "LoginOauth2Auth", @@ -9821,7 +9821,7 @@ func init() { "/logout": { "post": { "tags": [ - "UserAPI" + "Auth" ], "summary": "Logout from Console.", "operationId": "Logout", @@ -9841,7 +9841,7 @@ func init() { "/logs/search": { "get": { "tags": [ - "UserAPI" + "Logging" ], "summary": "Search the logs", "operationId": "LogSearch", @@ -9905,7 +9905,7 @@ func init() { "/nodes": { "get": { "tags": [ - "AdminAPI" + "System" ], "summary": "Lists Nodes", "operationId": "ListNodes", @@ -9931,7 +9931,7 @@ func init() { "/policies": { "get": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "List Policies", "operationId": "ListPolicies", @@ -9966,7 +9966,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "Add Policy", "operationId": "AddPolicy", @@ -9999,7 +9999,7 @@ func init() { "/policies/{policy}/groups": { "get": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "List Groups for a Policy", "operationId": "ListGroupsForPolicy", @@ -10033,7 +10033,7 @@ func init() { "/policies/{policy}/users": { "get": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "List Users for a Policy", "operationId": "ListUsersForPolicy", @@ -10067,7 +10067,7 @@ func init() { "/policy": { "get": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "Policy info", "operationId": "PolicyInfo", @@ -10096,7 +10096,7 @@ func init() { }, "delete": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "Remove policy", "operationId": "RemovePolicy", @@ -10124,7 +10124,7 @@ func init() { "/profiling/start": { "post": { "tags": [ - "AdminAPI" + "Profile" ], "summary": "Start recording profile data", "operationId": "ProfilingStart", @@ -10160,7 +10160,7 @@ func init() { "application/zip" ], "tags": [ - "AdminAPI" + "Profile" ], "summary": "Stop and download profile data", "operationId": "ProfilingStop", @@ -10183,7 +10183,7 @@ func init() { "/remote-buckets": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "List Remote Buckets", "operationId": "ListRemoteBuckets", @@ -10204,7 +10204,7 @@ func init() { }, "post": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Add Remote Bucket", "operationId": "AddRemoteBucket", @@ -10234,7 +10234,7 @@ func init() { "/remote-buckets/{name}": { "get": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Remote Bucket Details", "operationId": "RemoteBucketDetails", @@ -10265,7 +10265,7 @@ func init() { "/remote-buckets/{source-bucket-name}/{arn}": { "delete": { "tags": [ - "UserAPI" + "Bucket" ], "summary": "Delete Remote Bucket", "operationId": "DeleteRemoteBucket", @@ -10299,7 +10299,7 @@ func init() { "/service-account-credentials": { "post": { "tags": [ - "AdminAPI" + "ServiceAccount" ], "summary": "Create Service Account With Credentials", "operationId": "CreateServiceAccountCreds", @@ -10332,7 +10332,7 @@ func init() { "/service-accounts": { "get": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "List User's Service Accounts", "operationId": "ListUserServiceAccounts", @@ -10367,7 +10367,7 @@ func init() { }, "post": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "Create Service Account", "operationId": "CreateServiceAccount", @@ -10400,7 +10400,7 @@ func init() { "/service-accounts/delete-multi": { "delete": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "Delete Multiple Service Accounts", "operationId": "DeleteMultipleServiceAccounts", @@ -10433,7 +10433,7 @@ func init() { "/service-accounts/{access_key}": { "delete": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "Delete Service Account", "operationId": "DeleteServiceAccount", @@ -10461,7 +10461,7 @@ func init() { "/service-accounts/{access_key}/policy": { "get": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "Get Service Account Policy", "operationId": "GetServiceAccountPolicy", @@ -10490,7 +10490,7 @@ func init() { }, "put": { "tags": [ - "UserAPI" + "ServiceAccount" ], "summary": "Set Service Account Policy", "operationId": "SetServiceAccountPolicy", @@ -10526,7 +10526,7 @@ func init() { "/service/restart": { "post": { "tags": [ - "AdminAPI" + "Service" ], "summary": "Restart Service", "operationId": "RestartService", @@ -10546,7 +10546,7 @@ func init() { "/session": { "get": { "tags": [ - "UserAPI" + "Auth" ], "summary": "Endpoint to check if your session is still valid", "operationId": "SessionCheck", @@ -10569,7 +10569,7 @@ func init() { "/set-policy": { "put": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "Set policy", "operationId": "SetPolicy", @@ -10599,7 +10599,7 @@ func init() { "/set-policy-multi": { "put": { "tags": [ - "AdminAPI" + "Policy" ], "summary": "Set policy to multiple users/groups", "operationId": "SetPolicyMultiple", @@ -10629,7 +10629,7 @@ func init() { "/subnet/info": { "get": { "tags": [ - "AdminAPI" + "Subnet" ], "summary": "Subnet info", "operationId": "SubnetInfo", @@ -10652,7 +10652,7 @@ func init() { "/subnet/login": { "post": { "tags": [ - "AdminAPI" + "Subnet" ], "summary": "Login to subnet", "operationId": "SubnetLogin", @@ -10685,7 +10685,7 @@ func init() { "/subnet/login/mfa": { "post": { "tags": [ - "AdminAPI" + "Subnet" ], "summary": "Login to subnet using mfa", "operationId": "SubnetLoginMFA", @@ -10718,7 +10718,7 @@ func init() { "/subnet/register": { "post": { "tags": [ - "AdminAPI" + "Subnet" ], "summary": "Register cluster with Subnet", "operationId": "SubnetRegister", @@ -10748,7 +10748,7 @@ func init() { "/subnet/registration-token": { "get": { "tags": [ - "AdminAPI" + "Subnet" ], "summary": "Subnet registraton token", "operationId": "SubnetRegToken", @@ -10771,7 +10771,7 @@ func init() { "/user": { "get": { "tags": [ - "AdminAPI" + "User" ], "summary": "Get User Info", "operationId": "GetUserInfo", @@ -10800,7 +10800,7 @@ func init() { }, "put": { "tags": [ - "AdminAPI" + "User" ], "summary": "Update User Info", "operationId": "UpdateUserInfo", @@ -10837,7 +10837,7 @@ func init() { }, "delete": { "tags": [ - "AdminAPI" + "User" ], "summary": "Remove user", "operationId": "RemoveUser", @@ -10865,7 +10865,7 @@ func init() { "/user/groups": { "put": { "tags": [ - "AdminAPI" + "User" ], "summary": "Update Groups for a user", "operationId": "UpdateUserGroups", @@ -10904,7 +10904,7 @@ func init() { "/user/{name}/service-account-credentials": { "post": { "tags": [ - "AdminAPI" + "User" ], "summary": "Create Service Account for User With Credentials", "operationId": "CreateServiceAccountCredentials", @@ -10943,7 +10943,7 @@ func init() { "/user/{name}/service-accounts": { "get": { "tags": [ - "AdminAPI" + "User" ], "summary": "returns a list of service accounts for a user", "operationId": "ListAUserServiceAccounts", @@ -10972,7 +10972,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "User" ], "summary": "Create Service Account for User", "operationId": "CreateAUserServiceAccount", @@ -11011,7 +11011,7 @@ func init() { "/users": { "get": { "tags": [ - "AdminAPI" + "User" ], "summary": "List Users", "operationId": "ListUsers", @@ -11046,7 +11046,7 @@ func init() { }, "post": { "tags": [ - "AdminAPI" + "User" ], "summary": "Add User", "operationId": "AddUser", @@ -11079,7 +11079,7 @@ func init() { "/users-groups-bulk": { "put": { "tags": [ - "AdminAPI" + "User" ], "summary": "Bulk functionality to Add Users to Groups", "operationId": "BulkUpdateUsersGroups", diff --git a/restapi/operations/user_api/account_change_password.go b/restapi/operations/account/account_change_password.go similarity index 98% rename from restapi/operations/user_api/account_change_password.go rename to restapi/operations/account/account_change_password.go index 82e7c0972..06a7f1481 100644 --- a/restapi/operations/user_api/account_change_password.go +++ b/restapi/operations/account/account_change_password.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewAccountChangePassword(ctx *middleware.Context, handler AccountChangePass return &AccountChangePassword{Context: ctx, Handler: handler} } -/* AccountChangePassword swagger:route POST /account/change-password UserAPI accountChangePassword +/* AccountChangePassword swagger:route POST /account/change-password Account accountChangePassword Change password of currently logged in user. diff --git a/restapi/operations/user_api/account_change_password_parameters.go b/restapi/operations/account/account_change_password_parameters.go similarity index 99% rename from restapi/operations/user_api/account_change_password_parameters.go rename to restapi/operations/account/account_change_password_parameters.go index e38466a5a..ce7bffdc8 100644 --- a/restapi/operations/user_api/account_change_password_parameters.go +++ b/restapi/operations/account/account_change_password_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/account_change_password_responses.go b/restapi/operations/account/account_change_password_responses.go similarity index 99% rename from restapi/operations/user_api/account_change_password_responses.go rename to restapi/operations/account/account_change_password_responses.go index 7eff5e1e3..a7cb11a14 100644 --- a/restapi/operations/user_api/account_change_password_responses.go +++ b/restapi/operations/account/account_change_password_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/account_change_password_urlbuilder.go b/restapi/operations/account/account_change_password_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/account_change_password_urlbuilder.go rename to restapi/operations/account/account_change_password_urlbuilder.go index 53dc641f5..d3b8c079c 100644 --- a/restapi/operations/user_api/account_change_password_urlbuilder.go +++ b/restapi/operations/account/account_change_password_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/change_user_password.go b/restapi/operations/account/change_user_password.go similarity index 98% rename from restapi/operations/admin_api/change_user_password.go rename to restapi/operations/account/change_user_password.go index c3de2cbfb..568ac70cd 100644 --- a/restapi/operations/admin_api/change_user_password.go +++ b/restapi/operations/account/change_user_password.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewChangeUserPassword(ctx *middleware.Context, handler ChangeUserPasswordHa return &ChangeUserPassword{Context: ctx, Handler: handler} } -/* ChangeUserPassword swagger:route POST /account/change-user-password AdminAPI changeUserPassword +/* ChangeUserPassword swagger:route POST /account/change-user-password Account changeUserPassword Change password of currently logged in user. diff --git a/restapi/operations/admin_api/change_user_password_parameters.go b/restapi/operations/account/change_user_password_parameters.go similarity index 99% rename from restapi/operations/admin_api/change_user_password_parameters.go rename to restapi/operations/account/change_user_password_parameters.go index 3c1f87da5..ce7016d85 100644 --- a/restapi/operations/admin_api/change_user_password_parameters.go +++ b/restapi/operations/account/change_user_password_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/change_user_password_responses.go b/restapi/operations/account/change_user_password_responses.go similarity index 99% rename from restapi/operations/admin_api/change_user_password_responses.go rename to restapi/operations/account/change_user_password_responses.go index eae5e6939..60b594433 100644 --- a/restapi/operations/admin_api/change_user_password_responses.go +++ b/restapi/operations/account/change_user_password_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/change_user_password_urlbuilder.go b/restapi/operations/account/change_user_password_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/change_user_password_urlbuilder.go rename to restapi/operations/account/change_user_password_urlbuilder.go index 14f7cd18c..1d1da761f 100644 --- a/restapi/operations/admin_api/change_user_password_urlbuilder.go +++ b/restapi/operations/account/change_user_password_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/login.go b/restapi/operations/auth/login.go similarity index 97% rename from restapi/operations/user_api/login.go rename to restapi/operations/auth/login.go index 54bc7310f..2e3cd79fd 100644 --- a/restapi/operations/user_api/login.go +++ b/restapi/operations/auth/login.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -46,7 +46,7 @@ func NewLogin(ctx *middleware.Context, handler LoginHandler) *Login { return &Login{Context: ctx, Handler: handler} } -/* Login swagger:route POST /login UserAPI login +/* Login swagger:route POST /login Auth login Login to Console diff --git a/restapi/operations/user_api/login_detail.go b/restapi/operations/auth/login_detail.go similarity index 96% rename from restapi/operations/user_api/login_detail.go rename to restapi/operations/auth/login_detail.go index 5f7234c01..62a6286ca 100644 --- a/restapi/operations/user_api/login_detail.go +++ b/restapi/operations/auth/login_detail.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -46,7 +46,7 @@ func NewLoginDetail(ctx *middleware.Context, handler LoginDetailHandler) *LoginD return &LoginDetail{Context: ctx, Handler: handler} } -/* LoginDetail swagger:route GET /login UserAPI loginDetail +/* LoginDetail swagger:route GET /login Auth loginDetail Returns login strategy, form or sso. diff --git a/restapi/operations/user_api/login_detail_parameters.go b/restapi/operations/auth/login_detail_parameters.go similarity index 99% rename from restapi/operations/user_api/login_detail_parameters.go rename to restapi/operations/auth/login_detail_parameters.go index 607384fb4..37449b568 100644 --- a/restapi/operations/user_api/login_detail_parameters.go +++ b/restapi/operations/auth/login_detail_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/login_detail_responses.go b/restapi/operations/auth/login_detail_responses.go similarity index 99% rename from restapi/operations/user_api/login_detail_responses.go rename to restapi/operations/auth/login_detail_responses.go index d136f2097..28f53c75a 100644 --- a/restapi/operations/user_api/login_detail_responses.go +++ b/restapi/operations/auth/login_detail_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/operatorapi/operations/user_api/login_detail_urlbuilder.go b/restapi/operations/auth/login_detail_urlbuilder.go similarity index 99% rename from operatorapi/operations/user_api/login_detail_urlbuilder.go rename to restapi/operations/auth/login_detail_urlbuilder.go index 7b84165f4..f8f9e41a7 100644 --- a/operatorapi/operations/user_api/login_detail_urlbuilder.go +++ b/restapi/operations/auth/login_detail_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/login_oauth2_auth.go b/restapi/operations/auth/login_oauth2_auth.go similarity index 96% rename from restapi/operations/user_api/login_oauth2_auth.go rename to restapi/operations/auth/login_oauth2_auth.go index 175784824..e7d00271b 100644 --- a/restapi/operations/user_api/login_oauth2_auth.go +++ b/restapi/operations/auth/login_oauth2_auth.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -46,7 +46,7 @@ func NewLoginOauth2Auth(ctx *middleware.Context, handler LoginOauth2AuthHandler) return &LoginOauth2Auth{Context: ctx, Handler: handler} } -/* LoginOauth2Auth swagger:route POST /login/oauth2/auth UserAPI loginOauth2Auth +/* LoginOauth2Auth swagger:route POST /login/oauth2/auth Auth loginOauth2Auth Identity Provider oauth2 callback endpoint. diff --git a/operatorapi/operations/user_api/login_oauth2_auth_parameters.go b/restapi/operations/auth/login_oauth2_auth_parameters.go similarity index 99% rename from operatorapi/operations/user_api/login_oauth2_auth_parameters.go rename to restapi/operations/auth/login_oauth2_auth_parameters.go index 070117c25..83d1275c4 100644 --- a/operatorapi/operations/user_api/login_oauth2_auth_parameters.go +++ b/restapi/operations/auth/login_oauth2_auth_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/operatorapi/operations/user_api/login_oauth2_auth_responses.go b/restapi/operations/auth/login_oauth2_auth_responses.go similarity index 99% rename from operatorapi/operations/user_api/login_oauth2_auth_responses.go rename to restapi/operations/auth/login_oauth2_auth_responses.go index 6afe498a9..e089f66ab 100644 --- a/operatorapi/operations/user_api/login_oauth2_auth_responses.go +++ b/restapi/operations/auth/login_oauth2_auth_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/operatorapi/operations/user_api/login_oauth2_auth_urlbuilder.go b/restapi/operations/auth/login_oauth2_auth_urlbuilder.go similarity index 99% rename from operatorapi/operations/user_api/login_oauth2_auth_urlbuilder.go rename to restapi/operations/auth/login_oauth2_auth_urlbuilder.go index 6e9b324e8..769a9a892 100644 --- a/operatorapi/operations/user_api/login_oauth2_auth_urlbuilder.go +++ b/restapi/operations/auth/login_oauth2_auth_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/login_parameters.go b/restapi/operations/auth/login_parameters.go similarity index 99% rename from restapi/operations/user_api/login_parameters.go rename to restapi/operations/auth/login_parameters.go index 805609b3c..20676ef54 100644 --- a/restapi/operations/user_api/login_parameters.go +++ b/restapi/operations/auth/login_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/login_responses.go b/restapi/operations/auth/login_responses.go similarity index 99% rename from restapi/operations/user_api/login_responses.go rename to restapi/operations/auth/login_responses.go index 8e0adc591..e32bf7107 100644 --- a/restapi/operations/user_api/login_responses.go +++ b/restapi/operations/auth/login_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/login_urlbuilder.go b/restapi/operations/auth/login_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/login_urlbuilder.go rename to restapi/operations/auth/login_urlbuilder.go index 703c216ba..767c2efdc 100644 --- a/restapi/operations/user_api/login_urlbuilder.go +++ b/restapi/operations/auth/login_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/logout.go b/restapi/operations/auth/logout.go similarity index 97% rename from restapi/operations/user_api/logout.go rename to restapi/operations/auth/logout.go index a2591ff01..3c5c56877 100644 --- a/restapi/operations/user_api/logout.go +++ b/restapi/operations/auth/logout.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewLogout(ctx *middleware.Context, handler LogoutHandler) *Logout { return &Logout{Context: ctx, Handler: handler} } -/* Logout swagger:route POST /logout UserAPI logout +/* Logout swagger:route POST /logout Auth logout Logout from Console. diff --git a/operatorapi/operations/user_api/logout_parameters.go b/restapi/operations/auth/logout_parameters.go similarity index 99% rename from operatorapi/operations/user_api/logout_parameters.go rename to restapi/operations/auth/logout_parameters.go index c7a4ebbd4..3c8e1840f 100644 --- a/operatorapi/operations/user_api/logout_parameters.go +++ b/restapi/operations/auth/logout_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/logout_responses.go b/restapi/operations/auth/logout_responses.go similarity index 99% rename from restapi/operations/user_api/logout_responses.go rename to restapi/operations/auth/logout_responses.go index 9a2e694f3..273cd5099 100644 --- a/restapi/operations/user_api/logout_responses.go +++ b/restapi/operations/auth/logout_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/operatorapi/operations/user_api/logout_urlbuilder.go b/restapi/operations/auth/logout_urlbuilder.go similarity index 99% rename from operatorapi/operations/user_api/logout_urlbuilder.go rename to restapi/operations/auth/logout_urlbuilder.go index ff8f58434..d5e9d4319 100644 --- a/operatorapi/operations/user_api/logout_urlbuilder.go +++ b/restapi/operations/auth/logout_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/operatorapi/operations/user_api/session_check.go b/restapi/operations/auth/session_check.go similarity index 97% rename from operatorapi/operations/user_api/session_check.go rename to restapi/operations/auth/session_check.go index 12d57823b..41781ea48 100644 --- a/operatorapi/operations/user_api/session_check.go +++ b/restapi/operations/auth/session_check.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSessionCheck(ctx *middleware.Context, handler SessionCheckHandler) *Sess return &SessionCheck{Context: ctx, Handler: handler} } -/* SessionCheck swagger:route GET /session UserAPI sessionCheck +/* SessionCheck swagger:route GET /session Auth sessionCheck Endpoint to check if your session is still valid diff --git a/restapi/operations/user_api/session_check_parameters.go b/restapi/operations/auth/session_check_parameters.go similarity index 99% rename from restapi/operations/user_api/session_check_parameters.go rename to restapi/operations/auth/session_check_parameters.go index d35dd2547..17708d93f 100644 --- a/restapi/operations/user_api/session_check_parameters.go +++ b/restapi/operations/auth/session_check_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/session_check_responses.go b/restapi/operations/auth/session_check_responses.go similarity index 99% rename from restapi/operations/user_api/session_check_responses.go rename to restapi/operations/auth/session_check_responses.go index 4756f4603..71b71f0a1 100644 --- a/restapi/operations/user_api/session_check_responses.go +++ b/restapi/operations/auth/session_check_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/session_check_urlbuilder.go b/restapi/operations/auth/session_check_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/session_check_urlbuilder.go rename to restapi/operations/auth/session_check_urlbuilder.go index ba4ff8607..8a0cbbd8d 100644 --- a/restapi/operations/user_api/session_check_urlbuilder.go +++ b/restapi/operations/auth/session_check_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package auth // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/add_bucket_lifecycle.go b/restapi/operations/bucket/add_bucket_lifecycle.go similarity index 98% rename from restapi/operations/user_api/add_bucket_lifecycle.go rename to restapi/operations/bucket/add_bucket_lifecycle.go index bfc480ea8..685245b6c 100644 --- a/restapi/operations/user_api/add_bucket_lifecycle.go +++ b/restapi/operations/bucket/add_bucket_lifecycle.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewAddBucketLifecycle(ctx *middleware.Context, handler AddBucketLifecycleHa return &AddBucketLifecycle{Context: ctx, Handler: handler} } -/* AddBucketLifecycle swagger:route POST /buckets/{bucket_name}/lifecycle UserAPI addBucketLifecycle +/* AddBucketLifecycle swagger:route POST /buckets/{bucket_name}/lifecycle Bucket addBucketLifecycle Add Bucket Lifecycle diff --git a/restapi/operations/user_api/add_bucket_lifecycle_parameters.go b/restapi/operations/bucket/add_bucket_lifecycle_parameters.go similarity index 99% rename from restapi/operations/user_api/add_bucket_lifecycle_parameters.go rename to restapi/operations/bucket/add_bucket_lifecycle_parameters.go index e69c68d27..e0c2593f4 100644 --- a/restapi/operations/user_api/add_bucket_lifecycle_parameters.go +++ b/restapi/operations/bucket/add_bucket_lifecycle_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/add_bucket_lifecycle_responses.go b/restapi/operations/bucket/add_bucket_lifecycle_responses.go similarity index 99% rename from restapi/operations/user_api/add_bucket_lifecycle_responses.go rename to restapi/operations/bucket/add_bucket_lifecycle_responses.go index 412336909..20e579f7f 100644 --- a/restapi/operations/user_api/add_bucket_lifecycle_responses.go +++ b/restapi/operations/bucket/add_bucket_lifecycle_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/add_bucket_lifecycle_urlbuilder.go b/restapi/operations/bucket/add_bucket_lifecycle_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/add_bucket_lifecycle_urlbuilder.go rename to restapi/operations/bucket/add_bucket_lifecycle_urlbuilder.go index ceedde5bf..50df35b8b 100644 --- a/restapi/operations/user_api/add_bucket_lifecycle_urlbuilder.go +++ b/restapi/operations/bucket/add_bucket_lifecycle_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/add_multi_bucket_lifecycle.go b/restapi/operations/bucket/add_multi_bucket_lifecycle.go similarity index 98% rename from restapi/operations/user_api/add_multi_bucket_lifecycle.go rename to restapi/operations/bucket/add_multi_bucket_lifecycle.go index 886cc956e..24a248706 100644 --- a/restapi/operations/user_api/add_multi_bucket_lifecycle.go +++ b/restapi/operations/bucket/add_multi_bucket_lifecycle.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewAddMultiBucketLifecycle(ctx *middleware.Context, handler AddMultiBucketL return &AddMultiBucketLifecycle{Context: ctx, Handler: handler} } -/* AddMultiBucketLifecycle swagger:route POST /buckets/multi-lifecycle UserAPI addMultiBucketLifecycle +/* AddMultiBucketLifecycle swagger:route POST /buckets/multi-lifecycle Bucket addMultiBucketLifecycle Add Multi Bucket Lifecycle diff --git a/restapi/operations/user_api/add_multi_bucket_lifecycle_parameters.go b/restapi/operations/bucket/add_multi_bucket_lifecycle_parameters.go similarity index 99% rename from restapi/operations/user_api/add_multi_bucket_lifecycle_parameters.go rename to restapi/operations/bucket/add_multi_bucket_lifecycle_parameters.go index fbc5924da..e968fb028 100644 --- a/restapi/operations/user_api/add_multi_bucket_lifecycle_parameters.go +++ b/restapi/operations/bucket/add_multi_bucket_lifecycle_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/add_multi_bucket_lifecycle_responses.go b/restapi/operations/bucket/add_multi_bucket_lifecycle_responses.go similarity index 99% rename from restapi/operations/user_api/add_multi_bucket_lifecycle_responses.go rename to restapi/operations/bucket/add_multi_bucket_lifecycle_responses.go index cd304dd6e..b9f8a6199 100644 --- a/restapi/operations/user_api/add_multi_bucket_lifecycle_responses.go +++ b/restapi/operations/bucket/add_multi_bucket_lifecycle_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/add_multi_bucket_lifecycle_urlbuilder.go b/restapi/operations/bucket/add_multi_bucket_lifecycle_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/add_multi_bucket_lifecycle_urlbuilder.go rename to restapi/operations/bucket/add_multi_bucket_lifecycle_urlbuilder.go index e66b250ea..ca6839870 100644 --- a/restapi/operations/user_api/add_multi_bucket_lifecycle_urlbuilder.go +++ b/restapi/operations/bucket/add_multi_bucket_lifecycle_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/add_remote_bucket.go b/restapi/operations/bucket/add_remote_bucket.go similarity index 96% rename from restapi/operations/user_api/add_remote_bucket.go rename to restapi/operations/bucket/add_remote_bucket.go index d75bead3f..e225b571a 100644 --- a/restapi/operations/user_api/add_remote_bucket.go +++ b/restapi/operations/bucket/add_remote_bucket.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewAddRemoteBucket(ctx *middleware.Context, handler AddRemoteBucketHandler) return &AddRemoteBucket{Context: ctx, Handler: handler} } -/* AddRemoteBucket swagger:route POST /remote-buckets UserAPI addRemoteBucket +/* AddRemoteBucket swagger:route POST /remote-buckets Bucket addRemoteBucket Add Remote Bucket diff --git a/restapi/operations/user_api/add_remote_bucket_parameters.go b/restapi/operations/bucket/add_remote_bucket_parameters.go similarity index 99% rename from restapi/operations/user_api/add_remote_bucket_parameters.go rename to restapi/operations/bucket/add_remote_bucket_parameters.go index a5520ddd4..6fc01df75 100644 --- a/restapi/operations/user_api/add_remote_bucket_parameters.go +++ b/restapi/operations/bucket/add_remote_bucket_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/add_remote_bucket_responses.go b/restapi/operations/bucket/add_remote_bucket_responses.go similarity index 99% rename from restapi/operations/user_api/add_remote_bucket_responses.go rename to restapi/operations/bucket/add_remote_bucket_responses.go index 8c5489b9c..43a3965ed 100644 --- a/restapi/operations/user_api/add_remote_bucket_responses.go +++ b/restapi/operations/bucket/add_remote_bucket_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/add_remote_bucket_urlbuilder.go b/restapi/operations/bucket/add_remote_bucket_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/add_remote_bucket_urlbuilder.go rename to restapi/operations/bucket/add_remote_bucket_urlbuilder.go index e2f485803..e4b4df955 100644 --- a/restapi/operations/user_api/add_remote_bucket_urlbuilder.go +++ b/restapi/operations/bucket/add_remote_bucket_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/bucket_info.go b/restapi/operations/bucket/bucket_info.go similarity index 96% rename from restapi/operations/user_api/bucket_info.go rename to restapi/operations/bucket/bucket_info.go index 834cb8f5b..e3611c95f 100644 --- a/restapi/operations/user_api/bucket_info.go +++ b/restapi/operations/bucket/bucket_info.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewBucketInfo(ctx *middleware.Context, handler BucketInfoHandler) *BucketIn return &BucketInfo{Context: ctx, Handler: handler} } -/* BucketInfo swagger:route GET /buckets/{name} UserAPI bucketInfo +/* BucketInfo swagger:route GET /buckets/{name} Bucket bucketInfo Bucket Info diff --git a/restapi/operations/user_api/bucket_info_parameters.go b/restapi/operations/bucket/bucket_info_parameters.go similarity index 99% rename from restapi/operations/user_api/bucket_info_parameters.go rename to restapi/operations/bucket/bucket_info_parameters.go index 6a94874f1..d94e5bbeb 100644 --- a/restapi/operations/user_api/bucket_info_parameters.go +++ b/restapi/operations/bucket/bucket_info_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/bucket_info_responses.go b/restapi/operations/bucket/bucket_info_responses.go similarity index 99% rename from restapi/operations/user_api/bucket_info_responses.go rename to restapi/operations/bucket/bucket_info_responses.go index a52bd799e..56c810bc8 100644 --- a/restapi/operations/user_api/bucket_info_responses.go +++ b/restapi/operations/bucket/bucket_info_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/bucket_info_urlbuilder.go b/restapi/operations/bucket/bucket_info_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/bucket_info_urlbuilder.go rename to restapi/operations/bucket/bucket_info_urlbuilder.go index 15cf27afc..32f88502a 100644 --- a/restapi/operations/user_api/bucket_info_urlbuilder.go +++ b/restapi/operations/bucket/bucket_info_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/bucket_set_policy.go b/restapi/operations/bucket/bucket_set_policy.go similarity index 98% rename from restapi/operations/user_api/bucket_set_policy.go rename to restapi/operations/bucket/bucket_set_policy.go index 1b4497894..3894fc283 100644 --- a/restapi/operations/user_api/bucket_set_policy.go +++ b/restapi/operations/bucket/bucket_set_policy.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewBucketSetPolicy(ctx *middleware.Context, handler BucketSetPolicyHandler) return &BucketSetPolicy{Context: ctx, Handler: handler} } -/* BucketSetPolicy swagger:route PUT /buckets/{name}/set-policy UserAPI bucketSetPolicy +/* BucketSetPolicy swagger:route PUT /buckets/{name}/set-policy Bucket bucketSetPolicy Bucket Set Policy diff --git a/restapi/operations/user_api/bucket_set_policy_parameters.go b/restapi/operations/bucket/bucket_set_policy_parameters.go similarity index 99% rename from restapi/operations/user_api/bucket_set_policy_parameters.go rename to restapi/operations/bucket/bucket_set_policy_parameters.go index fc7373334..5578503d6 100644 --- a/restapi/operations/user_api/bucket_set_policy_parameters.go +++ b/restapi/operations/bucket/bucket_set_policy_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/bucket_set_policy_responses.go b/restapi/operations/bucket/bucket_set_policy_responses.go similarity index 99% rename from restapi/operations/user_api/bucket_set_policy_responses.go rename to restapi/operations/bucket/bucket_set_policy_responses.go index 171d51b8c..f7f9d663f 100644 --- a/restapi/operations/user_api/bucket_set_policy_responses.go +++ b/restapi/operations/bucket/bucket_set_policy_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/bucket_set_policy_urlbuilder.go b/restapi/operations/bucket/bucket_set_policy_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/bucket_set_policy_urlbuilder.go rename to restapi/operations/bucket/bucket_set_policy_urlbuilder.go index 1e2204e56..1aeff13f3 100644 --- a/restapi/operations/user_api/bucket_set_policy_urlbuilder.go +++ b/restapi/operations/bucket/bucket_set_policy_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/create_bucket_event.go b/restapi/operations/bucket/create_bucket_event.go similarity index 98% rename from restapi/operations/user_api/create_bucket_event.go rename to restapi/operations/bucket/create_bucket_event.go index 9a96caae1..b4645d330 100644 --- a/restapi/operations/user_api/create_bucket_event.go +++ b/restapi/operations/bucket/create_bucket_event.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewCreateBucketEvent(ctx *middleware.Context, handler CreateBucketEventHand return &CreateBucketEvent{Context: ctx, Handler: handler} } -/* CreateBucketEvent swagger:route POST /buckets/{bucket_name}/events UserAPI createBucketEvent +/* CreateBucketEvent swagger:route POST /buckets/{bucket_name}/events Bucket createBucketEvent Create Bucket Event diff --git a/restapi/operations/user_api/create_bucket_event_parameters.go b/restapi/operations/bucket/create_bucket_event_parameters.go similarity index 99% rename from restapi/operations/user_api/create_bucket_event_parameters.go rename to restapi/operations/bucket/create_bucket_event_parameters.go index eb93257eb..abac79732 100644 --- a/restapi/operations/user_api/create_bucket_event_parameters.go +++ b/restapi/operations/bucket/create_bucket_event_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/create_bucket_event_responses.go b/restapi/operations/bucket/create_bucket_event_responses.go similarity index 99% rename from restapi/operations/user_api/create_bucket_event_responses.go rename to restapi/operations/bucket/create_bucket_event_responses.go index 8ff500b30..65c6c3169 100644 --- a/restapi/operations/user_api/create_bucket_event_responses.go +++ b/restapi/operations/bucket/create_bucket_event_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/create_bucket_event_urlbuilder.go b/restapi/operations/bucket/create_bucket_event_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/create_bucket_event_urlbuilder.go rename to restapi/operations/bucket/create_bucket_event_urlbuilder.go index 87a9f5b0f..466a512d8 100644 --- a/restapi/operations/user_api/create_bucket_event_urlbuilder.go +++ b/restapi/operations/bucket/create_bucket_event_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/delete_access_rule_with_bucket.go b/restapi/operations/bucket/delete_access_rule_with_bucket.go similarity index 97% rename from restapi/operations/admin_api/delete_access_rule_with_bucket.go rename to restapi/operations/bucket/delete_access_rule_with_bucket.go index 51dc90ec0..cc3889ef0 100644 --- a/restapi/operations/admin_api/delete_access_rule_with_bucket.go +++ b/restapi/operations/bucket/delete_access_rule_with_bucket.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteAccessRuleWithBucket(ctx *middleware.Context, handler DeleteAccess return &DeleteAccessRuleWithBucket{Context: ctx, Handler: handler} } -/* DeleteAccessRuleWithBucket swagger:route DELETE /bucket/{bucket}/access-rules AdminAPI deleteAccessRuleWithBucket +/* DeleteAccessRuleWithBucket swagger:route DELETE /bucket/{bucket}/access-rules Bucket deleteAccessRuleWithBucket Delete Access Rule From Given Bucket diff --git a/restapi/operations/admin_api/delete_access_rule_with_bucket_parameters.go b/restapi/operations/bucket/delete_access_rule_with_bucket_parameters.go similarity index 99% rename from restapi/operations/admin_api/delete_access_rule_with_bucket_parameters.go rename to restapi/operations/bucket/delete_access_rule_with_bucket_parameters.go index 0da61d3b5..0c86e5f80 100644 --- a/restapi/operations/admin_api/delete_access_rule_with_bucket_parameters.go +++ b/restapi/operations/bucket/delete_access_rule_with_bucket_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/delete_access_rule_with_bucket_responses.go b/restapi/operations/bucket/delete_access_rule_with_bucket_responses.go similarity index 99% rename from restapi/operations/admin_api/delete_access_rule_with_bucket_responses.go rename to restapi/operations/bucket/delete_access_rule_with_bucket_responses.go index 97348b081..ea0e25c35 100644 --- a/restapi/operations/admin_api/delete_access_rule_with_bucket_responses.go +++ b/restapi/operations/bucket/delete_access_rule_with_bucket_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/delete_access_rule_with_bucket_urlbuilder.go b/restapi/operations/bucket/delete_access_rule_with_bucket_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/delete_access_rule_with_bucket_urlbuilder.go rename to restapi/operations/bucket/delete_access_rule_with_bucket_urlbuilder.go index e111efdba..05d92acba 100644 --- a/restapi/operations/admin_api/delete_access_rule_with_bucket_urlbuilder.go +++ b/restapi/operations/bucket/delete_access_rule_with_bucket_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_all_replication_rules.go b/restapi/operations/bucket/delete_all_replication_rules.go similarity index 97% rename from restapi/operations/user_api/delete_all_replication_rules.go rename to restapi/operations/bucket/delete_all_replication_rules.go index 5e2d4e11a..6e2a24a9b 100644 --- a/restapi/operations/user_api/delete_all_replication_rules.go +++ b/restapi/operations/bucket/delete_all_replication_rules.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteAllReplicationRules(ctx *middleware.Context, handler DeleteAllRepl return &DeleteAllReplicationRules{Context: ctx, Handler: handler} } -/* DeleteAllReplicationRules swagger:route DELETE /buckets/{bucket_name}/delete-all-replication-rules UserAPI deleteAllReplicationRules +/* DeleteAllReplicationRules swagger:route DELETE /buckets/{bucket_name}/delete-all-replication-rules Bucket deleteAllReplicationRules Deletes all replication rules from a bucket diff --git a/restapi/operations/user_api/delete_all_replication_rules_parameters.go b/restapi/operations/bucket/delete_all_replication_rules_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_all_replication_rules_parameters.go rename to restapi/operations/bucket/delete_all_replication_rules_parameters.go index 032e8f43a..3125a3024 100644 --- a/restapi/operations/user_api/delete_all_replication_rules_parameters.go +++ b/restapi/operations/bucket/delete_all_replication_rules_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_all_replication_rules_responses.go b/restapi/operations/bucket/delete_all_replication_rules_responses.go similarity index 99% rename from restapi/operations/user_api/delete_all_replication_rules_responses.go rename to restapi/operations/bucket/delete_all_replication_rules_responses.go index fd44b07c5..dbad5065a 100644 --- a/restapi/operations/user_api/delete_all_replication_rules_responses.go +++ b/restapi/operations/bucket/delete_all_replication_rules_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_all_replication_rules_urlbuilder.go b/restapi/operations/bucket/delete_all_replication_rules_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_all_replication_rules_urlbuilder.go rename to restapi/operations/bucket/delete_all_replication_rules_urlbuilder.go index 395b10e35..936ce355b 100644 --- a/restapi/operations/user_api/delete_all_replication_rules_urlbuilder.go +++ b/restapi/operations/bucket/delete_all_replication_rules_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_bucket.go b/restapi/operations/bucket/delete_bucket.go similarity index 96% rename from restapi/operations/user_api/delete_bucket.go rename to restapi/operations/bucket/delete_bucket.go index 392687ee1..b9a4c2f7c 100644 --- a/restapi/operations/user_api/delete_bucket.go +++ b/restapi/operations/bucket/delete_bucket.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteBucket(ctx *middleware.Context, handler DeleteBucketHandler) *Dele return &DeleteBucket{Context: ctx, Handler: handler} } -/* DeleteBucket swagger:route DELETE /buckets/{name} UserAPI deleteBucket +/* DeleteBucket swagger:route DELETE /buckets/{name} Bucket deleteBucket Delete Bucket diff --git a/restapi/operations/user_api/delete_bucket_event.go b/restapi/operations/bucket/delete_bucket_event.go similarity index 98% rename from restapi/operations/user_api/delete_bucket_event.go rename to restapi/operations/bucket/delete_bucket_event.go index 8ac403f8b..25b4ff083 100644 --- a/restapi/operations/user_api/delete_bucket_event.go +++ b/restapi/operations/bucket/delete_bucket_event.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteBucketEvent(ctx *middleware.Context, handler DeleteBucketEventHand return &DeleteBucketEvent{Context: ctx, Handler: handler} } -/* DeleteBucketEvent swagger:route DELETE /buckets/{bucket_name}/events/{arn} UserAPI deleteBucketEvent +/* DeleteBucketEvent swagger:route DELETE /buckets/{bucket_name}/events/{arn} Bucket deleteBucketEvent Delete Bucket Event diff --git a/restapi/operations/user_api/delete_bucket_event_parameters.go b/restapi/operations/bucket/delete_bucket_event_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_event_parameters.go rename to restapi/operations/bucket/delete_bucket_event_parameters.go index fe743a9db..5b0d34c1b 100644 --- a/restapi/operations/user_api/delete_bucket_event_parameters.go +++ b/restapi/operations/bucket/delete_bucket_event_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_bucket_event_responses.go b/restapi/operations/bucket/delete_bucket_event_responses.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_event_responses.go rename to restapi/operations/bucket/delete_bucket_event_responses.go index 9ee438660..7415aed9e 100644 --- a/restapi/operations/user_api/delete_bucket_event_responses.go +++ b/restapi/operations/bucket/delete_bucket_event_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_bucket_event_urlbuilder.go b/restapi/operations/bucket/delete_bucket_event_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_event_urlbuilder.go rename to restapi/operations/bucket/delete_bucket_event_urlbuilder.go index 4501bde5f..33bccf807 100644 --- a/restapi/operations/user_api/delete_bucket_event_urlbuilder.go +++ b/restapi/operations/bucket/delete_bucket_event_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_bucket_lifecycle_rule.go b/restapi/operations/bucket/delete_bucket_lifecycle_rule.go similarity index 97% rename from restapi/operations/user_api/delete_bucket_lifecycle_rule.go rename to restapi/operations/bucket/delete_bucket_lifecycle_rule.go index 9edf08a19..92ac10bf7 100644 --- a/restapi/operations/user_api/delete_bucket_lifecycle_rule.go +++ b/restapi/operations/bucket/delete_bucket_lifecycle_rule.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteBucketLifecycleRule(ctx *middleware.Context, handler DeleteBucketL return &DeleteBucketLifecycleRule{Context: ctx, Handler: handler} } -/* DeleteBucketLifecycleRule swagger:route DELETE /buckets/{bucket_name}/lifecycle/{lifecycle_id} UserAPI deleteBucketLifecycleRule +/* DeleteBucketLifecycleRule swagger:route DELETE /buckets/{bucket_name}/lifecycle/{lifecycle_id} Bucket deleteBucketLifecycleRule Delete Lifecycle rule diff --git a/restapi/operations/user_api/delete_bucket_lifecycle_rule_parameters.go b/restapi/operations/bucket/delete_bucket_lifecycle_rule_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_lifecycle_rule_parameters.go rename to restapi/operations/bucket/delete_bucket_lifecycle_rule_parameters.go index 3267017dd..2be5d39e5 100644 --- a/restapi/operations/user_api/delete_bucket_lifecycle_rule_parameters.go +++ b/restapi/operations/bucket/delete_bucket_lifecycle_rule_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_bucket_lifecycle_rule_responses.go b/restapi/operations/bucket/delete_bucket_lifecycle_rule_responses.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_lifecycle_rule_responses.go rename to restapi/operations/bucket/delete_bucket_lifecycle_rule_responses.go index c9234ddbf..788db6f45 100644 --- a/restapi/operations/user_api/delete_bucket_lifecycle_rule_responses.go +++ b/restapi/operations/bucket/delete_bucket_lifecycle_rule_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_bucket_lifecycle_rule_urlbuilder.go b/restapi/operations/bucket/delete_bucket_lifecycle_rule_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_lifecycle_rule_urlbuilder.go rename to restapi/operations/bucket/delete_bucket_lifecycle_rule_urlbuilder.go index 253083de6..54432a30f 100644 --- a/restapi/operations/user_api/delete_bucket_lifecycle_rule_urlbuilder.go +++ b/restapi/operations/bucket/delete_bucket_lifecycle_rule_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_bucket_parameters.go b/restapi/operations/bucket/delete_bucket_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_parameters.go rename to restapi/operations/bucket/delete_bucket_parameters.go index fe14fb23f..302b11cd9 100644 --- a/restapi/operations/user_api/delete_bucket_parameters.go +++ b/restapi/operations/bucket/delete_bucket_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_bucket_replication_rule.go b/restapi/operations/bucket/delete_bucket_replication_rule.go similarity index 97% rename from restapi/operations/user_api/delete_bucket_replication_rule.go rename to restapi/operations/bucket/delete_bucket_replication_rule.go index 6e0e1feda..dec4b1201 100644 --- a/restapi/operations/user_api/delete_bucket_replication_rule.go +++ b/restapi/operations/bucket/delete_bucket_replication_rule.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteBucketReplicationRule(ctx *middleware.Context, handler DeleteBucke return &DeleteBucketReplicationRule{Context: ctx, Handler: handler} } -/* DeleteBucketReplicationRule swagger:route DELETE /buckets/{bucket_name}/replication/{rule_id} UserAPI deleteBucketReplicationRule +/* DeleteBucketReplicationRule swagger:route DELETE /buckets/{bucket_name}/replication/{rule_id} Bucket deleteBucketReplicationRule Bucket Replication Rule Delete diff --git a/restapi/operations/user_api/delete_bucket_replication_rule_parameters.go b/restapi/operations/bucket/delete_bucket_replication_rule_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_replication_rule_parameters.go rename to restapi/operations/bucket/delete_bucket_replication_rule_parameters.go index 47af79bef..17441fc79 100644 --- a/restapi/operations/user_api/delete_bucket_replication_rule_parameters.go +++ b/restapi/operations/bucket/delete_bucket_replication_rule_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_bucket_replication_rule_responses.go b/restapi/operations/bucket/delete_bucket_replication_rule_responses.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_replication_rule_responses.go rename to restapi/operations/bucket/delete_bucket_replication_rule_responses.go index 0ca077b42..6999e54e2 100644 --- a/restapi/operations/user_api/delete_bucket_replication_rule_responses.go +++ b/restapi/operations/bucket/delete_bucket_replication_rule_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_bucket_replication_rule_urlbuilder.go b/restapi/operations/bucket/delete_bucket_replication_rule_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_replication_rule_urlbuilder.go rename to restapi/operations/bucket/delete_bucket_replication_rule_urlbuilder.go index fed264032..166ea9410 100644 --- a/restapi/operations/user_api/delete_bucket_replication_rule_urlbuilder.go +++ b/restapi/operations/bucket/delete_bucket_replication_rule_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_bucket_responses.go b/restapi/operations/bucket/delete_bucket_responses.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_responses.go rename to restapi/operations/bucket/delete_bucket_responses.go index 776a0d084..e8405346f 100644 --- a/restapi/operations/user_api/delete_bucket_responses.go +++ b/restapi/operations/bucket/delete_bucket_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_bucket_urlbuilder.go b/restapi/operations/bucket/delete_bucket_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_bucket_urlbuilder.go rename to restapi/operations/bucket/delete_bucket_urlbuilder.go index 3d6eff72d..1ffaa2ca4 100644 --- a/restapi/operations/user_api/delete_bucket_urlbuilder.go +++ b/restapi/operations/bucket/delete_bucket_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_remote_bucket.go b/restapi/operations/bucket/delete_remote_bucket.go similarity index 97% rename from restapi/operations/user_api/delete_remote_bucket.go rename to restapi/operations/bucket/delete_remote_bucket.go index 5f61a2e4c..76824bd81 100644 --- a/restapi/operations/user_api/delete_remote_bucket.go +++ b/restapi/operations/bucket/delete_remote_bucket.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteRemoteBucket(ctx *middleware.Context, handler DeleteRemoteBucketHa return &DeleteRemoteBucket{Context: ctx, Handler: handler} } -/* DeleteRemoteBucket swagger:route DELETE /remote-buckets/{source-bucket-name}/{arn} UserAPI deleteRemoteBucket +/* DeleteRemoteBucket swagger:route DELETE /remote-buckets/{source-bucket-name}/{arn} Bucket deleteRemoteBucket Delete Remote Bucket diff --git a/restapi/operations/user_api/delete_remote_bucket_parameters.go b/restapi/operations/bucket/delete_remote_bucket_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_remote_bucket_parameters.go rename to restapi/operations/bucket/delete_remote_bucket_parameters.go index 202a839a7..7a729761e 100644 --- a/restapi/operations/user_api/delete_remote_bucket_parameters.go +++ b/restapi/operations/bucket/delete_remote_bucket_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_remote_bucket_responses.go b/restapi/operations/bucket/delete_remote_bucket_responses.go similarity index 99% rename from restapi/operations/user_api/delete_remote_bucket_responses.go rename to restapi/operations/bucket/delete_remote_bucket_responses.go index e5e3492f9..32de3d421 100644 --- a/restapi/operations/user_api/delete_remote_bucket_responses.go +++ b/restapi/operations/bucket/delete_remote_bucket_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_remote_bucket_urlbuilder.go b/restapi/operations/bucket/delete_remote_bucket_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_remote_bucket_urlbuilder.go rename to restapi/operations/bucket/delete_remote_bucket_urlbuilder.go index 383e3bbe6..56fa9ff11 100644 --- a/restapi/operations/user_api/delete_remote_bucket_urlbuilder.go +++ b/restapi/operations/bucket/delete_remote_bucket_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_selected_replication_rules.go b/restapi/operations/bucket/delete_selected_replication_rules.go similarity index 96% rename from restapi/operations/user_api/delete_selected_replication_rules.go rename to restapi/operations/bucket/delete_selected_replication_rules.go index 6a0f25f7b..4ecf9ee4d 100644 --- a/restapi/operations/user_api/delete_selected_replication_rules.go +++ b/restapi/operations/bucket/delete_selected_replication_rules.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteSelectedReplicationRules(ctx *middleware.Context, handler DeleteSe return &DeleteSelectedReplicationRules{Context: ctx, Handler: handler} } -/* DeleteSelectedReplicationRules swagger:route DELETE /buckets/{bucket_name}/delete-selected-replication-rules UserAPI deleteSelectedReplicationRules +/* DeleteSelectedReplicationRules swagger:route DELETE /buckets/{bucket_name}/delete-selected-replication-rules Bucket deleteSelectedReplicationRules Deletes selected replication rules from a bucket diff --git a/restapi/operations/user_api/delete_selected_replication_rules_parameters.go b/restapi/operations/bucket/delete_selected_replication_rules_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_selected_replication_rules_parameters.go rename to restapi/operations/bucket/delete_selected_replication_rules_parameters.go index 8ab9f7f36..f10288d85 100644 --- a/restapi/operations/user_api/delete_selected_replication_rules_parameters.go +++ b/restapi/operations/bucket/delete_selected_replication_rules_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_selected_replication_rules_responses.go b/restapi/operations/bucket/delete_selected_replication_rules_responses.go similarity index 99% rename from restapi/operations/user_api/delete_selected_replication_rules_responses.go rename to restapi/operations/bucket/delete_selected_replication_rules_responses.go index 0177f0157..ba9225dc2 100644 --- a/restapi/operations/user_api/delete_selected_replication_rules_responses.go +++ b/restapi/operations/bucket/delete_selected_replication_rules_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_selected_replication_rules_urlbuilder.go b/restapi/operations/bucket/delete_selected_replication_rules_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_selected_replication_rules_urlbuilder.go rename to restapi/operations/bucket/delete_selected_replication_rules_urlbuilder.go index 2036ded52..9f158aebe 100644 --- a/restapi/operations/user_api/delete_selected_replication_rules_urlbuilder.go +++ b/restapi/operations/bucket/delete_selected_replication_rules_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/disable_bucket_encryption.go b/restapi/operations/bucket/disable_bucket_encryption.go similarity index 97% rename from restapi/operations/user_api/disable_bucket_encryption.go rename to restapi/operations/bucket/disable_bucket_encryption.go index f21196641..b89e81420 100644 --- a/restapi/operations/user_api/disable_bucket_encryption.go +++ b/restapi/operations/bucket/disable_bucket_encryption.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDisableBucketEncryption(ctx *middleware.Context, handler DisableBucketEn return &DisableBucketEncryption{Context: ctx, Handler: handler} } -/* DisableBucketEncryption swagger:route POST /buckets/{bucket_name}/encryption/disable UserAPI disableBucketEncryption +/* DisableBucketEncryption swagger:route POST /buckets/{bucket_name}/encryption/disable Bucket disableBucketEncryption Disable bucket encryption. diff --git a/restapi/operations/user_api/disable_bucket_encryption_parameters.go b/restapi/operations/bucket/disable_bucket_encryption_parameters.go similarity index 99% rename from restapi/operations/user_api/disable_bucket_encryption_parameters.go rename to restapi/operations/bucket/disable_bucket_encryption_parameters.go index ed439484b..b6804a23a 100644 --- a/restapi/operations/user_api/disable_bucket_encryption_parameters.go +++ b/restapi/operations/bucket/disable_bucket_encryption_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/disable_bucket_encryption_responses.go b/restapi/operations/bucket/disable_bucket_encryption_responses.go similarity index 99% rename from restapi/operations/user_api/disable_bucket_encryption_responses.go rename to restapi/operations/bucket/disable_bucket_encryption_responses.go index 398a35587..04dc2e6f4 100644 --- a/restapi/operations/user_api/disable_bucket_encryption_responses.go +++ b/restapi/operations/bucket/disable_bucket_encryption_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/disable_bucket_encryption_urlbuilder.go b/restapi/operations/bucket/disable_bucket_encryption_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/disable_bucket_encryption_urlbuilder.go rename to restapi/operations/bucket/disable_bucket_encryption_urlbuilder.go index 5a71c3c7d..ce99d20b2 100644 --- a/restapi/operations/user_api/disable_bucket_encryption_urlbuilder.go +++ b/restapi/operations/bucket/disable_bucket_encryption_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/enable_bucket_encryption.go b/restapi/operations/bucket/enable_bucket_encryption.go similarity index 97% rename from restapi/operations/user_api/enable_bucket_encryption.go rename to restapi/operations/bucket/enable_bucket_encryption.go index 662a67492..b8cca0810 100644 --- a/restapi/operations/user_api/enable_bucket_encryption.go +++ b/restapi/operations/bucket/enable_bucket_encryption.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewEnableBucketEncryption(ctx *middleware.Context, handler EnableBucketEncr return &EnableBucketEncryption{Context: ctx, Handler: handler} } -/* EnableBucketEncryption swagger:route POST /buckets/{bucket_name}/encryption/enable UserAPI enableBucketEncryption +/* EnableBucketEncryption swagger:route POST /buckets/{bucket_name}/encryption/enable Bucket enableBucketEncryption Enable bucket encryption. diff --git a/restapi/operations/user_api/enable_bucket_encryption_parameters.go b/restapi/operations/bucket/enable_bucket_encryption_parameters.go similarity index 99% rename from restapi/operations/user_api/enable_bucket_encryption_parameters.go rename to restapi/operations/bucket/enable_bucket_encryption_parameters.go index 67a799b87..18b5658b4 100644 --- a/restapi/operations/user_api/enable_bucket_encryption_parameters.go +++ b/restapi/operations/bucket/enable_bucket_encryption_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/enable_bucket_encryption_responses.go b/restapi/operations/bucket/enable_bucket_encryption_responses.go similarity index 99% rename from restapi/operations/user_api/enable_bucket_encryption_responses.go rename to restapi/operations/bucket/enable_bucket_encryption_responses.go index 44abe2b51..9aec84f78 100644 --- a/restapi/operations/user_api/enable_bucket_encryption_responses.go +++ b/restapi/operations/bucket/enable_bucket_encryption_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/enable_bucket_encryption_urlbuilder.go b/restapi/operations/bucket/enable_bucket_encryption_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/enable_bucket_encryption_urlbuilder.go rename to restapi/operations/bucket/enable_bucket_encryption_urlbuilder.go index f09a9a2b3..1673849ce 100644 --- a/restapi/operations/user_api/enable_bucket_encryption_urlbuilder.go +++ b/restapi/operations/bucket/enable_bucket_encryption_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/get_bucket_encryption_info.go b/restapi/operations/bucket/get_bucket_encryption_info.go similarity index 97% rename from restapi/operations/user_api/get_bucket_encryption_info.go rename to restapi/operations/bucket/get_bucket_encryption_info.go index 4c8c5d8fa..5d74adee3 100644 --- a/restapi/operations/user_api/get_bucket_encryption_info.go +++ b/restapi/operations/bucket/get_bucket_encryption_info.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetBucketEncryptionInfo(ctx *middleware.Context, handler GetBucketEncryp return &GetBucketEncryptionInfo{Context: ctx, Handler: handler} } -/* GetBucketEncryptionInfo swagger:route GET /buckets/{bucket_name}/encryption/info UserAPI getBucketEncryptionInfo +/* GetBucketEncryptionInfo swagger:route GET /buckets/{bucket_name}/encryption/info Bucket getBucketEncryptionInfo Get bucket encryption information. diff --git a/restapi/operations/user_api/get_bucket_encryption_info_parameters.go b/restapi/operations/bucket/get_bucket_encryption_info_parameters.go similarity index 99% rename from restapi/operations/user_api/get_bucket_encryption_info_parameters.go rename to restapi/operations/bucket/get_bucket_encryption_info_parameters.go index 7740ff5fa..b125500b0 100644 --- a/restapi/operations/user_api/get_bucket_encryption_info_parameters.go +++ b/restapi/operations/bucket/get_bucket_encryption_info_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_encryption_info_responses.go b/restapi/operations/bucket/get_bucket_encryption_info_responses.go similarity index 99% rename from restapi/operations/user_api/get_bucket_encryption_info_responses.go rename to restapi/operations/bucket/get_bucket_encryption_info_responses.go index ccfadac3f..5087ebaee 100644 --- a/restapi/operations/user_api/get_bucket_encryption_info_responses.go +++ b/restapi/operations/bucket/get_bucket_encryption_info_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_encryption_info_urlbuilder.go b/restapi/operations/bucket/get_bucket_encryption_info_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/get_bucket_encryption_info_urlbuilder.go rename to restapi/operations/bucket/get_bucket_encryption_info_urlbuilder.go index cd775d13a..f5e497045 100644 --- a/restapi/operations/user_api/get_bucket_encryption_info_urlbuilder.go +++ b/restapi/operations/bucket/get_bucket_encryption_info_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/get_bucket_lifecycle.go b/restapi/operations/bucket/get_bucket_lifecycle.go similarity index 98% rename from restapi/operations/user_api/get_bucket_lifecycle.go rename to restapi/operations/bucket/get_bucket_lifecycle.go index e3b7514fd..508b976e4 100644 --- a/restapi/operations/user_api/get_bucket_lifecycle.go +++ b/restapi/operations/bucket/get_bucket_lifecycle.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetBucketLifecycle(ctx *middleware.Context, handler GetBucketLifecycleHa return &GetBucketLifecycle{Context: ctx, Handler: handler} } -/* GetBucketLifecycle swagger:route GET /buckets/{bucket_name}/lifecycle UserAPI getBucketLifecycle +/* GetBucketLifecycle swagger:route GET /buckets/{bucket_name}/lifecycle Bucket getBucketLifecycle Bucket Lifecycle diff --git a/restapi/operations/user_api/get_bucket_lifecycle_parameters.go b/restapi/operations/bucket/get_bucket_lifecycle_parameters.go similarity index 99% rename from restapi/operations/user_api/get_bucket_lifecycle_parameters.go rename to restapi/operations/bucket/get_bucket_lifecycle_parameters.go index 6ae53eaa6..bd975f445 100644 --- a/restapi/operations/user_api/get_bucket_lifecycle_parameters.go +++ b/restapi/operations/bucket/get_bucket_lifecycle_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_lifecycle_responses.go b/restapi/operations/bucket/get_bucket_lifecycle_responses.go similarity index 99% rename from restapi/operations/user_api/get_bucket_lifecycle_responses.go rename to restapi/operations/bucket/get_bucket_lifecycle_responses.go index f74cdd860..58e050f05 100644 --- a/restapi/operations/user_api/get_bucket_lifecycle_responses.go +++ b/restapi/operations/bucket/get_bucket_lifecycle_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_lifecycle_urlbuilder.go b/restapi/operations/bucket/get_bucket_lifecycle_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/get_bucket_lifecycle_urlbuilder.go rename to restapi/operations/bucket/get_bucket_lifecycle_urlbuilder.go index 25f6f8022..3f2c8f22f 100644 --- a/restapi/operations/user_api/get_bucket_lifecycle_urlbuilder.go +++ b/restapi/operations/bucket/get_bucket_lifecycle_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/get_bucket_object_locking_status.go b/restapi/operations/bucket/get_bucket_object_locking_status.go similarity index 97% rename from restapi/operations/user_api/get_bucket_object_locking_status.go rename to restapi/operations/bucket/get_bucket_object_locking_status.go index a54f21b3d..5b596da0f 100644 --- a/restapi/operations/user_api/get_bucket_object_locking_status.go +++ b/restapi/operations/bucket/get_bucket_object_locking_status.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetBucketObjectLockingStatus(ctx *middleware.Context, handler GetBucketO return &GetBucketObjectLockingStatus{Context: ctx, Handler: handler} } -/* GetBucketObjectLockingStatus swagger:route GET /buckets/{bucket_name}/object-locking UserAPI getBucketObjectLockingStatus +/* GetBucketObjectLockingStatus swagger:route GET /buckets/{bucket_name}/object-locking Bucket getBucketObjectLockingStatus Returns the status of object locking support on the bucket diff --git a/restapi/operations/user_api/get_bucket_object_locking_status_parameters.go b/restapi/operations/bucket/get_bucket_object_locking_status_parameters.go similarity index 99% rename from restapi/operations/user_api/get_bucket_object_locking_status_parameters.go rename to restapi/operations/bucket/get_bucket_object_locking_status_parameters.go index 42962f8c2..57f5c6eae 100644 --- a/restapi/operations/user_api/get_bucket_object_locking_status_parameters.go +++ b/restapi/operations/bucket/get_bucket_object_locking_status_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_object_locking_status_responses.go b/restapi/operations/bucket/get_bucket_object_locking_status_responses.go similarity index 99% rename from restapi/operations/user_api/get_bucket_object_locking_status_responses.go rename to restapi/operations/bucket/get_bucket_object_locking_status_responses.go index afd7c6a2f..b928fcb5c 100644 --- a/restapi/operations/user_api/get_bucket_object_locking_status_responses.go +++ b/restapi/operations/bucket/get_bucket_object_locking_status_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_object_locking_status_urlbuilder.go b/restapi/operations/bucket/get_bucket_object_locking_status_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/get_bucket_object_locking_status_urlbuilder.go rename to restapi/operations/bucket/get_bucket_object_locking_status_urlbuilder.go index d12dec24b..4212e8664 100644 --- a/restapi/operations/user_api/get_bucket_object_locking_status_urlbuilder.go +++ b/restapi/operations/bucket/get_bucket_object_locking_status_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/get_bucket_quota.go b/restapi/operations/bucket/get_bucket_quota.go similarity index 96% rename from restapi/operations/user_api/get_bucket_quota.go rename to restapi/operations/bucket/get_bucket_quota.go index 003083f19..a49f67261 100644 --- a/restapi/operations/user_api/get_bucket_quota.go +++ b/restapi/operations/bucket/get_bucket_quota.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetBucketQuota(ctx *middleware.Context, handler GetBucketQuotaHandler) * return &GetBucketQuota{Context: ctx, Handler: handler} } -/* GetBucketQuota swagger:route GET /buckets/{name}/quota UserAPI getBucketQuota +/* GetBucketQuota swagger:route GET /buckets/{name}/quota Bucket getBucketQuota Get Bucket Quota diff --git a/restapi/operations/user_api/get_bucket_quota_parameters.go b/restapi/operations/bucket/get_bucket_quota_parameters.go similarity index 99% rename from restapi/operations/user_api/get_bucket_quota_parameters.go rename to restapi/operations/bucket/get_bucket_quota_parameters.go index 5ec1179c0..e1e7dcc7c 100644 --- a/restapi/operations/user_api/get_bucket_quota_parameters.go +++ b/restapi/operations/bucket/get_bucket_quota_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_quota_responses.go b/restapi/operations/bucket/get_bucket_quota_responses.go similarity index 99% rename from restapi/operations/user_api/get_bucket_quota_responses.go rename to restapi/operations/bucket/get_bucket_quota_responses.go index a49e4ba26..50a999a0c 100644 --- a/restapi/operations/user_api/get_bucket_quota_responses.go +++ b/restapi/operations/bucket/get_bucket_quota_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_quota_urlbuilder.go b/restapi/operations/bucket/get_bucket_quota_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/get_bucket_quota_urlbuilder.go rename to restapi/operations/bucket/get_bucket_quota_urlbuilder.go index 3919af5c1..9806c959d 100644 --- a/restapi/operations/user_api/get_bucket_quota_urlbuilder.go +++ b/restapi/operations/bucket/get_bucket_quota_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/get_bucket_replication.go b/restapi/operations/bucket/get_bucket_replication.go similarity index 98% rename from restapi/operations/user_api/get_bucket_replication.go rename to restapi/operations/bucket/get_bucket_replication.go index 1dc462fb8..6f45e3093 100644 --- a/restapi/operations/user_api/get_bucket_replication.go +++ b/restapi/operations/bucket/get_bucket_replication.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetBucketReplication(ctx *middleware.Context, handler GetBucketReplicati return &GetBucketReplication{Context: ctx, Handler: handler} } -/* GetBucketReplication swagger:route GET /buckets/{bucket_name}/replication UserAPI getBucketReplication +/* GetBucketReplication swagger:route GET /buckets/{bucket_name}/replication Bucket getBucketReplication Bucket Replication diff --git a/restapi/operations/user_api/get_bucket_replication_parameters.go b/restapi/operations/bucket/get_bucket_replication_parameters.go similarity index 99% rename from restapi/operations/user_api/get_bucket_replication_parameters.go rename to restapi/operations/bucket/get_bucket_replication_parameters.go index 8ff2a3aa3..caa2831b4 100644 --- a/restapi/operations/user_api/get_bucket_replication_parameters.go +++ b/restapi/operations/bucket/get_bucket_replication_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_replication_responses.go b/restapi/operations/bucket/get_bucket_replication_responses.go similarity index 99% rename from restapi/operations/user_api/get_bucket_replication_responses.go rename to restapi/operations/bucket/get_bucket_replication_responses.go index aa917b00b..3c81df3e4 100644 --- a/restapi/operations/user_api/get_bucket_replication_responses.go +++ b/restapi/operations/bucket/get_bucket_replication_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_replication_rule.go b/restapi/operations/bucket/get_bucket_replication_rule.go similarity index 97% rename from restapi/operations/user_api/get_bucket_replication_rule.go rename to restapi/operations/bucket/get_bucket_replication_rule.go index 732c4f836..c42ed29d6 100644 --- a/restapi/operations/user_api/get_bucket_replication_rule.go +++ b/restapi/operations/bucket/get_bucket_replication_rule.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetBucketReplicationRule(ctx *middleware.Context, handler GetBucketRepli return &GetBucketReplicationRule{Context: ctx, Handler: handler} } -/* GetBucketReplicationRule swagger:route GET /buckets/{bucket_name}/replication/{rule_id} UserAPI getBucketReplicationRule +/* GetBucketReplicationRule swagger:route GET /buckets/{bucket_name}/replication/{rule_id} Bucket getBucketReplicationRule Bucket Replication diff --git a/restapi/operations/user_api/get_bucket_replication_rule_parameters.go b/restapi/operations/bucket/get_bucket_replication_rule_parameters.go similarity index 99% rename from restapi/operations/user_api/get_bucket_replication_rule_parameters.go rename to restapi/operations/bucket/get_bucket_replication_rule_parameters.go index 4921eaa63..21609aaad 100644 --- a/restapi/operations/user_api/get_bucket_replication_rule_parameters.go +++ b/restapi/operations/bucket/get_bucket_replication_rule_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_replication_rule_responses.go b/restapi/operations/bucket/get_bucket_replication_rule_responses.go similarity index 99% rename from restapi/operations/user_api/get_bucket_replication_rule_responses.go rename to restapi/operations/bucket/get_bucket_replication_rule_responses.go index 64ec0de96..835f78bab 100644 --- a/restapi/operations/user_api/get_bucket_replication_rule_responses.go +++ b/restapi/operations/bucket/get_bucket_replication_rule_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_replication_rule_urlbuilder.go b/restapi/operations/bucket/get_bucket_replication_rule_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/get_bucket_replication_rule_urlbuilder.go rename to restapi/operations/bucket/get_bucket_replication_rule_urlbuilder.go index 6a0158a97..c58bc70b3 100644 --- a/restapi/operations/user_api/get_bucket_replication_rule_urlbuilder.go +++ b/restapi/operations/bucket/get_bucket_replication_rule_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/get_bucket_replication_urlbuilder.go b/restapi/operations/bucket/get_bucket_replication_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/get_bucket_replication_urlbuilder.go rename to restapi/operations/bucket/get_bucket_replication_urlbuilder.go index 88dc28698..c78313120 100644 --- a/restapi/operations/user_api/get_bucket_replication_urlbuilder.go +++ b/restapi/operations/bucket/get_bucket_replication_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/get_bucket_retention_config.go b/restapi/operations/bucket/get_bucket_retention_config.go similarity index 97% rename from restapi/operations/user_api/get_bucket_retention_config.go rename to restapi/operations/bucket/get_bucket_retention_config.go index b17c36577..7bf286dfe 100644 --- a/restapi/operations/user_api/get_bucket_retention_config.go +++ b/restapi/operations/bucket/get_bucket_retention_config.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetBucketRetentionConfig(ctx *middleware.Context, handler GetBucketReten return &GetBucketRetentionConfig{Context: ctx, Handler: handler} } -/* GetBucketRetentionConfig swagger:route GET /buckets/{bucket_name}/retention UserAPI getBucketRetentionConfig +/* GetBucketRetentionConfig swagger:route GET /buckets/{bucket_name}/retention Bucket getBucketRetentionConfig Get Bucket's retention config diff --git a/restapi/operations/user_api/get_bucket_retention_config_parameters.go b/restapi/operations/bucket/get_bucket_retention_config_parameters.go similarity index 99% rename from restapi/operations/user_api/get_bucket_retention_config_parameters.go rename to restapi/operations/bucket/get_bucket_retention_config_parameters.go index bf72d747f..c87400091 100644 --- a/restapi/operations/user_api/get_bucket_retention_config_parameters.go +++ b/restapi/operations/bucket/get_bucket_retention_config_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_retention_config_responses.go b/restapi/operations/bucket/get_bucket_retention_config_responses.go similarity index 99% rename from restapi/operations/user_api/get_bucket_retention_config_responses.go rename to restapi/operations/bucket/get_bucket_retention_config_responses.go index 6ca62a2f4..c50f915d3 100644 --- a/restapi/operations/user_api/get_bucket_retention_config_responses.go +++ b/restapi/operations/bucket/get_bucket_retention_config_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_retention_config_urlbuilder.go b/restapi/operations/bucket/get_bucket_retention_config_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/get_bucket_retention_config_urlbuilder.go rename to restapi/operations/bucket/get_bucket_retention_config_urlbuilder.go index 39d08c190..a6ed6f8c8 100644 --- a/restapi/operations/user_api/get_bucket_retention_config_urlbuilder.go +++ b/restapi/operations/bucket/get_bucket_retention_config_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/get_bucket_rewind.go b/restapi/operations/bucket/get_bucket_rewind.go similarity index 98% rename from restapi/operations/user_api/get_bucket_rewind.go rename to restapi/operations/bucket/get_bucket_rewind.go index 27f77b3a1..bbf5bdecc 100644 --- a/restapi/operations/user_api/get_bucket_rewind.go +++ b/restapi/operations/bucket/get_bucket_rewind.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetBucketRewind(ctx *middleware.Context, handler GetBucketRewindHandler) return &GetBucketRewind{Context: ctx, Handler: handler} } -/* GetBucketRewind swagger:route GET /buckets/{bucket_name}/rewind/{date} UserAPI getBucketRewind +/* GetBucketRewind swagger:route GET /buckets/{bucket_name}/rewind/{date} Bucket getBucketRewind Get objects in a bucket for a rewind date diff --git a/restapi/operations/user_api/get_bucket_rewind_parameters.go b/restapi/operations/bucket/get_bucket_rewind_parameters.go similarity index 99% rename from restapi/operations/user_api/get_bucket_rewind_parameters.go rename to restapi/operations/bucket/get_bucket_rewind_parameters.go index 4e52d19a6..c71c2cf49 100644 --- a/restapi/operations/user_api/get_bucket_rewind_parameters.go +++ b/restapi/operations/bucket/get_bucket_rewind_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_rewind_responses.go b/restapi/operations/bucket/get_bucket_rewind_responses.go similarity index 99% rename from restapi/operations/user_api/get_bucket_rewind_responses.go rename to restapi/operations/bucket/get_bucket_rewind_responses.go index 3e87405ee..15f7ec61f 100644 --- a/restapi/operations/user_api/get_bucket_rewind_responses.go +++ b/restapi/operations/bucket/get_bucket_rewind_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_rewind_urlbuilder.go b/restapi/operations/bucket/get_bucket_rewind_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/get_bucket_rewind_urlbuilder.go rename to restapi/operations/bucket/get_bucket_rewind_urlbuilder.go index 966e334af..71b2e0936 100644 --- a/restapi/operations/user_api/get_bucket_rewind_urlbuilder.go +++ b/restapi/operations/bucket/get_bucket_rewind_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/get_bucket_versioning.go b/restapi/operations/bucket/get_bucket_versioning.go similarity index 98% rename from restapi/operations/user_api/get_bucket_versioning.go rename to restapi/operations/bucket/get_bucket_versioning.go index 2169f2ac5..c705ab202 100644 --- a/restapi/operations/user_api/get_bucket_versioning.go +++ b/restapi/operations/bucket/get_bucket_versioning.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetBucketVersioning(ctx *middleware.Context, handler GetBucketVersioning return &GetBucketVersioning{Context: ctx, Handler: handler} } -/* GetBucketVersioning swagger:route GET /buckets/{bucket_name}/versioning UserAPI getBucketVersioning +/* GetBucketVersioning swagger:route GET /buckets/{bucket_name}/versioning Bucket getBucketVersioning Bucket Versioning diff --git a/restapi/operations/user_api/get_bucket_versioning_parameters.go b/restapi/operations/bucket/get_bucket_versioning_parameters.go similarity index 99% rename from restapi/operations/user_api/get_bucket_versioning_parameters.go rename to restapi/operations/bucket/get_bucket_versioning_parameters.go index 8473008e1..59cbb192c 100644 --- a/restapi/operations/user_api/get_bucket_versioning_parameters.go +++ b/restapi/operations/bucket/get_bucket_versioning_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_versioning_responses.go b/restapi/operations/bucket/get_bucket_versioning_responses.go similarity index 99% rename from restapi/operations/user_api/get_bucket_versioning_responses.go rename to restapi/operations/bucket/get_bucket_versioning_responses.go index 8fcbd0adf..9d450c004 100644 --- a/restapi/operations/user_api/get_bucket_versioning_responses.go +++ b/restapi/operations/bucket/get_bucket_versioning_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_bucket_versioning_urlbuilder.go b/restapi/operations/bucket/get_bucket_versioning_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/get_bucket_versioning_urlbuilder.go rename to restapi/operations/bucket/get_bucket_versioning_urlbuilder.go index 2df72b111..394e66ce4 100644 --- a/restapi/operations/user_api/get_bucket_versioning_urlbuilder.go +++ b/restapi/operations/bucket/get_bucket_versioning_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/list_access_rules_with_bucket.go b/restapi/operations/bucket/list_access_rules_with_bucket.go similarity index 97% rename from restapi/operations/admin_api/list_access_rules_with_bucket.go rename to restapi/operations/bucket/list_access_rules_with_bucket.go index 922fadeab..f7a494c36 100644 --- a/restapi/operations/admin_api/list_access_rules_with_bucket.go +++ b/restapi/operations/bucket/list_access_rules_with_bucket.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListAccessRulesWithBucket(ctx *middleware.Context, handler ListAccessRul return &ListAccessRulesWithBucket{Context: ctx, Handler: handler} } -/* ListAccessRulesWithBucket swagger:route GET /bucket/{bucket}/access-rules AdminAPI listAccessRulesWithBucket +/* ListAccessRulesWithBucket swagger:route GET /bucket/{bucket}/access-rules Bucket listAccessRulesWithBucket List Access Rules With Given Bucket diff --git a/restapi/operations/admin_api/list_access_rules_with_bucket_parameters.go b/restapi/operations/bucket/list_access_rules_with_bucket_parameters.go similarity index 99% rename from restapi/operations/admin_api/list_access_rules_with_bucket_parameters.go rename to restapi/operations/bucket/list_access_rules_with_bucket_parameters.go index 72c58d9de..e82a83ae0 100644 --- a/restapi/operations/admin_api/list_access_rules_with_bucket_parameters.go +++ b/restapi/operations/bucket/list_access_rules_with_bucket_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_access_rules_with_bucket_responses.go b/restapi/operations/bucket/list_access_rules_with_bucket_responses.go similarity index 99% rename from restapi/operations/admin_api/list_access_rules_with_bucket_responses.go rename to restapi/operations/bucket/list_access_rules_with_bucket_responses.go index f17487a85..4d871f9f4 100644 --- a/restapi/operations/admin_api/list_access_rules_with_bucket_responses.go +++ b/restapi/operations/bucket/list_access_rules_with_bucket_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_access_rules_with_bucket_urlbuilder.go b/restapi/operations/bucket/list_access_rules_with_bucket_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/list_access_rules_with_bucket_urlbuilder.go rename to restapi/operations/bucket/list_access_rules_with_bucket_urlbuilder.go index 700db269e..702e53ba2 100644 --- a/restapi/operations/admin_api/list_access_rules_with_bucket_urlbuilder.go +++ b/restapi/operations/bucket/list_access_rules_with_bucket_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/list_bucket_events.go b/restapi/operations/bucket/list_bucket_events.go similarity index 98% rename from restapi/operations/user_api/list_bucket_events.go rename to restapi/operations/bucket/list_bucket_events.go index 6497c4844..d943922c3 100644 --- a/restapi/operations/user_api/list_bucket_events.go +++ b/restapi/operations/bucket/list_bucket_events.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListBucketEvents(ctx *middleware.Context, handler ListBucketEventsHandle return &ListBucketEvents{Context: ctx, Handler: handler} } -/* ListBucketEvents swagger:route GET /buckets/{bucket_name}/events UserAPI listBucketEvents +/* ListBucketEvents swagger:route GET /buckets/{bucket_name}/events Bucket listBucketEvents List Bucket Events diff --git a/restapi/operations/user_api/list_bucket_events_parameters.go b/restapi/operations/bucket/list_bucket_events_parameters.go similarity index 99% rename from restapi/operations/user_api/list_bucket_events_parameters.go rename to restapi/operations/bucket/list_bucket_events_parameters.go index 223ddd4aa..bc5b65712 100644 --- a/restapi/operations/user_api/list_bucket_events_parameters.go +++ b/restapi/operations/bucket/list_bucket_events_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_bucket_events_responses.go b/restapi/operations/bucket/list_bucket_events_responses.go similarity index 99% rename from restapi/operations/user_api/list_bucket_events_responses.go rename to restapi/operations/bucket/list_bucket_events_responses.go index 58f87579f..07e1e4597 100644 --- a/restapi/operations/user_api/list_bucket_events_responses.go +++ b/restapi/operations/bucket/list_bucket_events_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_bucket_events_urlbuilder.go b/restapi/operations/bucket/list_bucket_events_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/list_bucket_events_urlbuilder.go rename to restapi/operations/bucket/list_bucket_events_urlbuilder.go index f80f0dd7d..ca212139b 100644 --- a/restapi/operations/user_api/list_bucket_events_urlbuilder.go +++ b/restapi/operations/bucket/list_bucket_events_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/list_buckets.go b/restapi/operations/bucket/list_buckets.go similarity index 97% rename from restapi/operations/user_api/list_buckets.go rename to restapi/operations/bucket/list_buckets.go index 0604dc972..95e6bd1c8 100644 --- a/restapi/operations/user_api/list_buckets.go +++ b/restapi/operations/bucket/list_buckets.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListBuckets(ctx *middleware.Context, handler ListBucketsHandler) *ListBu return &ListBuckets{Context: ctx, Handler: handler} } -/* ListBuckets swagger:route GET /buckets UserAPI listBuckets +/* ListBuckets swagger:route GET /buckets Bucket listBuckets List Buckets diff --git a/restapi/operations/user_api/list_buckets_parameters.go b/restapi/operations/bucket/list_buckets_parameters.go similarity index 99% rename from restapi/operations/user_api/list_buckets_parameters.go rename to restapi/operations/bucket/list_buckets_parameters.go index fd26f2583..1a804023a 100644 --- a/restapi/operations/user_api/list_buckets_parameters.go +++ b/restapi/operations/bucket/list_buckets_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_buckets_responses.go b/restapi/operations/bucket/list_buckets_responses.go similarity index 99% rename from restapi/operations/user_api/list_buckets_responses.go rename to restapi/operations/bucket/list_buckets_responses.go index 588ab2e76..420cba98c 100644 --- a/restapi/operations/user_api/list_buckets_responses.go +++ b/restapi/operations/bucket/list_buckets_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_buckets_urlbuilder.go b/restapi/operations/bucket/list_buckets_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/list_buckets_urlbuilder.go rename to restapi/operations/bucket/list_buckets_urlbuilder.go index 7626c249d..64b0012dc 100644 --- a/restapi/operations/user_api/list_buckets_urlbuilder.go +++ b/restapi/operations/bucket/list_buckets_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/list_external_buckets.go b/restapi/operations/bucket/list_external_buckets.go similarity index 98% rename from restapi/operations/user_api/list_external_buckets.go rename to restapi/operations/bucket/list_external_buckets.go index 0f2efee24..c31cd91f1 100644 --- a/restapi/operations/user_api/list_external_buckets.go +++ b/restapi/operations/bucket/list_external_buckets.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListExternalBuckets(ctx *middleware.Context, handler ListExternalBuckets return &ListExternalBuckets{Context: ctx, Handler: handler} } -/* ListExternalBuckets swagger:route POST /list-external-buckets UserAPI listExternalBuckets +/* ListExternalBuckets swagger:route POST /list-external-buckets Bucket listExternalBuckets Lists an External list of buckets using custom credentials diff --git a/restapi/operations/user_api/list_external_buckets_parameters.go b/restapi/operations/bucket/list_external_buckets_parameters.go similarity index 99% rename from restapi/operations/user_api/list_external_buckets_parameters.go rename to restapi/operations/bucket/list_external_buckets_parameters.go index 9cf72daf8..dffc29d26 100644 --- a/restapi/operations/user_api/list_external_buckets_parameters.go +++ b/restapi/operations/bucket/list_external_buckets_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_external_buckets_responses.go b/restapi/operations/bucket/list_external_buckets_responses.go similarity index 99% rename from restapi/operations/user_api/list_external_buckets_responses.go rename to restapi/operations/bucket/list_external_buckets_responses.go index eec0ac57d..6e192db8a 100644 --- a/restapi/operations/user_api/list_external_buckets_responses.go +++ b/restapi/operations/bucket/list_external_buckets_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_external_buckets_urlbuilder.go b/restapi/operations/bucket/list_external_buckets_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/list_external_buckets_urlbuilder.go rename to restapi/operations/bucket/list_external_buckets_urlbuilder.go index b77bd9e85..e1fd55b2e 100644 --- a/restapi/operations/user_api/list_external_buckets_urlbuilder.go +++ b/restapi/operations/bucket/list_external_buckets_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/list_policies_with_bucket.go b/restapi/operations/bucket/list_policies_with_bucket.go similarity index 98% rename from restapi/operations/admin_api/list_policies_with_bucket.go rename to restapi/operations/bucket/list_policies_with_bucket.go index ac95a32aa..4b767a2a4 100644 --- a/restapi/operations/admin_api/list_policies_with_bucket.go +++ b/restapi/operations/bucket/list_policies_with_bucket.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListPoliciesWithBucket(ctx *middleware.Context, handler ListPoliciesWith return &ListPoliciesWithBucket{Context: ctx, Handler: handler} } -/* ListPoliciesWithBucket swagger:route GET /bucket-policy/{bucket} AdminAPI listPoliciesWithBucket +/* ListPoliciesWithBucket swagger:route GET /bucket-policy/{bucket} Bucket listPoliciesWithBucket List Policies With Given Bucket diff --git a/restapi/operations/admin_api/list_policies_with_bucket_parameters.go b/restapi/operations/bucket/list_policies_with_bucket_parameters.go similarity index 99% rename from restapi/operations/admin_api/list_policies_with_bucket_parameters.go rename to restapi/operations/bucket/list_policies_with_bucket_parameters.go index d64a71353..e2cdae1e5 100644 --- a/restapi/operations/admin_api/list_policies_with_bucket_parameters.go +++ b/restapi/operations/bucket/list_policies_with_bucket_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_policies_with_bucket_responses.go b/restapi/operations/bucket/list_policies_with_bucket_responses.go similarity index 99% rename from restapi/operations/admin_api/list_policies_with_bucket_responses.go rename to restapi/operations/bucket/list_policies_with_bucket_responses.go index 375f0fb0c..72e97472f 100644 --- a/restapi/operations/admin_api/list_policies_with_bucket_responses.go +++ b/restapi/operations/bucket/list_policies_with_bucket_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_policies_with_bucket_urlbuilder.go b/restapi/operations/bucket/list_policies_with_bucket_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/list_policies_with_bucket_urlbuilder.go rename to restapi/operations/bucket/list_policies_with_bucket_urlbuilder.go index 5a6411fa8..a01b2948f 100644 --- a/restapi/operations/admin_api/list_policies_with_bucket_urlbuilder.go +++ b/restapi/operations/bucket/list_policies_with_bucket_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/list_remote_buckets.go b/restapi/operations/bucket/list_remote_buckets.go similarity index 96% rename from restapi/operations/user_api/list_remote_buckets.go rename to restapi/operations/bucket/list_remote_buckets.go index 3c1d1977a..e5512f403 100644 --- a/restapi/operations/user_api/list_remote_buckets.go +++ b/restapi/operations/bucket/list_remote_buckets.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListRemoteBuckets(ctx *middleware.Context, handler ListRemoteBucketsHand return &ListRemoteBuckets{Context: ctx, Handler: handler} } -/* ListRemoteBuckets swagger:route GET /remote-buckets UserAPI listRemoteBuckets +/* ListRemoteBuckets swagger:route GET /remote-buckets Bucket listRemoteBuckets List Remote Buckets diff --git a/restapi/operations/user_api/list_remote_buckets_parameters.go b/restapi/operations/bucket/list_remote_buckets_parameters.go similarity index 99% rename from restapi/operations/user_api/list_remote_buckets_parameters.go rename to restapi/operations/bucket/list_remote_buckets_parameters.go index 317eda9ab..556d5bd86 100644 --- a/restapi/operations/user_api/list_remote_buckets_parameters.go +++ b/restapi/operations/bucket/list_remote_buckets_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_remote_buckets_responses.go b/restapi/operations/bucket/list_remote_buckets_responses.go similarity index 99% rename from restapi/operations/user_api/list_remote_buckets_responses.go rename to restapi/operations/bucket/list_remote_buckets_responses.go index 0db1bae91..b82a38e91 100644 --- a/restapi/operations/user_api/list_remote_buckets_responses.go +++ b/restapi/operations/bucket/list_remote_buckets_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_remote_buckets_urlbuilder.go b/restapi/operations/bucket/list_remote_buckets_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/list_remote_buckets_urlbuilder.go rename to restapi/operations/bucket/list_remote_buckets_urlbuilder.go index d83ce98e8..6813b897b 100644 --- a/restapi/operations/user_api/list_remote_buckets_urlbuilder.go +++ b/restapi/operations/bucket/list_remote_buckets_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/list_users_with_access_to_bucket.go b/restapi/operations/bucket/list_users_with_access_to_bucket.go similarity index 98% rename from restapi/operations/admin_api/list_users_with_access_to_bucket.go rename to restapi/operations/bucket/list_users_with_access_to_bucket.go index ba3ca0125..db6f9faf6 100644 --- a/restapi/operations/admin_api/list_users_with_access_to_bucket.go +++ b/restapi/operations/bucket/list_users_with_access_to_bucket.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListUsersWithAccessToBucket(ctx *middleware.Context, handler ListUsersWi return &ListUsersWithAccessToBucket{Context: ctx, Handler: handler} } -/* ListUsersWithAccessToBucket swagger:route GET /bucket-users/{bucket} AdminAPI listUsersWithAccessToBucket +/* ListUsersWithAccessToBucket swagger:route GET /bucket-users/{bucket} Bucket listUsersWithAccessToBucket List Users With Access to a Given Bucket diff --git a/restapi/operations/admin_api/list_users_with_access_to_bucket_parameters.go b/restapi/operations/bucket/list_users_with_access_to_bucket_parameters.go similarity index 99% rename from restapi/operations/admin_api/list_users_with_access_to_bucket_parameters.go rename to restapi/operations/bucket/list_users_with_access_to_bucket_parameters.go index ff46aa45f..80484f909 100644 --- a/restapi/operations/admin_api/list_users_with_access_to_bucket_parameters.go +++ b/restapi/operations/bucket/list_users_with_access_to_bucket_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_users_with_access_to_bucket_responses.go b/restapi/operations/bucket/list_users_with_access_to_bucket_responses.go similarity index 99% rename from restapi/operations/admin_api/list_users_with_access_to_bucket_responses.go rename to restapi/operations/bucket/list_users_with_access_to_bucket_responses.go index 4361db119..31df7c44f 100644 --- a/restapi/operations/admin_api/list_users_with_access_to_bucket_responses.go +++ b/restapi/operations/bucket/list_users_with_access_to_bucket_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_users_with_access_to_bucket_urlbuilder.go b/restapi/operations/bucket/list_users_with_access_to_bucket_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/list_users_with_access_to_bucket_urlbuilder.go rename to restapi/operations/bucket/list_users_with_access_to_bucket_urlbuilder.go index c32c78853..c7bc1b7cd 100644 --- a/restapi/operations/admin_api/list_users_with_access_to_bucket_urlbuilder.go +++ b/restapi/operations/bucket/list_users_with_access_to_bucket_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/make_bucket.go b/restapi/operations/bucket/make_bucket.go similarity index 97% rename from restapi/operations/user_api/make_bucket.go rename to restapi/operations/bucket/make_bucket.go index df22f748e..68a6e582e 100644 --- a/restapi/operations/user_api/make_bucket.go +++ b/restapi/operations/bucket/make_bucket.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewMakeBucket(ctx *middleware.Context, handler MakeBucketHandler) *MakeBuck return &MakeBucket{Context: ctx, Handler: handler} } -/* MakeBucket swagger:route POST /buckets UserAPI makeBucket +/* MakeBucket swagger:route POST /buckets Bucket makeBucket Make bucket diff --git a/restapi/operations/user_api/make_bucket_parameters.go b/restapi/operations/bucket/make_bucket_parameters.go similarity index 99% rename from restapi/operations/user_api/make_bucket_parameters.go rename to restapi/operations/bucket/make_bucket_parameters.go index 68a672181..afdf48326 100644 --- a/restapi/operations/user_api/make_bucket_parameters.go +++ b/restapi/operations/bucket/make_bucket_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/make_bucket_responses.go b/restapi/operations/bucket/make_bucket_responses.go similarity index 99% rename from restapi/operations/user_api/make_bucket_responses.go rename to restapi/operations/bucket/make_bucket_responses.go index 8bdd2fa19..764fe248a 100644 --- a/restapi/operations/user_api/make_bucket_responses.go +++ b/restapi/operations/bucket/make_bucket_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/make_bucket_urlbuilder.go b/restapi/operations/bucket/make_bucket_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/make_bucket_urlbuilder.go rename to restapi/operations/bucket/make_bucket_urlbuilder.go index dbe356f6a..f2dd0ba9a 100644 --- a/restapi/operations/user_api/make_bucket_urlbuilder.go +++ b/restapi/operations/bucket/make_bucket_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/put_bucket_tags.go b/restapi/operations/bucket/put_bucket_tags.go similarity index 96% rename from restapi/operations/user_api/put_bucket_tags.go rename to restapi/operations/bucket/put_bucket_tags.go index 879f9ba51..3ba6af575 100644 --- a/restapi/operations/user_api/put_bucket_tags.go +++ b/restapi/operations/bucket/put_bucket_tags.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewPutBucketTags(ctx *middleware.Context, handler PutBucketTagsHandler) *Pu return &PutBucketTags{Context: ctx, Handler: handler} } -/* PutBucketTags swagger:route PUT /buckets/{bucket_name}/tags UserAPI putBucketTags +/* PutBucketTags swagger:route PUT /buckets/{bucket_name}/tags Bucket putBucketTags Put Bucket's tags diff --git a/restapi/operations/user_api/put_bucket_tags_parameters.go b/restapi/operations/bucket/put_bucket_tags_parameters.go similarity index 99% rename from restapi/operations/user_api/put_bucket_tags_parameters.go rename to restapi/operations/bucket/put_bucket_tags_parameters.go index 97444fa1d..2cee11e0a 100644 --- a/restapi/operations/user_api/put_bucket_tags_parameters.go +++ b/restapi/operations/bucket/put_bucket_tags_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/put_bucket_tags_responses.go b/restapi/operations/bucket/put_bucket_tags_responses.go similarity index 99% rename from restapi/operations/user_api/put_bucket_tags_responses.go rename to restapi/operations/bucket/put_bucket_tags_responses.go index 551e71c3f..8435124f6 100644 --- a/restapi/operations/user_api/put_bucket_tags_responses.go +++ b/restapi/operations/bucket/put_bucket_tags_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/put_bucket_tags_urlbuilder.go b/restapi/operations/bucket/put_bucket_tags_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/put_bucket_tags_urlbuilder.go rename to restapi/operations/bucket/put_bucket_tags_urlbuilder.go index 211e636f0..61b9469d5 100644 --- a/restapi/operations/user_api/put_bucket_tags_urlbuilder.go +++ b/restapi/operations/bucket/put_bucket_tags_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/remote_bucket_details.go b/restapi/operations/bucket/remote_bucket_details.go similarity index 98% rename from restapi/operations/user_api/remote_bucket_details.go rename to restapi/operations/bucket/remote_bucket_details.go index ae3041b8f..ee7d96344 100644 --- a/restapi/operations/user_api/remote_bucket_details.go +++ b/restapi/operations/bucket/remote_bucket_details.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewRemoteBucketDetails(ctx *middleware.Context, handler RemoteBucketDetails return &RemoteBucketDetails{Context: ctx, Handler: handler} } -/* RemoteBucketDetails swagger:route GET /remote-buckets/{name} UserAPI remoteBucketDetails +/* RemoteBucketDetails swagger:route GET /remote-buckets/{name} Bucket remoteBucketDetails Remote Bucket Details diff --git a/restapi/operations/user_api/remote_bucket_details_parameters.go b/restapi/operations/bucket/remote_bucket_details_parameters.go similarity index 99% rename from restapi/operations/user_api/remote_bucket_details_parameters.go rename to restapi/operations/bucket/remote_bucket_details_parameters.go index 659b59c2c..04ebcc2fd 100644 --- a/restapi/operations/user_api/remote_bucket_details_parameters.go +++ b/restapi/operations/bucket/remote_bucket_details_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/remote_bucket_details_responses.go b/restapi/operations/bucket/remote_bucket_details_responses.go similarity index 99% rename from restapi/operations/user_api/remote_bucket_details_responses.go rename to restapi/operations/bucket/remote_bucket_details_responses.go index b9cc9d213..0c93fa52d 100644 --- a/restapi/operations/user_api/remote_bucket_details_responses.go +++ b/restapi/operations/bucket/remote_bucket_details_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/remote_bucket_details_urlbuilder.go b/restapi/operations/bucket/remote_bucket_details_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/remote_bucket_details_urlbuilder.go rename to restapi/operations/bucket/remote_bucket_details_urlbuilder.go index 148b17c2f..08a1c5a9c 100644 --- a/restapi/operations/user_api/remote_bucket_details_urlbuilder.go +++ b/restapi/operations/bucket/remote_bucket_details_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/set_access_rule_with_bucket.go b/restapi/operations/bucket/set_access_rule_with_bucket.go similarity index 98% rename from restapi/operations/admin_api/set_access_rule_with_bucket.go rename to restapi/operations/bucket/set_access_rule_with_bucket.go index 69a083b07..b0b0c09ce 100644 --- a/restapi/operations/admin_api/set_access_rule_with_bucket.go +++ b/restapi/operations/bucket/set_access_rule_with_bucket.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSetAccessRuleWithBucket(ctx *middleware.Context, handler SetAccessRuleWi return &SetAccessRuleWithBucket{Context: ctx, Handler: handler} } -/* SetAccessRuleWithBucket swagger:route PUT /bucket/{bucket}/access-rules AdminAPI setAccessRuleWithBucket +/* SetAccessRuleWithBucket swagger:route PUT /bucket/{bucket}/access-rules Bucket setAccessRuleWithBucket Add Access Rule To Given Bucket diff --git a/restapi/operations/admin_api/set_access_rule_with_bucket_parameters.go b/restapi/operations/bucket/set_access_rule_with_bucket_parameters.go similarity index 99% rename from restapi/operations/admin_api/set_access_rule_with_bucket_parameters.go rename to restapi/operations/bucket/set_access_rule_with_bucket_parameters.go index e2a820f19..77f7b7f5e 100644 --- a/restapi/operations/admin_api/set_access_rule_with_bucket_parameters.go +++ b/restapi/operations/bucket/set_access_rule_with_bucket_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/set_access_rule_with_bucket_responses.go b/restapi/operations/bucket/set_access_rule_with_bucket_responses.go similarity index 99% rename from restapi/operations/admin_api/set_access_rule_with_bucket_responses.go rename to restapi/operations/bucket/set_access_rule_with_bucket_responses.go index c19ef5757..560d53d0e 100644 --- a/restapi/operations/admin_api/set_access_rule_with_bucket_responses.go +++ b/restapi/operations/bucket/set_access_rule_with_bucket_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/set_access_rule_with_bucket_urlbuilder.go b/restapi/operations/bucket/set_access_rule_with_bucket_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/set_access_rule_with_bucket_urlbuilder.go rename to restapi/operations/bucket/set_access_rule_with_bucket_urlbuilder.go index baf76c34c..7e5ae5c29 100644 --- a/restapi/operations/admin_api/set_access_rule_with_bucket_urlbuilder.go +++ b/restapi/operations/bucket/set_access_rule_with_bucket_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/set_bucket_quota.go b/restapi/operations/bucket/set_bucket_quota.go similarity index 96% rename from restapi/operations/user_api/set_bucket_quota.go rename to restapi/operations/bucket/set_bucket_quota.go index 2cebbba49..1e18ae747 100644 --- a/restapi/operations/user_api/set_bucket_quota.go +++ b/restapi/operations/bucket/set_bucket_quota.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSetBucketQuota(ctx *middleware.Context, handler SetBucketQuotaHandler) * return &SetBucketQuota{Context: ctx, Handler: handler} } -/* SetBucketQuota swagger:route PUT /buckets/{name}/quota UserAPI setBucketQuota +/* SetBucketQuota swagger:route PUT /buckets/{name}/quota Bucket setBucketQuota Bucket Quota diff --git a/restapi/operations/user_api/set_bucket_quota_parameters.go b/restapi/operations/bucket/set_bucket_quota_parameters.go similarity index 99% rename from restapi/operations/user_api/set_bucket_quota_parameters.go rename to restapi/operations/bucket/set_bucket_quota_parameters.go index 559bcc6cc..f8327e95c 100644 --- a/restapi/operations/user_api/set_bucket_quota_parameters.go +++ b/restapi/operations/bucket/set_bucket_quota_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/set_bucket_quota_responses.go b/restapi/operations/bucket/set_bucket_quota_responses.go similarity index 99% rename from restapi/operations/user_api/set_bucket_quota_responses.go rename to restapi/operations/bucket/set_bucket_quota_responses.go index 7f20cb69a..568a2ef42 100644 --- a/restapi/operations/user_api/set_bucket_quota_responses.go +++ b/restapi/operations/bucket/set_bucket_quota_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/set_bucket_quota_urlbuilder.go b/restapi/operations/bucket/set_bucket_quota_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/set_bucket_quota_urlbuilder.go rename to restapi/operations/bucket/set_bucket_quota_urlbuilder.go index 55c734f7d..7a456a6b0 100644 --- a/restapi/operations/user_api/set_bucket_quota_urlbuilder.go +++ b/restapi/operations/bucket/set_bucket_quota_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/set_bucket_retention_config.go b/restapi/operations/bucket/set_bucket_retention_config.go similarity index 97% rename from restapi/operations/user_api/set_bucket_retention_config.go rename to restapi/operations/bucket/set_bucket_retention_config.go index c774b71f6..9c7654035 100644 --- a/restapi/operations/user_api/set_bucket_retention_config.go +++ b/restapi/operations/bucket/set_bucket_retention_config.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSetBucketRetentionConfig(ctx *middleware.Context, handler SetBucketReten return &SetBucketRetentionConfig{Context: ctx, Handler: handler} } -/* SetBucketRetentionConfig swagger:route PUT /buckets/{bucket_name}/retention UserAPI setBucketRetentionConfig +/* SetBucketRetentionConfig swagger:route PUT /buckets/{bucket_name}/retention Bucket setBucketRetentionConfig Set Bucket's retention config diff --git a/restapi/operations/user_api/set_bucket_retention_config_parameters.go b/restapi/operations/bucket/set_bucket_retention_config_parameters.go similarity index 99% rename from restapi/operations/user_api/set_bucket_retention_config_parameters.go rename to restapi/operations/bucket/set_bucket_retention_config_parameters.go index d93567383..91e76d363 100644 --- a/restapi/operations/user_api/set_bucket_retention_config_parameters.go +++ b/restapi/operations/bucket/set_bucket_retention_config_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/set_bucket_retention_config_responses.go b/restapi/operations/bucket/set_bucket_retention_config_responses.go similarity index 99% rename from restapi/operations/user_api/set_bucket_retention_config_responses.go rename to restapi/operations/bucket/set_bucket_retention_config_responses.go index 74099e775..9a49a5421 100644 --- a/restapi/operations/user_api/set_bucket_retention_config_responses.go +++ b/restapi/operations/bucket/set_bucket_retention_config_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/set_bucket_retention_config_urlbuilder.go b/restapi/operations/bucket/set_bucket_retention_config_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/set_bucket_retention_config_urlbuilder.go rename to restapi/operations/bucket/set_bucket_retention_config_urlbuilder.go index eb3dc36b3..c36bf0818 100644 --- a/restapi/operations/user_api/set_bucket_retention_config_urlbuilder.go +++ b/restapi/operations/bucket/set_bucket_retention_config_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/set_bucket_versioning.go b/restapi/operations/bucket/set_bucket_versioning.go similarity index 98% rename from restapi/operations/user_api/set_bucket_versioning.go rename to restapi/operations/bucket/set_bucket_versioning.go index 074a1ffa6..383611992 100644 --- a/restapi/operations/user_api/set_bucket_versioning.go +++ b/restapi/operations/bucket/set_bucket_versioning.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSetBucketVersioning(ctx *middleware.Context, handler SetBucketVersioning return &SetBucketVersioning{Context: ctx, Handler: handler} } -/* SetBucketVersioning swagger:route PUT /buckets/{bucket_name}/versioning UserAPI setBucketVersioning +/* SetBucketVersioning swagger:route PUT /buckets/{bucket_name}/versioning Bucket setBucketVersioning Set Bucket Versioning diff --git a/restapi/operations/user_api/set_bucket_versioning_parameters.go b/restapi/operations/bucket/set_bucket_versioning_parameters.go similarity index 99% rename from restapi/operations/user_api/set_bucket_versioning_parameters.go rename to restapi/operations/bucket/set_bucket_versioning_parameters.go index 745970891..d2871f208 100644 --- a/restapi/operations/user_api/set_bucket_versioning_parameters.go +++ b/restapi/operations/bucket/set_bucket_versioning_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/set_bucket_versioning_responses.go b/restapi/operations/bucket/set_bucket_versioning_responses.go similarity index 99% rename from restapi/operations/user_api/set_bucket_versioning_responses.go rename to restapi/operations/bucket/set_bucket_versioning_responses.go index 1a651639c..1a5726c17 100644 --- a/restapi/operations/user_api/set_bucket_versioning_responses.go +++ b/restapi/operations/bucket/set_bucket_versioning_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/set_bucket_versioning_urlbuilder.go b/restapi/operations/bucket/set_bucket_versioning_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/set_bucket_versioning_urlbuilder.go rename to restapi/operations/bucket/set_bucket_versioning_urlbuilder.go index cc0594ec3..7f4f0875f 100644 --- a/restapi/operations/user_api/set_bucket_versioning_urlbuilder.go +++ b/restapi/operations/bucket/set_bucket_versioning_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/set_multi_bucket_replication.go b/restapi/operations/bucket/set_multi_bucket_replication.go similarity index 98% rename from restapi/operations/user_api/set_multi_bucket_replication.go rename to restapi/operations/bucket/set_multi_bucket_replication.go index aa82be02b..69a169c06 100644 --- a/restapi/operations/user_api/set_multi_bucket_replication.go +++ b/restapi/operations/bucket/set_multi_bucket_replication.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSetMultiBucketReplication(ctx *middleware.Context, handler SetMultiBucke return &SetMultiBucketReplication{Context: ctx, Handler: handler} } -/* SetMultiBucketReplication swagger:route POST /buckets-replication UserAPI setMultiBucketReplication +/* SetMultiBucketReplication swagger:route POST /buckets-replication Bucket setMultiBucketReplication Sets Multi Bucket Replication in multiple Buckets diff --git a/restapi/operations/user_api/set_multi_bucket_replication_parameters.go b/restapi/operations/bucket/set_multi_bucket_replication_parameters.go similarity index 99% rename from restapi/operations/user_api/set_multi_bucket_replication_parameters.go rename to restapi/operations/bucket/set_multi_bucket_replication_parameters.go index 3930f58ec..e4af80c4b 100644 --- a/restapi/operations/user_api/set_multi_bucket_replication_parameters.go +++ b/restapi/operations/bucket/set_multi_bucket_replication_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/set_multi_bucket_replication_responses.go b/restapi/operations/bucket/set_multi_bucket_replication_responses.go similarity index 99% rename from restapi/operations/user_api/set_multi_bucket_replication_responses.go rename to restapi/operations/bucket/set_multi_bucket_replication_responses.go index 70bdce637..b896c206d 100644 --- a/restapi/operations/user_api/set_multi_bucket_replication_responses.go +++ b/restapi/operations/bucket/set_multi_bucket_replication_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/set_multi_bucket_replication_urlbuilder.go b/restapi/operations/bucket/set_multi_bucket_replication_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/set_multi_bucket_replication_urlbuilder.go rename to restapi/operations/bucket/set_multi_bucket_replication_urlbuilder.go index 745289f0a..365954a7a 100644 --- a/restapi/operations/user_api/set_multi_bucket_replication_urlbuilder.go +++ b/restapi/operations/bucket/set_multi_bucket_replication_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/update_bucket_lifecycle.go b/restapi/operations/bucket/update_bucket_lifecycle.go similarity index 97% rename from restapi/operations/user_api/update_bucket_lifecycle.go rename to restapi/operations/bucket/update_bucket_lifecycle.go index 0110780b4..52dcc20ee 100644 --- a/restapi/operations/user_api/update_bucket_lifecycle.go +++ b/restapi/operations/bucket/update_bucket_lifecycle.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewUpdateBucketLifecycle(ctx *middleware.Context, handler UpdateBucketLifec return &UpdateBucketLifecycle{Context: ctx, Handler: handler} } -/* UpdateBucketLifecycle swagger:route PUT /buckets/{bucket_name}/lifecycle/{lifecycle_id} UserAPI updateBucketLifecycle +/* UpdateBucketLifecycle swagger:route PUT /buckets/{bucket_name}/lifecycle/{lifecycle_id} Bucket updateBucketLifecycle Update Lifecycle rule diff --git a/restapi/operations/user_api/update_bucket_lifecycle_parameters.go b/restapi/operations/bucket/update_bucket_lifecycle_parameters.go similarity index 99% rename from restapi/operations/user_api/update_bucket_lifecycle_parameters.go rename to restapi/operations/bucket/update_bucket_lifecycle_parameters.go index 6c977baed..adf880cb0 100644 --- a/restapi/operations/user_api/update_bucket_lifecycle_parameters.go +++ b/restapi/operations/bucket/update_bucket_lifecycle_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/update_bucket_lifecycle_responses.go b/restapi/operations/bucket/update_bucket_lifecycle_responses.go similarity index 99% rename from restapi/operations/user_api/update_bucket_lifecycle_responses.go rename to restapi/operations/bucket/update_bucket_lifecycle_responses.go index 080c2d6e6..0f9ebe824 100644 --- a/restapi/operations/user_api/update_bucket_lifecycle_responses.go +++ b/restapi/operations/bucket/update_bucket_lifecycle_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/update_bucket_lifecycle_urlbuilder.go b/restapi/operations/bucket/update_bucket_lifecycle_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/update_bucket_lifecycle_urlbuilder.go rename to restapi/operations/bucket/update_bucket_lifecycle_urlbuilder.go index 53fdf93da..690c680f2 100644 --- a/restapi/operations/user_api/update_bucket_lifecycle_urlbuilder.go +++ b/restapi/operations/bucket/update_bucket_lifecycle_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/update_multi_bucket_replication.go b/restapi/operations/bucket/update_multi_bucket_replication.go similarity index 97% rename from restapi/operations/user_api/update_multi_bucket_replication.go rename to restapi/operations/bucket/update_multi_bucket_replication.go index f573906bf..eb498d844 100644 --- a/restapi/operations/user_api/update_multi_bucket_replication.go +++ b/restapi/operations/bucket/update_multi_bucket_replication.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewUpdateMultiBucketReplication(ctx *middleware.Context, handler UpdateMult return &UpdateMultiBucketReplication{Context: ctx, Handler: handler} } -/* UpdateMultiBucketReplication swagger:route PUT /buckets/{bucket_name}/replication/{rule_id} UserAPI updateMultiBucketReplication +/* UpdateMultiBucketReplication swagger:route PUT /buckets/{bucket_name}/replication/{rule_id} Bucket updateMultiBucketReplication Update Replication rule diff --git a/restapi/operations/user_api/update_multi_bucket_replication_parameters.go b/restapi/operations/bucket/update_multi_bucket_replication_parameters.go similarity index 99% rename from restapi/operations/user_api/update_multi_bucket_replication_parameters.go rename to restapi/operations/bucket/update_multi_bucket_replication_parameters.go index c8fa92bdc..4b2efda4c 100644 --- a/restapi/operations/user_api/update_multi_bucket_replication_parameters.go +++ b/restapi/operations/bucket/update_multi_bucket_replication_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/update_multi_bucket_replication_responses.go b/restapi/operations/bucket/update_multi_bucket_replication_responses.go similarity index 99% rename from restapi/operations/user_api/update_multi_bucket_replication_responses.go rename to restapi/operations/bucket/update_multi_bucket_replication_responses.go index 5fc4eaf12..4c0bb342b 100644 --- a/restapi/operations/user_api/update_multi_bucket_replication_responses.go +++ b/restapi/operations/bucket/update_multi_bucket_replication_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/update_multi_bucket_replication_urlbuilder.go b/restapi/operations/bucket/update_multi_bucket_replication_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/update_multi_bucket_replication_urlbuilder.go rename to restapi/operations/bucket/update_multi_bucket_replication_urlbuilder.go index bf00ee518..1cd21f35c 100644 --- a/restapi/operations/user_api/update_multi_bucket_replication_urlbuilder.go +++ b/restapi/operations/bucket/update_multi_bucket_replication_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package bucket // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/add_notification_endpoint.go b/restapi/operations/configuration/add_notification_endpoint.go similarity index 97% rename from restapi/operations/admin_api/add_notification_endpoint.go rename to restapi/operations/configuration/add_notification_endpoint.go index a5d3d7796..4103d7fc5 100644 --- a/restapi/operations/admin_api/add_notification_endpoint.go +++ b/restapi/operations/configuration/add_notification_endpoint.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewAddNotificationEndpoint(ctx *middleware.Context, handler AddNotification return &AddNotificationEndpoint{Context: ctx, Handler: handler} } -/* AddNotificationEndpoint swagger:route POST /admin/notification_endpoints AdminAPI addNotificationEndpoint +/* AddNotificationEndpoint swagger:route POST /admin/notification_endpoints Configuration addNotificationEndpoint Allows to configure a new notification endpoint diff --git a/restapi/operations/admin_api/add_notification_endpoint_parameters.go b/restapi/operations/configuration/add_notification_endpoint_parameters.go similarity index 99% rename from restapi/operations/admin_api/add_notification_endpoint_parameters.go rename to restapi/operations/configuration/add_notification_endpoint_parameters.go index 604ff1f5e..bd98828df 100644 --- a/restapi/operations/admin_api/add_notification_endpoint_parameters.go +++ b/restapi/operations/configuration/add_notification_endpoint_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/add_notification_endpoint_responses.go b/restapi/operations/configuration/add_notification_endpoint_responses.go similarity index 99% rename from restapi/operations/admin_api/add_notification_endpoint_responses.go rename to restapi/operations/configuration/add_notification_endpoint_responses.go index 92430c057..d4c53123b 100644 --- a/restapi/operations/admin_api/add_notification_endpoint_responses.go +++ b/restapi/operations/configuration/add_notification_endpoint_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/add_notification_endpoint_urlbuilder.go b/restapi/operations/configuration/add_notification_endpoint_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/add_notification_endpoint_urlbuilder.go rename to restapi/operations/configuration/add_notification_endpoint_urlbuilder.go index 6c4bb447d..a12136600 100644 --- a/restapi/operations/admin_api/add_notification_endpoint_urlbuilder.go +++ b/restapi/operations/configuration/add_notification_endpoint_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/config_info.go b/restapi/operations/configuration/config_info.go similarity index 96% rename from restapi/operations/admin_api/config_info.go rename to restapi/operations/configuration/config_info.go index 647b14282..0b1dd9a15 100644 --- a/restapi/operations/admin_api/config_info.go +++ b/restapi/operations/configuration/config_info.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewConfigInfo(ctx *middleware.Context, handler ConfigInfoHandler) *ConfigIn return &ConfigInfo{Context: ctx, Handler: handler} } -/* ConfigInfo swagger:route GET /configs/{name} AdminAPI configInfo +/* ConfigInfo swagger:route GET /configs/{name} Configuration configInfo Configuration info diff --git a/restapi/operations/admin_api/config_info_parameters.go b/restapi/operations/configuration/config_info_parameters.go similarity index 99% rename from restapi/operations/admin_api/config_info_parameters.go rename to restapi/operations/configuration/config_info_parameters.go index f06a7c2f7..4fd1f53e3 100644 --- a/restapi/operations/admin_api/config_info_parameters.go +++ b/restapi/operations/configuration/config_info_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/config_info_responses.go b/restapi/operations/configuration/config_info_responses.go similarity index 99% rename from restapi/operations/admin_api/config_info_responses.go rename to restapi/operations/configuration/config_info_responses.go index 19a474260..9cf0aeb4f 100644 --- a/restapi/operations/admin_api/config_info_responses.go +++ b/restapi/operations/configuration/config_info_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/config_info_urlbuilder.go b/restapi/operations/configuration/config_info_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/config_info_urlbuilder.go rename to restapi/operations/configuration/config_info_urlbuilder.go index 05588c439..28ee9f4c1 100644 --- a/restapi/operations/admin_api/config_info_urlbuilder.go +++ b/restapi/operations/configuration/config_info_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/list_config.go b/restapi/operations/configuration/list_config.go similarity index 96% rename from restapi/operations/admin_api/list_config.go rename to restapi/operations/configuration/list_config.go index 020324744..da2e2864b 100644 --- a/restapi/operations/admin_api/list_config.go +++ b/restapi/operations/configuration/list_config.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListConfig(ctx *middleware.Context, handler ListConfigHandler) *ListConf return &ListConfig{Context: ctx, Handler: handler} } -/* ListConfig swagger:route GET /configs AdminAPI listConfig +/* ListConfig swagger:route GET /configs Configuration listConfig List Configurations diff --git a/restapi/operations/admin_api/list_config_parameters.go b/restapi/operations/configuration/list_config_parameters.go similarity index 99% rename from restapi/operations/admin_api/list_config_parameters.go rename to restapi/operations/configuration/list_config_parameters.go index 84e8282ed..c6fc54745 100644 --- a/restapi/operations/admin_api/list_config_parameters.go +++ b/restapi/operations/configuration/list_config_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_config_responses.go b/restapi/operations/configuration/list_config_responses.go similarity index 99% rename from restapi/operations/admin_api/list_config_responses.go rename to restapi/operations/configuration/list_config_responses.go index 4836d5d42..8d35dcc24 100644 --- a/restapi/operations/admin_api/list_config_responses.go +++ b/restapi/operations/configuration/list_config_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_config_urlbuilder.go b/restapi/operations/configuration/list_config_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/list_config_urlbuilder.go rename to restapi/operations/configuration/list_config_urlbuilder.go index a850bc22e..5719afb43 100644 --- a/restapi/operations/admin_api/list_config_urlbuilder.go +++ b/restapi/operations/configuration/list_config_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/notification_endpoint_list.go b/restapi/operations/configuration/notification_endpoint_list.go similarity index 97% rename from restapi/operations/admin_api/notification_endpoint_list.go rename to restapi/operations/configuration/notification_endpoint_list.go index adfbf14fb..33db1d745 100644 --- a/restapi/operations/admin_api/notification_endpoint_list.go +++ b/restapi/operations/configuration/notification_endpoint_list.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewNotificationEndpointList(ctx *middleware.Context, handler NotificationEn return &NotificationEndpointList{Context: ctx, Handler: handler} } -/* NotificationEndpointList swagger:route GET /admin/notification_endpoints AdminAPI notificationEndpointList +/* NotificationEndpointList swagger:route GET /admin/notification_endpoints Configuration notificationEndpointList Returns a list of active notification endpoints diff --git a/restapi/operations/admin_api/notification_endpoint_list_parameters.go b/restapi/operations/configuration/notification_endpoint_list_parameters.go similarity index 98% rename from restapi/operations/admin_api/notification_endpoint_list_parameters.go rename to restapi/operations/configuration/notification_endpoint_list_parameters.go index 27d1c994c..1f84d7c61 100644 --- a/restapi/operations/admin_api/notification_endpoint_list_parameters.go +++ b/restapi/operations/configuration/notification_endpoint_list_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/notification_endpoint_list_responses.go b/restapi/operations/configuration/notification_endpoint_list_responses.go similarity index 99% rename from restapi/operations/admin_api/notification_endpoint_list_responses.go rename to restapi/operations/configuration/notification_endpoint_list_responses.go index abf03fb41..0989e2112 100644 --- a/restapi/operations/admin_api/notification_endpoint_list_responses.go +++ b/restapi/operations/configuration/notification_endpoint_list_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/notification_endpoint_list_urlbuilder.go b/restapi/operations/configuration/notification_endpoint_list_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/notification_endpoint_list_urlbuilder.go rename to restapi/operations/configuration/notification_endpoint_list_urlbuilder.go index 5dc51657f..cee520740 100644 --- a/restapi/operations/admin_api/notification_endpoint_list_urlbuilder.go +++ b/restapi/operations/configuration/notification_endpoint_list_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/reset_config.go b/restapi/operations/configuration/reset_config.go similarity index 96% rename from restapi/operations/admin_api/reset_config.go rename to restapi/operations/configuration/reset_config.go index be2ecff93..36d41d1a1 100644 --- a/restapi/operations/admin_api/reset_config.go +++ b/restapi/operations/configuration/reset_config.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewResetConfig(ctx *middleware.Context, handler ResetConfigHandler) *ResetC return &ResetConfig{Context: ctx, Handler: handler} } -/* ResetConfig swagger:route GET /configs/{name}/reset AdminAPI resetConfig +/* ResetConfig swagger:route GET /configs/{name}/reset Configuration resetConfig Configuration reset diff --git a/restapi/operations/admin_api/reset_config_parameters.go b/restapi/operations/configuration/reset_config_parameters.go similarity index 99% rename from restapi/operations/admin_api/reset_config_parameters.go rename to restapi/operations/configuration/reset_config_parameters.go index 6806ee783..0e00d5b9e 100644 --- a/restapi/operations/admin_api/reset_config_parameters.go +++ b/restapi/operations/configuration/reset_config_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/reset_config_responses.go b/restapi/operations/configuration/reset_config_responses.go similarity index 99% rename from restapi/operations/admin_api/reset_config_responses.go rename to restapi/operations/configuration/reset_config_responses.go index dd618d1a2..f731bf1b5 100644 --- a/restapi/operations/admin_api/reset_config_responses.go +++ b/restapi/operations/configuration/reset_config_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/reset_config_urlbuilder.go b/restapi/operations/configuration/reset_config_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/reset_config_urlbuilder.go rename to restapi/operations/configuration/reset_config_urlbuilder.go index 7d8d4c479..bcd6caabd 100644 --- a/restapi/operations/admin_api/reset_config_urlbuilder.go +++ b/restapi/operations/configuration/reset_config_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/set_config.go b/restapi/operations/configuration/set_config.go similarity index 96% rename from restapi/operations/admin_api/set_config.go rename to restapi/operations/configuration/set_config.go index b60e1b7a6..ea2135e9b 100644 --- a/restapi/operations/admin_api/set_config.go +++ b/restapi/operations/configuration/set_config.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSetConfig(ctx *middleware.Context, handler SetConfigHandler) *SetConfig return &SetConfig{Context: ctx, Handler: handler} } -/* SetConfig swagger:route PUT /configs/{name} AdminAPI setConfig +/* SetConfig swagger:route PUT /configs/{name} Configuration setConfig Set Configuration diff --git a/restapi/operations/admin_api/set_config_parameters.go b/restapi/operations/configuration/set_config_parameters.go similarity index 99% rename from restapi/operations/admin_api/set_config_parameters.go rename to restapi/operations/configuration/set_config_parameters.go index db47807c9..c973c24c0 100644 --- a/restapi/operations/admin_api/set_config_parameters.go +++ b/restapi/operations/configuration/set_config_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/set_config_responses.go b/restapi/operations/configuration/set_config_responses.go similarity index 99% rename from restapi/operations/admin_api/set_config_responses.go rename to restapi/operations/configuration/set_config_responses.go index f1deb265a..47493d0ac 100644 --- a/restapi/operations/admin_api/set_config_responses.go +++ b/restapi/operations/configuration/set_config_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/set_config_urlbuilder.go b/restapi/operations/configuration/set_config_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/set_config_urlbuilder.go rename to restapi/operations/configuration/set_config_urlbuilder.go index dcf2abf62..b43e38912 100644 --- a/restapi/operations/admin_api/set_config_urlbuilder.go +++ b/restapi/operations/configuration/set_config_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package configuration // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/console_api.go b/restapi/operations/console_api.go index 9d89a2add..c7962a742 100644 --- a/restapi/operations/console_api.go +++ b/restapi/operations/console_api.go @@ -38,8 +38,23 @@ import ( "github.com/go-openapi/swag" "github.com/minio/console/models" - "github.com/minio/console/restapi/operations/admin_api" - "github.com/minio/console/restapi/operations/user_api" + "github.com/minio/console/restapi/operations/account" + "github.com/minio/console/restapi/operations/auth" + "github.com/minio/console/restapi/operations/bucket" + "github.com/minio/console/restapi/operations/configuration" + "github.com/minio/console/restapi/operations/group" + "github.com/minio/console/restapi/operations/inspect" + "github.com/minio/console/restapi/operations/logging" + "github.com/minio/console/restapi/operations/object" + "github.com/minio/console/restapi/operations/policy" + "github.com/minio/console/restapi/operations/profile" + "github.com/minio/console/restapi/operations/service" + "github.com/minio/console/restapi/operations/service_account" + "github.com/minio/console/restapi/operations/site_replication" + "github.com/minio/console/restapi/operations/subnet" + "github.com/minio/console/restapi/operations/system" + "github.com/minio/console/restapi/operations/tiering" + "github.com/minio/console/restapi/operations/user" ) // NewConsoleAPI creates a new Console instance @@ -69,368 +84,368 @@ func NewConsoleAPI(spec *loads.Document) *ConsoleAPI { BinProducer: runtime.ByteStreamProducer(), JSONProducer: runtime.JSONProducer(), - UserAPIAccountChangePasswordHandler: user_api.AccountChangePasswordHandlerFunc(func(params user_api.AccountChangePasswordParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.AccountChangePassword has not yet been implemented") + AccountAccountChangePasswordHandler: account.AccountChangePasswordHandlerFunc(func(params account.AccountChangePasswordParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation account.AccountChangePassword has not yet been implemented") }), - UserAPIAddBucketLifecycleHandler: user_api.AddBucketLifecycleHandlerFunc(func(params user_api.AddBucketLifecycleParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.AddBucketLifecycle has not yet been implemented") + BucketAddBucketLifecycleHandler: bucket.AddBucketLifecycleHandlerFunc(func(params bucket.AddBucketLifecycleParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.AddBucketLifecycle has not yet been implemented") }), - AdminAPIAddGroupHandler: admin_api.AddGroupHandlerFunc(func(params admin_api.AddGroupParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.AddGroup has not yet been implemented") + GroupAddGroupHandler: group.AddGroupHandlerFunc(func(params group.AddGroupParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation group.AddGroup has not yet been implemented") }), - UserAPIAddMultiBucketLifecycleHandler: user_api.AddMultiBucketLifecycleHandlerFunc(func(params user_api.AddMultiBucketLifecycleParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.AddMultiBucketLifecycle has not yet been implemented") + BucketAddMultiBucketLifecycleHandler: bucket.AddMultiBucketLifecycleHandlerFunc(func(params bucket.AddMultiBucketLifecycleParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.AddMultiBucketLifecycle has not yet been implemented") }), - AdminAPIAddNotificationEndpointHandler: admin_api.AddNotificationEndpointHandlerFunc(func(params admin_api.AddNotificationEndpointParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.AddNotificationEndpoint has not yet been implemented") + ConfigurationAddNotificationEndpointHandler: configuration.AddNotificationEndpointHandlerFunc(func(params configuration.AddNotificationEndpointParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation configuration.AddNotificationEndpoint has not yet been implemented") }), - AdminAPIAddPolicyHandler: admin_api.AddPolicyHandlerFunc(func(params admin_api.AddPolicyParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.AddPolicy has not yet been implemented") + PolicyAddPolicyHandler: policy.AddPolicyHandlerFunc(func(params policy.AddPolicyParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation policy.AddPolicy has not yet been implemented") }), - UserAPIAddRemoteBucketHandler: user_api.AddRemoteBucketHandlerFunc(func(params user_api.AddRemoteBucketParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.AddRemoteBucket has not yet been implemented") + BucketAddRemoteBucketHandler: bucket.AddRemoteBucketHandlerFunc(func(params bucket.AddRemoteBucketParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.AddRemoteBucket has not yet been implemented") }), - AdminAPIAddTierHandler: admin_api.AddTierHandlerFunc(func(params admin_api.AddTierParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.AddTier has not yet been implemented") + TieringAddTierHandler: tiering.AddTierHandlerFunc(func(params tiering.AddTierParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation tiering.AddTier has not yet been implemented") }), - AdminAPIAddUserHandler: admin_api.AddUserHandlerFunc(func(params admin_api.AddUserParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.AddUser has not yet been implemented") + UserAddUserHandler: user.AddUserHandlerFunc(func(params user.AddUserParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation user.AddUser has not yet been implemented") }), - AdminAPIAdminInfoHandler: admin_api.AdminInfoHandlerFunc(func(params admin_api.AdminInfoParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.AdminInfo has not yet been implemented") + SystemAdminInfoHandler: system.AdminInfoHandlerFunc(func(params system.AdminInfoParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation system.AdminInfo has not yet been implemented") }), - AdminAPIArnListHandler: admin_api.ArnListHandlerFunc(func(params admin_api.ArnListParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ArnList has not yet been implemented") + SystemArnListHandler: system.ArnListHandlerFunc(func(params system.ArnListParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation system.ArnList has not yet been implemented") }), - UserAPIBucketInfoHandler: user_api.BucketInfoHandlerFunc(func(params user_api.BucketInfoParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.BucketInfo has not yet been implemented") + BucketBucketInfoHandler: bucket.BucketInfoHandlerFunc(func(params bucket.BucketInfoParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.BucketInfo has not yet been implemented") }), - UserAPIBucketSetPolicyHandler: user_api.BucketSetPolicyHandlerFunc(func(params user_api.BucketSetPolicyParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.BucketSetPolicy has not yet been implemented") + BucketBucketSetPolicyHandler: bucket.BucketSetPolicyHandlerFunc(func(params bucket.BucketSetPolicyParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.BucketSetPolicy has not yet been implemented") }), - AdminAPIBulkUpdateUsersGroupsHandler: admin_api.BulkUpdateUsersGroupsHandlerFunc(func(params admin_api.BulkUpdateUsersGroupsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.BulkUpdateUsersGroups has not yet been implemented") + UserBulkUpdateUsersGroupsHandler: user.BulkUpdateUsersGroupsHandlerFunc(func(params user.BulkUpdateUsersGroupsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation user.BulkUpdateUsersGroups has not yet been implemented") }), - AdminAPIChangeUserPasswordHandler: admin_api.ChangeUserPasswordHandlerFunc(func(params admin_api.ChangeUserPasswordParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ChangeUserPassword has not yet been implemented") + AccountChangeUserPasswordHandler: account.ChangeUserPasswordHandlerFunc(func(params account.ChangeUserPasswordParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation account.ChangeUserPassword has not yet been implemented") }), - UserAPICheckMinIOVersionHandler: user_api.CheckMinIOVersionHandlerFunc(func(params user_api.CheckMinIOVersionParams) middleware.Responder { - return middleware.NotImplemented("operation user_api.CheckMinIOVersion has not yet been implemented") + SystemCheckMinIOVersionHandler: system.CheckMinIOVersionHandlerFunc(func(params system.CheckMinIOVersionParams) middleware.Responder { + return middleware.NotImplemented("operation system.CheckMinIOVersion has not yet been implemented") }), - AdminAPIConfigInfoHandler: admin_api.ConfigInfoHandlerFunc(func(params admin_api.ConfigInfoParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ConfigInfo has not yet been implemented") + ConfigurationConfigInfoHandler: configuration.ConfigInfoHandlerFunc(func(params configuration.ConfigInfoParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation configuration.ConfigInfo has not yet been implemented") }), - AdminAPICreateAUserServiceAccountHandler: admin_api.CreateAUserServiceAccountHandlerFunc(func(params admin_api.CreateAUserServiceAccountParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.CreateAUserServiceAccount has not yet been implemented") + UserCreateAUserServiceAccountHandler: user.CreateAUserServiceAccountHandlerFunc(func(params user.CreateAUserServiceAccountParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation user.CreateAUserServiceAccount has not yet been implemented") }), - UserAPICreateBucketEventHandler: user_api.CreateBucketEventHandlerFunc(func(params user_api.CreateBucketEventParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.CreateBucketEvent has not yet been implemented") + BucketCreateBucketEventHandler: bucket.CreateBucketEventHandlerFunc(func(params bucket.CreateBucketEventParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.CreateBucketEvent has not yet been implemented") }), - UserAPICreateServiceAccountHandler: user_api.CreateServiceAccountHandlerFunc(func(params user_api.CreateServiceAccountParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.CreateServiceAccount has not yet been implemented") + ServiceAccountCreateServiceAccountHandler: service_account.CreateServiceAccountHandlerFunc(func(params service_account.CreateServiceAccountParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation service_account.CreateServiceAccount has not yet been implemented") }), - AdminAPICreateServiceAccountCredentialsHandler: admin_api.CreateServiceAccountCredentialsHandlerFunc(func(params admin_api.CreateServiceAccountCredentialsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.CreateServiceAccountCredentials has not yet been implemented") + UserCreateServiceAccountCredentialsHandler: user.CreateServiceAccountCredentialsHandlerFunc(func(params user.CreateServiceAccountCredentialsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation user.CreateServiceAccountCredentials has not yet been implemented") }), - AdminAPICreateServiceAccountCredsHandler: admin_api.CreateServiceAccountCredsHandlerFunc(func(params admin_api.CreateServiceAccountCredsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.CreateServiceAccountCreds has not yet been implemented") + ServiceAccountCreateServiceAccountCredsHandler: service_account.CreateServiceAccountCredsHandlerFunc(func(params service_account.CreateServiceAccountCredsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation service_account.CreateServiceAccountCreds has not yet been implemented") }), - AdminAPIDashboardWidgetDetailsHandler: admin_api.DashboardWidgetDetailsHandlerFunc(func(params admin_api.DashboardWidgetDetailsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.DashboardWidgetDetails has not yet been implemented") + SystemDashboardWidgetDetailsHandler: system.DashboardWidgetDetailsHandlerFunc(func(params system.DashboardWidgetDetailsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation system.DashboardWidgetDetails has not yet been implemented") }), - AdminAPIDeleteAccessRuleWithBucketHandler: admin_api.DeleteAccessRuleWithBucketHandlerFunc(func(params admin_api.DeleteAccessRuleWithBucketParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.DeleteAccessRuleWithBucket has not yet been implemented") + BucketDeleteAccessRuleWithBucketHandler: bucket.DeleteAccessRuleWithBucketHandlerFunc(func(params bucket.DeleteAccessRuleWithBucketParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.DeleteAccessRuleWithBucket has not yet been implemented") }), - UserAPIDeleteAllReplicationRulesHandler: user_api.DeleteAllReplicationRulesHandlerFunc(func(params user_api.DeleteAllReplicationRulesParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteAllReplicationRules has not yet been implemented") + BucketDeleteAllReplicationRulesHandler: bucket.DeleteAllReplicationRulesHandlerFunc(func(params bucket.DeleteAllReplicationRulesParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.DeleteAllReplicationRules has not yet been implemented") }), - UserAPIDeleteBucketHandler: user_api.DeleteBucketHandlerFunc(func(params user_api.DeleteBucketParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteBucket has not yet been implemented") + BucketDeleteBucketHandler: bucket.DeleteBucketHandlerFunc(func(params bucket.DeleteBucketParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.DeleteBucket has not yet been implemented") }), - UserAPIDeleteBucketEventHandler: user_api.DeleteBucketEventHandlerFunc(func(params user_api.DeleteBucketEventParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteBucketEvent has not yet been implemented") + BucketDeleteBucketEventHandler: bucket.DeleteBucketEventHandlerFunc(func(params bucket.DeleteBucketEventParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.DeleteBucketEvent has not yet been implemented") }), - UserAPIDeleteBucketLifecycleRuleHandler: user_api.DeleteBucketLifecycleRuleHandlerFunc(func(params user_api.DeleteBucketLifecycleRuleParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteBucketLifecycleRule has not yet been implemented") + BucketDeleteBucketLifecycleRuleHandler: bucket.DeleteBucketLifecycleRuleHandlerFunc(func(params bucket.DeleteBucketLifecycleRuleParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.DeleteBucketLifecycleRule has not yet been implemented") }), - UserAPIDeleteBucketReplicationRuleHandler: user_api.DeleteBucketReplicationRuleHandlerFunc(func(params user_api.DeleteBucketReplicationRuleParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteBucketReplicationRule has not yet been implemented") + BucketDeleteBucketReplicationRuleHandler: bucket.DeleteBucketReplicationRuleHandlerFunc(func(params bucket.DeleteBucketReplicationRuleParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.DeleteBucketReplicationRule has not yet been implemented") }), - UserAPIDeleteMultipleObjectsHandler: user_api.DeleteMultipleObjectsHandlerFunc(func(params user_api.DeleteMultipleObjectsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteMultipleObjects has not yet been implemented") + ObjectDeleteMultipleObjectsHandler: object.DeleteMultipleObjectsHandlerFunc(func(params object.DeleteMultipleObjectsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.DeleteMultipleObjects has not yet been implemented") }), - UserAPIDeleteMultipleServiceAccountsHandler: user_api.DeleteMultipleServiceAccountsHandlerFunc(func(params user_api.DeleteMultipleServiceAccountsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteMultipleServiceAccounts has not yet been implemented") + ServiceAccountDeleteMultipleServiceAccountsHandler: service_account.DeleteMultipleServiceAccountsHandlerFunc(func(params service_account.DeleteMultipleServiceAccountsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation service_account.DeleteMultipleServiceAccounts has not yet been implemented") }), - UserAPIDeleteObjectHandler: user_api.DeleteObjectHandlerFunc(func(params user_api.DeleteObjectParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteObject has not yet been implemented") + ObjectDeleteObjectHandler: object.DeleteObjectHandlerFunc(func(params object.DeleteObjectParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.DeleteObject has not yet been implemented") }), - UserAPIDeleteObjectRetentionHandler: user_api.DeleteObjectRetentionHandlerFunc(func(params user_api.DeleteObjectRetentionParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteObjectRetention has not yet been implemented") + ObjectDeleteObjectRetentionHandler: object.DeleteObjectRetentionHandlerFunc(func(params object.DeleteObjectRetentionParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.DeleteObjectRetention has not yet been implemented") }), - UserAPIDeleteRemoteBucketHandler: user_api.DeleteRemoteBucketHandlerFunc(func(params user_api.DeleteRemoteBucketParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteRemoteBucket has not yet been implemented") + BucketDeleteRemoteBucketHandler: bucket.DeleteRemoteBucketHandlerFunc(func(params bucket.DeleteRemoteBucketParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.DeleteRemoteBucket has not yet been implemented") }), - UserAPIDeleteSelectedReplicationRulesHandler: user_api.DeleteSelectedReplicationRulesHandlerFunc(func(params user_api.DeleteSelectedReplicationRulesParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteSelectedReplicationRules has not yet been implemented") + BucketDeleteSelectedReplicationRulesHandler: bucket.DeleteSelectedReplicationRulesHandlerFunc(func(params bucket.DeleteSelectedReplicationRulesParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.DeleteSelectedReplicationRules has not yet been implemented") }), - UserAPIDeleteServiceAccountHandler: user_api.DeleteServiceAccountHandlerFunc(func(params user_api.DeleteServiceAccountParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DeleteServiceAccount has not yet been implemented") + ServiceAccountDeleteServiceAccountHandler: service_account.DeleteServiceAccountHandlerFunc(func(params service_account.DeleteServiceAccountParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation service_account.DeleteServiceAccount has not yet been implemented") }), - UserAPIDisableBucketEncryptionHandler: user_api.DisableBucketEncryptionHandlerFunc(func(params user_api.DisableBucketEncryptionParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DisableBucketEncryption has not yet been implemented") + BucketDisableBucketEncryptionHandler: bucket.DisableBucketEncryptionHandlerFunc(func(params bucket.DisableBucketEncryptionParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.DisableBucketEncryption has not yet been implemented") }), - UserAPIDownloadObjectHandler: user_api.DownloadObjectHandlerFunc(func(params user_api.DownloadObjectParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.DownloadObject has not yet been implemented") + ObjectDownloadObjectHandler: object.DownloadObjectHandlerFunc(func(params object.DownloadObjectParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.DownloadObject has not yet been implemented") }), - AdminAPIEditTierCredentialsHandler: admin_api.EditTierCredentialsHandlerFunc(func(params admin_api.EditTierCredentialsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.EditTierCredentials has not yet been implemented") + TieringEditTierCredentialsHandler: tiering.EditTierCredentialsHandlerFunc(func(params tiering.EditTierCredentialsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation tiering.EditTierCredentials has not yet been implemented") }), - UserAPIEnableBucketEncryptionHandler: user_api.EnableBucketEncryptionHandlerFunc(func(params user_api.EnableBucketEncryptionParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.EnableBucketEncryption has not yet been implemented") + BucketEnableBucketEncryptionHandler: bucket.EnableBucketEncryptionHandlerFunc(func(params bucket.EnableBucketEncryptionParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.EnableBucketEncryption has not yet been implemented") }), - UserAPIGetBucketEncryptionInfoHandler: user_api.GetBucketEncryptionInfoHandlerFunc(func(params user_api.GetBucketEncryptionInfoParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.GetBucketEncryptionInfo has not yet been implemented") + BucketGetBucketEncryptionInfoHandler: bucket.GetBucketEncryptionInfoHandlerFunc(func(params bucket.GetBucketEncryptionInfoParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.GetBucketEncryptionInfo has not yet been implemented") }), - UserAPIGetBucketLifecycleHandler: user_api.GetBucketLifecycleHandlerFunc(func(params user_api.GetBucketLifecycleParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.GetBucketLifecycle has not yet been implemented") + BucketGetBucketLifecycleHandler: bucket.GetBucketLifecycleHandlerFunc(func(params bucket.GetBucketLifecycleParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.GetBucketLifecycle has not yet been implemented") }), - UserAPIGetBucketObjectLockingStatusHandler: user_api.GetBucketObjectLockingStatusHandlerFunc(func(params user_api.GetBucketObjectLockingStatusParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.GetBucketObjectLockingStatus has not yet been implemented") + BucketGetBucketObjectLockingStatusHandler: bucket.GetBucketObjectLockingStatusHandlerFunc(func(params bucket.GetBucketObjectLockingStatusParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.GetBucketObjectLockingStatus has not yet been implemented") }), - UserAPIGetBucketQuotaHandler: user_api.GetBucketQuotaHandlerFunc(func(params user_api.GetBucketQuotaParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.GetBucketQuota has not yet been implemented") + BucketGetBucketQuotaHandler: bucket.GetBucketQuotaHandlerFunc(func(params bucket.GetBucketQuotaParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.GetBucketQuota has not yet been implemented") }), - UserAPIGetBucketReplicationHandler: user_api.GetBucketReplicationHandlerFunc(func(params user_api.GetBucketReplicationParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.GetBucketReplication has not yet been implemented") + BucketGetBucketReplicationHandler: bucket.GetBucketReplicationHandlerFunc(func(params bucket.GetBucketReplicationParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.GetBucketReplication has not yet been implemented") }), - UserAPIGetBucketReplicationRuleHandler: user_api.GetBucketReplicationRuleHandlerFunc(func(params user_api.GetBucketReplicationRuleParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.GetBucketReplicationRule has not yet been implemented") + BucketGetBucketReplicationRuleHandler: bucket.GetBucketReplicationRuleHandlerFunc(func(params bucket.GetBucketReplicationRuleParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.GetBucketReplicationRule has not yet been implemented") }), - UserAPIGetBucketRetentionConfigHandler: user_api.GetBucketRetentionConfigHandlerFunc(func(params user_api.GetBucketRetentionConfigParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.GetBucketRetentionConfig has not yet been implemented") + BucketGetBucketRetentionConfigHandler: bucket.GetBucketRetentionConfigHandlerFunc(func(params bucket.GetBucketRetentionConfigParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.GetBucketRetentionConfig has not yet been implemented") }), - UserAPIGetBucketRewindHandler: user_api.GetBucketRewindHandlerFunc(func(params user_api.GetBucketRewindParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.GetBucketRewind has not yet been implemented") + BucketGetBucketRewindHandler: bucket.GetBucketRewindHandlerFunc(func(params bucket.GetBucketRewindParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.GetBucketRewind has not yet been implemented") }), - UserAPIGetBucketVersioningHandler: user_api.GetBucketVersioningHandlerFunc(func(params user_api.GetBucketVersioningParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.GetBucketVersioning has not yet been implemented") + BucketGetBucketVersioningHandler: bucket.GetBucketVersioningHandlerFunc(func(params bucket.GetBucketVersioningParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.GetBucketVersioning has not yet been implemented") }), - UserAPIGetObjectMetadataHandler: user_api.GetObjectMetadataHandlerFunc(func(params user_api.GetObjectMetadataParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.GetObjectMetadata has not yet been implemented") + ObjectGetObjectMetadataHandler: object.GetObjectMetadataHandlerFunc(func(params object.GetObjectMetadataParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.GetObjectMetadata has not yet been implemented") }), - UserAPIGetServiceAccountPolicyHandler: user_api.GetServiceAccountPolicyHandlerFunc(func(params user_api.GetServiceAccountPolicyParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.GetServiceAccountPolicy has not yet been implemented") + ServiceAccountGetServiceAccountPolicyHandler: service_account.GetServiceAccountPolicyHandlerFunc(func(params service_account.GetServiceAccountPolicyParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation service_account.GetServiceAccountPolicy has not yet been implemented") }), - AdminAPIGetSiteReplicationInfoHandler: admin_api.GetSiteReplicationInfoHandlerFunc(func(params admin_api.GetSiteReplicationInfoParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.GetSiteReplicationInfo has not yet been implemented") + SiteReplicationGetSiteReplicationInfoHandler: site_replication.GetSiteReplicationInfoHandlerFunc(func(params site_replication.GetSiteReplicationInfoParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation site_replication.GetSiteReplicationInfo has not yet been implemented") }), - AdminAPIGetSiteReplicationStatusHandler: admin_api.GetSiteReplicationStatusHandlerFunc(func(params admin_api.GetSiteReplicationStatusParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.GetSiteReplicationStatus has not yet been implemented") + SiteReplicationGetSiteReplicationStatusHandler: site_replication.GetSiteReplicationStatusHandlerFunc(func(params site_replication.GetSiteReplicationStatusParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation site_replication.GetSiteReplicationStatus has not yet been implemented") }), - AdminAPIGetTierHandler: admin_api.GetTierHandlerFunc(func(params admin_api.GetTierParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.GetTier has not yet been implemented") + TieringGetTierHandler: tiering.GetTierHandlerFunc(func(params tiering.GetTierParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation tiering.GetTier has not yet been implemented") }), - AdminAPIGetUserInfoHandler: admin_api.GetUserInfoHandlerFunc(func(params admin_api.GetUserInfoParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.GetUserInfo has not yet been implemented") + UserGetUserInfoHandler: user.GetUserInfoHandlerFunc(func(params user.GetUserInfoParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation user.GetUserInfo has not yet been implemented") }), - AdminAPIGroupInfoHandler: admin_api.GroupInfoHandlerFunc(func(params admin_api.GroupInfoParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.GroupInfo has not yet been implemented") + GroupGroupInfoHandler: group.GroupInfoHandlerFunc(func(params group.GroupInfoParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation group.GroupInfo has not yet been implemented") }), - AdminAPIInspectHandler: admin_api.InspectHandlerFunc(func(params admin_api.InspectParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.Inspect has not yet been implemented") + InspectInspectHandler: inspect.InspectHandlerFunc(func(params inspect.InspectParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation inspect.Inspect has not yet been implemented") }), - AdminAPIListAUserServiceAccountsHandler: admin_api.ListAUserServiceAccountsHandlerFunc(func(params admin_api.ListAUserServiceAccountsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ListAUserServiceAccounts has not yet been implemented") + UserListAUserServiceAccountsHandler: user.ListAUserServiceAccountsHandlerFunc(func(params user.ListAUserServiceAccountsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation user.ListAUserServiceAccounts has not yet been implemented") }), - AdminAPIListAccessRulesWithBucketHandler: admin_api.ListAccessRulesWithBucketHandlerFunc(func(params admin_api.ListAccessRulesWithBucketParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ListAccessRulesWithBucket has not yet been implemented") + BucketListAccessRulesWithBucketHandler: bucket.ListAccessRulesWithBucketHandlerFunc(func(params bucket.ListAccessRulesWithBucketParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.ListAccessRulesWithBucket has not yet been implemented") }), - UserAPIListBucketEventsHandler: user_api.ListBucketEventsHandlerFunc(func(params user_api.ListBucketEventsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.ListBucketEvents has not yet been implemented") + BucketListBucketEventsHandler: bucket.ListBucketEventsHandlerFunc(func(params bucket.ListBucketEventsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.ListBucketEvents has not yet been implemented") }), - UserAPIListBucketsHandler: user_api.ListBucketsHandlerFunc(func(params user_api.ListBucketsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.ListBuckets has not yet been implemented") + BucketListBucketsHandler: bucket.ListBucketsHandlerFunc(func(params bucket.ListBucketsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.ListBuckets has not yet been implemented") }), - AdminAPIListConfigHandler: admin_api.ListConfigHandlerFunc(func(params admin_api.ListConfigParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ListConfig has not yet been implemented") + ConfigurationListConfigHandler: configuration.ListConfigHandlerFunc(func(params configuration.ListConfigParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation configuration.ListConfig has not yet been implemented") }), - UserAPIListExternalBucketsHandler: user_api.ListExternalBucketsHandlerFunc(func(params user_api.ListExternalBucketsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.ListExternalBuckets has not yet been implemented") + BucketListExternalBucketsHandler: bucket.ListExternalBucketsHandlerFunc(func(params bucket.ListExternalBucketsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.ListExternalBuckets has not yet been implemented") }), - AdminAPIListGroupsHandler: admin_api.ListGroupsHandlerFunc(func(params admin_api.ListGroupsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ListGroups has not yet been implemented") + GroupListGroupsHandler: group.ListGroupsHandlerFunc(func(params group.ListGroupsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation group.ListGroups has not yet been implemented") }), - AdminAPIListGroupsForPolicyHandler: admin_api.ListGroupsForPolicyHandlerFunc(func(params admin_api.ListGroupsForPolicyParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ListGroupsForPolicy has not yet been implemented") + PolicyListGroupsForPolicyHandler: policy.ListGroupsForPolicyHandlerFunc(func(params policy.ListGroupsForPolicyParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation policy.ListGroupsForPolicy has not yet been implemented") }), - AdminAPIListNodesHandler: admin_api.ListNodesHandlerFunc(func(params admin_api.ListNodesParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ListNodes has not yet been implemented") + SystemListNodesHandler: system.ListNodesHandlerFunc(func(params system.ListNodesParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation system.ListNodes has not yet been implemented") }), - UserAPIListObjectsHandler: user_api.ListObjectsHandlerFunc(func(params user_api.ListObjectsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.ListObjects has not yet been implemented") + ObjectListObjectsHandler: object.ListObjectsHandlerFunc(func(params object.ListObjectsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.ListObjects has not yet been implemented") }), - AdminAPIListPoliciesHandler: admin_api.ListPoliciesHandlerFunc(func(params admin_api.ListPoliciesParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ListPolicies has not yet been implemented") + PolicyListPoliciesHandler: policy.ListPoliciesHandlerFunc(func(params policy.ListPoliciesParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation policy.ListPolicies has not yet been implemented") }), - AdminAPIListPoliciesWithBucketHandler: admin_api.ListPoliciesWithBucketHandlerFunc(func(params admin_api.ListPoliciesWithBucketParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ListPoliciesWithBucket has not yet been implemented") + BucketListPoliciesWithBucketHandler: bucket.ListPoliciesWithBucketHandlerFunc(func(params bucket.ListPoliciesWithBucketParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.ListPoliciesWithBucket has not yet been implemented") }), - UserAPIListRemoteBucketsHandler: user_api.ListRemoteBucketsHandlerFunc(func(params user_api.ListRemoteBucketsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.ListRemoteBuckets has not yet been implemented") + BucketListRemoteBucketsHandler: bucket.ListRemoteBucketsHandlerFunc(func(params bucket.ListRemoteBucketsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.ListRemoteBuckets has not yet been implemented") }), - UserAPIListUserServiceAccountsHandler: user_api.ListUserServiceAccountsHandlerFunc(func(params user_api.ListUserServiceAccountsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.ListUserServiceAccounts has not yet been implemented") + ServiceAccountListUserServiceAccountsHandler: service_account.ListUserServiceAccountsHandlerFunc(func(params service_account.ListUserServiceAccountsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation service_account.ListUserServiceAccounts has not yet been implemented") }), - AdminAPIListUsersHandler: admin_api.ListUsersHandlerFunc(func(params admin_api.ListUsersParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ListUsers has not yet been implemented") + UserListUsersHandler: user.ListUsersHandlerFunc(func(params user.ListUsersParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation user.ListUsers has not yet been implemented") }), - AdminAPIListUsersForPolicyHandler: admin_api.ListUsersForPolicyHandlerFunc(func(params admin_api.ListUsersForPolicyParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ListUsersForPolicy has not yet been implemented") + PolicyListUsersForPolicyHandler: policy.ListUsersForPolicyHandlerFunc(func(params policy.ListUsersForPolicyParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation policy.ListUsersForPolicy has not yet been implemented") }), - AdminAPIListUsersWithAccessToBucketHandler: admin_api.ListUsersWithAccessToBucketHandlerFunc(func(params admin_api.ListUsersWithAccessToBucketParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ListUsersWithAccessToBucket has not yet been implemented") + BucketListUsersWithAccessToBucketHandler: bucket.ListUsersWithAccessToBucketHandlerFunc(func(params bucket.ListUsersWithAccessToBucketParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.ListUsersWithAccessToBucket has not yet been implemented") }), - UserAPILogSearchHandler: user_api.LogSearchHandlerFunc(func(params user_api.LogSearchParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.LogSearch has not yet been implemented") + LoggingLogSearchHandler: logging.LogSearchHandlerFunc(func(params logging.LogSearchParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation logging.LogSearch has not yet been implemented") }), - UserAPILoginHandler: user_api.LoginHandlerFunc(func(params user_api.LoginParams) middleware.Responder { - return middleware.NotImplemented("operation user_api.Login has not yet been implemented") + AuthLoginHandler: auth.LoginHandlerFunc(func(params auth.LoginParams) middleware.Responder { + return middleware.NotImplemented("operation auth.Login has not yet been implemented") }), - UserAPILoginDetailHandler: user_api.LoginDetailHandlerFunc(func(params user_api.LoginDetailParams) middleware.Responder { - return middleware.NotImplemented("operation user_api.LoginDetail has not yet been implemented") + AuthLoginDetailHandler: auth.LoginDetailHandlerFunc(func(params auth.LoginDetailParams) middleware.Responder { + return middleware.NotImplemented("operation auth.LoginDetail has not yet been implemented") }), - UserAPILoginOauth2AuthHandler: user_api.LoginOauth2AuthHandlerFunc(func(params user_api.LoginOauth2AuthParams) middleware.Responder { - return middleware.NotImplemented("operation user_api.LoginOauth2Auth has not yet been implemented") + AuthLoginOauth2AuthHandler: auth.LoginOauth2AuthHandlerFunc(func(params auth.LoginOauth2AuthParams) middleware.Responder { + return middleware.NotImplemented("operation auth.LoginOauth2Auth has not yet been implemented") }), - UserAPILogoutHandler: user_api.LogoutHandlerFunc(func(params user_api.LogoutParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.Logout has not yet been implemented") + AuthLogoutHandler: auth.LogoutHandlerFunc(func(params auth.LogoutParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation auth.Logout has not yet been implemented") }), - UserAPIMakeBucketHandler: user_api.MakeBucketHandlerFunc(func(params user_api.MakeBucketParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.MakeBucket has not yet been implemented") + BucketMakeBucketHandler: bucket.MakeBucketHandlerFunc(func(params bucket.MakeBucketParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.MakeBucket has not yet been implemented") }), - AdminAPINotificationEndpointListHandler: admin_api.NotificationEndpointListHandlerFunc(func(params admin_api.NotificationEndpointListParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.NotificationEndpointList has not yet been implemented") + ConfigurationNotificationEndpointListHandler: configuration.NotificationEndpointListHandlerFunc(func(params configuration.NotificationEndpointListParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation configuration.NotificationEndpointList has not yet been implemented") }), - AdminAPIPolicyInfoHandler: admin_api.PolicyInfoHandlerFunc(func(params admin_api.PolicyInfoParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.PolicyInfo has not yet been implemented") + PolicyPolicyInfoHandler: policy.PolicyInfoHandlerFunc(func(params policy.PolicyInfoParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation policy.PolicyInfo has not yet been implemented") }), - UserAPIPostBucketsBucketNameObjectsUploadHandler: user_api.PostBucketsBucketNameObjectsUploadHandlerFunc(func(params user_api.PostBucketsBucketNameObjectsUploadParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.PostBucketsBucketNameObjectsUpload has not yet been implemented") + ObjectPostBucketsBucketNameObjectsUploadHandler: object.PostBucketsBucketNameObjectsUploadHandlerFunc(func(params object.PostBucketsBucketNameObjectsUploadParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.PostBucketsBucketNameObjectsUpload has not yet been implemented") }), - AdminAPIProfilingStartHandler: admin_api.ProfilingStartHandlerFunc(func(params admin_api.ProfilingStartParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ProfilingStart has not yet been implemented") + ProfileProfilingStartHandler: profile.ProfilingStartHandlerFunc(func(params profile.ProfilingStartParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation profile.ProfilingStart has not yet been implemented") }), - AdminAPIProfilingStopHandler: admin_api.ProfilingStopHandlerFunc(func(params admin_api.ProfilingStopParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ProfilingStop has not yet been implemented") + ProfileProfilingStopHandler: profile.ProfilingStopHandlerFunc(func(params profile.ProfilingStopParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation profile.ProfilingStop has not yet been implemented") }), - UserAPIPutBucketTagsHandler: user_api.PutBucketTagsHandlerFunc(func(params user_api.PutBucketTagsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.PutBucketTags has not yet been implemented") + BucketPutBucketTagsHandler: bucket.PutBucketTagsHandlerFunc(func(params bucket.PutBucketTagsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.PutBucketTags has not yet been implemented") }), - UserAPIPutObjectLegalHoldHandler: user_api.PutObjectLegalHoldHandlerFunc(func(params user_api.PutObjectLegalHoldParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.PutObjectLegalHold has not yet been implemented") + ObjectPutObjectLegalHoldHandler: object.PutObjectLegalHoldHandlerFunc(func(params object.PutObjectLegalHoldParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.PutObjectLegalHold has not yet been implemented") }), - UserAPIPutObjectRestoreHandler: user_api.PutObjectRestoreHandlerFunc(func(params user_api.PutObjectRestoreParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.PutObjectRestore has not yet been implemented") + ObjectPutObjectRestoreHandler: object.PutObjectRestoreHandlerFunc(func(params object.PutObjectRestoreParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.PutObjectRestore has not yet been implemented") }), - UserAPIPutObjectRetentionHandler: user_api.PutObjectRetentionHandlerFunc(func(params user_api.PutObjectRetentionParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.PutObjectRetention has not yet been implemented") + ObjectPutObjectRetentionHandler: object.PutObjectRetentionHandlerFunc(func(params object.PutObjectRetentionParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.PutObjectRetention has not yet been implemented") }), - UserAPIPutObjectTagsHandler: user_api.PutObjectTagsHandlerFunc(func(params user_api.PutObjectTagsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.PutObjectTags has not yet been implemented") + ObjectPutObjectTagsHandler: object.PutObjectTagsHandlerFunc(func(params object.PutObjectTagsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.PutObjectTags has not yet been implemented") }), - UserAPIRemoteBucketDetailsHandler: user_api.RemoteBucketDetailsHandlerFunc(func(params user_api.RemoteBucketDetailsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.RemoteBucketDetails has not yet been implemented") + BucketRemoteBucketDetailsHandler: bucket.RemoteBucketDetailsHandlerFunc(func(params bucket.RemoteBucketDetailsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.RemoteBucketDetails has not yet been implemented") }), - AdminAPIRemoveGroupHandler: admin_api.RemoveGroupHandlerFunc(func(params admin_api.RemoveGroupParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.RemoveGroup has not yet been implemented") + GroupRemoveGroupHandler: group.RemoveGroupHandlerFunc(func(params group.RemoveGroupParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation group.RemoveGroup has not yet been implemented") }), - AdminAPIRemovePolicyHandler: admin_api.RemovePolicyHandlerFunc(func(params admin_api.RemovePolicyParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.RemovePolicy has not yet been implemented") + PolicyRemovePolicyHandler: policy.RemovePolicyHandlerFunc(func(params policy.RemovePolicyParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation policy.RemovePolicy has not yet been implemented") }), - AdminAPIRemoveUserHandler: admin_api.RemoveUserHandlerFunc(func(params admin_api.RemoveUserParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.RemoveUser has not yet been implemented") + UserRemoveUserHandler: user.RemoveUserHandlerFunc(func(params user.RemoveUserParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation user.RemoveUser has not yet been implemented") }), - AdminAPIResetConfigHandler: admin_api.ResetConfigHandlerFunc(func(params admin_api.ResetConfigParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.ResetConfig has not yet been implemented") + ConfigurationResetConfigHandler: configuration.ResetConfigHandlerFunc(func(params configuration.ResetConfigParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation configuration.ResetConfig has not yet been implemented") }), - AdminAPIRestartServiceHandler: admin_api.RestartServiceHandlerFunc(func(params admin_api.RestartServiceParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.RestartService has not yet been implemented") + ServiceRestartServiceHandler: service.RestartServiceHandlerFunc(func(params service.RestartServiceParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation service.RestartService has not yet been implemented") }), - UserAPISessionCheckHandler: user_api.SessionCheckHandlerFunc(func(params user_api.SessionCheckParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.SessionCheck has not yet been implemented") + AuthSessionCheckHandler: auth.SessionCheckHandlerFunc(func(params auth.SessionCheckParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation auth.SessionCheck has not yet been implemented") }), - AdminAPISetAccessRuleWithBucketHandler: admin_api.SetAccessRuleWithBucketHandlerFunc(func(params admin_api.SetAccessRuleWithBucketParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SetAccessRuleWithBucket has not yet been implemented") + BucketSetAccessRuleWithBucketHandler: bucket.SetAccessRuleWithBucketHandlerFunc(func(params bucket.SetAccessRuleWithBucketParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.SetAccessRuleWithBucket has not yet been implemented") }), - UserAPISetBucketQuotaHandler: user_api.SetBucketQuotaHandlerFunc(func(params user_api.SetBucketQuotaParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.SetBucketQuota has not yet been implemented") + BucketSetBucketQuotaHandler: bucket.SetBucketQuotaHandlerFunc(func(params bucket.SetBucketQuotaParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.SetBucketQuota has not yet been implemented") }), - UserAPISetBucketRetentionConfigHandler: user_api.SetBucketRetentionConfigHandlerFunc(func(params user_api.SetBucketRetentionConfigParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.SetBucketRetentionConfig has not yet been implemented") + BucketSetBucketRetentionConfigHandler: bucket.SetBucketRetentionConfigHandlerFunc(func(params bucket.SetBucketRetentionConfigParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.SetBucketRetentionConfig has not yet been implemented") }), - UserAPISetBucketVersioningHandler: user_api.SetBucketVersioningHandlerFunc(func(params user_api.SetBucketVersioningParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.SetBucketVersioning has not yet been implemented") + BucketSetBucketVersioningHandler: bucket.SetBucketVersioningHandlerFunc(func(params bucket.SetBucketVersioningParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.SetBucketVersioning has not yet been implemented") }), - AdminAPISetConfigHandler: admin_api.SetConfigHandlerFunc(func(params admin_api.SetConfigParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SetConfig has not yet been implemented") + ConfigurationSetConfigHandler: configuration.SetConfigHandlerFunc(func(params configuration.SetConfigParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation configuration.SetConfig has not yet been implemented") }), - UserAPISetMultiBucketReplicationHandler: user_api.SetMultiBucketReplicationHandlerFunc(func(params user_api.SetMultiBucketReplicationParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.SetMultiBucketReplication has not yet been implemented") + BucketSetMultiBucketReplicationHandler: bucket.SetMultiBucketReplicationHandlerFunc(func(params bucket.SetMultiBucketReplicationParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.SetMultiBucketReplication has not yet been implemented") }), - AdminAPISetPolicyHandler: admin_api.SetPolicyHandlerFunc(func(params admin_api.SetPolicyParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SetPolicy has not yet been implemented") + PolicySetPolicyHandler: policy.SetPolicyHandlerFunc(func(params policy.SetPolicyParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation policy.SetPolicy has not yet been implemented") }), - AdminAPISetPolicyMultipleHandler: admin_api.SetPolicyMultipleHandlerFunc(func(params admin_api.SetPolicyMultipleParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SetPolicyMultiple has not yet been implemented") + PolicySetPolicyMultipleHandler: policy.SetPolicyMultipleHandlerFunc(func(params policy.SetPolicyMultipleParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation policy.SetPolicyMultiple has not yet been implemented") }), - UserAPISetServiceAccountPolicyHandler: user_api.SetServiceAccountPolicyHandlerFunc(func(params user_api.SetServiceAccountPolicyParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.SetServiceAccountPolicy has not yet been implemented") + ServiceAccountSetServiceAccountPolicyHandler: service_account.SetServiceAccountPolicyHandlerFunc(func(params service_account.SetServiceAccountPolicyParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation service_account.SetServiceAccountPolicy has not yet been implemented") }), - UserAPIShareObjectHandler: user_api.ShareObjectHandlerFunc(func(params user_api.ShareObjectParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.ShareObject has not yet been implemented") + ObjectShareObjectHandler: object.ShareObjectHandlerFunc(func(params object.ShareObjectParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation object.ShareObject has not yet been implemented") }), - AdminAPISiteReplicationEditHandler: admin_api.SiteReplicationEditHandlerFunc(func(params admin_api.SiteReplicationEditParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SiteReplicationEdit has not yet been implemented") + SiteReplicationSiteReplicationEditHandler: site_replication.SiteReplicationEditHandlerFunc(func(params site_replication.SiteReplicationEditParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation site_replication.SiteReplicationEdit has not yet been implemented") }), - AdminAPISiteReplicationInfoAddHandler: admin_api.SiteReplicationInfoAddHandlerFunc(func(params admin_api.SiteReplicationInfoAddParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SiteReplicationInfoAdd has not yet been implemented") + SiteReplicationSiteReplicationInfoAddHandler: site_replication.SiteReplicationInfoAddHandlerFunc(func(params site_replication.SiteReplicationInfoAddParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation site_replication.SiteReplicationInfoAdd has not yet been implemented") }), - AdminAPISiteReplicationRemoveHandler: admin_api.SiteReplicationRemoveHandlerFunc(func(params admin_api.SiteReplicationRemoveParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SiteReplicationRemove has not yet been implemented") + SiteReplicationSiteReplicationRemoveHandler: site_replication.SiteReplicationRemoveHandlerFunc(func(params site_replication.SiteReplicationRemoveParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation site_replication.SiteReplicationRemove has not yet been implemented") }), - AdminAPISubnetInfoHandler: admin_api.SubnetInfoHandlerFunc(func(params admin_api.SubnetInfoParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SubnetInfo has not yet been implemented") + SubnetSubnetInfoHandler: subnet.SubnetInfoHandlerFunc(func(params subnet.SubnetInfoParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation subnet.SubnetInfo has not yet been implemented") }), - AdminAPISubnetLoginHandler: admin_api.SubnetLoginHandlerFunc(func(params admin_api.SubnetLoginParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SubnetLogin has not yet been implemented") + SubnetSubnetLoginHandler: subnet.SubnetLoginHandlerFunc(func(params subnet.SubnetLoginParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation subnet.SubnetLogin has not yet been implemented") }), - AdminAPISubnetLoginMFAHandler: admin_api.SubnetLoginMFAHandlerFunc(func(params admin_api.SubnetLoginMFAParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SubnetLoginMFA has not yet been implemented") + SubnetSubnetLoginMFAHandler: subnet.SubnetLoginMFAHandlerFunc(func(params subnet.SubnetLoginMFAParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation subnet.SubnetLoginMFA has not yet been implemented") }), - AdminAPISubnetRegTokenHandler: admin_api.SubnetRegTokenHandlerFunc(func(params admin_api.SubnetRegTokenParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SubnetRegToken has not yet been implemented") + SubnetSubnetRegTokenHandler: subnet.SubnetRegTokenHandlerFunc(func(params subnet.SubnetRegTokenParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation subnet.SubnetRegToken has not yet been implemented") }), - AdminAPISubnetRegisterHandler: admin_api.SubnetRegisterHandlerFunc(func(params admin_api.SubnetRegisterParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.SubnetRegister has not yet been implemented") + SubnetSubnetRegisterHandler: subnet.SubnetRegisterHandlerFunc(func(params subnet.SubnetRegisterParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation subnet.SubnetRegister has not yet been implemented") }), - AdminAPITiersListHandler: admin_api.TiersListHandlerFunc(func(params admin_api.TiersListParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.TiersList has not yet been implemented") + TieringTiersListHandler: tiering.TiersListHandlerFunc(func(params tiering.TiersListParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation tiering.TiersList has not yet been implemented") }), - UserAPIUpdateBucketLifecycleHandler: user_api.UpdateBucketLifecycleHandlerFunc(func(params user_api.UpdateBucketLifecycleParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.UpdateBucketLifecycle has not yet been implemented") + BucketUpdateBucketLifecycleHandler: bucket.UpdateBucketLifecycleHandlerFunc(func(params bucket.UpdateBucketLifecycleParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.UpdateBucketLifecycle has not yet been implemented") }), - AdminAPIUpdateGroupHandler: admin_api.UpdateGroupHandlerFunc(func(params admin_api.UpdateGroupParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.UpdateGroup has not yet been implemented") + GroupUpdateGroupHandler: group.UpdateGroupHandlerFunc(func(params group.UpdateGroupParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation group.UpdateGroup has not yet been implemented") }), - UserAPIUpdateMultiBucketReplicationHandler: user_api.UpdateMultiBucketReplicationHandlerFunc(func(params user_api.UpdateMultiBucketReplicationParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation user_api.UpdateMultiBucketReplication has not yet been implemented") + BucketUpdateMultiBucketReplicationHandler: bucket.UpdateMultiBucketReplicationHandlerFunc(func(params bucket.UpdateMultiBucketReplicationParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation bucket.UpdateMultiBucketReplication has not yet been implemented") }), - AdminAPIUpdateUserGroupsHandler: admin_api.UpdateUserGroupsHandlerFunc(func(params admin_api.UpdateUserGroupsParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.UpdateUserGroups has not yet been implemented") + UserUpdateUserGroupsHandler: user.UpdateUserGroupsHandlerFunc(func(params user.UpdateUserGroupsParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation user.UpdateUserGroups has not yet been implemented") }), - AdminAPIUpdateUserInfoHandler: admin_api.UpdateUserInfoHandlerFunc(func(params admin_api.UpdateUserInfoParams, principal *models.Principal) middleware.Responder { - return middleware.NotImplemented("operation admin_api.UpdateUserInfo has not yet been implemented") + UserUpdateUserInfoHandler: user.UpdateUserInfoHandlerFunc(func(params user.UpdateUserInfoParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation user.UpdateUserInfo has not yet been implemented") }), KeyAuth: func(token string, scopes []string) (*models.Principal, error) { @@ -490,248 +505,248 @@ type ConsoleAPI struct { // APIAuthorizer provides access control (ACL/RBAC/ABAC) by providing access to the request and authenticated principal APIAuthorizer runtime.Authorizer - // UserAPIAccountChangePasswordHandler sets the operation handler for the account change password operation - UserAPIAccountChangePasswordHandler user_api.AccountChangePasswordHandler - // UserAPIAddBucketLifecycleHandler sets the operation handler for the add bucket lifecycle operation - UserAPIAddBucketLifecycleHandler user_api.AddBucketLifecycleHandler - // AdminAPIAddGroupHandler sets the operation handler for the add group operation - AdminAPIAddGroupHandler admin_api.AddGroupHandler - // UserAPIAddMultiBucketLifecycleHandler sets the operation handler for the add multi bucket lifecycle operation - UserAPIAddMultiBucketLifecycleHandler user_api.AddMultiBucketLifecycleHandler - // AdminAPIAddNotificationEndpointHandler sets the operation handler for the add notification endpoint operation - AdminAPIAddNotificationEndpointHandler admin_api.AddNotificationEndpointHandler - // AdminAPIAddPolicyHandler sets the operation handler for the add policy operation - AdminAPIAddPolicyHandler admin_api.AddPolicyHandler - // UserAPIAddRemoteBucketHandler sets the operation handler for the add remote bucket operation - UserAPIAddRemoteBucketHandler user_api.AddRemoteBucketHandler - // AdminAPIAddTierHandler sets the operation handler for the add tier operation - AdminAPIAddTierHandler admin_api.AddTierHandler - // AdminAPIAddUserHandler sets the operation handler for the add user operation - AdminAPIAddUserHandler admin_api.AddUserHandler - // AdminAPIAdminInfoHandler sets the operation handler for the admin info operation - AdminAPIAdminInfoHandler admin_api.AdminInfoHandler - // AdminAPIArnListHandler sets the operation handler for the arn list operation - AdminAPIArnListHandler admin_api.ArnListHandler - // UserAPIBucketInfoHandler sets the operation handler for the bucket info operation - UserAPIBucketInfoHandler user_api.BucketInfoHandler - // UserAPIBucketSetPolicyHandler sets the operation handler for the bucket set policy operation - UserAPIBucketSetPolicyHandler user_api.BucketSetPolicyHandler - // AdminAPIBulkUpdateUsersGroupsHandler sets the operation handler for the bulk update users groups operation - AdminAPIBulkUpdateUsersGroupsHandler admin_api.BulkUpdateUsersGroupsHandler - // AdminAPIChangeUserPasswordHandler sets the operation handler for the change user password operation - AdminAPIChangeUserPasswordHandler admin_api.ChangeUserPasswordHandler - // UserAPICheckMinIOVersionHandler sets the operation handler for the check min i o version operation - UserAPICheckMinIOVersionHandler user_api.CheckMinIOVersionHandler - // AdminAPIConfigInfoHandler sets the operation handler for the config info operation - AdminAPIConfigInfoHandler admin_api.ConfigInfoHandler - // AdminAPICreateAUserServiceAccountHandler sets the operation handler for the create a user service account operation - AdminAPICreateAUserServiceAccountHandler admin_api.CreateAUserServiceAccountHandler - // UserAPICreateBucketEventHandler sets the operation handler for the create bucket event operation - UserAPICreateBucketEventHandler user_api.CreateBucketEventHandler - // UserAPICreateServiceAccountHandler sets the operation handler for the create service account operation - UserAPICreateServiceAccountHandler user_api.CreateServiceAccountHandler - // AdminAPICreateServiceAccountCredentialsHandler sets the operation handler for the create service account credentials operation - AdminAPICreateServiceAccountCredentialsHandler admin_api.CreateServiceAccountCredentialsHandler - // AdminAPICreateServiceAccountCredsHandler sets the operation handler for the create service account creds operation - AdminAPICreateServiceAccountCredsHandler admin_api.CreateServiceAccountCredsHandler - // AdminAPIDashboardWidgetDetailsHandler sets the operation handler for the dashboard widget details operation - AdminAPIDashboardWidgetDetailsHandler admin_api.DashboardWidgetDetailsHandler - // AdminAPIDeleteAccessRuleWithBucketHandler sets the operation handler for the delete access rule with bucket operation - AdminAPIDeleteAccessRuleWithBucketHandler admin_api.DeleteAccessRuleWithBucketHandler - // UserAPIDeleteAllReplicationRulesHandler sets the operation handler for the delete all replication rules operation - UserAPIDeleteAllReplicationRulesHandler user_api.DeleteAllReplicationRulesHandler - // UserAPIDeleteBucketHandler sets the operation handler for the delete bucket operation - UserAPIDeleteBucketHandler user_api.DeleteBucketHandler - // UserAPIDeleteBucketEventHandler sets the operation handler for the delete bucket event operation - UserAPIDeleteBucketEventHandler user_api.DeleteBucketEventHandler - // UserAPIDeleteBucketLifecycleRuleHandler sets the operation handler for the delete bucket lifecycle rule operation - UserAPIDeleteBucketLifecycleRuleHandler user_api.DeleteBucketLifecycleRuleHandler - // UserAPIDeleteBucketReplicationRuleHandler sets the operation handler for the delete bucket replication rule operation - UserAPIDeleteBucketReplicationRuleHandler user_api.DeleteBucketReplicationRuleHandler - // UserAPIDeleteMultipleObjectsHandler sets the operation handler for the delete multiple objects operation - UserAPIDeleteMultipleObjectsHandler user_api.DeleteMultipleObjectsHandler - // UserAPIDeleteMultipleServiceAccountsHandler sets the operation handler for the delete multiple service accounts operation - UserAPIDeleteMultipleServiceAccountsHandler user_api.DeleteMultipleServiceAccountsHandler - // UserAPIDeleteObjectHandler sets the operation handler for the delete object operation - UserAPIDeleteObjectHandler user_api.DeleteObjectHandler - // UserAPIDeleteObjectRetentionHandler sets the operation handler for the delete object retention operation - UserAPIDeleteObjectRetentionHandler user_api.DeleteObjectRetentionHandler - // UserAPIDeleteRemoteBucketHandler sets the operation handler for the delete remote bucket operation - UserAPIDeleteRemoteBucketHandler user_api.DeleteRemoteBucketHandler - // UserAPIDeleteSelectedReplicationRulesHandler sets the operation handler for the delete selected replication rules operation - UserAPIDeleteSelectedReplicationRulesHandler user_api.DeleteSelectedReplicationRulesHandler - // UserAPIDeleteServiceAccountHandler sets the operation handler for the delete service account operation - UserAPIDeleteServiceAccountHandler user_api.DeleteServiceAccountHandler - // UserAPIDisableBucketEncryptionHandler sets the operation handler for the disable bucket encryption operation - UserAPIDisableBucketEncryptionHandler user_api.DisableBucketEncryptionHandler - // UserAPIDownloadObjectHandler sets the operation handler for the download object operation - UserAPIDownloadObjectHandler user_api.DownloadObjectHandler - // AdminAPIEditTierCredentialsHandler sets the operation handler for the edit tier credentials operation - AdminAPIEditTierCredentialsHandler admin_api.EditTierCredentialsHandler - // UserAPIEnableBucketEncryptionHandler sets the operation handler for the enable bucket encryption operation - UserAPIEnableBucketEncryptionHandler user_api.EnableBucketEncryptionHandler - // UserAPIGetBucketEncryptionInfoHandler sets the operation handler for the get bucket encryption info operation - UserAPIGetBucketEncryptionInfoHandler user_api.GetBucketEncryptionInfoHandler - // UserAPIGetBucketLifecycleHandler sets the operation handler for the get bucket lifecycle operation - UserAPIGetBucketLifecycleHandler user_api.GetBucketLifecycleHandler - // UserAPIGetBucketObjectLockingStatusHandler sets the operation handler for the get bucket object locking status operation - UserAPIGetBucketObjectLockingStatusHandler user_api.GetBucketObjectLockingStatusHandler - // UserAPIGetBucketQuotaHandler sets the operation handler for the get bucket quota operation - UserAPIGetBucketQuotaHandler user_api.GetBucketQuotaHandler - // UserAPIGetBucketReplicationHandler sets the operation handler for the get bucket replication operation - UserAPIGetBucketReplicationHandler user_api.GetBucketReplicationHandler - // UserAPIGetBucketReplicationRuleHandler sets the operation handler for the get bucket replication rule operation - UserAPIGetBucketReplicationRuleHandler user_api.GetBucketReplicationRuleHandler - // UserAPIGetBucketRetentionConfigHandler sets the operation handler for the get bucket retention config operation - UserAPIGetBucketRetentionConfigHandler user_api.GetBucketRetentionConfigHandler - // UserAPIGetBucketRewindHandler sets the operation handler for the get bucket rewind operation - UserAPIGetBucketRewindHandler user_api.GetBucketRewindHandler - // UserAPIGetBucketVersioningHandler sets the operation handler for the get bucket versioning operation - UserAPIGetBucketVersioningHandler user_api.GetBucketVersioningHandler - // UserAPIGetObjectMetadataHandler sets the operation handler for the get object metadata operation - UserAPIGetObjectMetadataHandler user_api.GetObjectMetadataHandler - // UserAPIGetServiceAccountPolicyHandler sets the operation handler for the get service account policy operation - UserAPIGetServiceAccountPolicyHandler user_api.GetServiceAccountPolicyHandler - // AdminAPIGetSiteReplicationInfoHandler sets the operation handler for the get site replication info operation - AdminAPIGetSiteReplicationInfoHandler admin_api.GetSiteReplicationInfoHandler - // AdminAPIGetSiteReplicationStatusHandler sets the operation handler for the get site replication status operation - AdminAPIGetSiteReplicationStatusHandler admin_api.GetSiteReplicationStatusHandler - // AdminAPIGetTierHandler sets the operation handler for the get tier operation - AdminAPIGetTierHandler admin_api.GetTierHandler - // AdminAPIGetUserInfoHandler sets the operation handler for the get user info operation - AdminAPIGetUserInfoHandler admin_api.GetUserInfoHandler - // AdminAPIGroupInfoHandler sets the operation handler for the group info operation - AdminAPIGroupInfoHandler admin_api.GroupInfoHandler - // AdminAPIInspectHandler sets the operation handler for the inspect operation - AdminAPIInspectHandler admin_api.InspectHandler - // AdminAPIListAUserServiceAccountsHandler sets the operation handler for the list a user service accounts operation - AdminAPIListAUserServiceAccountsHandler admin_api.ListAUserServiceAccountsHandler - // AdminAPIListAccessRulesWithBucketHandler sets the operation handler for the list access rules with bucket operation - AdminAPIListAccessRulesWithBucketHandler admin_api.ListAccessRulesWithBucketHandler - // UserAPIListBucketEventsHandler sets the operation handler for the list bucket events operation - UserAPIListBucketEventsHandler user_api.ListBucketEventsHandler - // UserAPIListBucketsHandler sets the operation handler for the list buckets operation - UserAPIListBucketsHandler user_api.ListBucketsHandler - // AdminAPIListConfigHandler sets the operation handler for the list config operation - AdminAPIListConfigHandler admin_api.ListConfigHandler - // UserAPIListExternalBucketsHandler sets the operation handler for the list external buckets operation - UserAPIListExternalBucketsHandler user_api.ListExternalBucketsHandler - // AdminAPIListGroupsHandler sets the operation handler for the list groups operation - AdminAPIListGroupsHandler admin_api.ListGroupsHandler - // AdminAPIListGroupsForPolicyHandler sets the operation handler for the list groups for policy operation - AdminAPIListGroupsForPolicyHandler admin_api.ListGroupsForPolicyHandler - // AdminAPIListNodesHandler sets the operation handler for the list nodes operation - AdminAPIListNodesHandler admin_api.ListNodesHandler - // UserAPIListObjectsHandler sets the operation handler for the list objects operation - UserAPIListObjectsHandler user_api.ListObjectsHandler - // AdminAPIListPoliciesHandler sets the operation handler for the list policies operation - AdminAPIListPoliciesHandler admin_api.ListPoliciesHandler - // AdminAPIListPoliciesWithBucketHandler sets the operation handler for the list policies with bucket operation - AdminAPIListPoliciesWithBucketHandler admin_api.ListPoliciesWithBucketHandler - // UserAPIListRemoteBucketsHandler sets the operation handler for the list remote buckets operation - UserAPIListRemoteBucketsHandler user_api.ListRemoteBucketsHandler - // UserAPIListUserServiceAccountsHandler sets the operation handler for the list user service accounts operation - UserAPIListUserServiceAccountsHandler user_api.ListUserServiceAccountsHandler - // AdminAPIListUsersHandler sets the operation handler for the list users operation - AdminAPIListUsersHandler admin_api.ListUsersHandler - // AdminAPIListUsersForPolicyHandler sets the operation handler for the list users for policy operation - AdminAPIListUsersForPolicyHandler admin_api.ListUsersForPolicyHandler - // AdminAPIListUsersWithAccessToBucketHandler sets the operation handler for the list users with access to bucket operation - AdminAPIListUsersWithAccessToBucketHandler admin_api.ListUsersWithAccessToBucketHandler - // UserAPILogSearchHandler sets the operation handler for the log search operation - UserAPILogSearchHandler user_api.LogSearchHandler - // UserAPILoginHandler sets the operation handler for the login operation - UserAPILoginHandler user_api.LoginHandler - // UserAPILoginDetailHandler sets the operation handler for the login detail operation - UserAPILoginDetailHandler user_api.LoginDetailHandler - // UserAPILoginOauth2AuthHandler sets the operation handler for the login oauth2 auth operation - UserAPILoginOauth2AuthHandler user_api.LoginOauth2AuthHandler - // UserAPILogoutHandler sets the operation handler for the logout operation - UserAPILogoutHandler user_api.LogoutHandler - // UserAPIMakeBucketHandler sets the operation handler for the make bucket operation - UserAPIMakeBucketHandler user_api.MakeBucketHandler - // AdminAPINotificationEndpointListHandler sets the operation handler for the notification endpoint list operation - AdminAPINotificationEndpointListHandler admin_api.NotificationEndpointListHandler - // AdminAPIPolicyInfoHandler sets the operation handler for the policy info operation - AdminAPIPolicyInfoHandler admin_api.PolicyInfoHandler - // UserAPIPostBucketsBucketNameObjectsUploadHandler sets the operation handler for the post buckets bucket name objects upload operation - UserAPIPostBucketsBucketNameObjectsUploadHandler user_api.PostBucketsBucketNameObjectsUploadHandler - // AdminAPIProfilingStartHandler sets the operation handler for the profiling start operation - AdminAPIProfilingStartHandler admin_api.ProfilingStartHandler - // AdminAPIProfilingStopHandler sets the operation handler for the profiling stop operation - AdminAPIProfilingStopHandler admin_api.ProfilingStopHandler - // UserAPIPutBucketTagsHandler sets the operation handler for the put bucket tags operation - UserAPIPutBucketTagsHandler user_api.PutBucketTagsHandler - // UserAPIPutObjectLegalHoldHandler sets the operation handler for the put object legal hold operation - UserAPIPutObjectLegalHoldHandler user_api.PutObjectLegalHoldHandler - // UserAPIPutObjectRestoreHandler sets the operation handler for the put object restore operation - UserAPIPutObjectRestoreHandler user_api.PutObjectRestoreHandler - // UserAPIPutObjectRetentionHandler sets the operation handler for the put object retention operation - UserAPIPutObjectRetentionHandler user_api.PutObjectRetentionHandler - // UserAPIPutObjectTagsHandler sets the operation handler for the put object tags operation - UserAPIPutObjectTagsHandler user_api.PutObjectTagsHandler - // UserAPIRemoteBucketDetailsHandler sets the operation handler for the remote bucket details operation - UserAPIRemoteBucketDetailsHandler user_api.RemoteBucketDetailsHandler - // AdminAPIRemoveGroupHandler sets the operation handler for the remove group operation - AdminAPIRemoveGroupHandler admin_api.RemoveGroupHandler - // AdminAPIRemovePolicyHandler sets the operation handler for the remove policy operation - AdminAPIRemovePolicyHandler admin_api.RemovePolicyHandler - // AdminAPIRemoveUserHandler sets the operation handler for the remove user operation - AdminAPIRemoveUserHandler admin_api.RemoveUserHandler - // AdminAPIResetConfigHandler sets the operation handler for the reset config operation - AdminAPIResetConfigHandler admin_api.ResetConfigHandler - // AdminAPIRestartServiceHandler sets the operation handler for the restart service operation - AdminAPIRestartServiceHandler admin_api.RestartServiceHandler - // UserAPISessionCheckHandler sets the operation handler for the session check operation - UserAPISessionCheckHandler user_api.SessionCheckHandler - // AdminAPISetAccessRuleWithBucketHandler sets the operation handler for the set access rule with bucket operation - AdminAPISetAccessRuleWithBucketHandler admin_api.SetAccessRuleWithBucketHandler - // UserAPISetBucketQuotaHandler sets the operation handler for the set bucket quota operation - UserAPISetBucketQuotaHandler user_api.SetBucketQuotaHandler - // UserAPISetBucketRetentionConfigHandler sets the operation handler for the set bucket retention config operation - UserAPISetBucketRetentionConfigHandler user_api.SetBucketRetentionConfigHandler - // UserAPISetBucketVersioningHandler sets the operation handler for the set bucket versioning operation - UserAPISetBucketVersioningHandler user_api.SetBucketVersioningHandler - // AdminAPISetConfigHandler sets the operation handler for the set config operation - AdminAPISetConfigHandler admin_api.SetConfigHandler - // UserAPISetMultiBucketReplicationHandler sets the operation handler for the set multi bucket replication operation - UserAPISetMultiBucketReplicationHandler user_api.SetMultiBucketReplicationHandler - // AdminAPISetPolicyHandler sets the operation handler for the set policy operation - AdminAPISetPolicyHandler admin_api.SetPolicyHandler - // AdminAPISetPolicyMultipleHandler sets the operation handler for the set policy multiple operation - AdminAPISetPolicyMultipleHandler admin_api.SetPolicyMultipleHandler - // UserAPISetServiceAccountPolicyHandler sets the operation handler for the set service account policy operation - UserAPISetServiceAccountPolicyHandler user_api.SetServiceAccountPolicyHandler - // UserAPIShareObjectHandler sets the operation handler for the share object operation - UserAPIShareObjectHandler user_api.ShareObjectHandler - // AdminAPISiteReplicationEditHandler sets the operation handler for the site replication edit operation - AdminAPISiteReplicationEditHandler admin_api.SiteReplicationEditHandler - // AdminAPISiteReplicationInfoAddHandler sets the operation handler for the site replication info add operation - AdminAPISiteReplicationInfoAddHandler admin_api.SiteReplicationInfoAddHandler - // AdminAPISiteReplicationRemoveHandler sets the operation handler for the site replication remove operation - AdminAPISiteReplicationRemoveHandler admin_api.SiteReplicationRemoveHandler - // AdminAPISubnetInfoHandler sets the operation handler for the subnet info operation - AdminAPISubnetInfoHandler admin_api.SubnetInfoHandler - // AdminAPISubnetLoginHandler sets the operation handler for the subnet login operation - AdminAPISubnetLoginHandler admin_api.SubnetLoginHandler - // AdminAPISubnetLoginMFAHandler sets the operation handler for the subnet login m f a operation - AdminAPISubnetLoginMFAHandler admin_api.SubnetLoginMFAHandler - // AdminAPISubnetRegTokenHandler sets the operation handler for the subnet reg token operation - AdminAPISubnetRegTokenHandler admin_api.SubnetRegTokenHandler - // AdminAPISubnetRegisterHandler sets the operation handler for the subnet register operation - AdminAPISubnetRegisterHandler admin_api.SubnetRegisterHandler - // AdminAPITiersListHandler sets the operation handler for the tiers list operation - AdminAPITiersListHandler admin_api.TiersListHandler - // UserAPIUpdateBucketLifecycleHandler sets the operation handler for the update bucket lifecycle operation - UserAPIUpdateBucketLifecycleHandler user_api.UpdateBucketLifecycleHandler - // AdminAPIUpdateGroupHandler sets the operation handler for the update group operation - AdminAPIUpdateGroupHandler admin_api.UpdateGroupHandler - // UserAPIUpdateMultiBucketReplicationHandler sets the operation handler for the update multi bucket replication operation - UserAPIUpdateMultiBucketReplicationHandler user_api.UpdateMultiBucketReplicationHandler - // AdminAPIUpdateUserGroupsHandler sets the operation handler for the update user groups operation - AdminAPIUpdateUserGroupsHandler admin_api.UpdateUserGroupsHandler - // AdminAPIUpdateUserInfoHandler sets the operation handler for the update user info operation - AdminAPIUpdateUserInfoHandler admin_api.UpdateUserInfoHandler + // AccountAccountChangePasswordHandler sets the operation handler for the account change password operation + AccountAccountChangePasswordHandler account.AccountChangePasswordHandler + // BucketAddBucketLifecycleHandler sets the operation handler for the add bucket lifecycle operation + BucketAddBucketLifecycleHandler bucket.AddBucketLifecycleHandler + // GroupAddGroupHandler sets the operation handler for the add group operation + GroupAddGroupHandler group.AddGroupHandler + // BucketAddMultiBucketLifecycleHandler sets the operation handler for the add multi bucket lifecycle operation + BucketAddMultiBucketLifecycleHandler bucket.AddMultiBucketLifecycleHandler + // ConfigurationAddNotificationEndpointHandler sets the operation handler for the add notification endpoint operation + ConfigurationAddNotificationEndpointHandler configuration.AddNotificationEndpointHandler + // PolicyAddPolicyHandler sets the operation handler for the add policy operation + PolicyAddPolicyHandler policy.AddPolicyHandler + // BucketAddRemoteBucketHandler sets the operation handler for the add remote bucket operation + BucketAddRemoteBucketHandler bucket.AddRemoteBucketHandler + // TieringAddTierHandler sets the operation handler for the add tier operation + TieringAddTierHandler tiering.AddTierHandler + // UserAddUserHandler sets the operation handler for the add user operation + UserAddUserHandler user.AddUserHandler + // SystemAdminInfoHandler sets the operation handler for the admin info operation + SystemAdminInfoHandler system.AdminInfoHandler + // SystemArnListHandler sets the operation handler for the arn list operation + SystemArnListHandler system.ArnListHandler + // BucketBucketInfoHandler sets the operation handler for the bucket info operation + BucketBucketInfoHandler bucket.BucketInfoHandler + // BucketBucketSetPolicyHandler sets the operation handler for the bucket set policy operation + BucketBucketSetPolicyHandler bucket.BucketSetPolicyHandler + // UserBulkUpdateUsersGroupsHandler sets the operation handler for the bulk update users groups operation + UserBulkUpdateUsersGroupsHandler user.BulkUpdateUsersGroupsHandler + // AccountChangeUserPasswordHandler sets the operation handler for the change user password operation + AccountChangeUserPasswordHandler account.ChangeUserPasswordHandler + // SystemCheckMinIOVersionHandler sets the operation handler for the check min i o version operation + SystemCheckMinIOVersionHandler system.CheckMinIOVersionHandler + // ConfigurationConfigInfoHandler sets the operation handler for the config info operation + ConfigurationConfigInfoHandler configuration.ConfigInfoHandler + // UserCreateAUserServiceAccountHandler sets the operation handler for the create a user service account operation + UserCreateAUserServiceAccountHandler user.CreateAUserServiceAccountHandler + // BucketCreateBucketEventHandler sets the operation handler for the create bucket event operation + BucketCreateBucketEventHandler bucket.CreateBucketEventHandler + // ServiceAccountCreateServiceAccountHandler sets the operation handler for the create service account operation + ServiceAccountCreateServiceAccountHandler service_account.CreateServiceAccountHandler + // UserCreateServiceAccountCredentialsHandler sets the operation handler for the create service account credentials operation + UserCreateServiceAccountCredentialsHandler user.CreateServiceAccountCredentialsHandler + // ServiceAccountCreateServiceAccountCredsHandler sets the operation handler for the create service account creds operation + ServiceAccountCreateServiceAccountCredsHandler service_account.CreateServiceAccountCredsHandler + // SystemDashboardWidgetDetailsHandler sets the operation handler for the dashboard widget details operation + SystemDashboardWidgetDetailsHandler system.DashboardWidgetDetailsHandler + // BucketDeleteAccessRuleWithBucketHandler sets the operation handler for the delete access rule with bucket operation + BucketDeleteAccessRuleWithBucketHandler bucket.DeleteAccessRuleWithBucketHandler + // BucketDeleteAllReplicationRulesHandler sets the operation handler for the delete all replication rules operation + BucketDeleteAllReplicationRulesHandler bucket.DeleteAllReplicationRulesHandler + // BucketDeleteBucketHandler sets the operation handler for the delete bucket operation + BucketDeleteBucketHandler bucket.DeleteBucketHandler + // BucketDeleteBucketEventHandler sets the operation handler for the delete bucket event operation + BucketDeleteBucketEventHandler bucket.DeleteBucketEventHandler + // BucketDeleteBucketLifecycleRuleHandler sets the operation handler for the delete bucket lifecycle rule operation + BucketDeleteBucketLifecycleRuleHandler bucket.DeleteBucketLifecycleRuleHandler + // BucketDeleteBucketReplicationRuleHandler sets the operation handler for the delete bucket replication rule operation + BucketDeleteBucketReplicationRuleHandler bucket.DeleteBucketReplicationRuleHandler + // ObjectDeleteMultipleObjectsHandler sets the operation handler for the delete multiple objects operation + ObjectDeleteMultipleObjectsHandler object.DeleteMultipleObjectsHandler + // ServiceAccountDeleteMultipleServiceAccountsHandler sets the operation handler for the delete multiple service accounts operation + ServiceAccountDeleteMultipleServiceAccountsHandler service_account.DeleteMultipleServiceAccountsHandler + // ObjectDeleteObjectHandler sets the operation handler for the delete object operation + ObjectDeleteObjectHandler object.DeleteObjectHandler + // ObjectDeleteObjectRetentionHandler sets the operation handler for the delete object retention operation + ObjectDeleteObjectRetentionHandler object.DeleteObjectRetentionHandler + // BucketDeleteRemoteBucketHandler sets the operation handler for the delete remote bucket operation + BucketDeleteRemoteBucketHandler bucket.DeleteRemoteBucketHandler + // BucketDeleteSelectedReplicationRulesHandler sets the operation handler for the delete selected replication rules operation + BucketDeleteSelectedReplicationRulesHandler bucket.DeleteSelectedReplicationRulesHandler + // ServiceAccountDeleteServiceAccountHandler sets the operation handler for the delete service account operation + ServiceAccountDeleteServiceAccountHandler service_account.DeleteServiceAccountHandler + // BucketDisableBucketEncryptionHandler sets the operation handler for the disable bucket encryption operation + BucketDisableBucketEncryptionHandler bucket.DisableBucketEncryptionHandler + // ObjectDownloadObjectHandler sets the operation handler for the download object operation + ObjectDownloadObjectHandler object.DownloadObjectHandler + // TieringEditTierCredentialsHandler sets the operation handler for the edit tier credentials operation + TieringEditTierCredentialsHandler tiering.EditTierCredentialsHandler + // BucketEnableBucketEncryptionHandler sets the operation handler for the enable bucket encryption operation + BucketEnableBucketEncryptionHandler bucket.EnableBucketEncryptionHandler + // BucketGetBucketEncryptionInfoHandler sets the operation handler for the get bucket encryption info operation + BucketGetBucketEncryptionInfoHandler bucket.GetBucketEncryptionInfoHandler + // BucketGetBucketLifecycleHandler sets the operation handler for the get bucket lifecycle operation + BucketGetBucketLifecycleHandler bucket.GetBucketLifecycleHandler + // BucketGetBucketObjectLockingStatusHandler sets the operation handler for the get bucket object locking status operation + BucketGetBucketObjectLockingStatusHandler bucket.GetBucketObjectLockingStatusHandler + // BucketGetBucketQuotaHandler sets the operation handler for the get bucket quota operation + BucketGetBucketQuotaHandler bucket.GetBucketQuotaHandler + // BucketGetBucketReplicationHandler sets the operation handler for the get bucket replication operation + BucketGetBucketReplicationHandler bucket.GetBucketReplicationHandler + // BucketGetBucketReplicationRuleHandler sets the operation handler for the get bucket replication rule operation + BucketGetBucketReplicationRuleHandler bucket.GetBucketReplicationRuleHandler + // BucketGetBucketRetentionConfigHandler sets the operation handler for the get bucket retention config operation + BucketGetBucketRetentionConfigHandler bucket.GetBucketRetentionConfigHandler + // BucketGetBucketRewindHandler sets the operation handler for the get bucket rewind operation + BucketGetBucketRewindHandler bucket.GetBucketRewindHandler + // BucketGetBucketVersioningHandler sets the operation handler for the get bucket versioning operation + BucketGetBucketVersioningHandler bucket.GetBucketVersioningHandler + // ObjectGetObjectMetadataHandler sets the operation handler for the get object metadata operation + ObjectGetObjectMetadataHandler object.GetObjectMetadataHandler + // ServiceAccountGetServiceAccountPolicyHandler sets the operation handler for the get service account policy operation + ServiceAccountGetServiceAccountPolicyHandler service_account.GetServiceAccountPolicyHandler + // SiteReplicationGetSiteReplicationInfoHandler sets the operation handler for the get site replication info operation + SiteReplicationGetSiteReplicationInfoHandler site_replication.GetSiteReplicationInfoHandler + // SiteReplicationGetSiteReplicationStatusHandler sets the operation handler for the get site replication status operation + SiteReplicationGetSiteReplicationStatusHandler site_replication.GetSiteReplicationStatusHandler + // TieringGetTierHandler sets the operation handler for the get tier operation + TieringGetTierHandler tiering.GetTierHandler + // UserGetUserInfoHandler sets the operation handler for the get user info operation + UserGetUserInfoHandler user.GetUserInfoHandler + // GroupGroupInfoHandler sets the operation handler for the group info operation + GroupGroupInfoHandler group.GroupInfoHandler + // InspectInspectHandler sets the operation handler for the inspect operation + InspectInspectHandler inspect.InspectHandler + // UserListAUserServiceAccountsHandler sets the operation handler for the list a user service accounts operation + UserListAUserServiceAccountsHandler user.ListAUserServiceAccountsHandler + // BucketListAccessRulesWithBucketHandler sets the operation handler for the list access rules with bucket operation + BucketListAccessRulesWithBucketHandler bucket.ListAccessRulesWithBucketHandler + // BucketListBucketEventsHandler sets the operation handler for the list bucket events operation + BucketListBucketEventsHandler bucket.ListBucketEventsHandler + // BucketListBucketsHandler sets the operation handler for the list buckets operation + BucketListBucketsHandler bucket.ListBucketsHandler + // ConfigurationListConfigHandler sets the operation handler for the list config operation + ConfigurationListConfigHandler configuration.ListConfigHandler + // BucketListExternalBucketsHandler sets the operation handler for the list external buckets operation + BucketListExternalBucketsHandler bucket.ListExternalBucketsHandler + // GroupListGroupsHandler sets the operation handler for the list groups operation + GroupListGroupsHandler group.ListGroupsHandler + // PolicyListGroupsForPolicyHandler sets the operation handler for the list groups for policy operation + PolicyListGroupsForPolicyHandler policy.ListGroupsForPolicyHandler + // SystemListNodesHandler sets the operation handler for the list nodes operation + SystemListNodesHandler system.ListNodesHandler + // ObjectListObjectsHandler sets the operation handler for the list objects operation + ObjectListObjectsHandler object.ListObjectsHandler + // PolicyListPoliciesHandler sets the operation handler for the list policies operation + PolicyListPoliciesHandler policy.ListPoliciesHandler + // BucketListPoliciesWithBucketHandler sets the operation handler for the list policies with bucket operation + BucketListPoliciesWithBucketHandler bucket.ListPoliciesWithBucketHandler + // BucketListRemoteBucketsHandler sets the operation handler for the list remote buckets operation + BucketListRemoteBucketsHandler bucket.ListRemoteBucketsHandler + // ServiceAccountListUserServiceAccountsHandler sets the operation handler for the list user service accounts operation + ServiceAccountListUserServiceAccountsHandler service_account.ListUserServiceAccountsHandler + // UserListUsersHandler sets the operation handler for the list users operation + UserListUsersHandler user.ListUsersHandler + // PolicyListUsersForPolicyHandler sets the operation handler for the list users for policy operation + PolicyListUsersForPolicyHandler policy.ListUsersForPolicyHandler + // BucketListUsersWithAccessToBucketHandler sets the operation handler for the list users with access to bucket operation + BucketListUsersWithAccessToBucketHandler bucket.ListUsersWithAccessToBucketHandler + // LoggingLogSearchHandler sets the operation handler for the log search operation + LoggingLogSearchHandler logging.LogSearchHandler + // AuthLoginHandler sets the operation handler for the login operation + AuthLoginHandler auth.LoginHandler + // AuthLoginDetailHandler sets the operation handler for the login detail operation + AuthLoginDetailHandler auth.LoginDetailHandler + // AuthLoginOauth2AuthHandler sets the operation handler for the login oauth2 auth operation + AuthLoginOauth2AuthHandler auth.LoginOauth2AuthHandler + // AuthLogoutHandler sets the operation handler for the logout operation + AuthLogoutHandler auth.LogoutHandler + // BucketMakeBucketHandler sets the operation handler for the make bucket operation + BucketMakeBucketHandler bucket.MakeBucketHandler + // ConfigurationNotificationEndpointListHandler sets the operation handler for the notification endpoint list operation + ConfigurationNotificationEndpointListHandler configuration.NotificationEndpointListHandler + // PolicyPolicyInfoHandler sets the operation handler for the policy info operation + PolicyPolicyInfoHandler policy.PolicyInfoHandler + // ObjectPostBucketsBucketNameObjectsUploadHandler sets the operation handler for the post buckets bucket name objects upload operation + ObjectPostBucketsBucketNameObjectsUploadHandler object.PostBucketsBucketNameObjectsUploadHandler + // ProfileProfilingStartHandler sets the operation handler for the profiling start operation + ProfileProfilingStartHandler profile.ProfilingStartHandler + // ProfileProfilingStopHandler sets the operation handler for the profiling stop operation + ProfileProfilingStopHandler profile.ProfilingStopHandler + // BucketPutBucketTagsHandler sets the operation handler for the put bucket tags operation + BucketPutBucketTagsHandler bucket.PutBucketTagsHandler + // ObjectPutObjectLegalHoldHandler sets the operation handler for the put object legal hold operation + ObjectPutObjectLegalHoldHandler object.PutObjectLegalHoldHandler + // ObjectPutObjectRestoreHandler sets the operation handler for the put object restore operation + ObjectPutObjectRestoreHandler object.PutObjectRestoreHandler + // ObjectPutObjectRetentionHandler sets the operation handler for the put object retention operation + ObjectPutObjectRetentionHandler object.PutObjectRetentionHandler + // ObjectPutObjectTagsHandler sets the operation handler for the put object tags operation + ObjectPutObjectTagsHandler object.PutObjectTagsHandler + // BucketRemoteBucketDetailsHandler sets the operation handler for the remote bucket details operation + BucketRemoteBucketDetailsHandler bucket.RemoteBucketDetailsHandler + // GroupRemoveGroupHandler sets the operation handler for the remove group operation + GroupRemoveGroupHandler group.RemoveGroupHandler + // PolicyRemovePolicyHandler sets the operation handler for the remove policy operation + PolicyRemovePolicyHandler policy.RemovePolicyHandler + // UserRemoveUserHandler sets the operation handler for the remove user operation + UserRemoveUserHandler user.RemoveUserHandler + // ConfigurationResetConfigHandler sets the operation handler for the reset config operation + ConfigurationResetConfigHandler configuration.ResetConfigHandler + // ServiceRestartServiceHandler sets the operation handler for the restart service operation + ServiceRestartServiceHandler service.RestartServiceHandler + // AuthSessionCheckHandler sets the operation handler for the session check operation + AuthSessionCheckHandler auth.SessionCheckHandler + // BucketSetAccessRuleWithBucketHandler sets the operation handler for the set access rule with bucket operation + BucketSetAccessRuleWithBucketHandler bucket.SetAccessRuleWithBucketHandler + // BucketSetBucketQuotaHandler sets the operation handler for the set bucket quota operation + BucketSetBucketQuotaHandler bucket.SetBucketQuotaHandler + // BucketSetBucketRetentionConfigHandler sets the operation handler for the set bucket retention config operation + BucketSetBucketRetentionConfigHandler bucket.SetBucketRetentionConfigHandler + // BucketSetBucketVersioningHandler sets the operation handler for the set bucket versioning operation + BucketSetBucketVersioningHandler bucket.SetBucketVersioningHandler + // ConfigurationSetConfigHandler sets the operation handler for the set config operation + ConfigurationSetConfigHandler configuration.SetConfigHandler + // BucketSetMultiBucketReplicationHandler sets the operation handler for the set multi bucket replication operation + BucketSetMultiBucketReplicationHandler bucket.SetMultiBucketReplicationHandler + // PolicySetPolicyHandler sets the operation handler for the set policy operation + PolicySetPolicyHandler policy.SetPolicyHandler + // PolicySetPolicyMultipleHandler sets the operation handler for the set policy multiple operation + PolicySetPolicyMultipleHandler policy.SetPolicyMultipleHandler + // ServiceAccountSetServiceAccountPolicyHandler sets the operation handler for the set service account policy operation + ServiceAccountSetServiceAccountPolicyHandler service_account.SetServiceAccountPolicyHandler + // ObjectShareObjectHandler sets the operation handler for the share object operation + ObjectShareObjectHandler object.ShareObjectHandler + // SiteReplicationSiteReplicationEditHandler sets the operation handler for the site replication edit operation + SiteReplicationSiteReplicationEditHandler site_replication.SiteReplicationEditHandler + // SiteReplicationSiteReplicationInfoAddHandler sets the operation handler for the site replication info add operation + SiteReplicationSiteReplicationInfoAddHandler site_replication.SiteReplicationInfoAddHandler + // SiteReplicationSiteReplicationRemoveHandler sets the operation handler for the site replication remove operation + SiteReplicationSiteReplicationRemoveHandler site_replication.SiteReplicationRemoveHandler + // SubnetSubnetInfoHandler sets the operation handler for the subnet info operation + SubnetSubnetInfoHandler subnet.SubnetInfoHandler + // SubnetSubnetLoginHandler sets the operation handler for the subnet login operation + SubnetSubnetLoginHandler subnet.SubnetLoginHandler + // SubnetSubnetLoginMFAHandler sets the operation handler for the subnet login m f a operation + SubnetSubnetLoginMFAHandler subnet.SubnetLoginMFAHandler + // SubnetSubnetRegTokenHandler sets the operation handler for the subnet reg token operation + SubnetSubnetRegTokenHandler subnet.SubnetRegTokenHandler + // SubnetSubnetRegisterHandler sets the operation handler for the subnet register operation + SubnetSubnetRegisterHandler subnet.SubnetRegisterHandler + // TieringTiersListHandler sets the operation handler for the tiers list operation + TieringTiersListHandler tiering.TiersListHandler + // BucketUpdateBucketLifecycleHandler sets the operation handler for the update bucket lifecycle operation + BucketUpdateBucketLifecycleHandler bucket.UpdateBucketLifecycleHandler + // GroupUpdateGroupHandler sets the operation handler for the update group operation + GroupUpdateGroupHandler group.UpdateGroupHandler + // BucketUpdateMultiBucketReplicationHandler sets the operation handler for the update multi bucket replication operation + BucketUpdateMultiBucketReplicationHandler bucket.UpdateMultiBucketReplicationHandler + // UserUpdateUserGroupsHandler sets the operation handler for the update user groups operation + UserUpdateUserGroupsHandler user.UpdateUserGroupsHandler + // UserUpdateUserInfoHandler sets the operation handler for the update user info operation + UserUpdateUserInfoHandler user.UpdateUserInfoHandler // ServeError is called when an error is received, there is a default handler // but you can set your own with this @@ -822,368 +837,368 @@ func (o *ConsoleAPI) Validate() error { unregistered = append(unregistered, "KeyAuth") } - if o.UserAPIAccountChangePasswordHandler == nil { - unregistered = append(unregistered, "user_api.AccountChangePasswordHandler") + if o.AccountAccountChangePasswordHandler == nil { + unregistered = append(unregistered, "account.AccountChangePasswordHandler") } - if o.UserAPIAddBucketLifecycleHandler == nil { - unregistered = append(unregistered, "user_api.AddBucketLifecycleHandler") + if o.BucketAddBucketLifecycleHandler == nil { + unregistered = append(unregistered, "bucket.AddBucketLifecycleHandler") } - if o.AdminAPIAddGroupHandler == nil { - unregistered = append(unregistered, "admin_api.AddGroupHandler") + if o.GroupAddGroupHandler == nil { + unregistered = append(unregistered, "group.AddGroupHandler") } - if o.UserAPIAddMultiBucketLifecycleHandler == nil { - unregistered = append(unregistered, "user_api.AddMultiBucketLifecycleHandler") + if o.BucketAddMultiBucketLifecycleHandler == nil { + unregistered = append(unregistered, "bucket.AddMultiBucketLifecycleHandler") } - if o.AdminAPIAddNotificationEndpointHandler == nil { - unregistered = append(unregistered, "admin_api.AddNotificationEndpointHandler") + if o.ConfigurationAddNotificationEndpointHandler == nil { + unregistered = append(unregistered, "configuration.AddNotificationEndpointHandler") } - if o.AdminAPIAddPolicyHandler == nil { - unregistered = append(unregistered, "admin_api.AddPolicyHandler") + if o.PolicyAddPolicyHandler == nil { + unregistered = append(unregistered, "policy.AddPolicyHandler") } - if o.UserAPIAddRemoteBucketHandler == nil { - unregistered = append(unregistered, "user_api.AddRemoteBucketHandler") + if o.BucketAddRemoteBucketHandler == nil { + unregistered = append(unregistered, "bucket.AddRemoteBucketHandler") } - if o.AdminAPIAddTierHandler == nil { - unregistered = append(unregistered, "admin_api.AddTierHandler") + if o.TieringAddTierHandler == nil { + unregistered = append(unregistered, "tiering.AddTierHandler") } - if o.AdminAPIAddUserHandler == nil { - unregistered = append(unregistered, "admin_api.AddUserHandler") + if o.UserAddUserHandler == nil { + unregistered = append(unregistered, "user.AddUserHandler") } - if o.AdminAPIAdminInfoHandler == nil { - unregistered = append(unregistered, "admin_api.AdminInfoHandler") + if o.SystemAdminInfoHandler == nil { + unregistered = append(unregistered, "system.AdminInfoHandler") } - if o.AdminAPIArnListHandler == nil { - unregistered = append(unregistered, "admin_api.ArnListHandler") + if o.SystemArnListHandler == nil { + unregistered = append(unregistered, "system.ArnListHandler") } - if o.UserAPIBucketInfoHandler == nil { - unregistered = append(unregistered, "user_api.BucketInfoHandler") + if o.BucketBucketInfoHandler == nil { + unregistered = append(unregistered, "bucket.BucketInfoHandler") } - if o.UserAPIBucketSetPolicyHandler == nil { - unregistered = append(unregistered, "user_api.BucketSetPolicyHandler") + if o.BucketBucketSetPolicyHandler == nil { + unregistered = append(unregistered, "bucket.BucketSetPolicyHandler") } - if o.AdminAPIBulkUpdateUsersGroupsHandler == nil { - unregistered = append(unregistered, "admin_api.BulkUpdateUsersGroupsHandler") + if o.UserBulkUpdateUsersGroupsHandler == nil { + unregistered = append(unregistered, "user.BulkUpdateUsersGroupsHandler") } - if o.AdminAPIChangeUserPasswordHandler == nil { - unregistered = append(unregistered, "admin_api.ChangeUserPasswordHandler") + if o.AccountChangeUserPasswordHandler == nil { + unregistered = append(unregistered, "account.ChangeUserPasswordHandler") } - if o.UserAPICheckMinIOVersionHandler == nil { - unregistered = append(unregistered, "user_api.CheckMinIOVersionHandler") + if o.SystemCheckMinIOVersionHandler == nil { + unregistered = append(unregistered, "system.CheckMinIOVersionHandler") } - if o.AdminAPIConfigInfoHandler == nil { - unregistered = append(unregistered, "admin_api.ConfigInfoHandler") + if o.ConfigurationConfigInfoHandler == nil { + unregistered = append(unregistered, "configuration.ConfigInfoHandler") } - if o.AdminAPICreateAUserServiceAccountHandler == nil { - unregistered = append(unregistered, "admin_api.CreateAUserServiceAccountHandler") + if o.UserCreateAUserServiceAccountHandler == nil { + unregistered = append(unregistered, "user.CreateAUserServiceAccountHandler") } - if o.UserAPICreateBucketEventHandler == nil { - unregistered = append(unregistered, "user_api.CreateBucketEventHandler") + if o.BucketCreateBucketEventHandler == nil { + unregistered = append(unregistered, "bucket.CreateBucketEventHandler") } - if o.UserAPICreateServiceAccountHandler == nil { - unregistered = append(unregistered, "user_api.CreateServiceAccountHandler") + if o.ServiceAccountCreateServiceAccountHandler == nil { + unregistered = append(unregistered, "service_account.CreateServiceAccountHandler") } - if o.AdminAPICreateServiceAccountCredentialsHandler == nil { - unregistered = append(unregistered, "admin_api.CreateServiceAccountCredentialsHandler") + if o.UserCreateServiceAccountCredentialsHandler == nil { + unregistered = append(unregistered, "user.CreateServiceAccountCredentialsHandler") } - if o.AdminAPICreateServiceAccountCredsHandler == nil { - unregistered = append(unregistered, "admin_api.CreateServiceAccountCredsHandler") + if o.ServiceAccountCreateServiceAccountCredsHandler == nil { + unregistered = append(unregistered, "service_account.CreateServiceAccountCredsHandler") } - if o.AdminAPIDashboardWidgetDetailsHandler == nil { - unregistered = append(unregistered, "admin_api.DashboardWidgetDetailsHandler") + if o.SystemDashboardWidgetDetailsHandler == nil { + unregistered = append(unregistered, "system.DashboardWidgetDetailsHandler") } - if o.AdminAPIDeleteAccessRuleWithBucketHandler == nil { - unregistered = append(unregistered, "admin_api.DeleteAccessRuleWithBucketHandler") + if o.BucketDeleteAccessRuleWithBucketHandler == nil { + unregistered = append(unregistered, "bucket.DeleteAccessRuleWithBucketHandler") } - if o.UserAPIDeleteAllReplicationRulesHandler == nil { - unregistered = append(unregistered, "user_api.DeleteAllReplicationRulesHandler") + if o.BucketDeleteAllReplicationRulesHandler == nil { + unregistered = append(unregistered, "bucket.DeleteAllReplicationRulesHandler") } - if o.UserAPIDeleteBucketHandler == nil { - unregistered = append(unregistered, "user_api.DeleteBucketHandler") + if o.BucketDeleteBucketHandler == nil { + unregistered = append(unregistered, "bucket.DeleteBucketHandler") } - if o.UserAPIDeleteBucketEventHandler == nil { - unregistered = append(unregistered, "user_api.DeleteBucketEventHandler") + if o.BucketDeleteBucketEventHandler == nil { + unregistered = append(unregistered, "bucket.DeleteBucketEventHandler") } - if o.UserAPIDeleteBucketLifecycleRuleHandler == nil { - unregistered = append(unregistered, "user_api.DeleteBucketLifecycleRuleHandler") + if o.BucketDeleteBucketLifecycleRuleHandler == nil { + unregistered = append(unregistered, "bucket.DeleteBucketLifecycleRuleHandler") } - if o.UserAPIDeleteBucketReplicationRuleHandler == nil { - unregistered = append(unregistered, "user_api.DeleteBucketReplicationRuleHandler") + if o.BucketDeleteBucketReplicationRuleHandler == nil { + unregistered = append(unregistered, "bucket.DeleteBucketReplicationRuleHandler") } - if o.UserAPIDeleteMultipleObjectsHandler == nil { - unregistered = append(unregistered, "user_api.DeleteMultipleObjectsHandler") + if o.ObjectDeleteMultipleObjectsHandler == nil { + unregistered = append(unregistered, "object.DeleteMultipleObjectsHandler") } - if o.UserAPIDeleteMultipleServiceAccountsHandler == nil { - unregistered = append(unregistered, "user_api.DeleteMultipleServiceAccountsHandler") + if o.ServiceAccountDeleteMultipleServiceAccountsHandler == nil { + unregistered = append(unregistered, "service_account.DeleteMultipleServiceAccountsHandler") } - if o.UserAPIDeleteObjectHandler == nil { - unregistered = append(unregistered, "user_api.DeleteObjectHandler") + if o.ObjectDeleteObjectHandler == nil { + unregistered = append(unregistered, "object.DeleteObjectHandler") } - if o.UserAPIDeleteObjectRetentionHandler == nil { - unregistered = append(unregistered, "user_api.DeleteObjectRetentionHandler") + if o.ObjectDeleteObjectRetentionHandler == nil { + unregistered = append(unregistered, "object.DeleteObjectRetentionHandler") } - if o.UserAPIDeleteRemoteBucketHandler == nil { - unregistered = append(unregistered, "user_api.DeleteRemoteBucketHandler") + if o.BucketDeleteRemoteBucketHandler == nil { + unregistered = append(unregistered, "bucket.DeleteRemoteBucketHandler") } - if o.UserAPIDeleteSelectedReplicationRulesHandler == nil { - unregistered = append(unregistered, "user_api.DeleteSelectedReplicationRulesHandler") + if o.BucketDeleteSelectedReplicationRulesHandler == nil { + unregistered = append(unregistered, "bucket.DeleteSelectedReplicationRulesHandler") } - if o.UserAPIDeleteServiceAccountHandler == nil { - unregistered = append(unregistered, "user_api.DeleteServiceAccountHandler") + if o.ServiceAccountDeleteServiceAccountHandler == nil { + unregistered = append(unregistered, "service_account.DeleteServiceAccountHandler") } - if o.UserAPIDisableBucketEncryptionHandler == nil { - unregistered = append(unregistered, "user_api.DisableBucketEncryptionHandler") + if o.BucketDisableBucketEncryptionHandler == nil { + unregistered = append(unregistered, "bucket.DisableBucketEncryptionHandler") } - if o.UserAPIDownloadObjectHandler == nil { - unregistered = append(unregistered, "user_api.DownloadObjectHandler") + if o.ObjectDownloadObjectHandler == nil { + unregistered = append(unregistered, "object.DownloadObjectHandler") } - if o.AdminAPIEditTierCredentialsHandler == nil { - unregistered = append(unregistered, "admin_api.EditTierCredentialsHandler") + if o.TieringEditTierCredentialsHandler == nil { + unregistered = append(unregistered, "tiering.EditTierCredentialsHandler") } - if o.UserAPIEnableBucketEncryptionHandler == nil { - unregistered = append(unregistered, "user_api.EnableBucketEncryptionHandler") + if o.BucketEnableBucketEncryptionHandler == nil { + unregistered = append(unregistered, "bucket.EnableBucketEncryptionHandler") } - if o.UserAPIGetBucketEncryptionInfoHandler == nil { - unregistered = append(unregistered, "user_api.GetBucketEncryptionInfoHandler") + if o.BucketGetBucketEncryptionInfoHandler == nil { + unregistered = append(unregistered, "bucket.GetBucketEncryptionInfoHandler") } - if o.UserAPIGetBucketLifecycleHandler == nil { - unregistered = append(unregistered, "user_api.GetBucketLifecycleHandler") + if o.BucketGetBucketLifecycleHandler == nil { + unregistered = append(unregistered, "bucket.GetBucketLifecycleHandler") } - if o.UserAPIGetBucketObjectLockingStatusHandler == nil { - unregistered = append(unregistered, "user_api.GetBucketObjectLockingStatusHandler") + if o.BucketGetBucketObjectLockingStatusHandler == nil { + unregistered = append(unregistered, "bucket.GetBucketObjectLockingStatusHandler") } - if o.UserAPIGetBucketQuotaHandler == nil { - unregistered = append(unregistered, "user_api.GetBucketQuotaHandler") + if o.BucketGetBucketQuotaHandler == nil { + unregistered = append(unregistered, "bucket.GetBucketQuotaHandler") } - if o.UserAPIGetBucketReplicationHandler == nil { - unregistered = append(unregistered, "user_api.GetBucketReplicationHandler") + if o.BucketGetBucketReplicationHandler == nil { + unregistered = append(unregistered, "bucket.GetBucketReplicationHandler") } - if o.UserAPIGetBucketReplicationRuleHandler == nil { - unregistered = append(unregistered, "user_api.GetBucketReplicationRuleHandler") + if o.BucketGetBucketReplicationRuleHandler == nil { + unregistered = append(unregistered, "bucket.GetBucketReplicationRuleHandler") } - if o.UserAPIGetBucketRetentionConfigHandler == nil { - unregistered = append(unregistered, "user_api.GetBucketRetentionConfigHandler") + if o.BucketGetBucketRetentionConfigHandler == nil { + unregistered = append(unregistered, "bucket.GetBucketRetentionConfigHandler") } - if o.UserAPIGetBucketRewindHandler == nil { - unregistered = append(unregistered, "user_api.GetBucketRewindHandler") + if o.BucketGetBucketRewindHandler == nil { + unregistered = append(unregistered, "bucket.GetBucketRewindHandler") } - if o.UserAPIGetBucketVersioningHandler == nil { - unregistered = append(unregistered, "user_api.GetBucketVersioningHandler") + if o.BucketGetBucketVersioningHandler == nil { + unregistered = append(unregistered, "bucket.GetBucketVersioningHandler") } - if o.UserAPIGetObjectMetadataHandler == nil { - unregistered = append(unregistered, "user_api.GetObjectMetadataHandler") + if o.ObjectGetObjectMetadataHandler == nil { + unregistered = append(unregistered, "object.GetObjectMetadataHandler") } - if o.UserAPIGetServiceAccountPolicyHandler == nil { - unregistered = append(unregistered, "user_api.GetServiceAccountPolicyHandler") + if o.ServiceAccountGetServiceAccountPolicyHandler == nil { + unregistered = append(unregistered, "service_account.GetServiceAccountPolicyHandler") } - if o.AdminAPIGetSiteReplicationInfoHandler == nil { - unregistered = append(unregistered, "admin_api.GetSiteReplicationInfoHandler") + if o.SiteReplicationGetSiteReplicationInfoHandler == nil { + unregistered = append(unregistered, "site_replication.GetSiteReplicationInfoHandler") } - if o.AdminAPIGetSiteReplicationStatusHandler == nil { - unregistered = append(unregistered, "admin_api.GetSiteReplicationStatusHandler") + if o.SiteReplicationGetSiteReplicationStatusHandler == nil { + unregistered = append(unregistered, "site_replication.GetSiteReplicationStatusHandler") } - if o.AdminAPIGetTierHandler == nil { - unregistered = append(unregistered, "admin_api.GetTierHandler") + if o.TieringGetTierHandler == nil { + unregistered = append(unregistered, "tiering.GetTierHandler") } - if o.AdminAPIGetUserInfoHandler == nil { - unregistered = append(unregistered, "admin_api.GetUserInfoHandler") + if o.UserGetUserInfoHandler == nil { + unregistered = append(unregistered, "user.GetUserInfoHandler") } - if o.AdminAPIGroupInfoHandler == nil { - unregistered = append(unregistered, "admin_api.GroupInfoHandler") + if o.GroupGroupInfoHandler == nil { + unregistered = append(unregistered, "group.GroupInfoHandler") } - if o.AdminAPIInspectHandler == nil { - unregistered = append(unregistered, "admin_api.InspectHandler") + if o.InspectInspectHandler == nil { + unregistered = append(unregistered, "inspect.InspectHandler") } - if o.AdminAPIListAUserServiceAccountsHandler == nil { - unregistered = append(unregistered, "admin_api.ListAUserServiceAccountsHandler") + if o.UserListAUserServiceAccountsHandler == nil { + unregistered = append(unregistered, "user.ListAUserServiceAccountsHandler") } - if o.AdminAPIListAccessRulesWithBucketHandler == nil { - unregistered = append(unregistered, "admin_api.ListAccessRulesWithBucketHandler") + if o.BucketListAccessRulesWithBucketHandler == nil { + unregistered = append(unregistered, "bucket.ListAccessRulesWithBucketHandler") } - if o.UserAPIListBucketEventsHandler == nil { - unregistered = append(unregistered, "user_api.ListBucketEventsHandler") + if o.BucketListBucketEventsHandler == nil { + unregistered = append(unregistered, "bucket.ListBucketEventsHandler") } - if o.UserAPIListBucketsHandler == nil { - unregistered = append(unregistered, "user_api.ListBucketsHandler") + if o.BucketListBucketsHandler == nil { + unregistered = append(unregistered, "bucket.ListBucketsHandler") } - if o.AdminAPIListConfigHandler == nil { - unregistered = append(unregistered, "admin_api.ListConfigHandler") + if o.ConfigurationListConfigHandler == nil { + unregistered = append(unregistered, "configuration.ListConfigHandler") } - if o.UserAPIListExternalBucketsHandler == nil { - unregistered = append(unregistered, "user_api.ListExternalBucketsHandler") + if o.BucketListExternalBucketsHandler == nil { + unregistered = append(unregistered, "bucket.ListExternalBucketsHandler") } - if o.AdminAPIListGroupsHandler == nil { - unregistered = append(unregistered, "admin_api.ListGroupsHandler") + if o.GroupListGroupsHandler == nil { + unregistered = append(unregistered, "group.ListGroupsHandler") } - if o.AdminAPIListGroupsForPolicyHandler == nil { - unregistered = append(unregistered, "admin_api.ListGroupsForPolicyHandler") + if o.PolicyListGroupsForPolicyHandler == nil { + unregistered = append(unregistered, "policy.ListGroupsForPolicyHandler") } - if o.AdminAPIListNodesHandler == nil { - unregistered = append(unregistered, "admin_api.ListNodesHandler") + if o.SystemListNodesHandler == nil { + unregistered = append(unregistered, "system.ListNodesHandler") } - if o.UserAPIListObjectsHandler == nil { - unregistered = append(unregistered, "user_api.ListObjectsHandler") + if o.ObjectListObjectsHandler == nil { + unregistered = append(unregistered, "object.ListObjectsHandler") } - if o.AdminAPIListPoliciesHandler == nil { - unregistered = append(unregistered, "admin_api.ListPoliciesHandler") + if o.PolicyListPoliciesHandler == nil { + unregistered = append(unregistered, "policy.ListPoliciesHandler") } - if o.AdminAPIListPoliciesWithBucketHandler == nil { - unregistered = append(unregistered, "admin_api.ListPoliciesWithBucketHandler") + if o.BucketListPoliciesWithBucketHandler == nil { + unregistered = append(unregistered, "bucket.ListPoliciesWithBucketHandler") } - if o.UserAPIListRemoteBucketsHandler == nil { - unregistered = append(unregistered, "user_api.ListRemoteBucketsHandler") + if o.BucketListRemoteBucketsHandler == nil { + unregistered = append(unregistered, "bucket.ListRemoteBucketsHandler") } - if o.UserAPIListUserServiceAccountsHandler == nil { - unregistered = append(unregistered, "user_api.ListUserServiceAccountsHandler") + if o.ServiceAccountListUserServiceAccountsHandler == nil { + unregistered = append(unregistered, "service_account.ListUserServiceAccountsHandler") } - if o.AdminAPIListUsersHandler == nil { - unregistered = append(unregistered, "admin_api.ListUsersHandler") + if o.UserListUsersHandler == nil { + unregistered = append(unregistered, "user.ListUsersHandler") } - if o.AdminAPIListUsersForPolicyHandler == nil { - unregistered = append(unregistered, "admin_api.ListUsersForPolicyHandler") + if o.PolicyListUsersForPolicyHandler == nil { + unregistered = append(unregistered, "policy.ListUsersForPolicyHandler") } - if o.AdminAPIListUsersWithAccessToBucketHandler == nil { - unregistered = append(unregistered, "admin_api.ListUsersWithAccessToBucketHandler") + if o.BucketListUsersWithAccessToBucketHandler == nil { + unregistered = append(unregistered, "bucket.ListUsersWithAccessToBucketHandler") } - if o.UserAPILogSearchHandler == nil { - unregistered = append(unregistered, "user_api.LogSearchHandler") + if o.LoggingLogSearchHandler == nil { + unregistered = append(unregistered, "logging.LogSearchHandler") } - if o.UserAPILoginHandler == nil { - unregistered = append(unregistered, "user_api.LoginHandler") + if o.AuthLoginHandler == nil { + unregistered = append(unregistered, "auth.LoginHandler") } - if o.UserAPILoginDetailHandler == nil { - unregistered = append(unregistered, "user_api.LoginDetailHandler") + if o.AuthLoginDetailHandler == nil { + unregistered = append(unregistered, "auth.LoginDetailHandler") } - if o.UserAPILoginOauth2AuthHandler == nil { - unregistered = append(unregistered, "user_api.LoginOauth2AuthHandler") + if o.AuthLoginOauth2AuthHandler == nil { + unregistered = append(unregistered, "auth.LoginOauth2AuthHandler") } - if o.UserAPILogoutHandler == nil { - unregistered = append(unregistered, "user_api.LogoutHandler") + if o.AuthLogoutHandler == nil { + unregistered = append(unregistered, "auth.LogoutHandler") } - if o.UserAPIMakeBucketHandler == nil { - unregistered = append(unregistered, "user_api.MakeBucketHandler") + if o.BucketMakeBucketHandler == nil { + unregistered = append(unregistered, "bucket.MakeBucketHandler") } - if o.AdminAPINotificationEndpointListHandler == nil { - unregistered = append(unregistered, "admin_api.NotificationEndpointListHandler") + if o.ConfigurationNotificationEndpointListHandler == nil { + unregistered = append(unregistered, "configuration.NotificationEndpointListHandler") } - if o.AdminAPIPolicyInfoHandler == nil { - unregistered = append(unregistered, "admin_api.PolicyInfoHandler") + if o.PolicyPolicyInfoHandler == nil { + unregistered = append(unregistered, "policy.PolicyInfoHandler") } - if o.UserAPIPostBucketsBucketNameObjectsUploadHandler == nil { - unregistered = append(unregistered, "user_api.PostBucketsBucketNameObjectsUploadHandler") + if o.ObjectPostBucketsBucketNameObjectsUploadHandler == nil { + unregistered = append(unregistered, "object.PostBucketsBucketNameObjectsUploadHandler") } - if o.AdminAPIProfilingStartHandler == nil { - unregistered = append(unregistered, "admin_api.ProfilingStartHandler") + if o.ProfileProfilingStartHandler == nil { + unregistered = append(unregistered, "profile.ProfilingStartHandler") } - if o.AdminAPIProfilingStopHandler == nil { - unregistered = append(unregistered, "admin_api.ProfilingStopHandler") + if o.ProfileProfilingStopHandler == nil { + unregistered = append(unregistered, "profile.ProfilingStopHandler") } - if o.UserAPIPutBucketTagsHandler == nil { - unregistered = append(unregistered, "user_api.PutBucketTagsHandler") + if o.BucketPutBucketTagsHandler == nil { + unregistered = append(unregistered, "bucket.PutBucketTagsHandler") } - if o.UserAPIPutObjectLegalHoldHandler == nil { - unregistered = append(unregistered, "user_api.PutObjectLegalHoldHandler") + if o.ObjectPutObjectLegalHoldHandler == nil { + unregistered = append(unregistered, "object.PutObjectLegalHoldHandler") } - if o.UserAPIPutObjectRestoreHandler == nil { - unregistered = append(unregistered, "user_api.PutObjectRestoreHandler") + if o.ObjectPutObjectRestoreHandler == nil { + unregistered = append(unregistered, "object.PutObjectRestoreHandler") } - if o.UserAPIPutObjectRetentionHandler == nil { - unregistered = append(unregistered, "user_api.PutObjectRetentionHandler") + if o.ObjectPutObjectRetentionHandler == nil { + unregistered = append(unregistered, "object.PutObjectRetentionHandler") } - if o.UserAPIPutObjectTagsHandler == nil { - unregistered = append(unregistered, "user_api.PutObjectTagsHandler") + if o.ObjectPutObjectTagsHandler == nil { + unregistered = append(unregistered, "object.PutObjectTagsHandler") } - if o.UserAPIRemoteBucketDetailsHandler == nil { - unregistered = append(unregistered, "user_api.RemoteBucketDetailsHandler") + if o.BucketRemoteBucketDetailsHandler == nil { + unregistered = append(unregistered, "bucket.RemoteBucketDetailsHandler") } - if o.AdminAPIRemoveGroupHandler == nil { - unregistered = append(unregistered, "admin_api.RemoveGroupHandler") + if o.GroupRemoveGroupHandler == nil { + unregistered = append(unregistered, "group.RemoveGroupHandler") } - if o.AdminAPIRemovePolicyHandler == nil { - unregistered = append(unregistered, "admin_api.RemovePolicyHandler") + if o.PolicyRemovePolicyHandler == nil { + unregistered = append(unregistered, "policy.RemovePolicyHandler") } - if o.AdminAPIRemoveUserHandler == nil { - unregistered = append(unregistered, "admin_api.RemoveUserHandler") + if o.UserRemoveUserHandler == nil { + unregistered = append(unregistered, "user.RemoveUserHandler") } - if o.AdminAPIResetConfigHandler == nil { - unregistered = append(unregistered, "admin_api.ResetConfigHandler") + if o.ConfigurationResetConfigHandler == nil { + unregistered = append(unregistered, "configuration.ResetConfigHandler") } - if o.AdminAPIRestartServiceHandler == nil { - unregistered = append(unregistered, "admin_api.RestartServiceHandler") + if o.ServiceRestartServiceHandler == nil { + unregistered = append(unregistered, "service.RestartServiceHandler") } - if o.UserAPISessionCheckHandler == nil { - unregistered = append(unregistered, "user_api.SessionCheckHandler") + if o.AuthSessionCheckHandler == nil { + unregistered = append(unregistered, "auth.SessionCheckHandler") } - if o.AdminAPISetAccessRuleWithBucketHandler == nil { - unregistered = append(unregistered, "admin_api.SetAccessRuleWithBucketHandler") + if o.BucketSetAccessRuleWithBucketHandler == nil { + unregistered = append(unregistered, "bucket.SetAccessRuleWithBucketHandler") } - if o.UserAPISetBucketQuotaHandler == nil { - unregistered = append(unregistered, "user_api.SetBucketQuotaHandler") + if o.BucketSetBucketQuotaHandler == nil { + unregistered = append(unregistered, "bucket.SetBucketQuotaHandler") } - if o.UserAPISetBucketRetentionConfigHandler == nil { - unregistered = append(unregistered, "user_api.SetBucketRetentionConfigHandler") + if o.BucketSetBucketRetentionConfigHandler == nil { + unregistered = append(unregistered, "bucket.SetBucketRetentionConfigHandler") } - if o.UserAPISetBucketVersioningHandler == nil { - unregistered = append(unregistered, "user_api.SetBucketVersioningHandler") + if o.BucketSetBucketVersioningHandler == nil { + unregistered = append(unregistered, "bucket.SetBucketVersioningHandler") } - if o.AdminAPISetConfigHandler == nil { - unregistered = append(unregistered, "admin_api.SetConfigHandler") + if o.ConfigurationSetConfigHandler == nil { + unregistered = append(unregistered, "configuration.SetConfigHandler") } - if o.UserAPISetMultiBucketReplicationHandler == nil { - unregistered = append(unregistered, "user_api.SetMultiBucketReplicationHandler") + if o.BucketSetMultiBucketReplicationHandler == nil { + unregistered = append(unregistered, "bucket.SetMultiBucketReplicationHandler") } - if o.AdminAPISetPolicyHandler == nil { - unregistered = append(unregistered, "admin_api.SetPolicyHandler") + if o.PolicySetPolicyHandler == nil { + unregistered = append(unregistered, "policy.SetPolicyHandler") } - if o.AdminAPISetPolicyMultipleHandler == nil { - unregistered = append(unregistered, "admin_api.SetPolicyMultipleHandler") + if o.PolicySetPolicyMultipleHandler == nil { + unregistered = append(unregistered, "policy.SetPolicyMultipleHandler") } - if o.UserAPISetServiceAccountPolicyHandler == nil { - unregistered = append(unregistered, "user_api.SetServiceAccountPolicyHandler") + if o.ServiceAccountSetServiceAccountPolicyHandler == nil { + unregistered = append(unregistered, "service_account.SetServiceAccountPolicyHandler") } - if o.UserAPIShareObjectHandler == nil { - unregistered = append(unregistered, "user_api.ShareObjectHandler") + if o.ObjectShareObjectHandler == nil { + unregistered = append(unregistered, "object.ShareObjectHandler") } - if o.AdminAPISiteReplicationEditHandler == nil { - unregistered = append(unregistered, "admin_api.SiteReplicationEditHandler") + if o.SiteReplicationSiteReplicationEditHandler == nil { + unregistered = append(unregistered, "site_replication.SiteReplicationEditHandler") } - if o.AdminAPISiteReplicationInfoAddHandler == nil { - unregistered = append(unregistered, "admin_api.SiteReplicationInfoAddHandler") + if o.SiteReplicationSiteReplicationInfoAddHandler == nil { + unregistered = append(unregistered, "site_replication.SiteReplicationInfoAddHandler") } - if o.AdminAPISiteReplicationRemoveHandler == nil { - unregistered = append(unregistered, "admin_api.SiteReplicationRemoveHandler") + if o.SiteReplicationSiteReplicationRemoveHandler == nil { + unregistered = append(unregistered, "site_replication.SiteReplicationRemoveHandler") } - if o.AdminAPISubnetInfoHandler == nil { - unregistered = append(unregistered, "admin_api.SubnetInfoHandler") + if o.SubnetSubnetInfoHandler == nil { + unregistered = append(unregistered, "subnet.SubnetInfoHandler") } - if o.AdminAPISubnetLoginHandler == nil { - unregistered = append(unregistered, "admin_api.SubnetLoginHandler") + if o.SubnetSubnetLoginHandler == nil { + unregistered = append(unregistered, "subnet.SubnetLoginHandler") } - if o.AdminAPISubnetLoginMFAHandler == nil { - unregistered = append(unregistered, "admin_api.SubnetLoginMFAHandler") + if o.SubnetSubnetLoginMFAHandler == nil { + unregistered = append(unregistered, "subnet.SubnetLoginMFAHandler") } - if o.AdminAPISubnetRegTokenHandler == nil { - unregistered = append(unregistered, "admin_api.SubnetRegTokenHandler") + if o.SubnetSubnetRegTokenHandler == nil { + unregistered = append(unregistered, "subnet.SubnetRegTokenHandler") } - if o.AdminAPISubnetRegisterHandler == nil { - unregistered = append(unregistered, "admin_api.SubnetRegisterHandler") + if o.SubnetSubnetRegisterHandler == nil { + unregistered = append(unregistered, "subnet.SubnetRegisterHandler") } - if o.AdminAPITiersListHandler == nil { - unregistered = append(unregistered, "admin_api.TiersListHandler") + if o.TieringTiersListHandler == nil { + unregistered = append(unregistered, "tiering.TiersListHandler") } - if o.UserAPIUpdateBucketLifecycleHandler == nil { - unregistered = append(unregistered, "user_api.UpdateBucketLifecycleHandler") + if o.BucketUpdateBucketLifecycleHandler == nil { + unregistered = append(unregistered, "bucket.UpdateBucketLifecycleHandler") } - if o.AdminAPIUpdateGroupHandler == nil { - unregistered = append(unregistered, "admin_api.UpdateGroupHandler") + if o.GroupUpdateGroupHandler == nil { + unregistered = append(unregistered, "group.UpdateGroupHandler") } - if o.UserAPIUpdateMultiBucketReplicationHandler == nil { - unregistered = append(unregistered, "user_api.UpdateMultiBucketReplicationHandler") + if o.BucketUpdateMultiBucketReplicationHandler == nil { + unregistered = append(unregistered, "bucket.UpdateMultiBucketReplicationHandler") } - if o.AdminAPIUpdateUserGroupsHandler == nil { - unregistered = append(unregistered, "admin_api.UpdateUserGroupsHandler") + if o.UserUpdateUserGroupsHandler == nil { + unregistered = append(unregistered, "user.UpdateUserGroupsHandler") } - if o.AdminAPIUpdateUserInfoHandler == nil { - unregistered = append(unregistered, "admin_api.UpdateUserInfoHandler") + if o.UserUpdateUserInfoHandler == nil { + unregistered = append(unregistered, "user.UpdateUserInfoHandler") } if len(unregistered) > 0 { @@ -1292,487 +1307,487 @@ func (o *ConsoleAPI) initHandlerCache() { if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/account/change-password"] = user_api.NewAccountChangePassword(o.context, o.UserAPIAccountChangePasswordHandler) + o.handlers["POST"]["/account/change-password"] = account.NewAccountChangePassword(o.context, o.AccountAccountChangePasswordHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/buckets/{bucket_name}/lifecycle"] = user_api.NewAddBucketLifecycle(o.context, o.UserAPIAddBucketLifecycleHandler) + o.handlers["POST"]["/buckets/{bucket_name}/lifecycle"] = bucket.NewAddBucketLifecycle(o.context, o.BucketAddBucketLifecycleHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/groups"] = admin_api.NewAddGroup(o.context, o.AdminAPIAddGroupHandler) + o.handlers["POST"]["/groups"] = group.NewAddGroup(o.context, o.GroupAddGroupHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/buckets/multi-lifecycle"] = user_api.NewAddMultiBucketLifecycle(o.context, o.UserAPIAddMultiBucketLifecycleHandler) + o.handlers["POST"]["/buckets/multi-lifecycle"] = bucket.NewAddMultiBucketLifecycle(o.context, o.BucketAddMultiBucketLifecycleHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/admin/notification_endpoints"] = admin_api.NewAddNotificationEndpoint(o.context, o.AdminAPIAddNotificationEndpointHandler) + o.handlers["POST"]["/admin/notification_endpoints"] = configuration.NewAddNotificationEndpoint(o.context, o.ConfigurationAddNotificationEndpointHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/policies"] = admin_api.NewAddPolicy(o.context, o.AdminAPIAddPolicyHandler) + o.handlers["POST"]["/policies"] = policy.NewAddPolicy(o.context, o.PolicyAddPolicyHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/remote-buckets"] = user_api.NewAddRemoteBucket(o.context, o.UserAPIAddRemoteBucketHandler) + o.handlers["POST"]["/remote-buckets"] = bucket.NewAddRemoteBucket(o.context, o.BucketAddRemoteBucketHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/admin/tiers"] = admin_api.NewAddTier(o.context, o.AdminAPIAddTierHandler) + o.handlers["POST"]["/admin/tiers"] = tiering.NewAddTier(o.context, o.TieringAddTierHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/users"] = admin_api.NewAddUser(o.context, o.AdminAPIAddUserHandler) + o.handlers["POST"]["/users"] = user.NewAddUser(o.context, o.UserAddUserHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/admin/info"] = admin_api.NewAdminInfo(o.context, o.AdminAPIAdminInfoHandler) + o.handlers["GET"]["/admin/info"] = system.NewAdminInfo(o.context, o.SystemAdminInfoHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/admin/arns"] = admin_api.NewArnList(o.context, o.AdminAPIArnListHandler) + o.handlers["GET"]["/admin/arns"] = system.NewArnList(o.context, o.SystemArnListHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{name}"] = user_api.NewBucketInfo(o.context, o.UserAPIBucketInfoHandler) + o.handlers["GET"]["/buckets/{name}"] = bucket.NewBucketInfo(o.context, o.BucketBucketInfoHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/buckets/{name}/set-policy"] = user_api.NewBucketSetPolicy(o.context, o.UserAPIBucketSetPolicyHandler) + o.handlers["PUT"]["/buckets/{name}/set-policy"] = bucket.NewBucketSetPolicy(o.context, o.BucketBucketSetPolicyHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/users-groups-bulk"] = admin_api.NewBulkUpdateUsersGroups(o.context, o.AdminAPIBulkUpdateUsersGroupsHandler) + o.handlers["PUT"]["/users-groups-bulk"] = user.NewBulkUpdateUsersGroups(o.context, o.UserBulkUpdateUsersGroupsHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/account/change-user-password"] = admin_api.NewChangeUserPassword(o.context, o.AdminAPIChangeUserPasswordHandler) + o.handlers["POST"]["/account/change-user-password"] = account.NewChangeUserPassword(o.context, o.AccountChangeUserPasswordHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/check-version"] = user_api.NewCheckMinIOVersion(o.context, o.UserAPICheckMinIOVersionHandler) + o.handlers["GET"]["/check-version"] = system.NewCheckMinIOVersion(o.context, o.SystemCheckMinIOVersionHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/configs/{name}"] = admin_api.NewConfigInfo(o.context, o.AdminAPIConfigInfoHandler) + o.handlers["GET"]["/configs/{name}"] = configuration.NewConfigInfo(o.context, o.ConfigurationConfigInfoHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/user/{name}/service-accounts"] = admin_api.NewCreateAUserServiceAccount(o.context, o.AdminAPICreateAUserServiceAccountHandler) + o.handlers["POST"]["/user/{name}/service-accounts"] = user.NewCreateAUserServiceAccount(o.context, o.UserCreateAUserServiceAccountHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/buckets/{bucket_name}/events"] = user_api.NewCreateBucketEvent(o.context, o.UserAPICreateBucketEventHandler) + o.handlers["POST"]["/buckets/{bucket_name}/events"] = bucket.NewCreateBucketEvent(o.context, o.BucketCreateBucketEventHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/service-accounts"] = user_api.NewCreateServiceAccount(o.context, o.UserAPICreateServiceAccountHandler) + o.handlers["POST"]["/service-accounts"] = service_account.NewCreateServiceAccount(o.context, o.ServiceAccountCreateServiceAccountHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/user/{name}/service-account-credentials"] = admin_api.NewCreateServiceAccountCredentials(o.context, o.AdminAPICreateServiceAccountCredentialsHandler) + o.handlers["POST"]["/user/{name}/service-account-credentials"] = user.NewCreateServiceAccountCredentials(o.context, o.UserCreateServiceAccountCredentialsHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/service-account-credentials"] = admin_api.NewCreateServiceAccountCreds(o.context, o.AdminAPICreateServiceAccountCredsHandler) + o.handlers["POST"]["/service-account-credentials"] = service_account.NewCreateServiceAccountCreds(o.context, o.ServiceAccountCreateServiceAccountCredsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/admin/info/widgets/{widgetId}"] = admin_api.NewDashboardWidgetDetails(o.context, o.AdminAPIDashboardWidgetDetailsHandler) + o.handlers["GET"]["/admin/info/widgets/{widgetId}"] = system.NewDashboardWidgetDetails(o.context, o.SystemDashboardWidgetDetailsHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/bucket/{bucket}/access-rules"] = admin_api.NewDeleteAccessRuleWithBucket(o.context, o.AdminAPIDeleteAccessRuleWithBucketHandler) + o.handlers["DELETE"]["/bucket/{bucket}/access-rules"] = bucket.NewDeleteAccessRuleWithBucket(o.context, o.BucketDeleteAccessRuleWithBucketHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/buckets/{bucket_name}/delete-all-replication-rules"] = user_api.NewDeleteAllReplicationRules(o.context, o.UserAPIDeleteAllReplicationRulesHandler) + o.handlers["DELETE"]["/buckets/{bucket_name}/delete-all-replication-rules"] = bucket.NewDeleteAllReplicationRules(o.context, o.BucketDeleteAllReplicationRulesHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/buckets/{name}"] = user_api.NewDeleteBucket(o.context, o.UserAPIDeleteBucketHandler) + o.handlers["DELETE"]["/buckets/{name}"] = bucket.NewDeleteBucket(o.context, o.BucketDeleteBucketHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/buckets/{bucket_name}/events/{arn}"] = user_api.NewDeleteBucketEvent(o.context, o.UserAPIDeleteBucketEventHandler) + o.handlers["DELETE"]["/buckets/{bucket_name}/events/{arn}"] = bucket.NewDeleteBucketEvent(o.context, o.BucketDeleteBucketEventHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/buckets/{bucket_name}/lifecycle/{lifecycle_id}"] = user_api.NewDeleteBucketLifecycleRule(o.context, o.UserAPIDeleteBucketLifecycleRuleHandler) + o.handlers["DELETE"]["/buckets/{bucket_name}/lifecycle/{lifecycle_id}"] = bucket.NewDeleteBucketLifecycleRule(o.context, o.BucketDeleteBucketLifecycleRuleHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/buckets/{bucket_name}/replication/{rule_id}"] = user_api.NewDeleteBucketReplicationRule(o.context, o.UserAPIDeleteBucketReplicationRuleHandler) + o.handlers["DELETE"]["/buckets/{bucket_name}/replication/{rule_id}"] = bucket.NewDeleteBucketReplicationRule(o.context, o.BucketDeleteBucketReplicationRuleHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/buckets/{bucket_name}/delete-objects"] = user_api.NewDeleteMultipleObjects(o.context, o.UserAPIDeleteMultipleObjectsHandler) + o.handlers["POST"]["/buckets/{bucket_name}/delete-objects"] = object.NewDeleteMultipleObjects(o.context, o.ObjectDeleteMultipleObjectsHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/service-accounts/delete-multi"] = user_api.NewDeleteMultipleServiceAccounts(o.context, o.UserAPIDeleteMultipleServiceAccountsHandler) + o.handlers["DELETE"]["/service-accounts/delete-multi"] = service_account.NewDeleteMultipleServiceAccounts(o.context, o.ServiceAccountDeleteMultipleServiceAccountsHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/buckets/{bucket_name}/objects"] = user_api.NewDeleteObject(o.context, o.UserAPIDeleteObjectHandler) + o.handlers["DELETE"]["/buckets/{bucket_name}/objects"] = object.NewDeleteObject(o.context, o.ObjectDeleteObjectHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/buckets/{bucket_name}/objects/retention"] = user_api.NewDeleteObjectRetention(o.context, o.UserAPIDeleteObjectRetentionHandler) + o.handlers["DELETE"]["/buckets/{bucket_name}/objects/retention"] = object.NewDeleteObjectRetention(o.context, o.ObjectDeleteObjectRetentionHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/remote-buckets/{source-bucket-name}/{arn}"] = user_api.NewDeleteRemoteBucket(o.context, o.UserAPIDeleteRemoteBucketHandler) + o.handlers["DELETE"]["/remote-buckets/{source-bucket-name}/{arn}"] = bucket.NewDeleteRemoteBucket(o.context, o.BucketDeleteRemoteBucketHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/buckets/{bucket_name}/delete-selected-replication-rules"] = user_api.NewDeleteSelectedReplicationRules(o.context, o.UserAPIDeleteSelectedReplicationRulesHandler) + o.handlers["DELETE"]["/buckets/{bucket_name}/delete-selected-replication-rules"] = bucket.NewDeleteSelectedReplicationRules(o.context, o.BucketDeleteSelectedReplicationRulesHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/service-accounts/{access_key}"] = user_api.NewDeleteServiceAccount(o.context, o.UserAPIDeleteServiceAccountHandler) + o.handlers["DELETE"]["/service-accounts/{access_key}"] = service_account.NewDeleteServiceAccount(o.context, o.ServiceAccountDeleteServiceAccountHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/buckets/{bucket_name}/encryption/disable"] = user_api.NewDisableBucketEncryption(o.context, o.UserAPIDisableBucketEncryptionHandler) + o.handlers["POST"]["/buckets/{bucket_name}/encryption/disable"] = bucket.NewDisableBucketEncryption(o.context, o.BucketDisableBucketEncryptionHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/objects/download"] = user_api.NewDownloadObject(o.context, o.UserAPIDownloadObjectHandler) + o.handlers["GET"]["/buckets/{bucket_name}/objects/download"] = object.NewDownloadObject(o.context, o.ObjectDownloadObjectHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/admin/tiers/{type}/{name}/credentials"] = admin_api.NewEditTierCredentials(o.context, o.AdminAPIEditTierCredentialsHandler) + o.handlers["PUT"]["/admin/tiers/{type}/{name}/credentials"] = tiering.NewEditTierCredentials(o.context, o.TieringEditTierCredentialsHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/buckets/{bucket_name}/encryption/enable"] = user_api.NewEnableBucketEncryption(o.context, o.UserAPIEnableBucketEncryptionHandler) + o.handlers["POST"]["/buckets/{bucket_name}/encryption/enable"] = bucket.NewEnableBucketEncryption(o.context, o.BucketEnableBucketEncryptionHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/encryption/info"] = user_api.NewGetBucketEncryptionInfo(o.context, o.UserAPIGetBucketEncryptionInfoHandler) + o.handlers["GET"]["/buckets/{bucket_name}/encryption/info"] = bucket.NewGetBucketEncryptionInfo(o.context, o.BucketGetBucketEncryptionInfoHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/lifecycle"] = user_api.NewGetBucketLifecycle(o.context, o.UserAPIGetBucketLifecycleHandler) + o.handlers["GET"]["/buckets/{bucket_name}/lifecycle"] = bucket.NewGetBucketLifecycle(o.context, o.BucketGetBucketLifecycleHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/object-locking"] = user_api.NewGetBucketObjectLockingStatus(o.context, o.UserAPIGetBucketObjectLockingStatusHandler) + o.handlers["GET"]["/buckets/{bucket_name}/object-locking"] = bucket.NewGetBucketObjectLockingStatus(o.context, o.BucketGetBucketObjectLockingStatusHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{name}/quota"] = user_api.NewGetBucketQuota(o.context, o.UserAPIGetBucketQuotaHandler) + o.handlers["GET"]["/buckets/{name}/quota"] = bucket.NewGetBucketQuota(o.context, o.BucketGetBucketQuotaHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/replication"] = user_api.NewGetBucketReplication(o.context, o.UserAPIGetBucketReplicationHandler) + o.handlers["GET"]["/buckets/{bucket_name}/replication"] = bucket.NewGetBucketReplication(o.context, o.BucketGetBucketReplicationHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/replication/{rule_id}"] = user_api.NewGetBucketReplicationRule(o.context, o.UserAPIGetBucketReplicationRuleHandler) + o.handlers["GET"]["/buckets/{bucket_name}/replication/{rule_id}"] = bucket.NewGetBucketReplicationRule(o.context, o.BucketGetBucketReplicationRuleHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/retention"] = user_api.NewGetBucketRetentionConfig(o.context, o.UserAPIGetBucketRetentionConfigHandler) + o.handlers["GET"]["/buckets/{bucket_name}/retention"] = bucket.NewGetBucketRetentionConfig(o.context, o.BucketGetBucketRetentionConfigHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/rewind/{date}"] = user_api.NewGetBucketRewind(o.context, o.UserAPIGetBucketRewindHandler) + o.handlers["GET"]["/buckets/{bucket_name}/rewind/{date}"] = bucket.NewGetBucketRewind(o.context, o.BucketGetBucketRewindHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/versioning"] = user_api.NewGetBucketVersioning(o.context, o.UserAPIGetBucketVersioningHandler) + o.handlers["GET"]["/buckets/{bucket_name}/versioning"] = bucket.NewGetBucketVersioning(o.context, o.BucketGetBucketVersioningHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/objects/metadata"] = user_api.NewGetObjectMetadata(o.context, o.UserAPIGetObjectMetadataHandler) + o.handlers["GET"]["/buckets/{bucket_name}/objects/metadata"] = object.NewGetObjectMetadata(o.context, o.ObjectGetObjectMetadataHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/service-accounts/{access_key}/policy"] = user_api.NewGetServiceAccountPolicy(o.context, o.UserAPIGetServiceAccountPolicyHandler) + o.handlers["GET"]["/service-accounts/{access_key}/policy"] = service_account.NewGetServiceAccountPolicy(o.context, o.ServiceAccountGetServiceAccountPolicyHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/admin/site-replication"] = admin_api.NewGetSiteReplicationInfo(o.context, o.AdminAPIGetSiteReplicationInfoHandler) + o.handlers["GET"]["/admin/site-replication"] = site_replication.NewGetSiteReplicationInfo(o.context, o.SiteReplicationGetSiteReplicationInfoHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/admin/site-replication/status"] = admin_api.NewGetSiteReplicationStatus(o.context, o.AdminAPIGetSiteReplicationStatusHandler) + o.handlers["GET"]["/admin/site-replication/status"] = site_replication.NewGetSiteReplicationStatus(o.context, o.SiteReplicationGetSiteReplicationStatusHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/admin/tiers/{type}/{name}"] = admin_api.NewGetTier(o.context, o.AdminAPIGetTierHandler) + o.handlers["GET"]["/admin/tiers/{type}/{name}"] = tiering.NewGetTier(o.context, o.TieringGetTierHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/user"] = admin_api.NewGetUserInfo(o.context, o.AdminAPIGetUserInfoHandler) + o.handlers["GET"]["/user"] = user.NewGetUserInfo(o.context, o.UserGetUserInfoHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/group"] = admin_api.NewGroupInfo(o.context, o.AdminAPIGroupInfoHandler) + o.handlers["GET"]["/group"] = group.NewGroupInfo(o.context, o.GroupGroupInfoHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/admin/inspect"] = admin_api.NewInspect(o.context, o.AdminAPIInspectHandler) + o.handlers["GET"]["/admin/inspect"] = inspect.NewInspect(o.context, o.InspectInspectHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/user/{name}/service-accounts"] = admin_api.NewListAUserServiceAccounts(o.context, o.AdminAPIListAUserServiceAccountsHandler) + o.handlers["GET"]["/user/{name}/service-accounts"] = user.NewListAUserServiceAccounts(o.context, o.UserListAUserServiceAccountsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/bucket/{bucket}/access-rules"] = admin_api.NewListAccessRulesWithBucket(o.context, o.AdminAPIListAccessRulesWithBucketHandler) + o.handlers["GET"]["/bucket/{bucket}/access-rules"] = bucket.NewListAccessRulesWithBucket(o.context, o.BucketListAccessRulesWithBucketHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/events"] = user_api.NewListBucketEvents(o.context, o.UserAPIListBucketEventsHandler) + o.handlers["GET"]["/buckets/{bucket_name}/events"] = bucket.NewListBucketEvents(o.context, o.BucketListBucketEventsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets"] = user_api.NewListBuckets(o.context, o.UserAPIListBucketsHandler) + o.handlers["GET"]["/buckets"] = bucket.NewListBuckets(o.context, o.BucketListBucketsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/configs"] = admin_api.NewListConfig(o.context, o.AdminAPIListConfigHandler) + o.handlers["GET"]["/configs"] = configuration.NewListConfig(o.context, o.ConfigurationListConfigHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/list-external-buckets"] = user_api.NewListExternalBuckets(o.context, o.UserAPIListExternalBucketsHandler) + o.handlers["POST"]["/list-external-buckets"] = bucket.NewListExternalBuckets(o.context, o.BucketListExternalBucketsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/groups"] = admin_api.NewListGroups(o.context, o.AdminAPIListGroupsHandler) + o.handlers["GET"]["/groups"] = group.NewListGroups(o.context, o.GroupListGroupsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/policies/{policy}/groups"] = admin_api.NewListGroupsForPolicy(o.context, o.AdminAPIListGroupsForPolicyHandler) + o.handlers["GET"]["/policies/{policy}/groups"] = policy.NewListGroupsForPolicy(o.context, o.PolicyListGroupsForPolicyHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/nodes"] = admin_api.NewListNodes(o.context, o.AdminAPIListNodesHandler) + o.handlers["GET"]["/nodes"] = system.NewListNodes(o.context, o.SystemListNodesHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/objects"] = user_api.NewListObjects(o.context, o.UserAPIListObjectsHandler) + o.handlers["GET"]["/buckets/{bucket_name}/objects"] = object.NewListObjects(o.context, o.ObjectListObjectsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/policies"] = admin_api.NewListPolicies(o.context, o.AdminAPIListPoliciesHandler) + o.handlers["GET"]["/policies"] = policy.NewListPolicies(o.context, o.PolicyListPoliciesHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/bucket-policy/{bucket}"] = admin_api.NewListPoliciesWithBucket(o.context, o.AdminAPIListPoliciesWithBucketHandler) + o.handlers["GET"]["/bucket-policy/{bucket}"] = bucket.NewListPoliciesWithBucket(o.context, o.BucketListPoliciesWithBucketHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/remote-buckets"] = user_api.NewListRemoteBuckets(o.context, o.UserAPIListRemoteBucketsHandler) + o.handlers["GET"]["/remote-buckets"] = bucket.NewListRemoteBuckets(o.context, o.BucketListRemoteBucketsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/service-accounts"] = user_api.NewListUserServiceAccounts(o.context, o.UserAPIListUserServiceAccountsHandler) + o.handlers["GET"]["/service-accounts"] = service_account.NewListUserServiceAccounts(o.context, o.ServiceAccountListUserServiceAccountsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/users"] = admin_api.NewListUsers(o.context, o.AdminAPIListUsersHandler) + o.handlers["GET"]["/users"] = user.NewListUsers(o.context, o.UserListUsersHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/policies/{policy}/users"] = admin_api.NewListUsersForPolicy(o.context, o.AdminAPIListUsersForPolicyHandler) + o.handlers["GET"]["/policies/{policy}/users"] = policy.NewListUsersForPolicy(o.context, o.PolicyListUsersForPolicyHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/bucket-users/{bucket}"] = admin_api.NewListUsersWithAccessToBucket(o.context, o.AdminAPIListUsersWithAccessToBucketHandler) + o.handlers["GET"]["/bucket-users/{bucket}"] = bucket.NewListUsersWithAccessToBucket(o.context, o.BucketListUsersWithAccessToBucketHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/logs/search"] = user_api.NewLogSearch(o.context, o.UserAPILogSearchHandler) + o.handlers["GET"]["/logs/search"] = logging.NewLogSearch(o.context, o.LoggingLogSearchHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/login"] = user_api.NewLogin(o.context, o.UserAPILoginHandler) + o.handlers["POST"]["/login"] = auth.NewLogin(o.context, o.AuthLoginHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/login"] = user_api.NewLoginDetail(o.context, o.UserAPILoginDetailHandler) + o.handlers["GET"]["/login"] = auth.NewLoginDetail(o.context, o.AuthLoginDetailHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/login/oauth2/auth"] = user_api.NewLoginOauth2Auth(o.context, o.UserAPILoginOauth2AuthHandler) + o.handlers["POST"]["/login/oauth2/auth"] = auth.NewLoginOauth2Auth(o.context, o.AuthLoginOauth2AuthHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/logout"] = user_api.NewLogout(o.context, o.UserAPILogoutHandler) + o.handlers["POST"]["/logout"] = auth.NewLogout(o.context, o.AuthLogoutHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/buckets"] = user_api.NewMakeBucket(o.context, o.UserAPIMakeBucketHandler) + o.handlers["POST"]["/buckets"] = bucket.NewMakeBucket(o.context, o.BucketMakeBucketHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/admin/notification_endpoints"] = admin_api.NewNotificationEndpointList(o.context, o.AdminAPINotificationEndpointListHandler) + o.handlers["GET"]["/admin/notification_endpoints"] = configuration.NewNotificationEndpointList(o.context, o.ConfigurationNotificationEndpointListHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/policy"] = admin_api.NewPolicyInfo(o.context, o.AdminAPIPolicyInfoHandler) + o.handlers["GET"]["/policy"] = policy.NewPolicyInfo(o.context, o.PolicyPolicyInfoHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/buckets/{bucket_name}/objects/upload"] = user_api.NewPostBucketsBucketNameObjectsUpload(o.context, o.UserAPIPostBucketsBucketNameObjectsUploadHandler) + o.handlers["POST"]["/buckets/{bucket_name}/objects/upload"] = object.NewPostBucketsBucketNameObjectsUpload(o.context, o.ObjectPostBucketsBucketNameObjectsUploadHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/profiling/start"] = admin_api.NewProfilingStart(o.context, o.AdminAPIProfilingStartHandler) + o.handlers["POST"]["/profiling/start"] = profile.NewProfilingStart(o.context, o.ProfileProfilingStartHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/profiling/stop"] = admin_api.NewProfilingStop(o.context, o.AdminAPIProfilingStopHandler) + o.handlers["POST"]["/profiling/stop"] = profile.NewProfilingStop(o.context, o.ProfileProfilingStopHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/buckets/{bucket_name}/tags"] = user_api.NewPutBucketTags(o.context, o.UserAPIPutBucketTagsHandler) + o.handlers["PUT"]["/buckets/{bucket_name}/tags"] = bucket.NewPutBucketTags(o.context, o.BucketPutBucketTagsHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/buckets/{bucket_name}/objects/legalhold"] = user_api.NewPutObjectLegalHold(o.context, o.UserAPIPutObjectLegalHoldHandler) + o.handlers["PUT"]["/buckets/{bucket_name}/objects/legalhold"] = object.NewPutObjectLegalHold(o.context, o.ObjectPutObjectLegalHoldHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/buckets/{bucket_name}/objects/restore"] = user_api.NewPutObjectRestore(o.context, o.UserAPIPutObjectRestoreHandler) + o.handlers["PUT"]["/buckets/{bucket_name}/objects/restore"] = object.NewPutObjectRestore(o.context, o.ObjectPutObjectRestoreHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/buckets/{bucket_name}/objects/retention"] = user_api.NewPutObjectRetention(o.context, o.UserAPIPutObjectRetentionHandler) + o.handlers["PUT"]["/buckets/{bucket_name}/objects/retention"] = object.NewPutObjectRetention(o.context, o.ObjectPutObjectRetentionHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/buckets/{bucket_name}/objects/tags"] = user_api.NewPutObjectTags(o.context, o.UserAPIPutObjectTagsHandler) + o.handlers["PUT"]["/buckets/{bucket_name}/objects/tags"] = object.NewPutObjectTags(o.context, o.ObjectPutObjectTagsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/remote-buckets/{name}"] = user_api.NewRemoteBucketDetails(o.context, o.UserAPIRemoteBucketDetailsHandler) + o.handlers["GET"]["/remote-buckets/{name}"] = bucket.NewRemoteBucketDetails(o.context, o.BucketRemoteBucketDetailsHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/group"] = admin_api.NewRemoveGroup(o.context, o.AdminAPIRemoveGroupHandler) + o.handlers["DELETE"]["/group"] = group.NewRemoveGroup(o.context, o.GroupRemoveGroupHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/policy"] = admin_api.NewRemovePolicy(o.context, o.AdminAPIRemovePolicyHandler) + o.handlers["DELETE"]["/policy"] = policy.NewRemovePolicy(o.context, o.PolicyRemovePolicyHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/user"] = admin_api.NewRemoveUser(o.context, o.AdminAPIRemoveUserHandler) + o.handlers["DELETE"]["/user"] = user.NewRemoveUser(o.context, o.UserRemoveUserHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/configs/{name}/reset"] = admin_api.NewResetConfig(o.context, o.AdminAPIResetConfigHandler) + o.handlers["GET"]["/configs/{name}/reset"] = configuration.NewResetConfig(o.context, o.ConfigurationResetConfigHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/service/restart"] = admin_api.NewRestartService(o.context, o.AdminAPIRestartServiceHandler) + o.handlers["POST"]["/service/restart"] = service.NewRestartService(o.context, o.ServiceRestartServiceHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/session"] = user_api.NewSessionCheck(o.context, o.UserAPISessionCheckHandler) + o.handlers["GET"]["/session"] = auth.NewSessionCheck(o.context, o.AuthSessionCheckHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/bucket/{bucket}/access-rules"] = admin_api.NewSetAccessRuleWithBucket(o.context, o.AdminAPISetAccessRuleWithBucketHandler) + o.handlers["PUT"]["/bucket/{bucket}/access-rules"] = bucket.NewSetAccessRuleWithBucket(o.context, o.BucketSetAccessRuleWithBucketHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/buckets/{name}/quota"] = user_api.NewSetBucketQuota(o.context, o.UserAPISetBucketQuotaHandler) + o.handlers["PUT"]["/buckets/{name}/quota"] = bucket.NewSetBucketQuota(o.context, o.BucketSetBucketQuotaHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/buckets/{bucket_name}/retention"] = user_api.NewSetBucketRetentionConfig(o.context, o.UserAPISetBucketRetentionConfigHandler) + o.handlers["PUT"]["/buckets/{bucket_name}/retention"] = bucket.NewSetBucketRetentionConfig(o.context, o.BucketSetBucketRetentionConfigHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/buckets/{bucket_name}/versioning"] = user_api.NewSetBucketVersioning(o.context, o.UserAPISetBucketVersioningHandler) + o.handlers["PUT"]["/buckets/{bucket_name}/versioning"] = bucket.NewSetBucketVersioning(o.context, o.BucketSetBucketVersioningHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/configs/{name}"] = admin_api.NewSetConfig(o.context, o.AdminAPISetConfigHandler) + o.handlers["PUT"]["/configs/{name}"] = configuration.NewSetConfig(o.context, o.ConfigurationSetConfigHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/buckets-replication"] = user_api.NewSetMultiBucketReplication(o.context, o.UserAPISetMultiBucketReplicationHandler) + o.handlers["POST"]["/buckets-replication"] = bucket.NewSetMultiBucketReplication(o.context, o.BucketSetMultiBucketReplicationHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/set-policy"] = admin_api.NewSetPolicy(o.context, o.AdminAPISetPolicyHandler) + o.handlers["PUT"]["/set-policy"] = policy.NewSetPolicy(o.context, o.PolicySetPolicyHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/set-policy-multi"] = admin_api.NewSetPolicyMultiple(o.context, o.AdminAPISetPolicyMultipleHandler) + o.handlers["PUT"]["/set-policy-multi"] = policy.NewSetPolicyMultiple(o.context, o.PolicySetPolicyMultipleHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/service-accounts/{access_key}/policy"] = user_api.NewSetServiceAccountPolicy(o.context, o.UserAPISetServiceAccountPolicyHandler) + o.handlers["PUT"]["/service-accounts/{access_key}/policy"] = service_account.NewSetServiceAccountPolicy(o.context, o.ServiceAccountSetServiceAccountPolicyHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/buckets/{bucket_name}/objects/share"] = user_api.NewShareObject(o.context, o.UserAPIShareObjectHandler) + o.handlers["GET"]["/buckets/{bucket_name}/objects/share"] = object.NewShareObject(o.context, o.ObjectShareObjectHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/admin/site-replication"] = admin_api.NewSiteReplicationEdit(o.context, o.AdminAPISiteReplicationEditHandler) + o.handlers["PUT"]["/admin/site-replication"] = site_replication.NewSiteReplicationEdit(o.context, o.SiteReplicationSiteReplicationEditHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/admin/site-replication"] = admin_api.NewSiteReplicationInfoAdd(o.context, o.AdminAPISiteReplicationInfoAddHandler) + o.handlers["POST"]["/admin/site-replication"] = site_replication.NewSiteReplicationInfoAdd(o.context, o.SiteReplicationSiteReplicationInfoAddHandler) if o.handlers["DELETE"] == nil { o.handlers["DELETE"] = make(map[string]http.Handler) } - o.handlers["DELETE"]["/admin/site-replication"] = admin_api.NewSiteReplicationRemove(o.context, o.AdminAPISiteReplicationRemoveHandler) + o.handlers["DELETE"]["/admin/site-replication"] = site_replication.NewSiteReplicationRemove(o.context, o.SiteReplicationSiteReplicationRemoveHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/subnet/info"] = admin_api.NewSubnetInfo(o.context, o.AdminAPISubnetInfoHandler) + o.handlers["GET"]["/subnet/info"] = subnet.NewSubnetInfo(o.context, o.SubnetSubnetInfoHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/subnet/login"] = admin_api.NewSubnetLogin(o.context, o.AdminAPISubnetLoginHandler) + o.handlers["POST"]["/subnet/login"] = subnet.NewSubnetLogin(o.context, o.SubnetSubnetLoginHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/subnet/login/mfa"] = admin_api.NewSubnetLoginMFA(o.context, o.AdminAPISubnetLoginMFAHandler) + o.handlers["POST"]["/subnet/login/mfa"] = subnet.NewSubnetLoginMFA(o.context, o.SubnetSubnetLoginMFAHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/subnet/registration-token"] = admin_api.NewSubnetRegToken(o.context, o.AdminAPISubnetRegTokenHandler) + o.handlers["GET"]["/subnet/registration-token"] = subnet.NewSubnetRegToken(o.context, o.SubnetSubnetRegTokenHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) } - o.handlers["POST"]["/subnet/register"] = admin_api.NewSubnetRegister(o.context, o.AdminAPISubnetRegisterHandler) + o.handlers["POST"]["/subnet/register"] = subnet.NewSubnetRegister(o.context, o.SubnetSubnetRegisterHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/admin/tiers"] = admin_api.NewTiersList(o.context, o.AdminAPITiersListHandler) + o.handlers["GET"]["/admin/tiers"] = tiering.NewTiersList(o.context, o.TieringTiersListHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/buckets/{bucket_name}/lifecycle/{lifecycle_id}"] = user_api.NewUpdateBucketLifecycle(o.context, o.UserAPIUpdateBucketLifecycleHandler) + o.handlers["PUT"]["/buckets/{bucket_name}/lifecycle/{lifecycle_id}"] = bucket.NewUpdateBucketLifecycle(o.context, o.BucketUpdateBucketLifecycleHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/group"] = admin_api.NewUpdateGroup(o.context, o.AdminAPIUpdateGroupHandler) + o.handlers["PUT"]["/group"] = group.NewUpdateGroup(o.context, o.GroupUpdateGroupHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/buckets/{bucket_name}/replication/{rule_id}"] = user_api.NewUpdateMultiBucketReplication(o.context, o.UserAPIUpdateMultiBucketReplicationHandler) + o.handlers["PUT"]["/buckets/{bucket_name}/replication/{rule_id}"] = bucket.NewUpdateMultiBucketReplication(o.context, o.BucketUpdateMultiBucketReplicationHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/user/groups"] = admin_api.NewUpdateUserGroups(o.context, o.AdminAPIUpdateUserGroupsHandler) + o.handlers["PUT"]["/user/groups"] = user.NewUpdateUserGroups(o.context, o.UserUpdateUserGroupsHandler) if o.handlers["PUT"] == nil { o.handlers["PUT"] = make(map[string]http.Handler) } - o.handlers["PUT"]["/user"] = admin_api.NewUpdateUserInfo(o.context, o.AdminAPIUpdateUserInfoHandler) + o.handlers["PUT"]["/user"] = user.NewUpdateUserInfo(o.context, o.UserUpdateUserInfoHandler) } // Serve creates a http handler to serve the API over HTTP diff --git a/restapi/operations/admin_api/add_group.go b/restapi/operations/group/add_group.go similarity index 97% rename from restapi/operations/admin_api/add_group.go rename to restapi/operations/group/add_group.go index d9cc43e0a..9541a439f 100644 --- a/restapi/operations/admin_api/add_group.go +++ b/restapi/operations/group/add_group.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewAddGroup(ctx *middleware.Context, handler AddGroupHandler) *AddGroup { return &AddGroup{Context: ctx, Handler: handler} } -/* AddGroup swagger:route POST /groups AdminAPI addGroup +/* AddGroup swagger:route POST /groups Group addGroup Add Group diff --git a/restapi/operations/admin_api/add_group_parameters.go b/restapi/operations/group/add_group_parameters.go similarity index 99% rename from restapi/operations/admin_api/add_group_parameters.go rename to restapi/operations/group/add_group_parameters.go index 5edf7c2e9..cbfdd7c5e 100644 --- a/restapi/operations/admin_api/add_group_parameters.go +++ b/restapi/operations/group/add_group_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/add_group_responses.go b/restapi/operations/group/add_group_responses.go similarity index 99% rename from restapi/operations/admin_api/add_group_responses.go rename to restapi/operations/group/add_group_responses.go index 480104c2c..38e25472f 100644 --- a/restapi/operations/admin_api/add_group_responses.go +++ b/restapi/operations/group/add_group_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/add_group_urlbuilder.go b/restapi/operations/group/add_group_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/add_group_urlbuilder.go rename to restapi/operations/group/add_group_urlbuilder.go index 81a5cdbb8..6f2109594 100644 --- a/restapi/operations/admin_api/add_group_urlbuilder.go +++ b/restapi/operations/group/add_group_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/group_info.go b/restapi/operations/group/group_info.go similarity index 97% rename from restapi/operations/admin_api/group_info.go rename to restapi/operations/group/group_info.go index 423cf4576..1b74d5190 100644 --- a/restapi/operations/admin_api/group_info.go +++ b/restapi/operations/group/group_info.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGroupInfo(ctx *middleware.Context, handler GroupInfoHandler) *GroupInfo return &GroupInfo{Context: ctx, Handler: handler} } -/* GroupInfo swagger:route GET /group AdminAPI groupInfo +/* GroupInfo swagger:route GET /group Group groupInfo Group info diff --git a/restapi/operations/admin_api/group_info_parameters.go b/restapi/operations/group/group_info_parameters.go similarity index 99% rename from restapi/operations/admin_api/group_info_parameters.go rename to restapi/operations/group/group_info_parameters.go index 4ae7efe9f..45e835ae6 100644 --- a/restapi/operations/admin_api/group_info_parameters.go +++ b/restapi/operations/group/group_info_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/group_info_responses.go b/restapi/operations/group/group_info_responses.go similarity index 99% rename from restapi/operations/admin_api/group_info_responses.go rename to restapi/operations/group/group_info_responses.go index c36ae84e3..48888d04a 100644 --- a/restapi/operations/admin_api/group_info_responses.go +++ b/restapi/operations/group/group_info_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/group_info_urlbuilder.go b/restapi/operations/group/group_info_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/group_info_urlbuilder.go rename to restapi/operations/group/group_info_urlbuilder.go index 40e04e40a..78947a953 100644 --- a/restapi/operations/admin_api/group_info_urlbuilder.go +++ b/restapi/operations/group/group_info_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/list_groups.go b/restapi/operations/group/list_groups.go similarity index 97% rename from restapi/operations/admin_api/list_groups.go rename to restapi/operations/group/list_groups.go index 166b8878a..8e24bf839 100644 --- a/restapi/operations/admin_api/list_groups.go +++ b/restapi/operations/group/list_groups.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListGroups(ctx *middleware.Context, handler ListGroupsHandler) *ListGrou return &ListGroups{Context: ctx, Handler: handler} } -/* ListGroups swagger:route GET /groups AdminAPI listGroups +/* ListGroups swagger:route GET /groups Group listGroups List Groups diff --git a/restapi/operations/admin_api/list_groups_parameters.go b/restapi/operations/group/list_groups_parameters.go similarity index 99% rename from restapi/operations/admin_api/list_groups_parameters.go rename to restapi/operations/group/list_groups_parameters.go index b520c851d..e96c7822f 100644 --- a/restapi/operations/admin_api/list_groups_parameters.go +++ b/restapi/operations/group/list_groups_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_groups_responses.go b/restapi/operations/group/list_groups_responses.go similarity index 99% rename from restapi/operations/admin_api/list_groups_responses.go rename to restapi/operations/group/list_groups_responses.go index d038c1dfb..350f308d6 100644 --- a/restapi/operations/admin_api/list_groups_responses.go +++ b/restapi/operations/group/list_groups_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_groups_urlbuilder.go b/restapi/operations/group/list_groups_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/list_groups_urlbuilder.go rename to restapi/operations/group/list_groups_urlbuilder.go index f4faa6e78..67dee61db 100644 --- a/restapi/operations/admin_api/list_groups_urlbuilder.go +++ b/restapi/operations/group/list_groups_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/remove_group.go b/restapi/operations/group/remove_group.go similarity index 97% rename from restapi/operations/admin_api/remove_group.go rename to restapi/operations/group/remove_group.go index 4eec541c0..a3da922ab 100644 --- a/restapi/operations/admin_api/remove_group.go +++ b/restapi/operations/group/remove_group.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewRemoveGroup(ctx *middleware.Context, handler RemoveGroupHandler) *Remove return &RemoveGroup{Context: ctx, Handler: handler} } -/* RemoveGroup swagger:route DELETE /group AdminAPI removeGroup +/* RemoveGroup swagger:route DELETE /group Group removeGroup Remove group diff --git a/restapi/operations/admin_api/remove_group_parameters.go b/restapi/operations/group/remove_group_parameters.go similarity index 99% rename from restapi/operations/admin_api/remove_group_parameters.go rename to restapi/operations/group/remove_group_parameters.go index c290230f6..6cd16f061 100644 --- a/restapi/operations/admin_api/remove_group_parameters.go +++ b/restapi/operations/group/remove_group_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/remove_group_responses.go b/restapi/operations/group/remove_group_responses.go similarity index 99% rename from restapi/operations/admin_api/remove_group_responses.go rename to restapi/operations/group/remove_group_responses.go index 0fe3b9bdc..3fc3a5fe9 100644 --- a/restapi/operations/admin_api/remove_group_responses.go +++ b/restapi/operations/group/remove_group_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/remove_group_urlbuilder.go b/restapi/operations/group/remove_group_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/remove_group_urlbuilder.go rename to restapi/operations/group/remove_group_urlbuilder.go index a52147d27..e949639f6 100644 --- a/restapi/operations/admin_api/remove_group_urlbuilder.go +++ b/restapi/operations/group/remove_group_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/update_group.go b/restapi/operations/group/update_group.go similarity index 97% rename from restapi/operations/admin_api/update_group.go rename to restapi/operations/group/update_group.go index a9414cff8..9f082093a 100644 --- a/restapi/operations/admin_api/update_group.go +++ b/restapi/operations/group/update_group.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewUpdateGroup(ctx *middleware.Context, handler UpdateGroupHandler) *Update return &UpdateGroup{Context: ctx, Handler: handler} } -/* UpdateGroup swagger:route PUT /group AdminAPI updateGroup +/* UpdateGroup swagger:route PUT /group Group updateGroup Update Group Members or Status diff --git a/restapi/operations/admin_api/update_group_parameters.go b/restapi/operations/group/update_group_parameters.go similarity index 99% rename from restapi/operations/admin_api/update_group_parameters.go rename to restapi/operations/group/update_group_parameters.go index bdcd47b1e..d33da39ff 100644 --- a/restapi/operations/admin_api/update_group_parameters.go +++ b/restapi/operations/group/update_group_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/update_group_responses.go b/restapi/operations/group/update_group_responses.go similarity index 99% rename from restapi/operations/admin_api/update_group_responses.go rename to restapi/operations/group/update_group_responses.go index 46c905629..0aec2b39e 100644 --- a/restapi/operations/admin_api/update_group_responses.go +++ b/restapi/operations/group/update_group_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/update_group_urlbuilder.go b/restapi/operations/group/update_group_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/update_group_urlbuilder.go rename to restapi/operations/group/update_group_urlbuilder.go index 7bc874635..e3c1e64e3 100644 --- a/restapi/operations/admin_api/update_group_urlbuilder.go +++ b/restapi/operations/group/update_group_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package group // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/inspect.go b/restapi/operations/inspect/inspect.go similarity index 97% rename from restapi/operations/admin_api/inspect.go rename to restapi/operations/inspect/inspect.go index 582ab792f..01c0571cf 100644 --- a/restapi/operations/admin_api/inspect.go +++ b/restapi/operations/inspect/inspect.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package inspect // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewInspect(ctx *middleware.Context, handler InspectHandler) *Inspect { return &Inspect{Context: ctx, Handler: handler} } -/* Inspect swagger:route GET /admin/inspect AdminAPI inspect +/* Inspect swagger:route GET /admin/inspect Inspect inspect Inspect Files on Drive diff --git a/restapi/operations/admin_api/inspect_parameters.go b/restapi/operations/inspect/inspect_parameters.go similarity index 99% rename from restapi/operations/admin_api/inspect_parameters.go rename to restapi/operations/inspect/inspect_parameters.go index b378b2a0f..73b85186c 100644 --- a/restapi/operations/admin_api/inspect_parameters.go +++ b/restapi/operations/inspect/inspect_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package inspect // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/inspect_responses.go b/restapi/operations/inspect/inspect_responses.go similarity index 99% rename from restapi/operations/admin_api/inspect_responses.go rename to restapi/operations/inspect/inspect_responses.go index 0be27462e..3bdc299d7 100644 --- a/restapi/operations/admin_api/inspect_responses.go +++ b/restapi/operations/inspect/inspect_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package inspect // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/inspect_urlbuilder.go b/restapi/operations/inspect/inspect_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/inspect_urlbuilder.go rename to restapi/operations/inspect/inspect_urlbuilder.go index 669a8aa0c..8c44a7a98 100644 --- a/restapi/operations/admin_api/inspect_urlbuilder.go +++ b/restapi/operations/inspect/inspect_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package inspect // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/log_search.go b/restapi/operations/logging/log_search.go similarity index 97% rename from restapi/operations/user_api/log_search.go rename to restapi/operations/logging/log_search.go index 46e35784e..71d335c3b 100644 --- a/restapi/operations/user_api/log_search.go +++ b/restapi/operations/logging/log_search.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package logging // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewLogSearch(ctx *middleware.Context, handler LogSearchHandler) *LogSearch return &LogSearch{Context: ctx, Handler: handler} } -/* LogSearch swagger:route GET /logs/search UserAPI logSearch +/* LogSearch swagger:route GET /logs/search Logging logSearch Search the logs diff --git a/restapi/operations/user_api/log_search_parameters.go b/restapi/operations/logging/log_search_parameters.go similarity index 99% rename from restapi/operations/user_api/log_search_parameters.go rename to restapi/operations/logging/log_search_parameters.go index 601f727e5..154851eb4 100644 --- a/restapi/operations/user_api/log_search_parameters.go +++ b/restapi/operations/logging/log_search_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package logging // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/log_search_responses.go b/restapi/operations/logging/log_search_responses.go similarity index 99% rename from restapi/operations/user_api/log_search_responses.go rename to restapi/operations/logging/log_search_responses.go index 00182840e..24e2e7cca 100644 --- a/restapi/operations/user_api/log_search_responses.go +++ b/restapi/operations/logging/log_search_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package logging // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/log_search_urlbuilder.go b/restapi/operations/logging/log_search_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/log_search_urlbuilder.go rename to restapi/operations/logging/log_search_urlbuilder.go index 87cf3bf6a..1714b0f09 100644 --- a/restapi/operations/user_api/log_search_urlbuilder.go +++ b/restapi/operations/logging/log_search_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package logging // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_multiple_objects.go b/restapi/operations/object/delete_multiple_objects.go similarity index 97% rename from restapi/operations/user_api/delete_multiple_objects.go rename to restapi/operations/object/delete_multiple_objects.go index 956b357ea..9124a42b2 100644 --- a/restapi/operations/user_api/delete_multiple_objects.go +++ b/restapi/operations/object/delete_multiple_objects.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteMultipleObjects(ctx *middleware.Context, handler DeleteMultipleObj return &DeleteMultipleObjects{Context: ctx, Handler: handler} } -/* DeleteMultipleObjects swagger:route POST /buckets/{bucket_name}/delete-objects UserAPI deleteMultipleObjects +/* DeleteMultipleObjects swagger:route POST /buckets/{bucket_name}/delete-objects Object deleteMultipleObjects Delete Multiple Objects diff --git a/restapi/operations/user_api/delete_multiple_objects_parameters.go b/restapi/operations/object/delete_multiple_objects_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_multiple_objects_parameters.go rename to restapi/operations/object/delete_multiple_objects_parameters.go index deb8667d1..f4058449c 100644 --- a/restapi/operations/user_api/delete_multiple_objects_parameters.go +++ b/restapi/operations/object/delete_multiple_objects_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_multiple_objects_responses.go b/restapi/operations/object/delete_multiple_objects_responses.go similarity index 99% rename from restapi/operations/user_api/delete_multiple_objects_responses.go rename to restapi/operations/object/delete_multiple_objects_responses.go index 34060224d..4b52c3d81 100644 --- a/restapi/operations/user_api/delete_multiple_objects_responses.go +++ b/restapi/operations/object/delete_multiple_objects_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_multiple_objects_urlbuilder.go b/restapi/operations/object/delete_multiple_objects_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_multiple_objects_urlbuilder.go rename to restapi/operations/object/delete_multiple_objects_urlbuilder.go index 0fdfe9133..82e0d3d7c 100644 --- a/restapi/operations/user_api/delete_multiple_objects_urlbuilder.go +++ b/restapi/operations/object/delete_multiple_objects_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_object.go b/restapi/operations/object/delete_object.go similarity index 98% rename from restapi/operations/user_api/delete_object.go rename to restapi/operations/object/delete_object.go index 80ce298f7..6b15c414f 100644 --- a/restapi/operations/user_api/delete_object.go +++ b/restapi/operations/object/delete_object.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteObject(ctx *middleware.Context, handler DeleteObjectHandler) *Dele return &DeleteObject{Context: ctx, Handler: handler} } -/* DeleteObject swagger:route DELETE /buckets/{bucket_name}/objects UserAPI deleteObject +/* DeleteObject swagger:route DELETE /buckets/{bucket_name}/objects Object deleteObject Delete Object diff --git a/restapi/operations/user_api/delete_object_parameters.go b/restapi/operations/object/delete_object_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_object_parameters.go rename to restapi/operations/object/delete_object_parameters.go index 1d44382ce..2ed955761 100644 --- a/restapi/operations/user_api/delete_object_parameters.go +++ b/restapi/operations/object/delete_object_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_object_responses.go b/restapi/operations/object/delete_object_responses.go similarity index 99% rename from restapi/operations/user_api/delete_object_responses.go rename to restapi/operations/object/delete_object_responses.go index dcc28f59b..b2602fe1f 100644 --- a/restapi/operations/user_api/delete_object_responses.go +++ b/restapi/operations/object/delete_object_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_object_retention.go b/restapi/operations/object/delete_object_retention.go similarity index 97% rename from restapi/operations/user_api/delete_object_retention.go rename to restapi/operations/object/delete_object_retention.go index 157d40670..c3c62f845 100644 --- a/restapi/operations/user_api/delete_object_retention.go +++ b/restapi/operations/object/delete_object_retention.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteObjectRetention(ctx *middleware.Context, handler DeleteObjectReten return &DeleteObjectRetention{Context: ctx, Handler: handler} } -/* DeleteObjectRetention swagger:route DELETE /buckets/{bucket_name}/objects/retention UserAPI deleteObjectRetention +/* DeleteObjectRetention swagger:route DELETE /buckets/{bucket_name}/objects/retention Object deleteObjectRetention Delete Object retention from an object diff --git a/restapi/operations/user_api/delete_object_retention_parameters.go b/restapi/operations/object/delete_object_retention_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_object_retention_parameters.go rename to restapi/operations/object/delete_object_retention_parameters.go index 34a83b7fe..50cc58f95 100644 --- a/restapi/operations/user_api/delete_object_retention_parameters.go +++ b/restapi/operations/object/delete_object_retention_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_object_retention_responses.go b/restapi/operations/object/delete_object_retention_responses.go similarity index 99% rename from restapi/operations/user_api/delete_object_retention_responses.go rename to restapi/operations/object/delete_object_retention_responses.go index dde05f764..6ebd82b84 100644 --- a/restapi/operations/user_api/delete_object_retention_responses.go +++ b/restapi/operations/object/delete_object_retention_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_object_retention_urlbuilder.go b/restapi/operations/object/delete_object_retention_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_object_retention_urlbuilder.go rename to restapi/operations/object/delete_object_retention_urlbuilder.go index 07ea718ba..17d00cb48 100644 --- a/restapi/operations/user_api/delete_object_retention_urlbuilder.go +++ b/restapi/operations/object/delete_object_retention_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_object_urlbuilder.go b/restapi/operations/object/delete_object_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_object_urlbuilder.go rename to restapi/operations/object/delete_object_urlbuilder.go index da50ecb20..915a65e31 100644 --- a/restapi/operations/user_api/delete_object_urlbuilder.go +++ b/restapi/operations/object/delete_object_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/download_object.go b/restapi/operations/object/download_object.go similarity index 98% rename from restapi/operations/user_api/download_object.go rename to restapi/operations/object/download_object.go index 56bbfde57..9a77f4ffb 100644 --- a/restapi/operations/user_api/download_object.go +++ b/restapi/operations/object/download_object.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDownloadObject(ctx *middleware.Context, handler DownloadObjectHandler) * return &DownloadObject{Context: ctx, Handler: handler} } -/* DownloadObject swagger:route GET /buckets/{bucket_name}/objects/download UserAPI downloadObject +/* DownloadObject swagger:route GET /buckets/{bucket_name}/objects/download Object downloadObject Download Object diff --git a/restapi/operations/user_api/download_object_parameters.go b/restapi/operations/object/download_object_parameters.go similarity index 99% rename from restapi/operations/user_api/download_object_parameters.go rename to restapi/operations/object/download_object_parameters.go index 7a736c4c7..68a01981f 100644 --- a/restapi/operations/user_api/download_object_parameters.go +++ b/restapi/operations/object/download_object_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/download_object_responses.go b/restapi/operations/object/download_object_responses.go similarity index 99% rename from restapi/operations/user_api/download_object_responses.go rename to restapi/operations/object/download_object_responses.go index 57e01d0f9..49141748e 100644 --- a/restapi/operations/user_api/download_object_responses.go +++ b/restapi/operations/object/download_object_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/download_object_urlbuilder.go b/restapi/operations/object/download_object_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/download_object_urlbuilder.go rename to restapi/operations/object/download_object_urlbuilder.go index 5d3fb36c3..02a70800d 100644 --- a/restapi/operations/user_api/download_object_urlbuilder.go +++ b/restapi/operations/object/download_object_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/get_object_metadata.go b/restapi/operations/object/get_object_metadata.go similarity index 98% rename from restapi/operations/user_api/get_object_metadata.go rename to restapi/operations/object/get_object_metadata.go index 5fc9338ce..440471175 100644 --- a/restapi/operations/user_api/get_object_metadata.go +++ b/restapi/operations/object/get_object_metadata.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetObjectMetadata(ctx *middleware.Context, handler GetObjectMetadataHand return &GetObjectMetadata{Context: ctx, Handler: handler} } -/* GetObjectMetadata swagger:route GET /buckets/{bucket_name}/objects/metadata UserAPI getObjectMetadata +/* GetObjectMetadata swagger:route GET /buckets/{bucket_name}/objects/metadata Object getObjectMetadata Gets the metadata of an object diff --git a/restapi/operations/user_api/get_object_metadata_parameters.go b/restapi/operations/object/get_object_metadata_parameters.go similarity index 99% rename from restapi/operations/user_api/get_object_metadata_parameters.go rename to restapi/operations/object/get_object_metadata_parameters.go index e99e6ae4e..2dfcbf624 100644 --- a/restapi/operations/user_api/get_object_metadata_parameters.go +++ b/restapi/operations/object/get_object_metadata_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_object_metadata_responses.go b/restapi/operations/object/get_object_metadata_responses.go similarity index 99% rename from restapi/operations/user_api/get_object_metadata_responses.go rename to restapi/operations/object/get_object_metadata_responses.go index 402155bd0..e0b7b7c50 100644 --- a/restapi/operations/user_api/get_object_metadata_responses.go +++ b/restapi/operations/object/get_object_metadata_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_object_metadata_urlbuilder.go b/restapi/operations/object/get_object_metadata_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/get_object_metadata_urlbuilder.go rename to restapi/operations/object/get_object_metadata_urlbuilder.go index e86878383..a4f61542f 100644 --- a/restapi/operations/user_api/get_object_metadata_urlbuilder.go +++ b/restapi/operations/object/get_object_metadata_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/list_objects.go b/restapi/operations/object/list_objects.go similarity index 98% rename from restapi/operations/user_api/list_objects.go rename to restapi/operations/object/list_objects.go index 02be1c842..061e6bc40 100644 --- a/restapi/operations/user_api/list_objects.go +++ b/restapi/operations/object/list_objects.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListObjects(ctx *middleware.Context, handler ListObjectsHandler) *ListOb return &ListObjects{Context: ctx, Handler: handler} } -/* ListObjects swagger:route GET /buckets/{bucket_name}/objects UserAPI listObjects +/* ListObjects swagger:route GET /buckets/{bucket_name}/objects Object listObjects List Objects diff --git a/restapi/operations/user_api/list_objects_parameters.go b/restapi/operations/object/list_objects_parameters.go similarity index 99% rename from restapi/operations/user_api/list_objects_parameters.go rename to restapi/operations/object/list_objects_parameters.go index 4f43c1aa9..b1a89268b 100644 --- a/restapi/operations/user_api/list_objects_parameters.go +++ b/restapi/operations/object/list_objects_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_objects_responses.go b/restapi/operations/object/list_objects_responses.go similarity index 99% rename from restapi/operations/user_api/list_objects_responses.go rename to restapi/operations/object/list_objects_responses.go index cbc8ba552..3b068f142 100644 --- a/restapi/operations/user_api/list_objects_responses.go +++ b/restapi/operations/object/list_objects_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_objects_urlbuilder.go b/restapi/operations/object/list_objects_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/list_objects_urlbuilder.go rename to restapi/operations/object/list_objects_urlbuilder.go index bd77cb019..e1c6d69df 100644 --- a/restapi/operations/user_api/list_objects_urlbuilder.go +++ b/restapi/operations/object/list_objects_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/post_buckets_bucket_name_objects_upload.go b/restapi/operations/object/post_buckets_bucket_name_objects_upload.go similarity index 97% rename from restapi/operations/user_api/post_buckets_bucket_name_objects_upload.go rename to restapi/operations/object/post_buckets_bucket_name_objects_upload.go index 87afc7e4d..68f64a05c 100644 --- a/restapi/operations/user_api/post_buckets_bucket_name_objects_upload.go +++ b/restapi/operations/object/post_buckets_bucket_name_objects_upload.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewPostBucketsBucketNameObjectsUpload(ctx *middleware.Context, handler Post return &PostBucketsBucketNameObjectsUpload{Context: ctx, Handler: handler} } -/* PostBucketsBucketNameObjectsUpload swagger:route POST /buckets/{bucket_name}/objects/upload UserAPI postBucketsBucketNameObjectsUpload +/* PostBucketsBucketNameObjectsUpload swagger:route POST /buckets/{bucket_name}/objects/upload Object postBucketsBucketNameObjectsUpload Uploads an Object. diff --git a/restapi/operations/user_api/post_buckets_bucket_name_objects_upload_parameters.go b/restapi/operations/object/post_buckets_bucket_name_objects_upload_parameters.go similarity index 99% rename from restapi/operations/user_api/post_buckets_bucket_name_objects_upload_parameters.go rename to restapi/operations/object/post_buckets_bucket_name_objects_upload_parameters.go index 6a88b0f50..27621b1b2 100644 --- a/restapi/operations/user_api/post_buckets_bucket_name_objects_upload_parameters.go +++ b/restapi/operations/object/post_buckets_bucket_name_objects_upload_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/post_buckets_bucket_name_objects_upload_responses.go b/restapi/operations/object/post_buckets_bucket_name_objects_upload_responses.go similarity index 99% rename from restapi/operations/user_api/post_buckets_bucket_name_objects_upload_responses.go rename to restapi/operations/object/post_buckets_bucket_name_objects_upload_responses.go index 0b095656c..f197e3769 100644 --- a/restapi/operations/user_api/post_buckets_bucket_name_objects_upload_responses.go +++ b/restapi/operations/object/post_buckets_bucket_name_objects_upload_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/post_buckets_bucket_name_objects_upload_urlbuilder.go b/restapi/operations/object/post_buckets_bucket_name_objects_upload_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/post_buckets_bucket_name_objects_upload_urlbuilder.go rename to restapi/operations/object/post_buckets_bucket_name_objects_upload_urlbuilder.go index a1bd5c299..e31366c4b 100644 --- a/restapi/operations/user_api/post_buckets_bucket_name_objects_upload_urlbuilder.go +++ b/restapi/operations/object/post_buckets_bucket_name_objects_upload_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/put_object_legal_hold.go b/restapi/operations/object/put_object_legal_hold.go similarity index 97% rename from restapi/operations/user_api/put_object_legal_hold.go rename to restapi/operations/object/put_object_legal_hold.go index c93dc690a..c9aa6062c 100644 --- a/restapi/operations/user_api/put_object_legal_hold.go +++ b/restapi/operations/object/put_object_legal_hold.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewPutObjectLegalHold(ctx *middleware.Context, handler PutObjectLegalHoldHa return &PutObjectLegalHold{Context: ctx, Handler: handler} } -/* PutObjectLegalHold swagger:route PUT /buckets/{bucket_name}/objects/legalhold UserAPI putObjectLegalHold +/* PutObjectLegalHold swagger:route PUT /buckets/{bucket_name}/objects/legalhold Object putObjectLegalHold Put Object's legalhold status diff --git a/restapi/operations/user_api/put_object_legal_hold_parameters.go b/restapi/operations/object/put_object_legal_hold_parameters.go similarity index 99% rename from restapi/operations/user_api/put_object_legal_hold_parameters.go rename to restapi/operations/object/put_object_legal_hold_parameters.go index 2b26503f6..57385fa86 100644 --- a/restapi/operations/user_api/put_object_legal_hold_parameters.go +++ b/restapi/operations/object/put_object_legal_hold_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/put_object_legal_hold_responses.go b/restapi/operations/object/put_object_legal_hold_responses.go similarity index 99% rename from restapi/operations/user_api/put_object_legal_hold_responses.go rename to restapi/operations/object/put_object_legal_hold_responses.go index fd7c3cea9..ede22ee03 100644 --- a/restapi/operations/user_api/put_object_legal_hold_responses.go +++ b/restapi/operations/object/put_object_legal_hold_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/put_object_legal_hold_urlbuilder.go b/restapi/operations/object/put_object_legal_hold_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/put_object_legal_hold_urlbuilder.go rename to restapi/operations/object/put_object_legal_hold_urlbuilder.go index f284bfb35..3221a775c 100644 --- a/restapi/operations/user_api/put_object_legal_hold_urlbuilder.go +++ b/restapi/operations/object/put_object_legal_hold_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/put_object_restore.go b/restapi/operations/object/put_object_restore.go similarity index 98% rename from restapi/operations/user_api/put_object_restore.go rename to restapi/operations/object/put_object_restore.go index d6d2cdb37..bd60d0de2 100644 --- a/restapi/operations/user_api/put_object_restore.go +++ b/restapi/operations/object/put_object_restore.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewPutObjectRestore(ctx *middleware.Context, handler PutObjectRestoreHandle return &PutObjectRestore{Context: ctx, Handler: handler} } -/* PutObjectRestore swagger:route PUT /buckets/{bucket_name}/objects/restore UserAPI putObjectRestore +/* PutObjectRestore swagger:route PUT /buckets/{bucket_name}/objects/restore Object putObjectRestore Restore Object to a selected version diff --git a/restapi/operations/user_api/put_object_restore_parameters.go b/restapi/operations/object/put_object_restore_parameters.go similarity index 99% rename from restapi/operations/user_api/put_object_restore_parameters.go rename to restapi/operations/object/put_object_restore_parameters.go index 4675a7302..60b27f634 100644 --- a/restapi/operations/user_api/put_object_restore_parameters.go +++ b/restapi/operations/object/put_object_restore_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/put_object_restore_responses.go b/restapi/operations/object/put_object_restore_responses.go similarity index 99% rename from restapi/operations/user_api/put_object_restore_responses.go rename to restapi/operations/object/put_object_restore_responses.go index 041fd57de..fe25f69a3 100644 --- a/restapi/operations/user_api/put_object_restore_responses.go +++ b/restapi/operations/object/put_object_restore_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/put_object_restore_urlbuilder.go b/restapi/operations/object/put_object_restore_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/put_object_restore_urlbuilder.go rename to restapi/operations/object/put_object_restore_urlbuilder.go index b0d9ce481..15b1d2386 100644 --- a/restapi/operations/user_api/put_object_restore_urlbuilder.go +++ b/restapi/operations/object/put_object_restore_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/put_object_retention.go b/restapi/operations/object/put_object_retention.go similarity index 97% rename from restapi/operations/user_api/put_object_retention.go rename to restapi/operations/object/put_object_retention.go index 6456927c0..9147fdea1 100644 --- a/restapi/operations/user_api/put_object_retention.go +++ b/restapi/operations/object/put_object_retention.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewPutObjectRetention(ctx *middleware.Context, handler PutObjectRetentionHa return &PutObjectRetention{Context: ctx, Handler: handler} } -/* PutObjectRetention swagger:route PUT /buckets/{bucket_name}/objects/retention UserAPI putObjectRetention +/* PutObjectRetention swagger:route PUT /buckets/{bucket_name}/objects/retention Object putObjectRetention Put Object's retention status diff --git a/restapi/operations/user_api/put_object_retention_parameters.go b/restapi/operations/object/put_object_retention_parameters.go similarity index 99% rename from restapi/operations/user_api/put_object_retention_parameters.go rename to restapi/operations/object/put_object_retention_parameters.go index 418c23cd0..3598c108a 100644 --- a/restapi/operations/user_api/put_object_retention_parameters.go +++ b/restapi/operations/object/put_object_retention_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/put_object_retention_responses.go b/restapi/operations/object/put_object_retention_responses.go similarity index 99% rename from restapi/operations/user_api/put_object_retention_responses.go rename to restapi/operations/object/put_object_retention_responses.go index 40c79533b..384262126 100644 --- a/restapi/operations/user_api/put_object_retention_responses.go +++ b/restapi/operations/object/put_object_retention_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/put_object_retention_urlbuilder.go b/restapi/operations/object/put_object_retention_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/put_object_retention_urlbuilder.go rename to restapi/operations/object/put_object_retention_urlbuilder.go index 86ea6167a..fbd719658 100644 --- a/restapi/operations/user_api/put_object_retention_urlbuilder.go +++ b/restapi/operations/object/put_object_retention_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/put_object_tags.go b/restapi/operations/object/put_object_tags.go similarity index 98% rename from restapi/operations/user_api/put_object_tags.go rename to restapi/operations/object/put_object_tags.go index 8d5f4ede9..1b2140f0b 100644 --- a/restapi/operations/user_api/put_object_tags.go +++ b/restapi/operations/object/put_object_tags.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewPutObjectTags(ctx *middleware.Context, handler PutObjectTagsHandler) *Pu return &PutObjectTags{Context: ctx, Handler: handler} } -/* PutObjectTags swagger:route PUT /buckets/{bucket_name}/objects/tags UserAPI putObjectTags +/* PutObjectTags swagger:route PUT /buckets/{bucket_name}/objects/tags Object putObjectTags Put Object's tags diff --git a/restapi/operations/user_api/put_object_tags_parameters.go b/restapi/operations/object/put_object_tags_parameters.go similarity index 99% rename from restapi/operations/user_api/put_object_tags_parameters.go rename to restapi/operations/object/put_object_tags_parameters.go index 2f5be2cc6..957ea0149 100644 --- a/restapi/operations/user_api/put_object_tags_parameters.go +++ b/restapi/operations/object/put_object_tags_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/put_object_tags_responses.go b/restapi/operations/object/put_object_tags_responses.go similarity index 99% rename from restapi/operations/user_api/put_object_tags_responses.go rename to restapi/operations/object/put_object_tags_responses.go index bbef90539..2681c6ec0 100644 --- a/restapi/operations/user_api/put_object_tags_responses.go +++ b/restapi/operations/object/put_object_tags_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/put_object_tags_urlbuilder.go b/restapi/operations/object/put_object_tags_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/put_object_tags_urlbuilder.go rename to restapi/operations/object/put_object_tags_urlbuilder.go index b8ba0e772..51aa12b5b 100644 --- a/restapi/operations/user_api/put_object_tags_urlbuilder.go +++ b/restapi/operations/object/put_object_tags_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/share_object.go b/restapi/operations/object/share_object.go similarity index 98% rename from restapi/operations/user_api/share_object.go rename to restapi/operations/object/share_object.go index 157889c9e..2ca00a7d5 100644 --- a/restapi/operations/user_api/share_object.go +++ b/restapi/operations/object/share_object.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewShareObject(ctx *middleware.Context, handler ShareObjectHandler) *ShareO return &ShareObject{Context: ctx, Handler: handler} } -/* ShareObject swagger:route GET /buckets/{bucket_name}/objects/share UserAPI shareObject +/* ShareObject swagger:route GET /buckets/{bucket_name}/objects/share Object shareObject Shares an Object on a url diff --git a/restapi/operations/user_api/share_object_parameters.go b/restapi/operations/object/share_object_parameters.go similarity index 99% rename from restapi/operations/user_api/share_object_parameters.go rename to restapi/operations/object/share_object_parameters.go index b81500abc..fb1914933 100644 --- a/restapi/operations/user_api/share_object_parameters.go +++ b/restapi/operations/object/share_object_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/share_object_responses.go b/restapi/operations/object/share_object_responses.go similarity index 99% rename from restapi/operations/user_api/share_object_responses.go rename to restapi/operations/object/share_object_responses.go index 9ab6b21fc..3f7679c71 100644 --- a/restapi/operations/user_api/share_object_responses.go +++ b/restapi/operations/object/share_object_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/share_object_urlbuilder.go b/restapi/operations/object/share_object_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/share_object_urlbuilder.go rename to restapi/operations/object/share_object_urlbuilder.go index 93fffab14..d64bd63cb 100644 --- a/restapi/operations/user_api/share_object_urlbuilder.go +++ b/restapi/operations/object/share_object_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package object // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/add_policy.go b/restapi/operations/policy/add_policy.go similarity index 97% rename from restapi/operations/admin_api/add_policy.go rename to restapi/operations/policy/add_policy.go index 27abaeeb4..835cf9f8c 100644 --- a/restapi/operations/admin_api/add_policy.go +++ b/restapi/operations/policy/add_policy.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewAddPolicy(ctx *middleware.Context, handler AddPolicyHandler) *AddPolicy return &AddPolicy{Context: ctx, Handler: handler} } -/* AddPolicy swagger:route POST /policies AdminAPI addPolicy +/* AddPolicy swagger:route POST /policies Policy addPolicy Add Policy diff --git a/restapi/operations/admin_api/add_policy_parameters.go b/restapi/operations/policy/add_policy_parameters.go similarity index 99% rename from restapi/operations/admin_api/add_policy_parameters.go rename to restapi/operations/policy/add_policy_parameters.go index 3ecb2ee36..0ff8f5b5a 100644 --- a/restapi/operations/admin_api/add_policy_parameters.go +++ b/restapi/operations/policy/add_policy_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/add_policy_responses.go b/restapi/operations/policy/add_policy_responses.go similarity index 99% rename from restapi/operations/admin_api/add_policy_responses.go rename to restapi/operations/policy/add_policy_responses.go index 290574392..e529ff3ef 100644 --- a/restapi/operations/admin_api/add_policy_responses.go +++ b/restapi/operations/policy/add_policy_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/add_policy_urlbuilder.go b/restapi/operations/policy/add_policy_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/add_policy_urlbuilder.go rename to restapi/operations/policy/add_policy_urlbuilder.go index b2dc7b27a..d5bc73962 100644 --- a/restapi/operations/admin_api/add_policy_urlbuilder.go +++ b/restapi/operations/policy/add_policy_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/list_groups_for_policy.go b/restapi/operations/policy/list_groups_for_policy.go similarity index 98% rename from restapi/operations/admin_api/list_groups_for_policy.go rename to restapi/operations/policy/list_groups_for_policy.go index 4e883717f..97352ef2e 100644 --- a/restapi/operations/admin_api/list_groups_for_policy.go +++ b/restapi/operations/policy/list_groups_for_policy.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListGroupsForPolicy(ctx *middleware.Context, handler ListGroupsForPolicy return &ListGroupsForPolicy{Context: ctx, Handler: handler} } -/* ListGroupsForPolicy swagger:route GET /policies/{policy}/groups AdminAPI listGroupsForPolicy +/* ListGroupsForPolicy swagger:route GET /policies/{policy}/groups Policy listGroupsForPolicy List Groups for a Policy diff --git a/restapi/operations/admin_api/list_groups_for_policy_parameters.go b/restapi/operations/policy/list_groups_for_policy_parameters.go similarity index 99% rename from restapi/operations/admin_api/list_groups_for_policy_parameters.go rename to restapi/operations/policy/list_groups_for_policy_parameters.go index 5ba092799..52d4af149 100644 --- a/restapi/operations/admin_api/list_groups_for_policy_parameters.go +++ b/restapi/operations/policy/list_groups_for_policy_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_groups_for_policy_responses.go b/restapi/operations/policy/list_groups_for_policy_responses.go similarity index 99% rename from restapi/operations/admin_api/list_groups_for_policy_responses.go rename to restapi/operations/policy/list_groups_for_policy_responses.go index 1b76c23d7..973b10a64 100644 --- a/restapi/operations/admin_api/list_groups_for_policy_responses.go +++ b/restapi/operations/policy/list_groups_for_policy_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_groups_for_policy_urlbuilder.go b/restapi/operations/policy/list_groups_for_policy_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/list_groups_for_policy_urlbuilder.go rename to restapi/operations/policy/list_groups_for_policy_urlbuilder.go index b25144d05..542d36c98 100644 --- a/restapi/operations/admin_api/list_groups_for_policy_urlbuilder.go +++ b/restapi/operations/policy/list_groups_for_policy_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/list_policies.go b/restapi/operations/policy/list_policies.go similarity index 97% rename from restapi/operations/admin_api/list_policies.go rename to restapi/operations/policy/list_policies.go index 16fb0f190..0f1f7a87b 100644 --- a/restapi/operations/admin_api/list_policies.go +++ b/restapi/operations/policy/list_policies.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListPolicies(ctx *middleware.Context, handler ListPoliciesHandler) *List return &ListPolicies{Context: ctx, Handler: handler} } -/* ListPolicies swagger:route GET /policies AdminAPI listPolicies +/* ListPolicies swagger:route GET /policies Policy listPolicies List Policies diff --git a/restapi/operations/admin_api/list_policies_parameters.go b/restapi/operations/policy/list_policies_parameters.go similarity index 99% rename from restapi/operations/admin_api/list_policies_parameters.go rename to restapi/operations/policy/list_policies_parameters.go index ae02a11ca..6e41557e6 100644 --- a/restapi/operations/admin_api/list_policies_parameters.go +++ b/restapi/operations/policy/list_policies_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_policies_responses.go b/restapi/operations/policy/list_policies_responses.go similarity index 99% rename from restapi/operations/admin_api/list_policies_responses.go rename to restapi/operations/policy/list_policies_responses.go index ff6d30bee..e9db6551a 100644 --- a/restapi/operations/admin_api/list_policies_responses.go +++ b/restapi/operations/policy/list_policies_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_policies_urlbuilder.go b/restapi/operations/policy/list_policies_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/list_policies_urlbuilder.go rename to restapi/operations/policy/list_policies_urlbuilder.go index 476f40421..f2128192c 100644 --- a/restapi/operations/admin_api/list_policies_urlbuilder.go +++ b/restapi/operations/policy/list_policies_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/list_users_for_policy.go b/restapi/operations/policy/list_users_for_policy.go similarity index 98% rename from restapi/operations/admin_api/list_users_for_policy.go rename to restapi/operations/policy/list_users_for_policy.go index 4850b74a6..b9df40111 100644 --- a/restapi/operations/admin_api/list_users_for_policy.go +++ b/restapi/operations/policy/list_users_for_policy.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListUsersForPolicy(ctx *middleware.Context, handler ListUsersForPolicyHa return &ListUsersForPolicy{Context: ctx, Handler: handler} } -/* ListUsersForPolicy swagger:route GET /policies/{policy}/users AdminAPI listUsersForPolicy +/* ListUsersForPolicy swagger:route GET /policies/{policy}/users Policy listUsersForPolicy List Users for a Policy diff --git a/restapi/operations/admin_api/list_users_for_policy_parameters.go b/restapi/operations/policy/list_users_for_policy_parameters.go similarity index 99% rename from restapi/operations/admin_api/list_users_for_policy_parameters.go rename to restapi/operations/policy/list_users_for_policy_parameters.go index 9a4a89242..40b74dfd2 100644 --- a/restapi/operations/admin_api/list_users_for_policy_parameters.go +++ b/restapi/operations/policy/list_users_for_policy_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_users_for_policy_responses.go b/restapi/operations/policy/list_users_for_policy_responses.go similarity index 99% rename from restapi/operations/admin_api/list_users_for_policy_responses.go rename to restapi/operations/policy/list_users_for_policy_responses.go index 14d602b33..6a6d38046 100644 --- a/restapi/operations/admin_api/list_users_for_policy_responses.go +++ b/restapi/operations/policy/list_users_for_policy_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_users_for_policy_urlbuilder.go b/restapi/operations/policy/list_users_for_policy_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/list_users_for_policy_urlbuilder.go rename to restapi/operations/policy/list_users_for_policy_urlbuilder.go index 86b09b3a0..643f1c2c0 100644 --- a/restapi/operations/admin_api/list_users_for_policy_urlbuilder.go +++ b/restapi/operations/policy/list_users_for_policy_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/policy_info.go b/restapi/operations/policy/policy_info.go similarity index 97% rename from restapi/operations/admin_api/policy_info.go rename to restapi/operations/policy/policy_info.go index f52f0c714..10e63b0f6 100644 --- a/restapi/operations/admin_api/policy_info.go +++ b/restapi/operations/policy/policy_info.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewPolicyInfo(ctx *middleware.Context, handler PolicyInfoHandler) *PolicyIn return &PolicyInfo{Context: ctx, Handler: handler} } -/* PolicyInfo swagger:route GET /policy AdminAPI policyInfo +/* PolicyInfo swagger:route GET /policy Policy policyInfo Policy info diff --git a/restapi/operations/admin_api/policy_info_parameters.go b/restapi/operations/policy/policy_info_parameters.go similarity index 99% rename from restapi/operations/admin_api/policy_info_parameters.go rename to restapi/operations/policy/policy_info_parameters.go index 75c6a1bcf..2bf96ac34 100644 --- a/restapi/operations/admin_api/policy_info_parameters.go +++ b/restapi/operations/policy/policy_info_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/policy_info_responses.go b/restapi/operations/policy/policy_info_responses.go similarity index 99% rename from restapi/operations/admin_api/policy_info_responses.go rename to restapi/operations/policy/policy_info_responses.go index 46a022a81..7a1d29879 100644 --- a/restapi/operations/admin_api/policy_info_responses.go +++ b/restapi/operations/policy/policy_info_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/policy_info_urlbuilder.go b/restapi/operations/policy/policy_info_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/policy_info_urlbuilder.go rename to restapi/operations/policy/policy_info_urlbuilder.go index c1ecdf0df..45f0526ce 100644 --- a/restapi/operations/admin_api/policy_info_urlbuilder.go +++ b/restapi/operations/policy/policy_info_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/remove_policy.go b/restapi/operations/policy/remove_policy.go similarity index 96% rename from restapi/operations/admin_api/remove_policy.go rename to restapi/operations/policy/remove_policy.go index 1bbffbc15..8327a4275 100644 --- a/restapi/operations/admin_api/remove_policy.go +++ b/restapi/operations/policy/remove_policy.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewRemovePolicy(ctx *middleware.Context, handler RemovePolicyHandler) *Remo return &RemovePolicy{Context: ctx, Handler: handler} } -/* RemovePolicy swagger:route DELETE /policy AdminAPI removePolicy +/* RemovePolicy swagger:route DELETE /policy Policy removePolicy Remove policy diff --git a/restapi/operations/admin_api/remove_policy_parameters.go b/restapi/operations/policy/remove_policy_parameters.go similarity index 99% rename from restapi/operations/admin_api/remove_policy_parameters.go rename to restapi/operations/policy/remove_policy_parameters.go index 45586b317..d0e01ee59 100644 --- a/restapi/operations/admin_api/remove_policy_parameters.go +++ b/restapi/operations/policy/remove_policy_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/remove_policy_responses.go b/restapi/operations/policy/remove_policy_responses.go similarity index 99% rename from restapi/operations/admin_api/remove_policy_responses.go rename to restapi/operations/policy/remove_policy_responses.go index 9b0654268..1195fafe2 100644 --- a/restapi/operations/admin_api/remove_policy_responses.go +++ b/restapi/operations/policy/remove_policy_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/remove_policy_urlbuilder.go b/restapi/operations/policy/remove_policy_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/remove_policy_urlbuilder.go rename to restapi/operations/policy/remove_policy_urlbuilder.go index e282706b2..75cab4c72 100644 --- a/restapi/operations/admin_api/remove_policy_urlbuilder.go +++ b/restapi/operations/policy/remove_policy_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/set_policy.go b/restapi/operations/policy/set_policy.go similarity index 97% rename from restapi/operations/admin_api/set_policy.go rename to restapi/operations/policy/set_policy.go index fbacde3c8..a0c803293 100644 --- a/restapi/operations/admin_api/set_policy.go +++ b/restapi/operations/policy/set_policy.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSetPolicy(ctx *middleware.Context, handler SetPolicyHandler) *SetPolicy return &SetPolicy{Context: ctx, Handler: handler} } -/* SetPolicy swagger:route PUT /set-policy AdminAPI setPolicy +/* SetPolicy swagger:route PUT /set-policy Policy setPolicy Set policy diff --git a/restapi/operations/admin_api/set_policy_multiple.go b/restapi/operations/policy/set_policy_multiple.go similarity index 96% rename from restapi/operations/admin_api/set_policy_multiple.go rename to restapi/operations/policy/set_policy_multiple.go index d0d142383..a74d71f63 100644 --- a/restapi/operations/admin_api/set_policy_multiple.go +++ b/restapi/operations/policy/set_policy_multiple.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSetPolicyMultiple(ctx *middleware.Context, handler SetPolicyMultipleHand return &SetPolicyMultiple{Context: ctx, Handler: handler} } -/* SetPolicyMultiple swagger:route PUT /set-policy-multi AdminAPI setPolicyMultiple +/* SetPolicyMultiple swagger:route PUT /set-policy-multi Policy setPolicyMultiple Set policy to multiple users/groups diff --git a/restapi/operations/admin_api/set_policy_multiple_parameters.go b/restapi/operations/policy/set_policy_multiple_parameters.go similarity index 99% rename from restapi/operations/admin_api/set_policy_multiple_parameters.go rename to restapi/operations/policy/set_policy_multiple_parameters.go index ca253f17f..d84b27e43 100644 --- a/restapi/operations/admin_api/set_policy_multiple_parameters.go +++ b/restapi/operations/policy/set_policy_multiple_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/set_policy_multiple_responses.go b/restapi/operations/policy/set_policy_multiple_responses.go similarity index 99% rename from restapi/operations/admin_api/set_policy_multiple_responses.go rename to restapi/operations/policy/set_policy_multiple_responses.go index e31758b45..9c277d8eb 100644 --- a/restapi/operations/admin_api/set_policy_multiple_responses.go +++ b/restapi/operations/policy/set_policy_multiple_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/set_policy_multiple_urlbuilder.go b/restapi/operations/policy/set_policy_multiple_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/set_policy_multiple_urlbuilder.go rename to restapi/operations/policy/set_policy_multiple_urlbuilder.go index defe5ca1d..be7b348f4 100644 --- a/restapi/operations/admin_api/set_policy_multiple_urlbuilder.go +++ b/restapi/operations/policy/set_policy_multiple_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/set_policy_parameters.go b/restapi/operations/policy/set_policy_parameters.go similarity index 99% rename from restapi/operations/admin_api/set_policy_parameters.go rename to restapi/operations/policy/set_policy_parameters.go index 830bd211f..3712ae0b1 100644 --- a/restapi/operations/admin_api/set_policy_parameters.go +++ b/restapi/operations/policy/set_policy_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/set_policy_responses.go b/restapi/operations/policy/set_policy_responses.go similarity index 99% rename from restapi/operations/admin_api/set_policy_responses.go rename to restapi/operations/policy/set_policy_responses.go index 7d3cdf7fd..317bfc650 100644 --- a/restapi/operations/admin_api/set_policy_responses.go +++ b/restapi/operations/policy/set_policy_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/set_policy_urlbuilder.go b/restapi/operations/policy/set_policy_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/set_policy_urlbuilder.go rename to restapi/operations/policy/set_policy_urlbuilder.go index c5e906097..781545d9b 100644 --- a/restapi/operations/admin_api/set_policy_urlbuilder.go +++ b/restapi/operations/policy/set_policy_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package policy // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/profiling_start.go b/restapi/operations/profile/profiling_start.go similarity index 96% rename from restapi/operations/admin_api/profiling_start.go rename to restapi/operations/profile/profiling_start.go index 3ff6168a9..4e17f021e 100644 --- a/restapi/operations/admin_api/profiling_start.go +++ b/restapi/operations/profile/profiling_start.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package profile // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewProfilingStart(ctx *middleware.Context, handler ProfilingStartHandler) * return &ProfilingStart{Context: ctx, Handler: handler} } -/* ProfilingStart swagger:route POST /profiling/start AdminAPI profilingStart +/* ProfilingStart swagger:route POST /profiling/start Profile profilingStart Start recording profile data diff --git a/restapi/operations/admin_api/profiling_start_parameters.go b/restapi/operations/profile/profiling_start_parameters.go similarity index 99% rename from restapi/operations/admin_api/profiling_start_parameters.go rename to restapi/operations/profile/profiling_start_parameters.go index d00aa753b..e3a956400 100644 --- a/restapi/operations/admin_api/profiling_start_parameters.go +++ b/restapi/operations/profile/profiling_start_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package profile // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/profiling_start_responses.go b/restapi/operations/profile/profiling_start_responses.go similarity index 99% rename from restapi/operations/admin_api/profiling_start_responses.go rename to restapi/operations/profile/profiling_start_responses.go index 7bda0f38c..1378ee57a 100644 --- a/restapi/operations/admin_api/profiling_start_responses.go +++ b/restapi/operations/profile/profiling_start_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package profile // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/profiling_start_urlbuilder.go b/restapi/operations/profile/profiling_start_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/profiling_start_urlbuilder.go rename to restapi/operations/profile/profiling_start_urlbuilder.go index fbeac6c50..f453aae81 100644 --- a/restapi/operations/admin_api/profiling_start_urlbuilder.go +++ b/restapi/operations/profile/profiling_start_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package profile // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/profiling_stop.go b/restapi/operations/profile/profiling_stop.go similarity index 96% rename from restapi/operations/admin_api/profiling_stop.go rename to restapi/operations/profile/profiling_stop.go index 7e1a836f4..11c3f7bd1 100644 --- a/restapi/operations/admin_api/profiling_stop.go +++ b/restapi/operations/profile/profiling_stop.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package profile // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewProfilingStop(ctx *middleware.Context, handler ProfilingStopHandler) *Pr return &ProfilingStop{Context: ctx, Handler: handler} } -/* ProfilingStop swagger:route POST /profiling/stop AdminAPI profilingStop +/* ProfilingStop swagger:route POST /profiling/stop Profile profilingStop Stop and download profile data diff --git a/restapi/operations/admin_api/profiling_stop_parameters.go b/restapi/operations/profile/profiling_stop_parameters.go similarity index 99% rename from restapi/operations/admin_api/profiling_stop_parameters.go rename to restapi/operations/profile/profiling_stop_parameters.go index 401f1eef2..6ab00622f 100644 --- a/restapi/operations/admin_api/profiling_stop_parameters.go +++ b/restapi/operations/profile/profiling_stop_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package profile // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/profiling_stop_responses.go b/restapi/operations/profile/profiling_stop_responses.go similarity index 99% rename from restapi/operations/admin_api/profiling_stop_responses.go rename to restapi/operations/profile/profiling_stop_responses.go index 305f861dc..a67aec876 100644 --- a/restapi/operations/admin_api/profiling_stop_responses.go +++ b/restapi/operations/profile/profiling_stop_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package profile // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/profiling_stop_urlbuilder.go b/restapi/operations/profile/profiling_stop_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/profiling_stop_urlbuilder.go rename to restapi/operations/profile/profiling_stop_urlbuilder.go index b6f4b0ed2..248194ada 100644 --- a/restapi/operations/admin_api/profiling_stop_urlbuilder.go +++ b/restapi/operations/profile/profiling_stop_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package profile // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/restart_service.go b/restapi/operations/service/restart_service.go similarity index 96% rename from restapi/operations/admin_api/restart_service.go rename to restapi/operations/service/restart_service.go index a099adb96..7ba78ad4b 100644 --- a/restapi/operations/admin_api/restart_service.go +++ b/restapi/operations/service/restart_service.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package service // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewRestartService(ctx *middleware.Context, handler RestartServiceHandler) * return &RestartService{Context: ctx, Handler: handler} } -/* RestartService swagger:route POST /service/restart AdminAPI restartService +/* RestartService swagger:route POST /service/restart Service restartService Restart Service diff --git a/restapi/operations/admin_api/restart_service_parameters.go b/restapi/operations/service/restart_service_parameters.go similarity index 99% rename from restapi/operations/admin_api/restart_service_parameters.go rename to restapi/operations/service/restart_service_parameters.go index 0459e2603..c4d7d2448 100644 --- a/restapi/operations/admin_api/restart_service_parameters.go +++ b/restapi/operations/service/restart_service_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package service // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/restart_service_responses.go b/restapi/operations/service/restart_service_responses.go similarity index 99% rename from restapi/operations/admin_api/restart_service_responses.go rename to restapi/operations/service/restart_service_responses.go index 645f0d6cf..cf25aa446 100644 --- a/restapi/operations/admin_api/restart_service_responses.go +++ b/restapi/operations/service/restart_service_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package service // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/restart_service_urlbuilder.go b/restapi/operations/service/restart_service_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/restart_service_urlbuilder.go rename to restapi/operations/service/restart_service_urlbuilder.go index 1e9359863..2b188a561 100644 --- a/restapi/operations/admin_api/restart_service_urlbuilder.go +++ b/restapi/operations/service/restart_service_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package service // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/create_service_account.go b/restapi/operations/service_account/create_service_account.go similarity index 96% rename from restapi/operations/user_api/create_service_account.go rename to restapi/operations/service_account/create_service_account.go index 7677a0ebe..cb5625689 100644 --- a/restapi/operations/user_api/create_service_account.go +++ b/restapi/operations/service_account/create_service_account.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewCreateServiceAccount(ctx *middleware.Context, handler CreateServiceAccou return &CreateServiceAccount{Context: ctx, Handler: handler} } -/* CreateServiceAccount swagger:route POST /service-accounts UserAPI createServiceAccount +/* CreateServiceAccount swagger:route POST /service-accounts ServiceAccount createServiceAccount Create Service Account diff --git a/restapi/operations/admin_api/create_service_account_creds.go b/restapi/operations/service_account/create_service_account_creds.go similarity index 97% rename from restapi/operations/admin_api/create_service_account_creds.go rename to restapi/operations/service_account/create_service_account_creds.go index 5647f1953..f0b1efbda 100644 --- a/restapi/operations/admin_api/create_service_account_creds.go +++ b/restapi/operations/service_account/create_service_account_creds.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewCreateServiceAccountCreds(ctx *middleware.Context, handler CreateService return &CreateServiceAccountCreds{Context: ctx, Handler: handler} } -/* CreateServiceAccountCreds swagger:route POST /service-account-credentials AdminAPI createServiceAccountCreds +/* CreateServiceAccountCreds swagger:route POST /service-account-credentials ServiceAccount createServiceAccountCreds Create Service Account With Credentials diff --git a/restapi/operations/admin_api/create_service_account_creds_parameters.go b/restapi/operations/service_account/create_service_account_creds_parameters.go similarity index 99% rename from restapi/operations/admin_api/create_service_account_creds_parameters.go rename to restapi/operations/service_account/create_service_account_creds_parameters.go index 20c87c025..03f4e962b 100644 --- a/restapi/operations/admin_api/create_service_account_creds_parameters.go +++ b/restapi/operations/service_account/create_service_account_creds_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/create_service_account_creds_responses.go b/restapi/operations/service_account/create_service_account_creds_responses.go similarity index 99% rename from restapi/operations/admin_api/create_service_account_creds_responses.go rename to restapi/operations/service_account/create_service_account_creds_responses.go index eb5433bd3..83231b07b 100644 --- a/restapi/operations/admin_api/create_service_account_creds_responses.go +++ b/restapi/operations/service_account/create_service_account_creds_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/create_service_account_creds_urlbuilder.go b/restapi/operations/service_account/create_service_account_creds_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/create_service_account_creds_urlbuilder.go rename to restapi/operations/service_account/create_service_account_creds_urlbuilder.go index 917458adc..13374d070 100644 --- a/restapi/operations/admin_api/create_service_account_creds_urlbuilder.go +++ b/restapi/operations/service_account/create_service_account_creds_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/create_service_account_parameters.go b/restapi/operations/service_account/create_service_account_parameters.go similarity index 99% rename from restapi/operations/user_api/create_service_account_parameters.go rename to restapi/operations/service_account/create_service_account_parameters.go index 156254efa..dcd107913 100644 --- a/restapi/operations/user_api/create_service_account_parameters.go +++ b/restapi/operations/service_account/create_service_account_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/create_service_account_responses.go b/restapi/operations/service_account/create_service_account_responses.go similarity index 99% rename from restapi/operations/user_api/create_service_account_responses.go rename to restapi/operations/service_account/create_service_account_responses.go index 7087cad28..7ec2a960f 100644 --- a/restapi/operations/user_api/create_service_account_responses.go +++ b/restapi/operations/service_account/create_service_account_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/create_service_account_urlbuilder.go b/restapi/operations/service_account/create_service_account_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/create_service_account_urlbuilder.go rename to restapi/operations/service_account/create_service_account_urlbuilder.go index ff7f7a444..c8586d96a 100644 --- a/restapi/operations/user_api/create_service_account_urlbuilder.go +++ b/restapi/operations/service_account/create_service_account_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_multiple_service_accounts.go b/restapi/operations/service_account/delete_multiple_service_accounts.go similarity index 97% rename from restapi/operations/user_api/delete_multiple_service_accounts.go rename to restapi/operations/service_account/delete_multiple_service_accounts.go index 980e22a3b..9e2d13782 100644 --- a/restapi/operations/user_api/delete_multiple_service_accounts.go +++ b/restapi/operations/service_account/delete_multiple_service_accounts.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteMultipleServiceAccounts(ctx *middleware.Context, handler DeleteMul return &DeleteMultipleServiceAccounts{Context: ctx, Handler: handler} } -/* DeleteMultipleServiceAccounts swagger:route DELETE /service-accounts/delete-multi UserAPI deleteMultipleServiceAccounts +/* DeleteMultipleServiceAccounts swagger:route DELETE /service-accounts/delete-multi ServiceAccount deleteMultipleServiceAccounts Delete Multiple Service Accounts diff --git a/restapi/operations/user_api/delete_multiple_service_accounts_parameters.go b/restapi/operations/service_account/delete_multiple_service_accounts_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_multiple_service_accounts_parameters.go rename to restapi/operations/service_account/delete_multiple_service_accounts_parameters.go index a99172e63..5c1d974db 100644 --- a/restapi/operations/user_api/delete_multiple_service_accounts_parameters.go +++ b/restapi/operations/service_account/delete_multiple_service_accounts_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_multiple_service_accounts_responses.go b/restapi/operations/service_account/delete_multiple_service_accounts_responses.go similarity index 99% rename from restapi/operations/user_api/delete_multiple_service_accounts_responses.go rename to restapi/operations/service_account/delete_multiple_service_accounts_responses.go index 99da6a467..9977f1a1c 100644 --- a/restapi/operations/user_api/delete_multiple_service_accounts_responses.go +++ b/restapi/operations/service_account/delete_multiple_service_accounts_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_multiple_service_accounts_urlbuilder.go b/restapi/operations/service_account/delete_multiple_service_accounts_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_multiple_service_accounts_urlbuilder.go rename to restapi/operations/service_account/delete_multiple_service_accounts_urlbuilder.go index e685220d5..66773d99c 100644 --- a/restapi/operations/user_api/delete_multiple_service_accounts_urlbuilder.go +++ b/restapi/operations/service_account/delete_multiple_service_accounts_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/delete_service_account.go b/restapi/operations/service_account/delete_service_account.go similarity index 97% rename from restapi/operations/user_api/delete_service_account.go rename to restapi/operations/service_account/delete_service_account.go index 29bc37d6d..cc52866c8 100644 --- a/restapi/operations/user_api/delete_service_account.go +++ b/restapi/operations/service_account/delete_service_account.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDeleteServiceAccount(ctx *middleware.Context, handler DeleteServiceAccou return &DeleteServiceAccount{Context: ctx, Handler: handler} } -/* DeleteServiceAccount swagger:route DELETE /service-accounts/{access_key} UserAPI deleteServiceAccount +/* DeleteServiceAccount swagger:route DELETE /service-accounts/{access_key} ServiceAccount deleteServiceAccount Delete Service Account diff --git a/restapi/operations/user_api/delete_service_account_parameters.go b/restapi/operations/service_account/delete_service_account_parameters.go similarity index 99% rename from restapi/operations/user_api/delete_service_account_parameters.go rename to restapi/operations/service_account/delete_service_account_parameters.go index c289c8e04..5defe229f 100644 --- a/restapi/operations/user_api/delete_service_account_parameters.go +++ b/restapi/operations/service_account/delete_service_account_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_service_account_responses.go b/restapi/operations/service_account/delete_service_account_responses.go similarity index 99% rename from restapi/operations/user_api/delete_service_account_responses.go rename to restapi/operations/service_account/delete_service_account_responses.go index f3008761d..da756d723 100644 --- a/restapi/operations/user_api/delete_service_account_responses.go +++ b/restapi/operations/service_account/delete_service_account_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/delete_service_account_urlbuilder.go b/restapi/operations/service_account/delete_service_account_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/delete_service_account_urlbuilder.go rename to restapi/operations/service_account/delete_service_account_urlbuilder.go index 192ffb38d..1905336f3 100644 --- a/restapi/operations/user_api/delete_service_account_urlbuilder.go +++ b/restapi/operations/service_account/delete_service_account_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/get_service_account_policy.go b/restapi/operations/service_account/get_service_account_policy.go similarity index 97% rename from restapi/operations/user_api/get_service_account_policy.go rename to restapi/operations/service_account/get_service_account_policy.go index 5c90fe349..77d459155 100644 --- a/restapi/operations/user_api/get_service_account_policy.go +++ b/restapi/operations/service_account/get_service_account_policy.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetServiceAccountPolicy(ctx *middleware.Context, handler GetServiceAccou return &GetServiceAccountPolicy{Context: ctx, Handler: handler} } -/* GetServiceAccountPolicy swagger:route GET /service-accounts/{access_key}/policy UserAPI getServiceAccountPolicy +/* GetServiceAccountPolicy swagger:route GET /service-accounts/{access_key}/policy ServiceAccount getServiceAccountPolicy Get Service Account Policy diff --git a/restapi/operations/user_api/get_service_account_policy_parameters.go b/restapi/operations/service_account/get_service_account_policy_parameters.go similarity index 99% rename from restapi/operations/user_api/get_service_account_policy_parameters.go rename to restapi/operations/service_account/get_service_account_policy_parameters.go index 7b82146d1..8f385bd6f 100644 --- a/restapi/operations/user_api/get_service_account_policy_parameters.go +++ b/restapi/operations/service_account/get_service_account_policy_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_service_account_policy_responses.go b/restapi/operations/service_account/get_service_account_policy_responses.go similarity index 99% rename from restapi/operations/user_api/get_service_account_policy_responses.go rename to restapi/operations/service_account/get_service_account_policy_responses.go index d46fb96e8..806d4c5d2 100644 --- a/restapi/operations/user_api/get_service_account_policy_responses.go +++ b/restapi/operations/service_account/get_service_account_policy_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/get_service_account_policy_urlbuilder.go b/restapi/operations/service_account/get_service_account_policy_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/get_service_account_policy_urlbuilder.go rename to restapi/operations/service_account/get_service_account_policy_urlbuilder.go index 169dc7c08..9ab694656 100644 --- a/restapi/operations/user_api/get_service_account_policy_urlbuilder.go +++ b/restapi/operations/service_account/get_service_account_policy_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/list_user_service_accounts.go b/restapi/operations/service_account/list_user_service_accounts.go similarity index 95% rename from restapi/operations/user_api/list_user_service_accounts.go rename to restapi/operations/service_account/list_user_service_accounts.go index 9abf7dfd7..fe9a471b6 100644 --- a/restapi/operations/user_api/list_user_service_accounts.go +++ b/restapi/operations/service_account/list_user_service_accounts.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListUserServiceAccounts(ctx *middleware.Context, handler ListUserService return &ListUserServiceAccounts{Context: ctx, Handler: handler} } -/* ListUserServiceAccounts swagger:route GET /service-accounts UserAPI listUserServiceAccounts +/* ListUserServiceAccounts swagger:route GET /service-accounts ServiceAccount listUserServiceAccounts List User's Service Accounts diff --git a/restapi/operations/user_api/list_user_service_accounts_parameters.go b/restapi/operations/service_account/list_user_service_accounts_parameters.go similarity index 99% rename from restapi/operations/user_api/list_user_service_accounts_parameters.go rename to restapi/operations/service_account/list_user_service_accounts_parameters.go index b387db946..48bc8c89b 100644 --- a/restapi/operations/user_api/list_user_service_accounts_parameters.go +++ b/restapi/operations/service_account/list_user_service_accounts_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_user_service_accounts_responses.go b/restapi/operations/service_account/list_user_service_accounts_responses.go similarity index 99% rename from restapi/operations/user_api/list_user_service_accounts_responses.go rename to restapi/operations/service_account/list_user_service_accounts_responses.go index 4e38b5fbf..6f7f94207 100644 --- a/restapi/operations/user_api/list_user_service_accounts_responses.go +++ b/restapi/operations/service_account/list_user_service_accounts_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/list_user_service_accounts_urlbuilder.go b/restapi/operations/service_account/list_user_service_accounts_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/list_user_service_accounts_urlbuilder.go rename to restapi/operations/service_account/list_user_service_accounts_urlbuilder.go index fa56519cf..4598fbd03 100644 --- a/restapi/operations/user_api/list_user_service_accounts_urlbuilder.go +++ b/restapi/operations/service_account/list_user_service_accounts_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/set_service_account_policy.go b/restapi/operations/service_account/set_service_account_policy.go similarity index 97% rename from restapi/operations/user_api/set_service_account_policy.go rename to restapi/operations/service_account/set_service_account_policy.go index f42fac104..35e756624 100644 --- a/restapi/operations/user_api/set_service_account_policy.go +++ b/restapi/operations/service_account/set_service_account_policy.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSetServiceAccountPolicy(ctx *middleware.Context, handler SetServiceAccou return &SetServiceAccountPolicy{Context: ctx, Handler: handler} } -/* SetServiceAccountPolicy swagger:route PUT /service-accounts/{access_key}/policy UserAPI setServiceAccountPolicy +/* SetServiceAccountPolicy swagger:route PUT /service-accounts/{access_key}/policy ServiceAccount setServiceAccountPolicy Set Service Account Policy diff --git a/restapi/operations/user_api/set_service_account_policy_parameters.go b/restapi/operations/service_account/set_service_account_policy_parameters.go similarity index 99% rename from restapi/operations/user_api/set_service_account_policy_parameters.go rename to restapi/operations/service_account/set_service_account_policy_parameters.go index e5c497a95..93fa6670a 100644 --- a/restapi/operations/user_api/set_service_account_policy_parameters.go +++ b/restapi/operations/service_account/set_service_account_policy_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/set_service_account_policy_responses.go b/restapi/operations/service_account/set_service_account_policy_responses.go similarity index 99% rename from restapi/operations/user_api/set_service_account_policy_responses.go rename to restapi/operations/service_account/set_service_account_policy_responses.go index bc57ada03..8cee81f7e 100644 --- a/restapi/operations/user_api/set_service_account_policy_responses.go +++ b/restapi/operations/service_account/set_service_account_policy_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/set_service_account_policy_urlbuilder.go b/restapi/operations/service_account/set_service_account_policy_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/set_service_account_policy_urlbuilder.go rename to restapi/operations/service_account/set_service_account_policy_urlbuilder.go index c035880a6..6b536418a 100644 --- a/restapi/operations/user_api/set_service_account_policy_urlbuilder.go +++ b/restapi/operations/service_account/set_service_account_policy_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package service_account // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/get_site_replication_info.go b/restapi/operations/site_replication/get_site_replication_info.go similarity index 97% rename from restapi/operations/admin_api/get_site_replication_info.go rename to restapi/operations/site_replication/get_site_replication_info.go index 3b3bfa838..86bb06641 100644 --- a/restapi/operations/admin_api/get_site_replication_info.go +++ b/restapi/operations/site_replication/get_site_replication_info.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetSiteReplicationInfo(ctx *middleware.Context, handler GetSiteReplicati return &GetSiteReplicationInfo{Context: ctx, Handler: handler} } -/* GetSiteReplicationInfo swagger:route GET /admin/site-replication AdminAPI getSiteReplicationInfo +/* GetSiteReplicationInfo swagger:route GET /admin/site-replication SiteReplication getSiteReplicationInfo Get list of Replication Sites diff --git a/restapi/operations/admin_api/get_site_replication_info_parameters.go b/restapi/operations/site_replication/get_site_replication_info_parameters.go similarity index 98% rename from restapi/operations/admin_api/get_site_replication_info_parameters.go rename to restapi/operations/site_replication/get_site_replication_info_parameters.go index d4b999c19..318b9a2ba 100644 --- a/restapi/operations/admin_api/get_site_replication_info_parameters.go +++ b/restapi/operations/site_replication/get_site_replication_info_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/get_site_replication_info_responses.go b/restapi/operations/site_replication/get_site_replication_info_responses.go similarity index 99% rename from restapi/operations/admin_api/get_site_replication_info_responses.go rename to restapi/operations/site_replication/get_site_replication_info_responses.go index 172ed97f9..c22d1b3f6 100644 --- a/restapi/operations/admin_api/get_site_replication_info_responses.go +++ b/restapi/operations/site_replication/get_site_replication_info_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/get_site_replication_info_urlbuilder.go b/restapi/operations/site_replication/get_site_replication_info_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/get_site_replication_info_urlbuilder.go rename to restapi/operations/site_replication/get_site_replication_info_urlbuilder.go index 737cfa66e..0af7f1e54 100644 --- a/restapi/operations/admin_api/get_site_replication_info_urlbuilder.go +++ b/restapi/operations/site_replication/get_site_replication_info_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/get_site_replication_status.go b/restapi/operations/site_replication/get_site_replication_status.go similarity index 97% rename from restapi/operations/admin_api/get_site_replication_status.go rename to restapi/operations/site_replication/get_site_replication_status.go index 9f50916ac..572efc90b 100644 --- a/restapi/operations/admin_api/get_site_replication_status.go +++ b/restapi/operations/site_replication/get_site_replication_status.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetSiteReplicationStatus(ctx *middleware.Context, handler GetSiteReplica return &GetSiteReplicationStatus{Context: ctx, Handler: handler} } -/* GetSiteReplicationStatus swagger:route GET /admin/site-replication/status AdminAPI getSiteReplicationStatus +/* GetSiteReplicationStatus swagger:route GET /admin/site-replication/status SiteReplication getSiteReplicationStatus Display overall site replication status diff --git a/restapi/operations/admin_api/get_site_replication_status_parameters.go b/restapi/operations/site_replication/get_site_replication_status_parameters.go similarity index 99% rename from restapi/operations/admin_api/get_site_replication_status_parameters.go rename to restapi/operations/site_replication/get_site_replication_status_parameters.go index 59b715e40..faeb3dfe7 100644 --- a/restapi/operations/admin_api/get_site_replication_status_parameters.go +++ b/restapi/operations/site_replication/get_site_replication_status_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/get_site_replication_status_responses.go b/restapi/operations/site_replication/get_site_replication_status_responses.go similarity index 99% rename from restapi/operations/admin_api/get_site_replication_status_responses.go rename to restapi/operations/site_replication/get_site_replication_status_responses.go index b0cfcb7e5..c2c9f1d9c 100644 --- a/restapi/operations/admin_api/get_site_replication_status_responses.go +++ b/restapi/operations/site_replication/get_site_replication_status_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/get_site_replication_status_urlbuilder.go b/restapi/operations/site_replication/get_site_replication_status_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/get_site_replication_status_urlbuilder.go rename to restapi/operations/site_replication/get_site_replication_status_urlbuilder.go index 6c74d123c..c7ca355c5 100644 --- a/restapi/operations/admin_api/get_site_replication_status_urlbuilder.go +++ b/restapi/operations/site_replication/get_site_replication_status_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/site_replication_edit.go b/restapi/operations/site_replication/site_replication_edit.go similarity index 97% rename from restapi/operations/admin_api/site_replication_edit.go rename to restapi/operations/site_replication/site_replication_edit.go index 02b538fd8..411c4f92e 100644 --- a/restapi/operations/admin_api/site_replication_edit.go +++ b/restapi/operations/site_replication/site_replication_edit.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSiteReplicationEdit(ctx *middleware.Context, handler SiteReplicationEdit return &SiteReplicationEdit{Context: ctx, Handler: handler} } -/* SiteReplicationEdit swagger:route PUT /admin/site-replication AdminAPI siteReplicationEdit +/* SiteReplicationEdit swagger:route PUT /admin/site-replication SiteReplication siteReplicationEdit Edit a Replication Site diff --git a/restapi/operations/admin_api/site_replication_edit_parameters.go b/restapi/operations/site_replication/site_replication_edit_parameters.go similarity index 99% rename from restapi/operations/admin_api/site_replication_edit_parameters.go rename to restapi/operations/site_replication/site_replication_edit_parameters.go index 0115f95cf..bc7c7f7d8 100644 --- a/restapi/operations/admin_api/site_replication_edit_parameters.go +++ b/restapi/operations/site_replication/site_replication_edit_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/site_replication_edit_responses.go b/restapi/operations/site_replication/site_replication_edit_responses.go similarity index 99% rename from restapi/operations/admin_api/site_replication_edit_responses.go rename to restapi/operations/site_replication/site_replication_edit_responses.go index bd1cc2238..e1245d4c2 100644 --- a/restapi/operations/admin_api/site_replication_edit_responses.go +++ b/restapi/operations/site_replication/site_replication_edit_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/site_replication_edit_urlbuilder.go b/restapi/operations/site_replication/site_replication_edit_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/site_replication_edit_urlbuilder.go rename to restapi/operations/site_replication/site_replication_edit_urlbuilder.go index 9b9130734..2c282bcac 100644 --- a/restapi/operations/admin_api/site_replication_edit_urlbuilder.go +++ b/restapi/operations/site_replication/site_replication_edit_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/site_replication_info_add.go b/restapi/operations/site_replication/site_replication_info_add.go similarity index 97% rename from restapi/operations/admin_api/site_replication_info_add.go rename to restapi/operations/site_replication/site_replication_info_add.go index edef1ce22..81ec555d4 100644 --- a/restapi/operations/admin_api/site_replication_info_add.go +++ b/restapi/operations/site_replication/site_replication_info_add.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSiteReplicationInfoAdd(ctx *middleware.Context, handler SiteReplicationI return &SiteReplicationInfoAdd{Context: ctx, Handler: handler} } -/* SiteReplicationInfoAdd swagger:route POST /admin/site-replication AdminAPI siteReplicationInfoAdd +/* SiteReplicationInfoAdd swagger:route POST /admin/site-replication SiteReplication siteReplicationInfoAdd Add a Replication Site diff --git a/restapi/operations/admin_api/site_replication_info_add_parameters.go b/restapi/operations/site_replication/site_replication_info_add_parameters.go similarity index 99% rename from restapi/operations/admin_api/site_replication_info_add_parameters.go rename to restapi/operations/site_replication/site_replication_info_add_parameters.go index a18aea49a..8a11484df 100644 --- a/restapi/operations/admin_api/site_replication_info_add_parameters.go +++ b/restapi/operations/site_replication/site_replication_info_add_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/site_replication_info_add_responses.go b/restapi/operations/site_replication/site_replication_info_add_responses.go similarity index 99% rename from restapi/operations/admin_api/site_replication_info_add_responses.go rename to restapi/operations/site_replication/site_replication_info_add_responses.go index 971dc67ac..7f522b691 100644 --- a/restapi/operations/admin_api/site_replication_info_add_responses.go +++ b/restapi/operations/site_replication/site_replication_info_add_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/site_replication_info_add_urlbuilder.go b/restapi/operations/site_replication/site_replication_info_add_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/site_replication_info_add_urlbuilder.go rename to restapi/operations/site_replication/site_replication_info_add_urlbuilder.go index a80fba8c0..d0caae87d 100644 --- a/restapi/operations/admin_api/site_replication_info_add_urlbuilder.go +++ b/restapi/operations/site_replication/site_replication_info_add_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/site_replication_remove.go b/restapi/operations/site_replication/site_replication_remove.go similarity index 97% rename from restapi/operations/admin_api/site_replication_remove.go rename to restapi/operations/site_replication/site_replication_remove.go index 6ab87a010..ce2c31dab 100644 --- a/restapi/operations/admin_api/site_replication_remove.go +++ b/restapi/operations/site_replication/site_replication_remove.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSiteReplicationRemove(ctx *middleware.Context, handler SiteReplicationRe return &SiteReplicationRemove{Context: ctx, Handler: handler} } -/* SiteReplicationRemove swagger:route DELETE /admin/site-replication AdminAPI siteReplicationRemove +/* SiteReplicationRemove swagger:route DELETE /admin/site-replication SiteReplication siteReplicationRemove Remove a Replication Site diff --git a/restapi/operations/admin_api/site_replication_remove_parameters.go b/restapi/operations/site_replication/site_replication_remove_parameters.go similarity index 99% rename from restapi/operations/admin_api/site_replication_remove_parameters.go rename to restapi/operations/site_replication/site_replication_remove_parameters.go index 470aa35bf..dc5dd9668 100644 --- a/restapi/operations/admin_api/site_replication_remove_parameters.go +++ b/restapi/operations/site_replication/site_replication_remove_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/site_replication_remove_responses.go b/restapi/operations/site_replication/site_replication_remove_responses.go similarity index 99% rename from restapi/operations/admin_api/site_replication_remove_responses.go rename to restapi/operations/site_replication/site_replication_remove_responses.go index 8fc804a48..42de1e5e4 100644 --- a/restapi/operations/admin_api/site_replication_remove_responses.go +++ b/restapi/operations/site_replication/site_replication_remove_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/site_replication_remove_urlbuilder.go b/restapi/operations/site_replication/site_replication_remove_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/site_replication_remove_urlbuilder.go rename to restapi/operations/site_replication/site_replication_remove_urlbuilder.go index 19ec2c0f4..071f2ddd5 100644 --- a/restapi/operations/admin_api/site_replication_remove_urlbuilder.go +++ b/restapi/operations/site_replication/site_replication_remove_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package site_replication // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/subnet_info.go b/restapi/operations/subnet/subnet_info.go similarity index 97% rename from restapi/operations/admin_api/subnet_info.go rename to restapi/operations/subnet/subnet_info.go index 5a7b11b0b..7e44096e3 100644 --- a/restapi/operations/admin_api/subnet_info.go +++ b/restapi/operations/subnet/subnet_info.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSubnetInfo(ctx *middleware.Context, handler SubnetInfoHandler) *SubnetIn return &SubnetInfo{Context: ctx, Handler: handler} } -/* SubnetInfo swagger:route GET /subnet/info AdminAPI subnetInfo +/* SubnetInfo swagger:route GET /subnet/info Subnet subnetInfo Subnet info diff --git a/restapi/operations/admin_api/subnet_info_parameters.go b/restapi/operations/subnet/subnet_info_parameters.go similarity index 99% rename from restapi/operations/admin_api/subnet_info_parameters.go rename to restapi/operations/subnet/subnet_info_parameters.go index dc2af1c15..46948b81e 100644 --- a/restapi/operations/admin_api/subnet_info_parameters.go +++ b/restapi/operations/subnet/subnet_info_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/subnet_info_responses.go b/restapi/operations/subnet/subnet_info_responses.go similarity index 99% rename from restapi/operations/admin_api/subnet_info_responses.go rename to restapi/operations/subnet/subnet_info_responses.go index 0b79b3a3f..5ed6c5891 100644 --- a/restapi/operations/admin_api/subnet_info_responses.go +++ b/restapi/operations/subnet/subnet_info_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/subnet_info_urlbuilder.go b/restapi/operations/subnet/subnet_info_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/subnet_info_urlbuilder.go rename to restapi/operations/subnet/subnet_info_urlbuilder.go index 85f5c4d10..1d8884b6d 100644 --- a/restapi/operations/admin_api/subnet_info_urlbuilder.go +++ b/restapi/operations/subnet/subnet_info_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/subnet_login.go b/restapi/operations/subnet/subnet_login.go similarity index 96% rename from restapi/operations/admin_api/subnet_login.go rename to restapi/operations/subnet/subnet_login.go index 57288e572..d07feeeff 100644 --- a/restapi/operations/admin_api/subnet_login.go +++ b/restapi/operations/subnet/subnet_login.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSubnetLogin(ctx *middleware.Context, handler SubnetLoginHandler) *Subnet return &SubnetLogin{Context: ctx, Handler: handler} } -/* SubnetLogin swagger:route POST /subnet/login AdminAPI subnetLogin +/* SubnetLogin swagger:route POST /subnet/login Subnet subnetLogin Login to subnet diff --git a/restapi/operations/admin_api/subnet_login_m_f_a.go b/restapi/operations/subnet/subnet_login_m_f_a.go similarity index 96% rename from restapi/operations/admin_api/subnet_login_m_f_a.go rename to restapi/operations/subnet/subnet_login_m_f_a.go index ede17267c..6e6690f67 100644 --- a/restapi/operations/admin_api/subnet_login_m_f_a.go +++ b/restapi/operations/subnet/subnet_login_m_f_a.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSubnetLoginMFA(ctx *middleware.Context, handler SubnetLoginMFAHandler) * return &SubnetLoginMFA{Context: ctx, Handler: handler} } -/* SubnetLoginMFA swagger:route POST /subnet/login/mfa AdminAPI subnetLoginMFA +/* SubnetLoginMFA swagger:route POST /subnet/login/mfa Subnet subnetLoginMFA Login to subnet using mfa diff --git a/restapi/operations/admin_api/subnet_login_m_f_a_parameters.go b/restapi/operations/subnet/subnet_login_m_f_a_parameters.go similarity index 99% rename from restapi/operations/admin_api/subnet_login_m_f_a_parameters.go rename to restapi/operations/subnet/subnet_login_m_f_a_parameters.go index 6f2ef5426..516d5c528 100644 --- a/restapi/operations/admin_api/subnet_login_m_f_a_parameters.go +++ b/restapi/operations/subnet/subnet_login_m_f_a_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/subnet_login_m_f_a_responses.go b/restapi/operations/subnet/subnet_login_m_f_a_responses.go similarity index 99% rename from restapi/operations/admin_api/subnet_login_m_f_a_responses.go rename to restapi/operations/subnet/subnet_login_m_f_a_responses.go index c6845a603..fc8a44716 100644 --- a/restapi/operations/admin_api/subnet_login_m_f_a_responses.go +++ b/restapi/operations/subnet/subnet_login_m_f_a_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/subnet_login_m_f_a_urlbuilder.go b/restapi/operations/subnet/subnet_login_m_f_a_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/subnet_login_m_f_a_urlbuilder.go rename to restapi/operations/subnet/subnet_login_m_f_a_urlbuilder.go index b89e6b83c..157e6c79c 100644 --- a/restapi/operations/admin_api/subnet_login_m_f_a_urlbuilder.go +++ b/restapi/operations/subnet/subnet_login_m_f_a_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/subnet_login_parameters.go b/restapi/operations/subnet/subnet_login_parameters.go similarity index 99% rename from restapi/operations/admin_api/subnet_login_parameters.go rename to restapi/operations/subnet/subnet_login_parameters.go index f0b4e9dc1..8f54a6321 100644 --- a/restapi/operations/admin_api/subnet_login_parameters.go +++ b/restapi/operations/subnet/subnet_login_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/subnet_login_responses.go b/restapi/operations/subnet/subnet_login_responses.go similarity index 99% rename from restapi/operations/admin_api/subnet_login_responses.go rename to restapi/operations/subnet/subnet_login_responses.go index 4b8926717..c82d92962 100644 --- a/restapi/operations/admin_api/subnet_login_responses.go +++ b/restapi/operations/subnet/subnet_login_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/subnet_login_urlbuilder.go b/restapi/operations/subnet/subnet_login_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/subnet_login_urlbuilder.go rename to restapi/operations/subnet/subnet_login_urlbuilder.go index 586712dd8..a55bfec8c 100644 --- a/restapi/operations/admin_api/subnet_login_urlbuilder.go +++ b/restapi/operations/subnet/subnet_login_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/subnet_reg_token.go b/restapi/operations/subnet/subnet_reg_token.go similarity index 96% rename from restapi/operations/admin_api/subnet_reg_token.go rename to restapi/operations/subnet/subnet_reg_token.go index 98cf315ee..8dc7b799c 100644 --- a/restapi/operations/admin_api/subnet_reg_token.go +++ b/restapi/operations/subnet/subnet_reg_token.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSubnetRegToken(ctx *middleware.Context, handler SubnetRegTokenHandler) * return &SubnetRegToken{Context: ctx, Handler: handler} } -/* SubnetRegToken swagger:route GET /subnet/registration-token AdminAPI subnetRegToken +/* SubnetRegToken swagger:route GET /subnet/registration-token Subnet subnetRegToken Subnet registraton token diff --git a/restapi/operations/admin_api/subnet_reg_token_parameters.go b/restapi/operations/subnet/subnet_reg_token_parameters.go similarity index 99% rename from restapi/operations/admin_api/subnet_reg_token_parameters.go rename to restapi/operations/subnet/subnet_reg_token_parameters.go index bca67cf7a..655bc85e5 100644 --- a/restapi/operations/admin_api/subnet_reg_token_parameters.go +++ b/restapi/operations/subnet/subnet_reg_token_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/subnet_reg_token_responses.go b/restapi/operations/subnet/subnet_reg_token_responses.go similarity index 99% rename from restapi/operations/admin_api/subnet_reg_token_responses.go rename to restapi/operations/subnet/subnet_reg_token_responses.go index e68647f04..16ee56e3f 100644 --- a/restapi/operations/admin_api/subnet_reg_token_responses.go +++ b/restapi/operations/subnet/subnet_reg_token_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/subnet_reg_token_urlbuilder.go b/restapi/operations/subnet/subnet_reg_token_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/subnet_reg_token_urlbuilder.go rename to restapi/operations/subnet/subnet_reg_token_urlbuilder.go index c7c315041..f794bd801 100644 --- a/restapi/operations/admin_api/subnet_reg_token_urlbuilder.go +++ b/restapi/operations/subnet/subnet_reg_token_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/subnet_register.go b/restapi/operations/subnet/subnet_register.go similarity index 96% rename from restapi/operations/admin_api/subnet_register.go rename to restapi/operations/subnet/subnet_register.go index 32e122fed..cdaa67a0b 100644 --- a/restapi/operations/admin_api/subnet_register.go +++ b/restapi/operations/subnet/subnet_register.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewSubnetRegister(ctx *middleware.Context, handler SubnetRegisterHandler) * return &SubnetRegister{Context: ctx, Handler: handler} } -/* SubnetRegister swagger:route POST /subnet/register AdminAPI subnetRegister +/* SubnetRegister swagger:route POST /subnet/register Subnet subnetRegister Register cluster with Subnet diff --git a/restapi/operations/admin_api/subnet_register_parameters.go b/restapi/operations/subnet/subnet_register_parameters.go similarity index 99% rename from restapi/operations/admin_api/subnet_register_parameters.go rename to restapi/operations/subnet/subnet_register_parameters.go index 5145e438d..e196c3b61 100644 --- a/restapi/operations/admin_api/subnet_register_parameters.go +++ b/restapi/operations/subnet/subnet_register_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/subnet_register_responses.go b/restapi/operations/subnet/subnet_register_responses.go similarity index 99% rename from restapi/operations/admin_api/subnet_register_responses.go rename to restapi/operations/subnet/subnet_register_responses.go index 8e99c9f0b..141c5dd77 100644 --- a/restapi/operations/admin_api/subnet_register_responses.go +++ b/restapi/operations/subnet/subnet_register_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/subnet_register_urlbuilder.go b/restapi/operations/subnet/subnet_register_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/subnet_register_urlbuilder.go rename to restapi/operations/subnet/subnet_register_urlbuilder.go index 0e9b50540..31ddaecd8 100644 --- a/restapi/operations/admin_api/subnet_register_urlbuilder.go +++ b/restapi/operations/subnet/subnet_register_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package subnet // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/admin_info.go b/restapi/operations/system/admin_info.go similarity index 97% rename from restapi/operations/admin_api/admin_info.go rename to restapi/operations/system/admin_info.go index 8d24cc3f7..252096f86 100644 --- a/restapi/operations/admin_api/admin_info.go +++ b/restapi/operations/system/admin_info.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewAdminInfo(ctx *middleware.Context, handler AdminInfoHandler) *AdminInfo return &AdminInfo{Context: ctx, Handler: handler} } -/* AdminInfo swagger:route GET /admin/info AdminAPI adminInfo +/* AdminInfo swagger:route GET /admin/info System adminInfo Returns information about the deployment diff --git a/restapi/operations/admin_api/admin_info_parameters.go b/restapi/operations/system/admin_info_parameters.go similarity index 99% rename from restapi/operations/admin_api/admin_info_parameters.go rename to restapi/operations/system/admin_info_parameters.go index 9be050191..821649e51 100644 --- a/restapi/operations/admin_api/admin_info_parameters.go +++ b/restapi/operations/system/admin_info_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/admin_info_responses.go b/restapi/operations/system/admin_info_responses.go similarity index 99% rename from restapi/operations/admin_api/admin_info_responses.go rename to restapi/operations/system/admin_info_responses.go index 40fd01ee5..e0f276e09 100644 --- a/restapi/operations/admin_api/admin_info_responses.go +++ b/restapi/operations/system/admin_info_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/admin_info_urlbuilder.go b/restapi/operations/system/admin_info_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/admin_info_urlbuilder.go rename to restapi/operations/system/admin_info_urlbuilder.go index 7051b0c22..33bf9157a 100644 --- a/restapi/operations/admin_api/admin_info_urlbuilder.go +++ b/restapi/operations/system/admin_info_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/arn_list.go b/restapi/operations/system/arn_list.go similarity index 97% rename from restapi/operations/admin_api/arn_list.go rename to restapi/operations/system/arn_list.go index b46ad7729..c9b38b25c 100644 --- a/restapi/operations/admin_api/arn_list.go +++ b/restapi/operations/system/arn_list.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewArnList(ctx *middleware.Context, handler ArnListHandler) *ArnList { return &ArnList{Context: ctx, Handler: handler} } -/* ArnList swagger:route GET /admin/arns AdminAPI arnList +/* ArnList swagger:route GET /admin/arns System arnList Returns a list of active ARNs in the instance diff --git a/restapi/operations/admin_api/arn_list_parameters.go b/restapi/operations/system/arn_list_parameters.go similarity index 99% rename from restapi/operations/admin_api/arn_list_parameters.go rename to restapi/operations/system/arn_list_parameters.go index 8644c763c..936e156e8 100644 --- a/restapi/operations/admin_api/arn_list_parameters.go +++ b/restapi/operations/system/arn_list_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/arn_list_responses.go b/restapi/operations/system/arn_list_responses.go similarity index 99% rename from restapi/operations/admin_api/arn_list_responses.go rename to restapi/operations/system/arn_list_responses.go index aa5e715c2..c862f914a 100644 --- a/restapi/operations/admin_api/arn_list_responses.go +++ b/restapi/operations/system/arn_list_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/arn_list_urlbuilder.go b/restapi/operations/system/arn_list_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/arn_list_urlbuilder.go rename to restapi/operations/system/arn_list_urlbuilder.go index 2872a45ee..c7a129699 100644 --- a/restapi/operations/admin_api/arn_list_urlbuilder.go +++ b/restapi/operations/system/arn_list_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/user_api/check_min_i_o_version.go b/restapi/operations/system/check_min_i_o_version.go similarity index 96% rename from restapi/operations/user_api/check_min_i_o_version.go rename to restapi/operations/system/check_min_i_o_version.go index 71424c87e..184fc9b76 100644 --- a/restapi/operations/user_api/check_min_i_o_version.go +++ b/restapi/operations/system/check_min_i_o_version.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -46,7 +46,7 @@ func NewCheckMinIOVersion(ctx *middleware.Context, handler CheckMinIOVersionHand return &CheckMinIOVersion{Context: ctx, Handler: handler} } -/* CheckMinIOVersion swagger:route GET /check-version UserAPI checkMinIOVersion +/* CheckMinIOVersion swagger:route GET /check-version System checkMinIOVersion Checks the current MinIO version against the latest diff --git a/restapi/operations/user_api/check_min_i_o_version_parameters.go b/restapi/operations/system/check_min_i_o_version_parameters.go similarity index 99% rename from restapi/operations/user_api/check_min_i_o_version_parameters.go rename to restapi/operations/system/check_min_i_o_version_parameters.go index 3e7bf67f4..c291e94f0 100644 --- a/restapi/operations/user_api/check_min_i_o_version_parameters.go +++ b/restapi/operations/system/check_min_i_o_version_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/check_min_i_o_version_responses.go b/restapi/operations/system/check_min_i_o_version_responses.go similarity index 99% rename from restapi/operations/user_api/check_min_i_o_version_responses.go rename to restapi/operations/system/check_min_i_o_version_responses.go index 9c956b40e..27c9fc5bf 100644 --- a/restapi/operations/user_api/check_min_i_o_version_responses.go +++ b/restapi/operations/system/check_min_i_o_version_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/user_api/check_min_i_o_version_urlbuilder.go b/restapi/operations/system/check_min_i_o_version_urlbuilder.go similarity index 99% rename from restapi/operations/user_api/check_min_i_o_version_urlbuilder.go rename to restapi/operations/system/check_min_i_o_version_urlbuilder.go index 570a11dbc..04497fb53 100644 --- a/restapi/operations/user_api/check_min_i_o_version_urlbuilder.go +++ b/restapi/operations/system/check_min_i_o_version_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package user_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/dashboard_widget_details.go b/restapi/operations/system/dashboard_widget_details.go similarity index 98% rename from restapi/operations/admin_api/dashboard_widget_details.go rename to restapi/operations/system/dashboard_widget_details.go index 00e081908..940d21402 100644 --- a/restapi/operations/admin_api/dashboard_widget_details.go +++ b/restapi/operations/system/dashboard_widget_details.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewDashboardWidgetDetails(ctx *middleware.Context, handler DashboardWidgetD return &DashboardWidgetDetails{Context: ctx, Handler: handler} } -/* DashboardWidgetDetails swagger:route GET /admin/info/widgets/{widgetId} AdminAPI dashboardWidgetDetails +/* DashboardWidgetDetails swagger:route GET /admin/info/widgets/{widgetId} System dashboardWidgetDetails Returns information about the deployment diff --git a/restapi/operations/admin_api/dashboard_widget_details_parameters.go b/restapi/operations/system/dashboard_widget_details_parameters.go similarity index 99% rename from restapi/operations/admin_api/dashboard_widget_details_parameters.go rename to restapi/operations/system/dashboard_widget_details_parameters.go index 23c17fa6b..79c54ef66 100644 --- a/restapi/operations/admin_api/dashboard_widget_details_parameters.go +++ b/restapi/operations/system/dashboard_widget_details_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/dashboard_widget_details_responses.go b/restapi/operations/system/dashboard_widget_details_responses.go similarity index 99% rename from restapi/operations/admin_api/dashboard_widget_details_responses.go rename to restapi/operations/system/dashboard_widget_details_responses.go index 815e7848e..7bf99418f 100644 --- a/restapi/operations/admin_api/dashboard_widget_details_responses.go +++ b/restapi/operations/system/dashboard_widget_details_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/dashboard_widget_details_urlbuilder.go b/restapi/operations/system/dashboard_widget_details_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/dashboard_widget_details_urlbuilder.go rename to restapi/operations/system/dashboard_widget_details_urlbuilder.go index c5b66d983..a8e5b7f59 100644 --- a/restapi/operations/admin_api/dashboard_widget_details_urlbuilder.go +++ b/restapi/operations/system/dashboard_widget_details_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/list_nodes.go b/restapi/operations/system/list_nodes.go similarity index 97% rename from restapi/operations/admin_api/list_nodes.go rename to restapi/operations/system/list_nodes.go index 1d9527577..160dc657d 100644 --- a/restapi/operations/admin_api/list_nodes.go +++ b/restapi/operations/system/list_nodes.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListNodes(ctx *middleware.Context, handler ListNodesHandler) *ListNodes return &ListNodes{Context: ctx, Handler: handler} } -/* ListNodes swagger:route GET /nodes AdminAPI listNodes +/* ListNodes swagger:route GET /nodes System listNodes Lists Nodes diff --git a/restapi/operations/admin_api/list_nodes_parameters.go b/restapi/operations/system/list_nodes_parameters.go similarity index 99% rename from restapi/operations/admin_api/list_nodes_parameters.go rename to restapi/operations/system/list_nodes_parameters.go index f6d325252..e77a6031e 100644 --- a/restapi/operations/admin_api/list_nodes_parameters.go +++ b/restapi/operations/system/list_nodes_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_nodes_responses.go b/restapi/operations/system/list_nodes_responses.go similarity index 99% rename from restapi/operations/admin_api/list_nodes_responses.go rename to restapi/operations/system/list_nodes_responses.go index eaf4fd278..40b1ce41f 100644 --- a/restapi/operations/admin_api/list_nodes_responses.go +++ b/restapi/operations/system/list_nodes_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_nodes_urlbuilder.go b/restapi/operations/system/list_nodes_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/list_nodes_urlbuilder.go rename to restapi/operations/system/list_nodes_urlbuilder.go index 501e11a4c..61e25f0cf 100644 --- a/restapi/operations/admin_api/list_nodes_urlbuilder.go +++ b/restapi/operations/system/list_nodes_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package system // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/add_tier.go b/restapi/operations/tiering/add_tier.go similarity index 97% rename from restapi/operations/admin_api/add_tier.go rename to restapi/operations/tiering/add_tier.go index d3387329c..fb3a12e2a 100644 --- a/restapi/operations/admin_api/add_tier.go +++ b/restapi/operations/tiering/add_tier.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewAddTier(ctx *middleware.Context, handler AddTierHandler) *AddTier { return &AddTier{Context: ctx, Handler: handler} } -/* AddTier swagger:route POST /admin/tiers AdminAPI addTier +/* AddTier swagger:route POST /admin/tiers Tiering addTier Allows to configure a new tier diff --git a/restapi/operations/admin_api/add_tier_parameters.go b/restapi/operations/tiering/add_tier_parameters.go similarity index 99% rename from restapi/operations/admin_api/add_tier_parameters.go rename to restapi/operations/tiering/add_tier_parameters.go index 38b908e64..6cc0897d0 100644 --- a/restapi/operations/admin_api/add_tier_parameters.go +++ b/restapi/operations/tiering/add_tier_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/add_tier_responses.go b/restapi/operations/tiering/add_tier_responses.go similarity index 99% rename from restapi/operations/admin_api/add_tier_responses.go rename to restapi/operations/tiering/add_tier_responses.go index 768866b8e..7761dbf11 100644 --- a/restapi/operations/admin_api/add_tier_responses.go +++ b/restapi/operations/tiering/add_tier_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/add_tier_urlbuilder.go b/restapi/operations/tiering/add_tier_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/add_tier_urlbuilder.go rename to restapi/operations/tiering/add_tier_urlbuilder.go index e8bf182ed..76dfd3980 100644 --- a/restapi/operations/admin_api/add_tier_urlbuilder.go +++ b/restapi/operations/tiering/add_tier_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/edit_tier_credentials.go b/restapi/operations/tiering/edit_tier_credentials.go similarity index 97% rename from restapi/operations/admin_api/edit_tier_credentials.go rename to restapi/operations/tiering/edit_tier_credentials.go index 46b694321..14a1c595d 100644 --- a/restapi/operations/admin_api/edit_tier_credentials.go +++ b/restapi/operations/tiering/edit_tier_credentials.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewEditTierCredentials(ctx *middleware.Context, handler EditTierCredentials return &EditTierCredentials{Context: ctx, Handler: handler} } -/* EditTierCredentials swagger:route PUT /admin/tiers/{type}/{name}/credentials AdminAPI editTierCredentials +/* EditTierCredentials swagger:route PUT /admin/tiers/{type}/{name}/credentials Tiering editTierCredentials Edit Tier Credentials diff --git a/restapi/operations/admin_api/edit_tier_credentials_parameters.go b/restapi/operations/tiering/edit_tier_credentials_parameters.go similarity index 99% rename from restapi/operations/admin_api/edit_tier_credentials_parameters.go rename to restapi/operations/tiering/edit_tier_credentials_parameters.go index 811fdcc0b..6113daabb 100644 --- a/restapi/operations/admin_api/edit_tier_credentials_parameters.go +++ b/restapi/operations/tiering/edit_tier_credentials_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/edit_tier_credentials_responses.go b/restapi/operations/tiering/edit_tier_credentials_responses.go similarity index 99% rename from restapi/operations/admin_api/edit_tier_credentials_responses.go rename to restapi/operations/tiering/edit_tier_credentials_responses.go index c31457a23..e8d0ee84a 100644 --- a/restapi/operations/admin_api/edit_tier_credentials_responses.go +++ b/restapi/operations/tiering/edit_tier_credentials_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/edit_tier_credentials_urlbuilder.go b/restapi/operations/tiering/edit_tier_credentials_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/edit_tier_credentials_urlbuilder.go rename to restapi/operations/tiering/edit_tier_credentials_urlbuilder.go index dffc9dad1..2d180678b 100644 --- a/restapi/operations/admin_api/edit_tier_credentials_urlbuilder.go +++ b/restapi/operations/tiering/edit_tier_credentials_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/get_tier.go b/restapi/operations/tiering/get_tier.go similarity index 96% rename from restapi/operations/admin_api/get_tier.go rename to restapi/operations/tiering/get_tier.go index 6b46d81fa..f7216104d 100644 --- a/restapi/operations/admin_api/get_tier.go +++ b/restapi/operations/tiering/get_tier.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetTier(ctx *middleware.Context, handler GetTierHandler) *GetTier { return &GetTier{Context: ctx, Handler: handler} } -/* GetTier swagger:route GET /admin/tiers/{type}/{name} AdminAPI getTier +/* GetTier swagger:route GET /admin/tiers/{type}/{name} Tiering getTier Get Tier diff --git a/restapi/operations/admin_api/get_tier_parameters.go b/restapi/operations/tiering/get_tier_parameters.go similarity index 99% rename from restapi/operations/admin_api/get_tier_parameters.go rename to restapi/operations/tiering/get_tier_parameters.go index ad9474564..dbc57e474 100644 --- a/restapi/operations/admin_api/get_tier_parameters.go +++ b/restapi/operations/tiering/get_tier_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/get_tier_responses.go b/restapi/operations/tiering/get_tier_responses.go similarity index 99% rename from restapi/operations/admin_api/get_tier_responses.go rename to restapi/operations/tiering/get_tier_responses.go index edeef6763..1d5ef7f97 100644 --- a/restapi/operations/admin_api/get_tier_responses.go +++ b/restapi/operations/tiering/get_tier_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/get_tier_urlbuilder.go b/restapi/operations/tiering/get_tier_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/get_tier_urlbuilder.go rename to restapi/operations/tiering/get_tier_urlbuilder.go index 6691e7b6f..315b2349c 100644 --- a/restapi/operations/admin_api/get_tier_urlbuilder.go +++ b/restapi/operations/tiering/get_tier_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/tiers_list.go b/restapi/operations/tiering/tiers_list.go similarity index 97% rename from restapi/operations/admin_api/tiers_list.go rename to restapi/operations/tiering/tiers_list.go index ae0465bd5..d1f3a06e5 100644 --- a/restapi/operations/admin_api/tiers_list.go +++ b/restapi/operations/tiering/tiers_list.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewTiersList(ctx *middleware.Context, handler TiersListHandler) *TiersList return &TiersList{Context: ctx, Handler: handler} } -/* TiersList swagger:route GET /admin/tiers AdminAPI tiersList +/* TiersList swagger:route GET /admin/tiers Tiering tiersList Returns a list of tiers for ilm diff --git a/restapi/operations/admin_api/tiers_list_parameters.go b/restapi/operations/tiering/tiers_list_parameters.go similarity index 99% rename from restapi/operations/admin_api/tiers_list_parameters.go rename to restapi/operations/tiering/tiers_list_parameters.go index 07fc395d4..5965b9e56 100644 --- a/restapi/operations/admin_api/tiers_list_parameters.go +++ b/restapi/operations/tiering/tiers_list_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/tiers_list_responses.go b/restapi/operations/tiering/tiers_list_responses.go similarity index 99% rename from restapi/operations/admin_api/tiers_list_responses.go rename to restapi/operations/tiering/tiers_list_responses.go index 0e7d70b97..d217fd0da 100644 --- a/restapi/operations/admin_api/tiers_list_responses.go +++ b/restapi/operations/tiering/tiers_list_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/tiers_list_urlbuilder.go b/restapi/operations/tiering/tiers_list_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/tiers_list_urlbuilder.go rename to restapi/operations/tiering/tiers_list_urlbuilder.go index 8296e6f7d..7d54673e4 100644 --- a/restapi/operations/admin_api/tiers_list_urlbuilder.go +++ b/restapi/operations/tiering/tiers_list_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package tiering // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/add_user.go b/restapi/operations/user/add_user.go similarity index 97% rename from restapi/operations/admin_api/add_user.go rename to restapi/operations/user/add_user.go index 58435d850..fc19e708f 100644 --- a/restapi/operations/admin_api/add_user.go +++ b/restapi/operations/user/add_user.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewAddUser(ctx *middleware.Context, handler AddUserHandler) *AddUser { return &AddUser{Context: ctx, Handler: handler} } -/* AddUser swagger:route POST /users AdminAPI addUser +/* AddUser swagger:route POST /users User addUser Add User diff --git a/restapi/operations/admin_api/add_user_parameters.go b/restapi/operations/user/add_user_parameters.go similarity index 99% rename from restapi/operations/admin_api/add_user_parameters.go rename to restapi/operations/user/add_user_parameters.go index db7284a37..e53cdd717 100644 --- a/restapi/operations/admin_api/add_user_parameters.go +++ b/restapi/operations/user/add_user_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/add_user_responses.go b/restapi/operations/user/add_user_responses.go similarity index 99% rename from restapi/operations/admin_api/add_user_responses.go rename to restapi/operations/user/add_user_responses.go index 31ec591ba..95a0c787a 100644 --- a/restapi/operations/admin_api/add_user_responses.go +++ b/restapi/operations/user/add_user_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/add_user_urlbuilder.go b/restapi/operations/user/add_user_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/add_user_urlbuilder.go rename to restapi/operations/user/add_user_urlbuilder.go index 043966524..63bbc420c 100644 --- a/restapi/operations/admin_api/add_user_urlbuilder.go +++ b/restapi/operations/user/add_user_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/bulk_update_users_groups.go b/restapi/operations/user/bulk_update_users_groups.go similarity index 96% rename from restapi/operations/admin_api/bulk_update_users_groups.go rename to restapi/operations/user/bulk_update_users_groups.go index eca3e105f..b9f434be0 100644 --- a/restapi/operations/admin_api/bulk_update_users_groups.go +++ b/restapi/operations/user/bulk_update_users_groups.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewBulkUpdateUsersGroups(ctx *middleware.Context, handler BulkUpdateUsersGr return &BulkUpdateUsersGroups{Context: ctx, Handler: handler} } -/* BulkUpdateUsersGroups swagger:route PUT /users-groups-bulk AdminAPI bulkUpdateUsersGroups +/* BulkUpdateUsersGroups swagger:route PUT /users-groups-bulk User bulkUpdateUsersGroups Bulk functionality to Add Users to Groups diff --git a/restapi/operations/admin_api/bulk_update_users_groups_parameters.go b/restapi/operations/user/bulk_update_users_groups_parameters.go similarity index 99% rename from restapi/operations/admin_api/bulk_update_users_groups_parameters.go rename to restapi/operations/user/bulk_update_users_groups_parameters.go index d2aefaeaa..709649d4d 100644 --- a/restapi/operations/admin_api/bulk_update_users_groups_parameters.go +++ b/restapi/operations/user/bulk_update_users_groups_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/bulk_update_users_groups_responses.go b/restapi/operations/user/bulk_update_users_groups_responses.go similarity index 99% rename from restapi/operations/admin_api/bulk_update_users_groups_responses.go rename to restapi/operations/user/bulk_update_users_groups_responses.go index 0dae69163..f04c30347 100644 --- a/restapi/operations/admin_api/bulk_update_users_groups_responses.go +++ b/restapi/operations/user/bulk_update_users_groups_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/bulk_update_users_groups_urlbuilder.go b/restapi/operations/user/bulk_update_users_groups_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/bulk_update_users_groups_urlbuilder.go rename to restapi/operations/user/bulk_update_users_groups_urlbuilder.go index df76bf542..26bae1380 100644 --- a/restapi/operations/admin_api/bulk_update_users_groups_urlbuilder.go +++ b/restapi/operations/user/bulk_update_users_groups_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/create_a_user_service_account.go b/restapi/operations/user/create_a_user_service_account.go similarity index 97% rename from restapi/operations/admin_api/create_a_user_service_account.go rename to restapi/operations/user/create_a_user_service_account.go index c9f0daff9..fc909ed55 100644 --- a/restapi/operations/admin_api/create_a_user_service_account.go +++ b/restapi/operations/user/create_a_user_service_account.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewCreateAUserServiceAccount(ctx *middleware.Context, handler CreateAUserSe return &CreateAUserServiceAccount{Context: ctx, Handler: handler} } -/* CreateAUserServiceAccount swagger:route POST /user/{name}/service-accounts AdminAPI createAUserServiceAccount +/* CreateAUserServiceAccount swagger:route POST /user/{name}/service-accounts User createAUserServiceAccount Create Service Account for User diff --git a/restapi/operations/admin_api/create_a_user_service_account_parameters.go b/restapi/operations/user/create_a_user_service_account_parameters.go similarity index 99% rename from restapi/operations/admin_api/create_a_user_service_account_parameters.go rename to restapi/operations/user/create_a_user_service_account_parameters.go index 6ce2003c4..f7cd4f01f 100644 --- a/restapi/operations/admin_api/create_a_user_service_account_parameters.go +++ b/restapi/operations/user/create_a_user_service_account_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/create_a_user_service_account_responses.go b/restapi/operations/user/create_a_user_service_account_responses.go similarity index 99% rename from restapi/operations/admin_api/create_a_user_service_account_responses.go rename to restapi/operations/user/create_a_user_service_account_responses.go index 19d380dae..14e372bb2 100644 --- a/restapi/operations/admin_api/create_a_user_service_account_responses.go +++ b/restapi/operations/user/create_a_user_service_account_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/create_a_user_service_account_urlbuilder.go b/restapi/operations/user/create_a_user_service_account_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/create_a_user_service_account_urlbuilder.go rename to restapi/operations/user/create_a_user_service_account_urlbuilder.go index 5924389eb..de9d66898 100644 --- a/restapi/operations/admin_api/create_a_user_service_account_urlbuilder.go +++ b/restapi/operations/user/create_a_user_service_account_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/create_service_account_credentials.go b/restapi/operations/user/create_service_account_credentials.go similarity index 97% rename from restapi/operations/admin_api/create_service_account_credentials.go rename to restapi/operations/user/create_service_account_credentials.go index f89a5d141..eeab47417 100644 --- a/restapi/operations/admin_api/create_service_account_credentials.go +++ b/restapi/operations/user/create_service_account_credentials.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewCreateServiceAccountCredentials(ctx *middleware.Context, handler CreateS return &CreateServiceAccountCredentials{Context: ctx, Handler: handler} } -/* CreateServiceAccountCredentials swagger:route POST /user/{name}/service-account-credentials AdminAPI createServiceAccountCredentials +/* CreateServiceAccountCredentials swagger:route POST /user/{name}/service-account-credentials User createServiceAccountCredentials Create Service Account for User With Credentials diff --git a/restapi/operations/admin_api/create_service_account_credentials_parameters.go b/restapi/operations/user/create_service_account_credentials_parameters.go similarity index 99% rename from restapi/operations/admin_api/create_service_account_credentials_parameters.go rename to restapi/operations/user/create_service_account_credentials_parameters.go index ed42f4d3a..26e83859f 100644 --- a/restapi/operations/admin_api/create_service_account_credentials_parameters.go +++ b/restapi/operations/user/create_service_account_credentials_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/create_service_account_credentials_responses.go b/restapi/operations/user/create_service_account_credentials_responses.go similarity index 99% rename from restapi/operations/admin_api/create_service_account_credentials_responses.go rename to restapi/operations/user/create_service_account_credentials_responses.go index 2808e944c..a5dc63701 100644 --- a/restapi/operations/admin_api/create_service_account_credentials_responses.go +++ b/restapi/operations/user/create_service_account_credentials_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/create_service_account_credentials_urlbuilder.go b/restapi/operations/user/create_service_account_credentials_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/create_service_account_credentials_urlbuilder.go rename to restapi/operations/user/create_service_account_credentials_urlbuilder.go index c796efa6d..a06795ca9 100644 --- a/restapi/operations/admin_api/create_service_account_credentials_urlbuilder.go +++ b/restapi/operations/user/create_service_account_credentials_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/get_user_info.go b/restapi/operations/user/get_user_info.go similarity index 97% rename from restapi/operations/admin_api/get_user_info.go rename to restapi/operations/user/get_user_info.go index 77176363e..b94a6bd7a 100644 --- a/restapi/operations/admin_api/get_user_info.go +++ b/restapi/operations/user/get_user_info.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewGetUserInfo(ctx *middleware.Context, handler GetUserInfoHandler) *GetUse return &GetUserInfo{Context: ctx, Handler: handler} } -/* GetUserInfo swagger:route GET /user AdminAPI getUserInfo +/* GetUserInfo swagger:route GET /user User getUserInfo Get User Info diff --git a/restapi/operations/admin_api/get_user_info_parameters.go b/restapi/operations/user/get_user_info_parameters.go similarity index 99% rename from restapi/operations/admin_api/get_user_info_parameters.go rename to restapi/operations/user/get_user_info_parameters.go index 1f406781b..b5a0a41c6 100644 --- a/restapi/operations/admin_api/get_user_info_parameters.go +++ b/restapi/operations/user/get_user_info_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/get_user_info_responses.go b/restapi/operations/user/get_user_info_responses.go similarity index 99% rename from restapi/operations/admin_api/get_user_info_responses.go rename to restapi/operations/user/get_user_info_responses.go index 3e3062346..560cc4fc6 100644 --- a/restapi/operations/admin_api/get_user_info_responses.go +++ b/restapi/operations/user/get_user_info_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/get_user_info_urlbuilder.go b/restapi/operations/user/get_user_info_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/get_user_info_urlbuilder.go rename to restapi/operations/user/get_user_info_urlbuilder.go index ffb69ff8a..7191d8766 100644 --- a/restapi/operations/admin_api/get_user_info_urlbuilder.go +++ b/restapi/operations/user/get_user_info_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/list_a_user_service_accounts.go b/restapi/operations/user/list_a_user_service_accounts.go similarity index 97% rename from restapi/operations/admin_api/list_a_user_service_accounts.go rename to restapi/operations/user/list_a_user_service_accounts.go index 40f034039..53e3259d0 100644 --- a/restapi/operations/admin_api/list_a_user_service_accounts.go +++ b/restapi/operations/user/list_a_user_service_accounts.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListAUserServiceAccounts(ctx *middleware.Context, handler ListAUserServi return &ListAUserServiceAccounts{Context: ctx, Handler: handler} } -/* ListAUserServiceAccounts swagger:route GET /user/{name}/service-accounts AdminAPI listAUserServiceAccounts +/* ListAUserServiceAccounts swagger:route GET /user/{name}/service-accounts User listAUserServiceAccounts returns a list of service accounts for a user diff --git a/restapi/operations/admin_api/list_a_user_service_accounts_parameters.go b/restapi/operations/user/list_a_user_service_accounts_parameters.go similarity index 99% rename from restapi/operations/admin_api/list_a_user_service_accounts_parameters.go rename to restapi/operations/user/list_a_user_service_accounts_parameters.go index 449655529..0eb21e5e3 100644 --- a/restapi/operations/admin_api/list_a_user_service_accounts_parameters.go +++ b/restapi/operations/user/list_a_user_service_accounts_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_a_user_service_accounts_responses.go b/restapi/operations/user/list_a_user_service_accounts_responses.go similarity index 99% rename from restapi/operations/admin_api/list_a_user_service_accounts_responses.go rename to restapi/operations/user/list_a_user_service_accounts_responses.go index 5bab82186..b4c682aa2 100644 --- a/restapi/operations/admin_api/list_a_user_service_accounts_responses.go +++ b/restapi/operations/user/list_a_user_service_accounts_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_a_user_service_accounts_urlbuilder.go b/restapi/operations/user/list_a_user_service_accounts_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/list_a_user_service_accounts_urlbuilder.go rename to restapi/operations/user/list_a_user_service_accounts_urlbuilder.go index 86e25bfdf..880dbc657 100644 --- a/restapi/operations/admin_api/list_a_user_service_accounts_urlbuilder.go +++ b/restapi/operations/user/list_a_user_service_accounts_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/list_users.go b/restapi/operations/user/list_users.go similarity index 97% rename from restapi/operations/admin_api/list_users.go rename to restapi/operations/user/list_users.go index af57b29f0..4bbb1abdd 100644 --- a/restapi/operations/admin_api/list_users.go +++ b/restapi/operations/user/list_users.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewListUsers(ctx *middleware.Context, handler ListUsersHandler) *ListUsers return &ListUsers{Context: ctx, Handler: handler} } -/* ListUsers swagger:route GET /users AdminAPI listUsers +/* ListUsers swagger:route GET /users User listUsers List Users diff --git a/restapi/operations/admin_api/list_users_parameters.go b/restapi/operations/user/list_users_parameters.go similarity index 99% rename from restapi/operations/admin_api/list_users_parameters.go rename to restapi/operations/user/list_users_parameters.go index 961a504ce..99bd089e2 100644 --- a/restapi/operations/admin_api/list_users_parameters.go +++ b/restapi/operations/user/list_users_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_users_responses.go b/restapi/operations/user/list_users_responses.go similarity index 99% rename from restapi/operations/admin_api/list_users_responses.go rename to restapi/operations/user/list_users_responses.go index df4394dca..a9698f12a 100644 --- a/restapi/operations/admin_api/list_users_responses.go +++ b/restapi/operations/user/list_users_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/list_users_urlbuilder.go b/restapi/operations/user/list_users_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/list_users_urlbuilder.go rename to restapi/operations/user/list_users_urlbuilder.go index e01e9b112..a1fb9f125 100644 --- a/restapi/operations/admin_api/list_users_urlbuilder.go +++ b/restapi/operations/user/list_users_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/remove_user.go b/restapi/operations/user/remove_user.go similarity index 97% rename from restapi/operations/admin_api/remove_user.go rename to restapi/operations/user/remove_user.go index aed549ecd..fe469896a 100644 --- a/restapi/operations/admin_api/remove_user.go +++ b/restapi/operations/user/remove_user.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewRemoveUser(ctx *middleware.Context, handler RemoveUserHandler) *RemoveUs return &RemoveUser{Context: ctx, Handler: handler} } -/* RemoveUser swagger:route DELETE /user AdminAPI removeUser +/* RemoveUser swagger:route DELETE /user User removeUser Remove user diff --git a/restapi/operations/admin_api/remove_user_parameters.go b/restapi/operations/user/remove_user_parameters.go similarity index 99% rename from restapi/operations/admin_api/remove_user_parameters.go rename to restapi/operations/user/remove_user_parameters.go index c5cf109ae..e089208fe 100644 --- a/restapi/operations/admin_api/remove_user_parameters.go +++ b/restapi/operations/user/remove_user_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/remove_user_responses.go b/restapi/operations/user/remove_user_responses.go similarity index 99% rename from restapi/operations/admin_api/remove_user_responses.go rename to restapi/operations/user/remove_user_responses.go index bf8756f42..1e71e5cc6 100644 --- a/restapi/operations/admin_api/remove_user_responses.go +++ b/restapi/operations/user/remove_user_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/remove_user_urlbuilder.go b/restapi/operations/user/remove_user_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/remove_user_urlbuilder.go rename to restapi/operations/user/remove_user_urlbuilder.go index 58d4800dd..d91b2eb73 100644 --- a/restapi/operations/admin_api/remove_user_urlbuilder.go +++ b/restapi/operations/user/remove_user_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/update_user_groups.go b/restapi/operations/user/update_user_groups.go similarity index 96% rename from restapi/operations/admin_api/update_user_groups.go rename to restapi/operations/user/update_user_groups.go index 3acd4dc95..d13add4d2 100644 --- a/restapi/operations/admin_api/update_user_groups.go +++ b/restapi/operations/user/update_user_groups.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewUpdateUserGroups(ctx *middleware.Context, handler UpdateUserGroupsHandle return &UpdateUserGroups{Context: ctx, Handler: handler} } -/* UpdateUserGroups swagger:route PUT /user/groups AdminAPI updateUserGroups +/* UpdateUserGroups swagger:route PUT /user/groups User updateUserGroups Update Groups for a user diff --git a/restapi/operations/admin_api/update_user_groups_parameters.go b/restapi/operations/user/update_user_groups_parameters.go similarity index 99% rename from restapi/operations/admin_api/update_user_groups_parameters.go rename to restapi/operations/user/update_user_groups_parameters.go index 474d76243..f2cba57bd 100644 --- a/restapi/operations/admin_api/update_user_groups_parameters.go +++ b/restapi/operations/user/update_user_groups_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/update_user_groups_responses.go b/restapi/operations/user/update_user_groups_responses.go similarity index 99% rename from restapi/operations/admin_api/update_user_groups_responses.go rename to restapi/operations/user/update_user_groups_responses.go index ce5505207..1e6a27c6a 100644 --- a/restapi/operations/admin_api/update_user_groups_responses.go +++ b/restapi/operations/user/update_user_groups_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/update_user_groups_urlbuilder.go b/restapi/operations/user/update_user_groups_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/update_user_groups_urlbuilder.go rename to restapi/operations/user/update_user_groups_urlbuilder.go index 6d7d6d1c7..53f10c3e6 100644 --- a/restapi/operations/admin_api/update_user_groups_urlbuilder.go +++ b/restapi/operations/user/update_user_groups_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/operations/admin_api/update_user_info.go b/restapi/operations/user/update_user_info.go similarity index 97% rename from restapi/operations/admin_api/update_user_info.go rename to restapi/operations/user/update_user_info.go index 87e93c8a0..3b2963554 100644 --- a/restapi/operations/admin_api/update_user_info.go +++ b/restapi/operations/user/update_user_info.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command @@ -48,7 +48,7 @@ func NewUpdateUserInfo(ctx *middleware.Context, handler UpdateUserInfoHandler) * return &UpdateUserInfo{Context: ctx, Handler: handler} } -/* UpdateUserInfo swagger:route PUT /user AdminAPI updateUserInfo +/* UpdateUserInfo swagger:route PUT /user User updateUserInfo Update User Info diff --git a/restapi/operations/admin_api/update_user_info_parameters.go b/restapi/operations/user/update_user_info_parameters.go similarity index 99% rename from restapi/operations/admin_api/update_user_info_parameters.go rename to restapi/operations/user/update_user_info_parameters.go index bf810b844..f7b024bab 100644 --- a/restapi/operations/admin_api/update_user_info_parameters.go +++ b/restapi/operations/user/update_user_info_parameters.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/update_user_info_responses.go b/restapi/operations/user/update_user_info_responses.go similarity index 99% rename from restapi/operations/admin_api/update_user_info_responses.go rename to restapi/operations/user/update_user_info_responses.go index 56c6aafc8..8088f45f3 100644 --- a/restapi/operations/admin_api/update_user_info_responses.go +++ b/restapi/operations/user/update_user_info_responses.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the swagger generate command diff --git a/restapi/operations/admin_api/update_user_info_urlbuilder.go b/restapi/operations/user/update_user_info_urlbuilder.go similarity index 99% rename from restapi/operations/admin_api/update_user_info_urlbuilder.go rename to restapi/operations/user/update_user_info_urlbuilder.go index 858544ad3..d60273cf7 100644 --- a/restapi/operations/admin_api/update_user_info_urlbuilder.go +++ b/restapi/operations/user/update_user_info_urlbuilder.go @@ -17,7 +17,7 @@ // along with this program. If not, see . // -package admin_api +package user // This file was generated by the swagger tool. // Editing this file might prove futile when you re-run the generate command diff --git a/restapi/user_account.go b/restapi/user_account.go index a52caa915..00ff98018 100644 --- a/restapi/user_account.go +++ b/restapi/user_account.go @@ -20,27 +20,29 @@ import ( "context" "net/http" + authApi "github.com/minio/console/restapi/operations/auth" + "github.com/minio/console/pkg/auth" "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + accountApi "github.com/minio/console/restapi/operations/account" ) func registerAccountHandlers(api *operations.ConsoleAPI) { // change user password - api.UserAPIAccountChangePasswordHandler = user_api.AccountChangePasswordHandlerFunc(func(params user_api.AccountChangePasswordParams, session *models.Principal) middleware.Responder { + api.AccountAccountChangePasswordHandler = accountApi.AccountChangePasswordHandlerFunc(func(params accountApi.AccountChangePasswordParams, session *models.Principal) middleware.Responder { changePasswordResponse, err := getChangePasswordResponse(session, params) if err != nil { - return user_api.NewAccountChangePasswordDefault(int(err.Code)).WithPayload(err) + return accountApi.NewAccountChangePasswordDefault(int(err.Code)).WithPayload(err) } // Custom response writer to update the session cookies return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) { cookie := NewSessionCookieForConsole(changePasswordResponse.SessionID) http.SetCookie(w, &cookie) - user_api.NewLoginNoContent().WriteResponse(w, p) + authApi.NewLoginNoContent().WriteResponse(w, p) }) }) } @@ -52,7 +54,7 @@ func changePassword(ctx context.Context, client MinioAdmin, session *models.Prin // getChangePasswordResponse will validate user knows what is the current password (avoid account hijacking), update user account password // and authenticate the user generating a new session token/cookie -func getChangePasswordResponse(session *models.Principal, params user_api.AccountChangePasswordParams) (*models.LoginResponse, *models.Error) { +func getChangePasswordResponse(session *models.Principal, params accountApi.AccountChangePasswordParams) (*models.LoginResponse, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() // changePassword operations requires an AdminClient initialized with parent account credentials not diff --git a/restapi/user_account_test.go b/restapi/user_account_test.go index 3f0f988b0..1d3e3006c 100644 --- a/restapi/user_account_test.go +++ b/restapi/user_account_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/minio/console/models" - "github.com/minio/console/restapi/operations/user_api" + accountApi "github.com/minio/console/restapi/operations/account" "github.com/stretchr/testify/assert" ) @@ -35,7 +35,7 @@ func Test_getChangePasswordResponse(t *testing.T) { } CurrentSecretKey := "string" NewSecretKey := "string" - changePasswordParameters := user_api.AccountChangePasswordParams{ + changePasswordParameters := accountApi.AccountChangePasswordParams{ Body: &models.AccountChangePasswordRequest{ CurrentSecretKey: &CurrentSecretKey, NewSecretKey: &NewSecretKey, diff --git a/restapi/user_bucket_quota.go b/restapi/user_bucket_quota.go index 8e5913dad..ca5b4500c 100644 --- a/restapi/user_bucket_quota.go +++ b/restapi/user_bucket_quota.go @@ -25,7 +25,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + bucektApi "github.com/minio/console/restapi/operations/bucket" "github.com/minio/madmin-go" @@ -34,25 +34,25 @@ import ( func registerBucketQuotaHandlers(api *operations.ConsoleAPI) { // set bucket quota - api.UserAPISetBucketQuotaHandler = user_api.SetBucketQuotaHandlerFunc(func(params user_api.SetBucketQuotaParams, session *models.Principal) middleware.Responder { + api.BucketSetBucketQuotaHandler = bucektApi.SetBucketQuotaHandlerFunc(func(params bucektApi.SetBucketQuotaParams, session *models.Principal) middleware.Responder { err := setBucketQuotaResponse(session, params) if err != nil { - return user_api.NewSetBucketQuotaDefault(int(err.Code)).WithPayload(err) + return bucektApi.NewSetBucketQuotaDefault(int(err.Code)).WithPayload(err) } - return user_api.NewSetBucketQuotaOK() + return bucektApi.NewSetBucketQuotaOK() }) // get bucket quota - api.UserAPIGetBucketQuotaHandler = user_api.GetBucketQuotaHandlerFunc(func(params user_api.GetBucketQuotaParams, session *models.Principal) middleware.Responder { + api.BucketGetBucketQuotaHandler = bucektApi.GetBucketQuotaHandlerFunc(func(params bucektApi.GetBucketQuotaParams, session *models.Principal) middleware.Responder { resp, err := getBucketQuotaResponse(session, params) if err != nil { - return user_api.NewGetBucketQuotaDefault(int(err.Code)).WithPayload(err) + return bucektApi.NewGetBucketQuotaDefault(int(err.Code)).WithPayload(err) } - return user_api.NewGetBucketQuotaOK().WithPayload(resp) + return bucektApi.NewGetBucketQuotaOK().WithPayload(resp) }) } -func setBucketQuotaResponse(session *models.Principal, params user_api.SetBucketQuotaParams) *models.Error { +func setBucketQuotaResponse(session *models.Principal, params bucektApi.SetBucketQuotaParams) *models.Error { mAdmin, err := NewMinioAdminClient(session) if err != nil { return prepareError(err) @@ -96,7 +96,7 @@ func setBucketQuota(ctx context.Context, ac *AdminClient, bucket *string, bucket return nil } -func getBucketQuotaResponse(session *models.Principal, params user_api.GetBucketQuotaParams) (*models.BucketQuota, *models.Error) { +func getBucketQuotaResponse(session *models.Principal, params bucektApi.GetBucketQuotaParams) (*models.BucketQuota, *models.Error) { mAdmin, err := NewMinioAdminClient(session) if err != nil { diff --git a/restapi/user_buckets.go b/restapi/user_buckets.go index 2cc0afb91..e29b7a740 100644 --- a/restapi/user_buckets.go +++ b/restapi/user_buckets.go @@ -38,7 +38,7 @@ import ( "github.com/go-openapi/swag" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + bucketApi "github.com/minio/console/restapi/operations/bucket" "github.com/minio/minio-go/v7/pkg/policy" "github.com/minio/minio-go/v7/pkg/replication" minioIAMPolicy "github.com/minio/pkg/iam/policy" @@ -46,138 +46,138 @@ import ( func registerBucketsHandlers(api *operations.ConsoleAPI) { // list buckets - api.UserAPIListBucketsHandler = user_api.ListBucketsHandlerFunc(func(params user_api.ListBucketsParams, session *models.Principal) middleware.Responder { + api.BucketListBucketsHandler = bucketApi.ListBucketsHandlerFunc(func(params bucketApi.ListBucketsParams, session *models.Principal) middleware.Responder { listBucketsResponse, err := getListBucketsResponse(session) if err != nil { - return user_api.NewListBucketsDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewListBucketsDefault(int(err.Code)).WithPayload(err) } - return user_api.NewListBucketsOK().WithPayload(listBucketsResponse) + return bucketApi.NewListBucketsOK().WithPayload(listBucketsResponse) }) // make bucket - api.UserAPIMakeBucketHandler = user_api.MakeBucketHandlerFunc(func(params user_api.MakeBucketParams, session *models.Principal) middleware.Responder { + api.BucketMakeBucketHandler = bucketApi.MakeBucketHandlerFunc(func(params bucketApi.MakeBucketParams, session *models.Principal) middleware.Responder { if err := getMakeBucketResponse(session, params.Body); err != nil { - return user_api.NewMakeBucketDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewMakeBucketDefault(int(err.Code)).WithPayload(err) } - return user_api.NewMakeBucketCreated() + return bucketApi.NewMakeBucketCreated() }) // delete bucket - api.UserAPIDeleteBucketHandler = user_api.DeleteBucketHandlerFunc(func(params user_api.DeleteBucketParams, session *models.Principal) middleware.Responder { + api.BucketDeleteBucketHandler = bucketApi.DeleteBucketHandlerFunc(func(params bucketApi.DeleteBucketParams, session *models.Principal) middleware.Responder { if err := getDeleteBucketResponse(session, params); err != nil { - return user_api.NewMakeBucketDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewMakeBucketDefault(int(err.Code)).WithPayload(err) } - return user_api.NewDeleteBucketNoContent() + return bucketApi.NewDeleteBucketNoContent() }) // get bucket info - api.UserAPIBucketInfoHandler = user_api.BucketInfoHandlerFunc(func(params user_api.BucketInfoParams, session *models.Principal) middleware.Responder { + api.BucketBucketInfoHandler = bucketApi.BucketInfoHandlerFunc(func(params bucketApi.BucketInfoParams, session *models.Principal) middleware.Responder { bucketInfoResp, err := getBucketInfoResponse(session, params) if err != nil { - return user_api.NewBucketInfoDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewBucketInfoDefault(int(err.Code)).WithPayload(err) } - return user_api.NewBucketInfoOK().WithPayload(bucketInfoResp) + return bucketApi.NewBucketInfoOK().WithPayload(bucketInfoResp) }) // set bucket policy - api.UserAPIBucketSetPolicyHandler = user_api.BucketSetPolicyHandlerFunc(func(params user_api.BucketSetPolicyParams, session *models.Principal) middleware.Responder { + api.BucketBucketSetPolicyHandler = bucketApi.BucketSetPolicyHandlerFunc(func(params bucketApi.BucketSetPolicyParams, session *models.Principal) middleware.Responder { bucketSetPolicyResp, err := getBucketSetPolicyResponse(session, params.Name, params.Body) if err != nil { - return user_api.NewBucketSetPolicyDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewBucketSetPolicyDefault(int(err.Code)).WithPayload(err) } - return user_api.NewBucketSetPolicyOK().WithPayload(bucketSetPolicyResp) + return bucketApi.NewBucketSetPolicyOK().WithPayload(bucketSetPolicyResp) }) // set bucket tags - api.UserAPIPutBucketTagsHandler = user_api.PutBucketTagsHandlerFunc(func(params user_api.PutBucketTagsParams, session *models.Principal) middleware.Responder { + api.BucketPutBucketTagsHandler = bucketApi.PutBucketTagsHandlerFunc(func(params bucketApi.PutBucketTagsParams, session *models.Principal) middleware.Responder { err := getPutBucketTagsResponse(session, params.BucketName, params.Body) if err != nil { - return user_api.NewPutBucketTagsDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewPutBucketTagsDefault(int(err.Code)).WithPayload(err) } - return user_api.NewPutBucketTagsOK() + return bucketApi.NewPutBucketTagsOK() }) // get bucket versioning - api.UserAPIGetBucketVersioningHandler = user_api.GetBucketVersioningHandlerFunc(func(params user_api.GetBucketVersioningParams, session *models.Principal) middleware.Responder { + api.BucketGetBucketVersioningHandler = bucketApi.GetBucketVersioningHandlerFunc(func(params bucketApi.GetBucketVersioningParams, session *models.Principal) middleware.Responder { getBucketVersioning, err := getBucketVersionedResponse(session, params.BucketName) if err != nil { - return user_api.NewGetBucketVersioningDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) + return bucketApi.NewGetBucketVersioningDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } - return user_api.NewGetBucketVersioningOK().WithPayload(getBucketVersioning) + return bucketApi.NewGetBucketVersioningOK().WithPayload(getBucketVersioning) }) // update bucket versioning - api.UserAPISetBucketVersioningHandler = user_api.SetBucketVersioningHandlerFunc(func(params user_api.SetBucketVersioningParams, session *models.Principal) middleware.Responder { + api.BucketSetBucketVersioningHandler = bucketApi.SetBucketVersioningHandlerFunc(func(params bucketApi.SetBucketVersioningParams, session *models.Principal) middleware.Responder { err := setBucketVersioningResponse(session, params.BucketName, ¶ms) if err != nil { - return user_api.NewSetBucketVersioningDefault(500).WithPayload(err) + return bucketApi.NewSetBucketVersioningDefault(500).WithPayload(err) } - return user_api.NewSetBucketVersioningCreated() + return bucketApi.NewSetBucketVersioningCreated() }) // get bucket replication - api.UserAPIGetBucketReplicationHandler = user_api.GetBucketReplicationHandlerFunc(func(params user_api.GetBucketReplicationParams, session *models.Principal) middleware.Responder { + api.BucketGetBucketReplicationHandler = bucketApi.GetBucketReplicationHandlerFunc(func(params bucketApi.GetBucketReplicationParams, session *models.Principal) middleware.Responder { getBucketReplication, err := getBucketReplicationResponse(session, params.BucketName) if err != nil { - return user_api.NewGetBucketReplicationDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) + return bucketApi.NewGetBucketReplicationDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } - return user_api.NewGetBucketReplicationOK().WithPayload(getBucketReplication) + return bucketApi.NewGetBucketReplicationOK().WithPayload(getBucketReplication) }) // get single bucket replication rule - api.UserAPIGetBucketReplicationRuleHandler = user_api.GetBucketReplicationRuleHandlerFunc(func(params user_api.GetBucketReplicationRuleParams, session *models.Principal) middleware.Responder { + api.BucketGetBucketReplicationRuleHandler = bucketApi.GetBucketReplicationRuleHandlerFunc(func(params bucketApi.GetBucketReplicationRuleParams, session *models.Principal) middleware.Responder { getBucketReplicationRule, err := getBucketReplicationRuleResponse(session, params.BucketName, params.RuleID) if err != nil { - return user_api.NewGetBucketReplicationRuleDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) + return bucketApi.NewGetBucketReplicationRuleDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } - return user_api.NewGetBucketReplicationRuleOK().WithPayload(getBucketReplicationRule) + return bucketApi.NewGetBucketReplicationRuleOK().WithPayload(getBucketReplicationRule) }) // enable bucket encryption - api.UserAPIEnableBucketEncryptionHandler = user_api.EnableBucketEncryptionHandlerFunc(func(params user_api.EnableBucketEncryptionParams, session *models.Principal) middleware.Responder { + api.BucketEnableBucketEncryptionHandler = bucketApi.EnableBucketEncryptionHandlerFunc(func(params bucketApi.EnableBucketEncryptionParams, session *models.Principal) middleware.Responder { if err := enableBucketEncryptionResponse(session, params); err != nil { - return user_api.NewEnableBucketEncryptionDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewEnableBucketEncryptionDefault(int(err.Code)).WithPayload(err) } - return user_api.NewEnableBucketEncryptionOK() + return bucketApi.NewEnableBucketEncryptionOK() }) // disable bucket encryption - api.UserAPIDisableBucketEncryptionHandler = user_api.DisableBucketEncryptionHandlerFunc(func(params user_api.DisableBucketEncryptionParams, session *models.Principal) middleware.Responder { + api.BucketDisableBucketEncryptionHandler = bucketApi.DisableBucketEncryptionHandlerFunc(func(params bucketApi.DisableBucketEncryptionParams, session *models.Principal) middleware.Responder { if err := disableBucketEncryptionResponse(session, params); err != nil { - return user_api.NewDisableBucketEncryptionDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewDisableBucketEncryptionDefault(int(err.Code)).WithPayload(err) } - return user_api.NewDisableBucketEncryptionOK() + return bucketApi.NewDisableBucketEncryptionOK() }) // get bucket encryption info - api.UserAPIGetBucketEncryptionInfoHandler = user_api.GetBucketEncryptionInfoHandlerFunc(func(params user_api.GetBucketEncryptionInfoParams, session *models.Principal) middleware.Responder { + api.BucketGetBucketEncryptionInfoHandler = bucketApi.GetBucketEncryptionInfoHandlerFunc(func(params bucketApi.GetBucketEncryptionInfoParams, session *models.Principal) middleware.Responder { response, err := getBucketEncryptionInfoResponse(session, params) if err != nil { - return user_api.NewGetBucketEncryptionInfoDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewGetBucketEncryptionInfoDefault(int(err.Code)).WithPayload(err) } - return user_api.NewGetBucketEncryptionInfoOK().WithPayload(response) + return bucketApi.NewGetBucketEncryptionInfoOK().WithPayload(response) }) // set bucket retention config - api.UserAPISetBucketRetentionConfigHandler = user_api.SetBucketRetentionConfigHandlerFunc(func(params user_api.SetBucketRetentionConfigParams, session *models.Principal) middleware.Responder { + api.BucketSetBucketRetentionConfigHandler = bucketApi.SetBucketRetentionConfigHandlerFunc(func(params bucketApi.SetBucketRetentionConfigParams, session *models.Principal) middleware.Responder { if err := getSetBucketRetentionConfigResponse(session, params); err != nil { - return user_api.NewSetBucketRetentionConfigDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewSetBucketRetentionConfigDefault(int(err.Code)).WithPayload(err) } - return user_api.NewSetBucketRetentionConfigOK() + return bucketApi.NewSetBucketRetentionConfigOK() }) // get bucket retention config - api.UserAPIGetBucketRetentionConfigHandler = user_api.GetBucketRetentionConfigHandlerFunc(func(params user_api.GetBucketRetentionConfigParams, session *models.Principal) middleware.Responder { + api.BucketGetBucketRetentionConfigHandler = bucketApi.GetBucketRetentionConfigHandlerFunc(func(params bucketApi.GetBucketRetentionConfigParams, session *models.Principal) middleware.Responder { response, err := getBucketRetentionConfigResponse(session, params.BucketName) if err != nil { - return user_api.NewGetBucketRetentionConfigDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewGetBucketRetentionConfigDefault(int(err.Code)).WithPayload(err) } - return user_api.NewGetBucketRetentionConfigOK().WithPayload(response) + return bucketApi.NewGetBucketRetentionConfigOK().WithPayload(response) }) // get bucket object locking status - api.UserAPIGetBucketObjectLockingStatusHandler = user_api.GetBucketObjectLockingStatusHandlerFunc(func(params user_api.GetBucketObjectLockingStatusParams, session *models.Principal) middleware.Responder { + api.BucketGetBucketObjectLockingStatusHandler = bucketApi.GetBucketObjectLockingStatusHandlerFunc(func(params bucketApi.GetBucketObjectLockingStatusParams, session *models.Principal) middleware.Responder { getBucketObjectLockingStatus, err := getBucketObjectLockingResponse(session, params.BucketName) if err != nil { - return user_api.NewGetBucketObjectLockingStatusDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) + return bucketApi.NewGetBucketObjectLockingStatusDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())}) } - return user_api.NewGetBucketObjectLockingStatusOK().WithPayload(getBucketObjectLockingStatus) + return bucketApi.NewGetBucketObjectLockingStatusOK().WithPayload(getBucketObjectLockingStatus) }) // get objects rewind for a bucket - api.UserAPIGetBucketRewindHandler = user_api.GetBucketRewindHandlerFunc(func(params user_api.GetBucketRewindParams, session *models.Principal) middleware.Responder { + api.BucketGetBucketRewindHandler = bucketApi.GetBucketRewindHandlerFunc(func(params bucketApi.GetBucketRewindParams, session *models.Principal) middleware.Responder { getBucketRewind, err := getBucketRewindResponse(session, params) if err != nil { - return user_api.NewGetBucketRewindDefault(500).WithPayload(err) + return bucketApi.NewGetBucketRewindDefault(500).WithPayload(err) } - return user_api.NewGetBucketRewindOK().WithPayload(getBucketRewind) + return bucketApi.NewGetBucketRewindOK().WithPayload(getBucketRewind) }) } @@ -199,7 +199,7 @@ func doSetVersioning(client MCClient, state VersionState) error { return nil } -func setBucketVersioningResponse(session *models.Principal, bucketName string, params *user_api.SetBucketVersioningParams) *models.Error { +func setBucketVersioningResponse(session *models.Principal, bucketName string, params *bucketApi.SetBucketVersioningParams) *models.Error { s3Client, err := newS3BucketClient(session, bucketName, "") if err != nil { return prepareError(err) @@ -614,7 +614,7 @@ func removeBucket(client MinioClient, bucketName string) error { } // getDeleteBucketResponse performs removeBucket() to delete a bucket -func getDeleteBucketResponse(session *models.Principal, params user_api.DeleteBucketParams) *models.Error { +func getDeleteBucketResponse(session *models.Principal, params bucketApi.DeleteBucketParams) *models.Error { if params.Name == "" { return prepareError(errBucketNameNotInRequest) } @@ -691,7 +691,7 @@ func getBucketInfo(ctx context.Context, client MinioClient, adminClient MinioAdm } // getBucketInfoResponse calls getBucketInfo() to get the bucket's info -func getBucketInfoResponse(session *models.Principal, params user_api.BucketInfoParams) (*models.Bucket, *models.Error) { +func getBucketInfoResponse(session *models.Principal, params bucketApi.BucketInfoParams) (*models.Bucket, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -757,7 +757,7 @@ func enableBucketEncryption(ctx context.Context, client MinioClient, bucketName } // enableBucketEncryptionResponse calls enableBucketEncryption() to create new encryption configuration for provided bucket name -func enableBucketEncryptionResponse(session *models.Principal, params user_api.EnableBucketEncryptionParams) *models.Error { +func enableBucketEncryptionResponse(session *models.Principal, params bucketApi.EnableBucketEncryptionParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -779,7 +779,7 @@ func disableBucketEncryption(ctx context.Context, client MinioClient, bucketName } // disableBucketEncryptionResponse calls disableBucketEncryption() -func disableBucketEncryptionResponse(session *models.Principal, params user_api.DisableBucketEncryptionParams) *models.Error { +func disableBucketEncryptionResponse(session *models.Principal, params bucketApi.DisableBucketEncryptionParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -806,7 +806,7 @@ func getBucketEncryptionInfo(ctx context.Context, client MinioClient, bucketName return &models.BucketEncryptionInfo{Algorithm: bucketInfo.Rules[0].Apply.SSEAlgorithm, KmsMasterKeyID: bucketInfo.Rules[0].Apply.KmsMasterKeyID}, nil } -func getBucketEncryptionInfoResponse(session *models.Principal, params user_api.GetBucketEncryptionInfoParams) (*models.BucketEncryptionInfo, *models.Error) { +func getBucketEncryptionInfoResponse(session *models.Principal, params bucketApi.GetBucketEncryptionInfoParams) (*models.BucketEncryptionInfo, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -853,7 +853,7 @@ func setBucketRetentionConfig(ctx context.Context, client MinioClient, bucketNam return client.setObjectLockConfig(ctx, bucketName, &retentionMode, &retentionValidity, &retentionUnit) } -func getSetBucketRetentionConfigResponse(session *models.Principal, params user_api.SetBucketRetentionConfigParams) *models.Error { +func getSetBucketRetentionConfigResponse(session *models.Principal, params bucketApi.SetBucketRetentionConfigParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -974,7 +974,7 @@ func getBucketObjectLockingResponse(session *models.Principal, bucketName string }, nil } -func getBucketRewindResponse(session *models.Principal, params user_api.GetBucketRewindParams) (*models.RewindResponse, *models.Error) { +func getBucketRewindResponse(session *models.Principal, params bucketApi.GetBucketRewindParams) (*models.RewindResponse, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() var prefix = "" diff --git a/restapi/user_buckets_events.go b/restapi/user_buckets_events.go index 0f0626868..27dd3e895 100644 --- a/restapi/user_buckets_events.go +++ b/restapi/user_buckets_events.go @@ -24,32 +24,32 @@ import ( "github.com/go-openapi/swag" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + bucketApi "github.com/minio/console/restapi/operations/bucket" "github.com/minio/minio-go/v7/pkg/notification" ) func registerBucketEventsHandlers(api *operations.ConsoleAPI) { // list bucket events - api.UserAPIListBucketEventsHandler = user_api.ListBucketEventsHandlerFunc(func(params user_api.ListBucketEventsParams, session *models.Principal) middleware.Responder { + api.BucketListBucketEventsHandler = bucketApi.ListBucketEventsHandlerFunc(func(params bucketApi.ListBucketEventsParams, session *models.Principal) middleware.Responder { listBucketEventsResponse, err := getListBucketEventsResponse(session, params) if err != nil { - return user_api.NewListBucketEventsDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewListBucketEventsDefault(int(err.Code)).WithPayload(err) } - return user_api.NewListBucketEventsOK().WithPayload(listBucketEventsResponse) + return bucketApi.NewListBucketEventsOK().WithPayload(listBucketEventsResponse) }) // create bucket event - api.UserAPICreateBucketEventHandler = user_api.CreateBucketEventHandlerFunc(func(params user_api.CreateBucketEventParams, session *models.Principal) middleware.Responder { + api.BucketCreateBucketEventHandler = bucketApi.CreateBucketEventHandlerFunc(func(params bucketApi.CreateBucketEventParams, session *models.Principal) middleware.Responder { if err := getCreateBucketEventsResponse(session, params.BucketName, params.Body); err != nil { - return user_api.NewCreateBucketEventDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewCreateBucketEventDefault(int(err.Code)).WithPayload(err) } - return user_api.NewCreateBucketEventCreated() + return bucketApi.NewCreateBucketEventCreated() }) // delete bucket event - api.UserAPIDeleteBucketEventHandler = user_api.DeleteBucketEventHandlerFunc(func(params user_api.DeleteBucketEventParams, session *models.Principal) middleware.Responder { + api.BucketDeleteBucketEventHandler = bucketApi.DeleteBucketEventHandlerFunc(func(params bucketApi.DeleteBucketEventParams, session *models.Principal) middleware.Responder { if err := getDeleteBucketEventsResponse(session, params.BucketName, params.Arn, params.Body.Events, params.Body.Prefix, params.Body.Suffix); err != nil { - return user_api.NewDeleteBucketEventDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewDeleteBucketEventDefault(int(err.Code)).WithPayload(err) } - return user_api.NewDeleteBucketEventNoContent() + return bucketApi.NewDeleteBucketEventNoContent() }) } @@ -124,7 +124,7 @@ func listBucketEvents(client MinioClient, bucketName string) ([]*models.Notifica } // getListBucketsResponse performs listBucketEvents() and serializes it to the handler's output -func getListBucketEventsResponse(session *models.Principal, params user_api.ListBucketEventsParams) (*models.ListBucketEventsResponse, *models.Error) { +func getListBucketEventsResponse(session *models.Principal, params bucketApi.ListBucketEventsParams) (*models.ListBucketEventsResponse, *models.Error) { mClient, err := newMinioClient(session) if err != nil { return nil, prepareError(err) diff --git a/restapi/user_buckets_lifecycle.go b/restapi/user_buckets_lifecycle.go index d6a1f9aab..6460acaa0 100644 --- a/restapi/user_buckets_lifecycle.go +++ b/restapi/user_buckets_lifecycle.go @@ -36,7 +36,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + bucketApi "github.com/minio/console/restapi/operations/bucket" ) type MultiLifecycleResult struct { @@ -45,43 +45,43 @@ type MultiLifecycleResult struct { } func registerBucketsLifecycleHandlers(api *operations.ConsoleAPI) { - api.UserAPIGetBucketLifecycleHandler = user_api.GetBucketLifecycleHandlerFunc(func(params user_api.GetBucketLifecycleParams, session *models.Principal) middleware.Responder { + api.BucketGetBucketLifecycleHandler = bucketApi.GetBucketLifecycleHandlerFunc(func(params bucketApi.GetBucketLifecycleParams, session *models.Principal) middleware.Responder { listBucketLifecycleResponse, err := getBucketLifecycleResponse(session, params) if err != nil { - return user_api.NewGetBucketLifecycleDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewGetBucketLifecycleDefault(int(err.Code)).WithPayload(err) } - return user_api.NewGetBucketLifecycleOK().WithPayload(listBucketLifecycleResponse) + return bucketApi.NewGetBucketLifecycleOK().WithPayload(listBucketLifecycleResponse) }) - api.UserAPIAddBucketLifecycleHandler = user_api.AddBucketLifecycleHandlerFunc(func(params user_api.AddBucketLifecycleParams, session *models.Principal) middleware.Responder { + api.BucketAddBucketLifecycleHandler = bucketApi.AddBucketLifecycleHandlerFunc(func(params bucketApi.AddBucketLifecycleParams, session *models.Principal) middleware.Responder { err := getAddBucketLifecycleResponse(session, params) if err != nil { - return user_api.NewAddBucketLifecycleDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewAddBucketLifecycleDefault(int(err.Code)).WithPayload(err) } - return user_api.NewAddBucketLifecycleCreated() + return bucketApi.NewAddBucketLifecycleCreated() }) - api.UserAPIUpdateBucketLifecycleHandler = user_api.UpdateBucketLifecycleHandlerFunc(func(params user_api.UpdateBucketLifecycleParams, session *models.Principal) middleware.Responder { + api.BucketUpdateBucketLifecycleHandler = bucketApi.UpdateBucketLifecycleHandlerFunc(func(params bucketApi.UpdateBucketLifecycleParams, session *models.Principal) middleware.Responder { err := getEditBucketLifecycleRule(session, params) if err != nil { - return user_api.NewUpdateBucketLifecycleDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewUpdateBucketLifecycleDefault(int(err.Code)).WithPayload(err) } - return user_api.NewUpdateBucketLifecycleOK() + return bucketApi.NewUpdateBucketLifecycleOK() }) - api.UserAPIDeleteBucketLifecycleRuleHandler = user_api.DeleteBucketLifecycleRuleHandlerFunc(func(params user_api.DeleteBucketLifecycleRuleParams, session *models.Principal) middleware.Responder { + api.BucketDeleteBucketLifecycleRuleHandler = bucketApi.DeleteBucketLifecycleRuleHandlerFunc(func(params bucketApi.DeleteBucketLifecycleRuleParams, session *models.Principal) middleware.Responder { err := getDeleteBucketLifecycleRule(session, params) if err != nil { - return user_api.NewDeleteBucketLifecycleRuleDefault(int(err.Code)).WithPayload(err) + return bucketApi.NewDeleteBucketLifecycleRuleDefault(int(err.Code)).WithPayload(err) } - return user_api.NewDeleteBucketLifecycleRuleNoContent() + return bucketApi.NewDeleteBucketLifecycleRuleNoContent() }) - api.UserAPIAddMultiBucketLifecycleHandler = user_api.AddMultiBucketLifecycleHandlerFunc(func(params user_api.AddMultiBucketLifecycleParams, session *models.Principal) middleware.Responder { + api.BucketAddMultiBucketLifecycleHandler = bucketApi.AddMultiBucketLifecycleHandlerFunc(func(params bucketApi.AddMultiBucketLifecycleParams, session *models.Principal) middleware.Responder { multiBucketResponse, err := getAddMultiBucketLifecycleResponse(session, params) if err != nil { - user_api.NewAddMultiBucketLifecycleDefault(int(err.Code)).WithPayload(err) + bucketApi.NewAddMultiBucketLifecycleDefault(int(err.Code)).WithPayload(err) } - return user_api.NewAddMultiBucketLifecycleOK().WithPayload(multiBucketResponse) + return bucketApi.NewAddMultiBucketLifecycleOK().WithPayload(multiBucketResponse) }) } @@ -141,7 +141,7 @@ func getBucketLifecycle(ctx context.Context, client MinioClient, bucketName stri } // getBucketLifecycleResponse performs getBucketLifecycle() and serializes it to the handler's output -func getBucketLifecycleResponse(session *models.Principal, params user_api.GetBucketLifecycleParams) (*models.BucketLifecycleResponse, *models.Error) { +func getBucketLifecycleResponse(session *models.Principal, params bucketApi.GetBucketLifecycleParams) (*models.BucketLifecycleResponse, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -160,7 +160,7 @@ func getBucketLifecycleResponse(session *models.Principal, params user_api.GetBu } // addBucketLifecycle gets lifecycle lists for a bucket from MinIO API and returns their implementations -func addBucketLifecycle(ctx context.Context, client MinioClient, params user_api.AddBucketLifecycleParams) error { +func addBucketLifecycle(ctx context.Context, client MinioClient, params bucketApi.AddBucketLifecycleParams) error { // Configuration that is already set. lfcCfg, err := client.getLifecycleRules(ctx, params.BucketName) if err != nil { @@ -240,7 +240,7 @@ func addBucketLifecycle(ctx context.Context, client MinioClient, params user_api } // getAddBucketLifecycleResponse returns the response of adding a bucket lifecycle response -func getAddBucketLifecycleResponse(session *models.Principal, params user_api.AddBucketLifecycleParams) *models.Error { +func getAddBucketLifecycleResponse(session *models.Principal, params bucketApi.AddBucketLifecycleParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -260,7 +260,7 @@ func getAddBucketLifecycleResponse(session *models.Principal, params user_api.Ad } // editBucketLifecycle gets lifecycle lists for a bucket from MinIO API and updates the selected lifecycle rule -func editBucketLifecycle(ctx context.Context, client MinioClient, params user_api.UpdateBucketLifecycleParams) error { +func editBucketLifecycle(ctx context.Context, client MinioClient, params bucketApi.UpdateBucketLifecycleParams) error { // Configuration that is already set. lfcCfg, err := client.getLifecycleRules(ctx, params.BucketName) if err != nil { @@ -339,7 +339,7 @@ func editBucketLifecycle(ctx context.Context, client MinioClient, params user_ap } // getEditBucketLifecycleRule returns the response of bucket lifecycle tier edit -func getEditBucketLifecycleRule(session *models.Principal, params user_api.UpdateBucketLifecycleParams) *models.Error { +func getEditBucketLifecycleRule(session *models.Principal, params bucketApi.UpdateBucketLifecycleParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -359,7 +359,7 @@ func getEditBucketLifecycleRule(session *models.Principal, params user_api.Updat } // deleteBucketLifecycle deletes lifecycle rule by passing an empty rule to a selected ID -func deleteBucketLifecycle(ctx context.Context, client MinioClient, params user_api.DeleteBucketLifecycleRuleParams) error { +func deleteBucketLifecycle(ctx context.Context, client MinioClient, params bucketApi.DeleteBucketLifecycleRuleParams) error { // Configuration that is already set. lfcCfg, err := client.getLifecycleRules(ctx, params.BucketName) if err != nil { @@ -393,7 +393,7 @@ func deleteBucketLifecycle(ctx context.Context, client MinioClient, params user_ } // getDeleteBucketLifecycleRule returns the response of bucket lifecycle tier delete -func getDeleteBucketLifecycleRule(session *models.Principal, params user_api.DeleteBucketLifecycleRuleParams) *models.Error { +func getDeleteBucketLifecycleRule(session *models.Principal, params bucketApi.DeleteBucketLifecycleRuleParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -413,7 +413,7 @@ func getDeleteBucketLifecycleRule(session *models.Principal, params user_api.Del } // addMultiBucketLifecycle creates multibuckets lifecycle assignments -func addMultiBucketLifecycle(ctx context.Context, client MinioClient, params user_api.AddMultiBucketLifecycleParams) []MultiLifecycleResult { +func addMultiBucketLifecycle(ctx context.Context, client MinioClient, params bucketApi.AddMultiBucketLifecycleParams) []MultiLifecycleResult { bucketsRelation := params.Body.Buckets // Parallel Lifecycle rules set @@ -438,7 +438,7 @@ func addMultiBucketLifecycle(ctx context.Context, client MinioClient, params use go func() { defer close(remoteProc) - lifecycleParams := user_api.AddBucketLifecycleParams{ + lifecycleParams := bucketApi.AddBucketLifecycleParams{ BucketName: bucketName, Body: &lifecycleParams, } @@ -479,7 +479,7 @@ func addMultiBucketLifecycle(ctx context.Context, client MinioClient, params use } // getAddMultiBucketLifecycleResponse returns the response of multibucket lifecycle assignment -func getAddMultiBucketLifecycleResponse(session *models.Principal, params user_api.AddMultiBucketLifecycleParams) (*models.MultiLifecycleResult, *models.Error) { +func getAddMultiBucketLifecycleResponse(session *models.Principal, params bucketApi.AddMultiBucketLifecycleParams) (*models.MultiLifecycleResult, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) diff --git a/restapi/user_buckets_lifecycle_test.go b/restapi/user_buckets_lifecycle_test.go index 3bc02eaf3..95cad3f97 100644 --- a/restapi/user_buckets_lifecycle_test.go +++ b/restapi/user_buckets_lifecycle_test.go @@ -25,7 +25,7 @@ import ( "github.com/minio/console/models" "github.com/stretchr/testify/assert" - "github.com/minio/console/restapi/operations/user_api" + bucketApi "github.com/minio/console/restapi/operations/bucket" "github.com/minio/minio-go/v7/pkg/lifecycle" ) @@ -167,7 +167,7 @@ func TestSetLifecycleRule(t *testing.T) { expiryRule := "expiry" - insertMock := user_api.AddBucketLifecycleParams{ + insertMock := bucketApi.AddBucketLifecycleParams{ BucketName: "testBucket", Body: &models.AddBucketLifecycle{ Type: expiryRule, @@ -233,7 +233,7 @@ func TestUpdateLifecycleRule(t *testing.T) { expiryRule := "expiry" - editMock := user_api.UpdateBucketLifecycleParams{ + editMock := bucketApi.UpdateBucketLifecycleParams{ BucketName: "testBucket", Body: &models.UpdateBucketLifecycle{ Type: &expiryRule, @@ -262,7 +262,7 @@ func TestUpdateLifecycleRule(t *testing.T) { transitionRule := "transition" - editMock = user_api.UpdateBucketLifecycleParams{ + editMock = bucketApi.UpdateBucketLifecycleParams{ BucketName: "testBucket", Body: &models.UpdateBucketLifecycle{ Type: &transitionRule, @@ -334,7 +334,7 @@ func TestDeleteLifecycleRule(t *testing.T) { // Test-2 : deleteBucketLifecycle() try to delete an available rule - availableParams := user_api.DeleteBucketLifecycleRuleParams{ + availableParams := bucketApi.DeleteBucketLifecycleRuleParams{ LifecycleID: "TESTRULE2", BucketName: "testBucket", } @@ -345,7 +345,7 @@ func TestDeleteLifecycleRule(t *testing.T) { // Test-3 : deleteBucketLifecycle() returns error trying to delete a non available rule - nonAvailableParams := user_api.DeleteBucketLifecycleRuleParams{ + nonAvailableParams := bucketApi.DeleteBucketLifecycleRuleParams{ LifecycleID: "INVALIDTESTRULE", BucketName: "testBucket", } diff --git a/restapi/user_log_search.go b/restapi/user_log_search.go index e31a2d2ca..2ddc41457 100644 --- a/restapi/user_log_search.go +++ b/restapi/user_log_search.go @@ -25,23 +25,23 @@ import ( "github.com/go-openapi/swag" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + logApi "github.com/minio/console/restapi/operations/logging" iampolicy "github.com/minio/pkg/iam/policy" ) func registerLogSearchHandlers(api *operations.ConsoleAPI) { // log search - api.UserAPILogSearchHandler = user_api.LogSearchHandlerFunc(func(params user_api.LogSearchParams, session *models.Principal) middleware.Responder { + api.LoggingLogSearchHandler = logApi.LogSearchHandlerFunc(func(params logApi.LogSearchParams, session *models.Principal) middleware.Responder { searchResp, err := getLogSearchResponse(session, params) if err != nil { - return user_api.NewLogSearchDefault(int(err.Code)).WithPayload(err) + return logApi.NewLogSearchDefault(int(err.Code)).WithPayload(err) } - return user_api.NewLogSearchOK().WithPayload(searchResp) + return logApi.NewLogSearchOK().WithPayload(searchResp) }) } // getLogSearchResponse performs a query to Log Search if Enabled -func getLogSearchResponse(session *models.Principal, params user_api.LogSearchParams) (*models.LogSearchResponse, *models.Error) { +func getLogSearchResponse(session *models.Principal, params logApi.LogSearchParams) (*models.LogSearchResponse, *models.Error) { sessionResp, err := getSessionResponse(session) if err != nil { return nil, err diff --git a/restapi/user_login.go b/restapi/user_login.go index 4e1d1e04a..ab76f3dad 100644 --- a/restapi/user_login.go +++ b/restapi/user_login.go @@ -30,42 +30,42 @@ import ( "github.com/minio/console/pkg/auth" "github.com/minio/console/pkg/auth/idp/oauth2" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + authApi "github.com/minio/console/restapi/operations/auth" ) func registerLoginHandlers(api *operations.ConsoleAPI) { // GET login strategy - api.UserAPILoginDetailHandler = user_api.LoginDetailHandlerFunc(func(params user_api.LoginDetailParams) middleware.Responder { + api.AuthLoginDetailHandler = authApi.LoginDetailHandlerFunc(func(params authApi.LoginDetailParams) middleware.Responder { loginDetails, err := getLoginDetailsResponse(params.HTTPRequest) if err != nil { - return user_api.NewLoginDetailDefault(int(err.Code)).WithPayload(err) + return authApi.NewLoginDetailDefault(int(err.Code)).WithPayload(err) } - return user_api.NewLoginDetailOK().WithPayload(loginDetails) + return authApi.NewLoginDetailOK().WithPayload(loginDetails) }) // POST login using user credentials - api.UserAPILoginHandler = user_api.LoginHandlerFunc(func(params user_api.LoginParams) middleware.Responder { + api.AuthLoginHandler = authApi.LoginHandlerFunc(func(params authApi.LoginParams) middleware.Responder { loginResponse, err := getLoginResponse(params.Body) if err != nil { - return user_api.NewLoginDefault(int(err.Code)).WithPayload(err) + return authApi.NewLoginDefault(int(err.Code)).WithPayload(err) } // Custom response writer to set the session cookies return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) { cookie := NewSessionCookieForConsole(loginResponse.SessionID) http.SetCookie(w, &cookie) - user_api.NewLoginNoContent().WriteResponse(w, p) + authApi.NewLoginNoContent().WriteResponse(w, p) }) }) // POST login using external IDP - api.UserAPILoginOauth2AuthHandler = user_api.LoginOauth2AuthHandlerFunc(func(params user_api.LoginOauth2AuthParams) middleware.Responder { + api.AuthLoginOauth2AuthHandler = authApi.LoginOauth2AuthHandlerFunc(func(params authApi.LoginOauth2AuthParams) middleware.Responder { loginResponse, err := getLoginOauth2AuthResponse(params.HTTPRequest, params.Body) if err != nil { - return user_api.NewLoginOauth2AuthDefault(int(err.Code)).WithPayload(err) + return authApi.NewLoginOauth2AuthDefault(int(err.Code)).WithPayload(err) } // Custom response writer to set the session cookies return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) { cookie := NewSessionCookieForConsole(loginResponse.SessionID) http.SetCookie(w, &cookie) - user_api.NewLoginOauth2AuthNoContent().WriteResponse(w, p) + authApi.NewLoginOauth2AuthNoContent().WriteResponse(w, p) }) }) } diff --git a/restapi/user_logout.go b/restapi/user_logout.go index b78566fc1..2b34cfdcd 100644 --- a/restapi/user_logout.go +++ b/restapi/user_logout.go @@ -23,12 +23,12 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + authApi "github.com/minio/console/restapi/operations/auth" ) func registerLogoutHandlers(api *operations.ConsoleAPI) { // logout from console - api.UserAPILogoutHandler = user_api.LogoutHandlerFunc(func(params user_api.LogoutParams, session *models.Principal) middleware.Responder { + api.AuthLogoutHandler = authApi.LogoutHandlerFunc(func(params authApi.LogoutParams, session *models.Principal) middleware.Responder { getLogoutResponse(session) // Custom response writer to expire the session cookies return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) { @@ -36,7 +36,7 @@ func registerLogoutHandlers(api *operations.ConsoleAPI) { // this will tell the browser to clear the cookie and invalidate user session // additionally we are deleting the cookie from the client side http.SetCookie(w, &expiredCookie) - user_api.NewLogoutOK().WriteResponse(w, p) + authApi.NewLogoutOK().WriteResponse(w, p) }) }) } diff --git a/restapi/user_objects.go b/restapi/user_objects.go index 7f4c13741..3452f17c1 100644 --- a/restapi/user_objects.go +++ b/restapi/user_objects.go @@ -40,7 +40,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + objectApi "github.com/minio/console/restapi/operations/object" mc "github.com/minio/mc/cmd" "github.com/minio/mc/pkg/probe" "github.com/minio/minio-go/v7/pkg/tags" @@ -55,29 +55,29 @@ const ( func registerObjectsHandlers(api *operations.ConsoleAPI) { // list objects - api.UserAPIListObjectsHandler = user_api.ListObjectsHandlerFunc(func(params user_api.ListObjectsParams, session *models.Principal) middleware.Responder { + api.ObjectListObjectsHandler = objectApi.ListObjectsHandlerFunc(func(params objectApi.ListObjectsParams, session *models.Principal) middleware.Responder { resp, err := getListObjectsResponse(session, params) if err != nil { - return user_api.NewListObjectsDefault(int(err.Code)).WithPayload(err) + return objectApi.NewListObjectsDefault(int(err.Code)).WithPayload(err) } - return user_api.NewListObjectsOK().WithPayload(resp) + return objectApi.NewListObjectsOK().WithPayload(resp) }) // delete object - api.UserAPIDeleteObjectHandler = user_api.DeleteObjectHandlerFunc(func(params user_api.DeleteObjectParams, session *models.Principal) middleware.Responder { + api.ObjectDeleteObjectHandler = objectApi.DeleteObjectHandlerFunc(func(params objectApi.DeleteObjectParams, session *models.Principal) middleware.Responder { if err := getDeleteObjectResponse(session, params); err != nil { - return user_api.NewDeleteObjectDefault(int(err.Code)).WithPayload(err) + return objectApi.NewDeleteObjectDefault(int(err.Code)).WithPayload(err) } - return user_api.NewDeleteObjectOK() + return objectApi.NewDeleteObjectOK() }) // delete multiple objects - api.UserAPIDeleteMultipleObjectsHandler = user_api.DeleteMultipleObjectsHandlerFunc(func(params user_api.DeleteMultipleObjectsParams, session *models.Principal) middleware.Responder { + api.ObjectDeleteMultipleObjectsHandler = objectApi.DeleteMultipleObjectsHandlerFunc(func(params objectApi.DeleteMultipleObjectsParams, session *models.Principal) middleware.Responder { if err := getDeleteMultiplePathsResponse(session, params); err != nil { - return user_api.NewDeleteMultipleObjectsDefault(int(err.Code)).WithPayload(err) + return objectApi.NewDeleteMultipleObjectsDefault(int(err.Code)).WithPayload(err) } - return user_api.NewDeleteMultipleObjectsOK() + return objectApi.NewDeleteMultipleObjectsOK() }) // download object - api.UserAPIDownloadObjectHandler = user_api.DownloadObjectHandlerFunc(func(params user_api.DownloadObjectParams, session *models.Principal) middleware.Responder { + api.ObjectDownloadObjectHandler = objectApi.DownloadObjectHandlerFunc(func(params objectApi.DownloadObjectParams, session *models.Principal) middleware.Responder { isFolder := false var prefix string @@ -85,7 +85,7 @@ func registerObjectsHandlers(api *operations.ConsoleAPI) { encodedPrefix := SanitizeEncodedPrefix(params.Prefix) decodedPrefix, err := base64.StdEncoding.DecodeString(encodedPrefix) if err != nil { - return user_api.NewDownloadObjectDefault(int(400)).WithPayload(prepareError(err)) + return objectApi.NewDownloadObjectDefault(int(400)).WithPayload(prepareError(err)) } prefix = string(decodedPrefix) } @@ -104,75 +104,75 @@ func registerObjectsHandlers(api *operations.ConsoleAPI) { } if err != nil { - return user_api.NewDownloadObjectDefault(int(err.Code)).WithPayload(err) + return objectApi.NewDownloadObjectDefault(int(err.Code)).WithPayload(err) } return resp }) // upload object - api.UserAPIPostBucketsBucketNameObjectsUploadHandler = user_api.PostBucketsBucketNameObjectsUploadHandlerFunc(func(params user_api.PostBucketsBucketNameObjectsUploadParams, session *models.Principal) middleware.Responder { + api.ObjectPostBucketsBucketNameObjectsUploadHandler = objectApi.PostBucketsBucketNameObjectsUploadHandlerFunc(func(params objectApi.PostBucketsBucketNameObjectsUploadParams, session *models.Principal) middleware.Responder { if err := getUploadObjectResponse(session, params); err != nil { if strings.Contains(*err.DetailedMessage, "413") { - return user_api.NewPostBucketsBucketNameObjectsUploadDefault(413).WithPayload(err) + return objectApi.NewPostBucketsBucketNameObjectsUploadDefault(413).WithPayload(err) } - return user_api.NewPostBucketsBucketNameObjectsUploadDefault(int(err.Code)).WithPayload(err) + return objectApi.NewPostBucketsBucketNameObjectsUploadDefault(int(err.Code)).WithPayload(err) } - return user_api.NewPostBucketsBucketNameObjectsUploadOK() + return objectApi.NewPostBucketsBucketNameObjectsUploadOK() }) // get share object url - api.UserAPIShareObjectHandler = user_api.ShareObjectHandlerFunc(func(params user_api.ShareObjectParams, session *models.Principal) middleware.Responder { + api.ObjectShareObjectHandler = objectApi.ShareObjectHandlerFunc(func(params objectApi.ShareObjectParams, session *models.Principal) middleware.Responder { resp, err := getShareObjectResponse(session, params) if err != nil { - return user_api.NewShareObjectDefault(int(err.Code)).WithPayload(err) + return objectApi.NewShareObjectDefault(int(err.Code)).WithPayload(err) } - return user_api.NewShareObjectOK().WithPayload(*resp) + return objectApi.NewShareObjectOK().WithPayload(*resp) }) // set object legalhold status - api.UserAPIPutObjectLegalHoldHandler = user_api.PutObjectLegalHoldHandlerFunc(func(params user_api.PutObjectLegalHoldParams, session *models.Principal) middleware.Responder { + api.ObjectPutObjectLegalHoldHandler = objectApi.PutObjectLegalHoldHandlerFunc(func(params objectApi.PutObjectLegalHoldParams, session *models.Principal) middleware.Responder { if err := getSetObjectLegalHoldResponse(session, params); err != nil { - return user_api.NewPutObjectLegalHoldDefault(int(err.Code)).WithPayload(err) + return objectApi.NewPutObjectLegalHoldDefault(int(err.Code)).WithPayload(err) } - return user_api.NewPutObjectLegalHoldOK() + return objectApi.NewPutObjectLegalHoldOK() }) // set object retention - api.UserAPIPutObjectRetentionHandler = user_api.PutObjectRetentionHandlerFunc(func(params user_api.PutObjectRetentionParams, session *models.Principal) middleware.Responder { + api.ObjectPutObjectRetentionHandler = objectApi.PutObjectRetentionHandlerFunc(func(params objectApi.PutObjectRetentionParams, session *models.Principal) middleware.Responder { if err := getSetObjectRetentionResponse(session, params); err != nil { - return user_api.NewPutObjectRetentionDefault(int(err.Code)).WithPayload(err) + return objectApi.NewPutObjectRetentionDefault(int(err.Code)).WithPayload(err) } - return user_api.NewPutObjectRetentionOK() + return objectApi.NewPutObjectRetentionOK() }) // delete object retention - api.UserAPIDeleteObjectRetentionHandler = user_api.DeleteObjectRetentionHandlerFunc(func(params user_api.DeleteObjectRetentionParams, session *models.Principal) middleware.Responder { + api.ObjectDeleteObjectRetentionHandler = objectApi.DeleteObjectRetentionHandlerFunc(func(params objectApi.DeleteObjectRetentionParams, session *models.Principal) middleware.Responder { if err := deleteObjectRetentionResponse(session, params); err != nil { - return user_api.NewDeleteObjectRetentionDefault(int(err.Code)).WithPayload(err) + return objectApi.NewDeleteObjectRetentionDefault(int(err.Code)).WithPayload(err) } - return user_api.NewDeleteObjectRetentionOK() + return objectApi.NewDeleteObjectRetentionOK() }) // set tags in object - api.UserAPIPutObjectTagsHandler = user_api.PutObjectTagsHandlerFunc(func(params user_api.PutObjectTagsParams, session *models.Principal) middleware.Responder { + api.ObjectPutObjectTagsHandler = objectApi.PutObjectTagsHandlerFunc(func(params objectApi.PutObjectTagsParams, session *models.Principal) middleware.Responder { if err := getPutObjectTagsResponse(session, params); err != nil { - return user_api.NewPutObjectTagsDefault(int(err.Code)).WithPayload(err) + return objectApi.NewPutObjectTagsDefault(int(err.Code)).WithPayload(err) } - return user_api.NewPutObjectTagsOK() + return objectApi.NewPutObjectTagsOK() }) //Restore file version - api.UserAPIPutObjectRestoreHandler = user_api.PutObjectRestoreHandlerFunc(func(params user_api.PutObjectRestoreParams, session *models.Principal) middleware.Responder { + api.ObjectPutObjectRestoreHandler = objectApi.PutObjectRestoreHandlerFunc(func(params objectApi.PutObjectRestoreParams, session *models.Principal) middleware.Responder { if err := getPutObjectRestoreResponse(session, params); err != nil { - return user_api.NewPutObjectRestoreDefault(int(err.Code)).WithPayload(err) + return objectApi.NewPutObjectRestoreDefault(int(err.Code)).WithPayload(err) } - return user_api.NewPutObjectRestoreOK() + return objectApi.NewPutObjectRestoreOK() }) // Metadata in object - api.UserAPIGetObjectMetadataHandler = user_api.GetObjectMetadataHandlerFunc(func(params user_api.GetObjectMetadataParams, session *models.Principal) middleware.Responder { + api.ObjectGetObjectMetadataHandler = objectApi.GetObjectMetadataHandlerFunc(func(params objectApi.GetObjectMetadataParams, session *models.Principal) middleware.Responder { resp, err := getObjectMetadataResponse(session, params) if err != nil { - return user_api.NewGetObjectMetadataDefault(int(err.Code)).WithPayload(err) + return objectApi.NewGetObjectMetadataDefault(int(err.Code)).WithPayload(err) } - return user_api.NewGetObjectMetadataOK().WithPayload(resp) + return objectApi.NewGetObjectMetadataOK().WithPayload(resp) }) } // getListObjectsResponse returns a list of objects -func getListObjectsResponse(session *models.Principal, params user_api.ListObjectsParams) (*models.ListObjectsResponse, *models.Error) { +func getListObjectsResponse(session *models.Principal, params objectApi.ListObjectsParams) (*models.ListObjectsResponse, *models.Error) { var prefix string var recursive bool var withVersions bool @@ -366,7 +366,7 @@ func parseRange(s string, size int64) ([]httpRange, error) { return ranges, nil } -func getDownloadObjectResponse(session *models.Principal, params user_api.DownloadObjectParams) (middleware.Responder, *models.Error) { +func getDownloadObjectResponse(session *models.Principal, params objectApi.DownloadObjectParams) (middleware.Responder, *models.Error) { ctx := context.Background() var prefix string @@ -473,7 +473,7 @@ func getDownloadObjectResponse(session *models.Principal, params user_api.Downlo } }), nil } -func getDownloadFolderResponse(session *models.Principal, params user_api.DownloadObjectParams) (middleware.Responder, *models.Error) { +func getDownloadFolderResponse(session *models.Principal, params objectApi.DownloadObjectParams) (middleware.Responder, *models.Error) { ctx := context.Background() var prefix string @@ -558,7 +558,7 @@ func getDownloadFolderResponse(session *models.Principal, params user_api.Downlo } // getDeleteObjectResponse returns whether there was an error on deletion of object -func getDeleteObjectResponse(session *models.Principal, params user_api.DeleteObjectParams) *models.Error { +func getDeleteObjectResponse(session *models.Principal, params objectApi.DeleteObjectParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() var prefix string @@ -607,7 +607,7 @@ func getDeleteObjectResponse(session *models.Principal, params user_api.DeleteOb } // getDeleteMultiplePathsResponse returns whether there was an error on deletion of any object -func getDeleteMultiplePathsResponse(session *models.Principal, params user_api.DeleteMultipleObjectsParams) *models.Error { +func getDeleteMultiplePathsResponse(session *models.Principal, params objectApi.DeleteMultipleObjectsParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() var version string @@ -766,7 +766,7 @@ func deleteNonCurrentVersions(ctx context.Context, client MCClient, bucket, path return nil } -func getUploadObjectResponse(session *models.Principal, params user_api.PostBucketsBucketNameObjectsUploadParams) *models.Error { +func getUploadObjectResponse(session *models.Principal, params objectApi.PostBucketsBucketNameObjectsUploadParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -783,7 +783,7 @@ func getUploadObjectResponse(session *models.Principal, params user_api.PostBuck } // uploadFiles gets files from http.Request form and uploads them to MinIO -func uploadFiles(ctx context.Context, client MinioClient, params user_api.PostBucketsBucketNameObjectsUploadParams) error { +func uploadFiles(ctx context.Context, client MinioClient, params objectApi.PostBucketsBucketNameObjectsUploadParams) error { var prefix string if params.Prefix != nil { encodedPrefix := SanitizeEncodedPrefix(*params.Prefix) @@ -831,7 +831,7 @@ func uploadFiles(ctx context.Context, client MinioClient, params user_api.PostBu } // getShareObjectResponse returns a share object url -func getShareObjectResponse(session *models.Principal, params user_api.ShareObjectParams) (*string, *models.Error) { +func getShareObjectResponse(session *models.Principal, params objectApi.ShareObjectParams) (*string, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() var prefix string @@ -878,7 +878,7 @@ func getShareObjectURL(ctx context.Context, client MCClient, versionID string, d return &objURL, nil } -func getSetObjectLegalHoldResponse(session *models.Principal, params user_api.PutObjectLegalHoldParams) *models.Error { +func getSetObjectLegalHoldResponse(session *models.Principal, params objectApi.PutObjectLegalHoldParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -914,7 +914,7 @@ func setObjectLegalHold(ctx context.Context, client MinioClient, bucketName, pre return client.putObjectLegalHold(ctx, bucketName, prefix, minio.PutObjectLegalHoldOptions{VersionID: versionID, Status: &lstatus}) } -func getSetObjectRetentionResponse(session *models.Principal, params user_api.PutObjectRetentionParams) *models.Error { +func getSetObjectRetentionResponse(session *models.Principal, params objectApi.PutObjectRetentionParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -967,7 +967,7 @@ func setObjectRetention(ctx context.Context, client MinioClient, bucketName, ver return client.putObjectRetention(ctx, bucketName, prefix, opts) } -func deleteObjectRetentionResponse(session *models.Principal, params user_api.DeleteObjectRetentionParams) *models.Error { +func deleteObjectRetentionResponse(session *models.Principal, params objectApi.DeleteObjectRetentionParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -1002,7 +1002,7 @@ func deleteObjectRetention(ctx context.Context, client MinioClient, bucketName, return client.putObjectRetention(ctx, bucketName, prefix, opts) } -func getPutObjectTagsResponse(session *models.Principal, params user_api.PutObjectTagsParams) *models.Error { +func getPutObjectTagsResponse(session *models.Principal, params objectApi.PutObjectTagsParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -1040,7 +1040,7 @@ func putObjectTags(ctx context.Context, client MinioClient, bucketName, prefix, } // Restore Object Version -func getPutObjectRestoreResponse(session *models.Principal, params user_api.PutObjectRestoreParams) *models.Error { +func getPutObjectRestoreResponse(session *models.Principal, params objectApi.PutObjectRestoreParams) *models.Error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) @@ -1097,7 +1097,7 @@ func restoreObject(ctx context.Context, client MinioClient, bucketName, prefix, } // Metadata Response from minio-go API -func getObjectMetadataResponse(session *models.Principal, params user_api.GetObjectMetadataParams) (*models.Metadata, *models.Error) { +func getObjectMetadataResponse(session *models.Principal, params objectApi.GetObjectMetadataParams) (*models.Metadata, *models.Error) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() mClient, err := newMinioClient(session) diff --git a/restapi/user_service_accounts.go b/restapi/user_service_accounts.go index 6b3a21484..ba294831b 100644 --- a/restapi/user_service_accounts.go +++ b/restapi/user_service_accounts.go @@ -23,95 +23,96 @@ import ( "errors" "strings" + userApi "github.com/minio/console/restapi/operations/user" + "github.com/go-openapi/runtime/middleware" "github.com/minio/console/models" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/admin_api" - "github.com/minio/console/restapi/operations/user_api" + saApi "github.com/minio/console/restapi/operations/service_account" "github.com/minio/madmin-go" iampolicy "github.com/minio/pkg/iam/policy" ) func registerServiceAccountsHandlers(api *operations.ConsoleAPI) { // Create Service Account - api.UserAPICreateServiceAccountHandler = user_api.CreateServiceAccountHandlerFunc(func(params user_api.CreateServiceAccountParams, session *models.Principal) middleware.Responder { + api.ServiceAccountCreateServiceAccountHandler = saApi.CreateServiceAccountHandlerFunc(func(params saApi.CreateServiceAccountParams, session *models.Principal) middleware.Responder { creds, err := getCreateServiceAccountResponse(session, params.Body) if err != nil { - return user_api.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err) + return saApi.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err) } - return user_api.NewCreateServiceAccountCreated().WithPayload(creds) + return saApi.NewCreateServiceAccountCreated().WithPayload(creds) }) // Create User Service Account - api.AdminAPICreateAUserServiceAccountHandler = admin_api.CreateAUserServiceAccountHandlerFunc(func(params admin_api.CreateAUserServiceAccountParams, session *models.Principal) middleware.Responder { + api.UserCreateAUserServiceAccountHandler = userApi.CreateAUserServiceAccountHandlerFunc(func(params userApi.CreateAUserServiceAccountParams, session *models.Principal) middleware.Responder { creds, err := getCreateAUserServiceAccountResponse(session, params.Body, params.Name) if err != nil { - return user_api.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err) + return saApi.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewCreateAUserServiceAccountCreated().WithPayload(creds) + return userApi.NewCreateAUserServiceAccountCreated().WithPayload(creds) }) // Create User Service Account - api.AdminAPICreateServiceAccountCredentialsHandler = admin_api.CreateServiceAccountCredentialsHandlerFunc(func(params admin_api.CreateServiceAccountCredentialsParams, session *models.Principal) middleware.Responder { + api.UserCreateServiceAccountCredentialsHandler = userApi.CreateServiceAccountCredentialsHandlerFunc(func(params userApi.CreateServiceAccountCredentialsParams, session *models.Principal) middleware.Responder { creds, err := getCreateAUserServiceAccountCredsResponse(session, params.Body, params.Name) if err != nil { - return user_api.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err) + return saApi.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewCreateServiceAccountCredentialsCreated().WithPayload(creds) + return userApi.NewCreateServiceAccountCredentialsCreated().WithPayload(creds) }) - api.AdminAPICreateServiceAccountCredsHandler = admin_api.CreateServiceAccountCredsHandlerFunc(func(params admin_api.CreateServiceAccountCredsParams, session *models.Principal) middleware.Responder { + api.ServiceAccountCreateServiceAccountCredsHandler = saApi.CreateServiceAccountCredsHandlerFunc(func(params saApi.CreateServiceAccountCredsParams, session *models.Principal) middleware.Responder { creds, err := getCreateServiceAccountCredsResponse(session, params.Body) if err != nil { - return user_api.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err) + return saApi.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err) } - return admin_api.NewCreateServiceAccountCredentialsCreated().WithPayload(creds) + return userApi.NewCreateServiceAccountCredentialsCreated().WithPayload(creds) }) // List Service Accounts for User - api.UserAPIListUserServiceAccountsHandler = user_api.ListUserServiceAccountsHandlerFunc(func(params user_api.ListUserServiceAccountsParams, session *models.Principal) middleware.Responder { + api.ServiceAccountListUserServiceAccountsHandler = saApi.ListUserServiceAccountsHandlerFunc(func(params saApi.ListUserServiceAccountsParams, session *models.Principal) middleware.Responder { serviceAccounts, err := getUserServiceAccountsResponse(session, "") if err != nil { - return user_api.NewListUserServiceAccountsDefault(int(err.Code)).WithPayload(err) + return saApi.NewListUserServiceAccountsDefault(int(err.Code)).WithPayload(err) } - return user_api.NewListUserServiceAccountsOK().WithPayload(serviceAccounts) + return saApi.NewListUserServiceAccountsOK().WithPayload(serviceAccounts) }) // Delete a User's service account - api.UserAPIDeleteServiceAccountHandler = user_api.DeleteServiceAccountHandlerFunc(func(params user_api.DeleteServiceAccountParams, session *models.Principal) middleware.Responder { + api.ServiceAccountDeleteServiceAccountHandler = saApi.DeleteServiceAccountHandlerFunc(func(params saApi.DeleteServiceAccountParams, session *models.Principal) middleware.Responder { if err := getDeleteServiceAccountResponse(session, params.AccessKey); err != nil { - return user_api.NewDeleteServiceAccountDefault(int(err.Code)).WithPayload(err) + return saApi.NewDeleteServiceAccountDefault(int(err.Code)).WithPayload(err) } - return user_api.NewDeleteServiceAccountNoContent() + return saApi.NewDeleteServiceAccountNoContent() }) // List Service Accounts for User - api.AdminAPIListAUserServiceAccountsHandler = admin_api.ListAUserServiceAccountsHandlerFunc(func(params admin_api.ListAUserServiceAccountsParams, session *models.Principal) middleware.Responder { + api.UserListAUserServiceAccountsHandler = userApi.ListAUserServiceAccountsHandlerFunc(func(params userApi.ListAUserServiceAccountsParams, session *models.Principal) middleware.Responder { serviceAccounts, err := getUserServiceAccountsResponse(session, params.Name) if err != nil { - return user_api.NewListUserServiceAccountsDefault(int(err.Code)).WithPayload(err) + return saApi.NewListUserServiceAccountsDefault(int(err.Code)).WithPayload(err) } - return user_api.NewListUserServiceAccountsOK().WithPayload(serviceAccounts) + return saApi.NewListUserServiceAccountsOK().WithPayload(serviceAccounts) }) - api.UserAPIGetServiceAccountPolicyHandler = user_api.GetServiceAccountPolicyHandlerFunc(func(params user_api.GetServiceAccountPolicyParams, session *models.Principal) middleware.Responder { + api.ServiceAccountGetServiceAccountPolicyHandler = saApi.GetServiceAccountPolicyHandlerFunc(func(params saApi.GetServiceAccountPolicyParams, session *models.Principal) middleware.Responder { serviceAccounts, err := getServiceAccountPolicyResponse(session, params.AccessKey) if err != nil { - return user_api.NewGetServiceAccountPolicyDefault(int(err.Code)).WithPayload(err) + return saApi.NewGetServiceAccountPolicyDefault(int(err.Code)).WithPayload(err) } - return user_api.NewGetServiceAccountPolicyOK().WithPayload(serviceAccounts) + return saApi.NewGetServiceAccountPolicyOK().WithPayload(serviceAccounts) }) - api.UserAPISetServiceAccountPolicyHandler = user_api.SetServiceAccountPolicyHandlerFunc(func(params user_api.SetServiceAccountPolicyParams, session *models.Principal) middleware.Responder { + api.ServiceAccountSetServiceAccountPolicyHandler = saApi.SetServiceAccountPolicyHandlerFunc(func(params saApi.SetServiceAccountPolicyParams, session *models.Principal) middleware.Responder { err := getSetServiceAccountPolicyResponse(session, params.AccessKey, *params.Policy.Policy) if err != nil { - return user_api.NewSetServiceAccountPolicyDefault(int(err.Code)).WithPayload(err) + return saApi.NewSetServiceAccountPolicyDefault(int(err.Code)).WithPayload(err) } - return user_api.NewSetServiceAccountPolicyOK() + return saApi.NewSetServiceAccountPolicyOK() }) // Delete multiple service accounts - api.UserAPIDeleteMultipleServiceAccountsHandler = user_api.DeleteMultipleServiceAccountsHandlerFunc(func(params user_api.DeleteMultipleServiceAccountsParams, session *models.Principal) middleware.Responder { + api.ServiceAccountDeleteMultipleServiceAccountsHandler = saApi.DeleteMultipleServiceAccountsHandlerFunc(func(params saApi.DeleteMultipleServiceAccountsParams, session *models.Principal) middleware.Responder { if err := getDeleteMultipleServiceAccountsResponse(session, params.SelectedSA); err != nil { - return user_api.NewDeleteMultipleServiceAccountsDefault(int(err.Code)).WithPayload(err) + return saApi.NewDeleteMultipleServiceAccountsDefault(int(err.Code)).WithPayload(err) } - return user_api.NewDeleteMultipleServiceAccountsNoContent() + return saApi.NewDeleteMultipleServiceAccountsNoContent() }) } diff --git a/restapi/user_session.go b/restapi/user_session.go index 0855c0047..0dafa5569 100644 --- a/restapi/user_session.go +++ b/restapi/user_session.go @@ -37,7 +37,7 @@ import ( "github.com/minio/console/pkg/auth/idp/oauth2" "github.com/minio/console/pkg/auth/ldap" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + authApi "github.com/minio/console/restapi/operations/auth" ) func isErasureMode() bool { @@ -67,12 +67,12 @@ func isErasureMode() bool { func registerSessionHandlers(api *operations.ConsoleAPI) { // session check - api.UserAPISessionCheckHandler = user_api.SessionCheckHandlerFunc(func(params user_api.SessionCheckParams, session *models.Principal) middleware.Responder { + api.AuthSessionCheckHandler = authApi.SessionCheckHandlerFunc(func(params authApi.SessionCheckParams, session *models.Principal) middleware.Responder { sessionResp, err := getSessionResponse(session) if err != nil { - return user_api.NewSessionCheckDefault(int(err.Code)).WithPayload(err) + return authApi.NewSessionCheckDefault(int(err.Code)).WithPayload(err) } - return user_api.NewSessionCheckOK().WithPayload(sessionResp) + return authApi.NewSessionCheckOK().WithPayload(sessionResp) }) } diff --git a/restapi/user_version.go b/restapi/user_version.go index 5513ddb41..4f3ba9a12 100644 --- a/restapi/user_version.go +++ b/restapi/user_version.go @@ -24,16 +24,16 @@ import ( "github.com/minio/console/models" "github.com/minio/console/pkg/utils" "github.com/minio/console/restapi/operations" - "github.com/minio/console/restapi/operations/user_api" + systemApi "github.com/minio/console/restapi/operations/system" ) func registerVersionHandlers(api *operations.ConsoleAPI) { - api.UserAPICheckMinIOVersionHandler = user_api.CheckMinIOVersionHandlerFunc(func(params user_api.CheckMinIOVersionParams) middleware.Responder { + api.SystemCheckMinIOVersionHandler = systemApi.CheckMinIOVersionHandlerFunc(func(params systemApi.CheckMinIOVersionParams) middleware.Responder { versionResponse, err := getVersionResponse() if err != nil { - return user_api.NewCheckMinIOVersionDefault(int(err.Code)).WithPayload(err) + return systemApi.NewCheckMinIOVersionDefault(int(err.Code)).WithPayload(err) } - return user_api.NewCheckMinIOVersionOK().WithPayload(versionResponse) + return systemApi.NewCheckMinIOVersionOK().WithPayload(versionResponse) }) } diff --git a/swagger-console.yml b/swagger-console.yml index 8dbe14ef7..8c21f2d95 100644 --- a/swagger-console.yml +++ b/swagger-console.yml @@ -19,7 +19,7 @@ securityDefinitions: tokenUrl: http://min.io # Apply the key security definition to all APIs security: - - key: [] + - key: [ ] paths: /login: get: @@ -35,9 +35,9 @@ paths: schema: $ref: "#/definitions/error" # Exclude this API from the authentication requirement - security: [] + security: [ ] tags: - - UserAPI + - Auth post: summary: Login to Console operationId: Login @@ -55,9 +55,9 @@ paths: schema: $ref: "#/definitions/error" # Exclude this API from the authentication requirement - security: [] + security: [ ] tags: - - UserAPI + - Auth /login/oauth2/auth: post: summary: Identity Provider oauth2 callback endpoint. @@ -75,9 +75,9 @@ paths: description: Generic error response. schema: $ref: "#/definitions/error" - security: [] + security: [ ] tags: - - UserAPI + - Auth /logout: post: @@ -91,7 +91,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Auth /session: get: @@ -107,7 +107,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Auth /check-version: get: @@ -122,9 +122,9 @@ paths: description: Generic error response. schema: $ref: "#/definitions/error" - security: [] + security: [ ] tags: - - UserAPI + - System /account/change-password: post: @@ -144,7 +144,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Account /account/change-user-password: post: @@ -164,7 +164,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Account /buckets: get: @@ -180,7 +180,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket post: summary: Make bucket operationId: MakeBucket @@ -198,7 +198,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{name}: get: @@ -219,7 +219,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket delete: summary: Delete Bucket operationId: DeleteBucket @@ -236,7 +236,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/retention: get: @@ -257,7 +257,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket put: summary: Set Bucket's retention config operationId: SetBucketRetentionConfig @@ -279,7 +279,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/objects: get: @@ -316,7 +316,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object delete: summary: Delete Object operationId: DeleteObject @@ -353,7 +353,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object /buckets/{bucket_name}/delete-objects: post: @@ -383,7 +383,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object /buckets/{bucket_name}/objects/upload: post: @@ -406,7 +406,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object /buckets/{bucket_name}/objects/download: get: @@ -442,7 +442,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object /buckets/{bucket_name}/objects/share: get: @@ -475,7 +475,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object /buckets/{bucket_name}/objects/legalhold: put: @@ -507,7 +507,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object /buckets/{bucket_name}/objects/retention: put: @@ -539,7 +539,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object delete: summary: Delete Object retention from an object operationId: DeleteObjectRetention @@ -564,7 +564,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object /buckets/{bucket_name}/objects/tags: put: @@ -596,7 +596,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object /buckets/{bucket_name}/objects/restore: put: @@ -623,7 +623,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object /buckets/{bucket_name}/objects/metadata: get: @@ -648,7 +648,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Object /buckets/{bucket_name}/tags: put: @@ -672,7 +672,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{name}/set-policy: put: @@ -698,7 +698,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{name}/quota: get: @@ -719,7 +719,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket put: summary: Bucket Quota operationId: SetBucketQuota @@ -743,7 +743,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/events: get: @@ -774,7 +774,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket post: summary: Create Bucket Event operationId: CreateBucketEvent @@ -796,7 +796,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/events/{arn}: delete: @@ -824,7 +824,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /list-external-buckets: post: @@ -846,7 +846,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets-replication: post: @@ -868,7 +868,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/replication: get: @@ -889,7 +889,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/replication/{rule_id}: get: @@ -914,7 +914,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket put: summary: Update Replication rule @@ -941,7 +941,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket delete: summary: Bucket Replication Rule Delete @@ -964,7 +964,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/delete-all-replication-rules: delete: @@ -983,7 +983,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/delete-selected-replication-rules: delete: @@ -1007,7 +1007,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/versioning: get: @@ -1028,7 +1028,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket put: summary: Set Bucket Versioning operationId: SetBucketVersioning @@ -1050,7 +1050,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/object-locking: get: @@ -1071,7 +1071,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/encryption/enable: post: @@ -1095,7 +1095,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/encryption/disable: post: @@ -1114,7 +1114,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/encryption/info: get: @@ -1135,7 +1135,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/lifecycle: get: @@ -1156,7 +1156,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket post: summary: Add Bucket Lifecycle operationId: AddBucketLifecycle @@ -1178,7 +1178,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/multi-lifecycle: post: @@ -1200,7 +1200,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/lifecycle/{lifecycle_id}: put: @@ -1228,7 +1228,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket delete: summary: Delete Lifecycle rule @@ -1250,7 +1250,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /buckets/{bucket_name}/rewind/{date}: get: @@ -1279,7 +1279,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /service-accounts: get: @@ -1306,7 +1306,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - ServiceAccount post: summary: Create Service Account operationId: CreateServiceAccount @@ -1326,7 +1326,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - ServiceAccount /service-account-credentials: post: @@ -1348,7 +1348,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - ServiceAccount /service-accounts/{access_key}: delete: @@ -1367,7 +1367,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - ServiceAccount /service-accounts/delete-multi: delete: @@ -1389,7 +1389,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - ServiceAccount /service-accounts/{access_key}/policy: get: @@ -1410,7 +1410,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - ServiceAccount put: summary: Set Service Account Policy operationId: SetServiceAccountPolicy @@ -1432,7 +1432,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - ServiceAccount /users: get: @@ -1459,7 +1459,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - User post: summary: Add User operationId: AddUser @@ -1479,7 +1479,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - User /user: get: @@ -1500,7 +1500,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - User put: summary: Update User Info operationId: UpdateUserInfo @@ -1524,7 +1524,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - User delete: summary: Remove user operationId: RemoveUser @@ -1541,7 +1541,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - User /user/groups: put: @@ -1567,7 +1567,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - User /user/{name}/service-accounts: get: @@ -1588,7 +1588,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - User post: summary: Create Service Account for User operationId: CreateAUserServiceAccount @@ -1612,7 +1612,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - User /user/{name}/service-account-credentials: post: @@ -1638,7 +1638,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - User /users-groups-bulk: put: @@ -1658,7 +1658,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - User /groups: get: @@ -1685,7 +1685,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Group post: summary: Add Group operationId: AddGroup @@ -1703,7 +1703,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Group /group: get: @@ -1724,7 +1724,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Group delete: summary: Remove group operationId: RemoveGroup @@ -1741,7 +1741,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Group put: summary: Update Group Members or Status operationId: UpdateGroup @@ -1765,7 +1765,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Group /policies: get: @@ -1792,7 +1792,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Policy post: summary: Add Policy operationId: AddPolicy @@ -1812,7 +1812,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Policy /policies/{policy}/users: get: @@ -1835,7 +1835,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Policy /policies/{policy}/groups: get: @@ -1858,7 +1858,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Policy /bucket-policy/{bucket}: get: @@ -1889,7 +1889,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Bucket /bucket/{bucket}/access-rules: put: @@ -1915,7 +1915,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Bucket get: summary: List Access Rules With Given Bucket operationId: ListAccessRulesWithBucket @@ -1944,7 +1944,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Bucket delete: summary: Delete Access Rule From Given Bucket operationId: DeleteAccessRuleWithBucket @@ -1968,7 +1968,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Bucket /bucket-users/{bucket}: get: @@ -2001,7 +2001,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Bucket /policy: get: @@ -2022,7 +2022,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Policy delete: summary: Remove policy operationId: RemovePolicy @@ -2039,7 +2039,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Policy /configs: get: @@ -2066,7 +2066,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Configuration /set-policy: put: @@ -2086,7 +2086,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Policy /set-policy-multi: put: @@ -2106,7 +2106,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Policy /configs/{name}: get: @@ -2127,7 +2127,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Configuration put: summary: Set Configuration operationId: SetConfig @@ -2151,7 +2151,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Configuration /configs/{name}/reset: get: @@ -2172,7 +2172,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Configuration /service/restart: post: @@ -2186,7 +2186,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Service /profiling/start: post: summary: Start recording profile data @@ -2207,7 +2207,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Profile /profiling/stop: post: @@ -2225,7 +2225,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Profile /subnet/registration-token: get: summary: Subnet registraton token @@ -2240,7 +2240,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Subnet /subnet/info: get: summary: Subnet info @@ -2255,7 +2255,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Subnet /subnet/register: post: summary: Register cluster with Subnet @@ -2276,7 +2276,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Subnet /subnet/login: post: @@ -2298,7 +2298,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Subnet /subnet/login/mfa: post: @@ -2320,7 +2320,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Subnet /admin/info: get: @@ -2342,7 +2342,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - System /admin/info/widgets/{widgetId}: get: @@ -2374,7 +2374,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - System /admin/arns: get: @@ -2390,7 +2390,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - System /admin/notification_endpoints: get: @@ -2406,7 +2406,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Configuration post: summary: Allows to configure a new notification endpoint operationId: AddNotificationEndpoint @@ -2426,7 +2426,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Configuration /admin/site-replication: get: @@ -2442,7 +2442,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - SiteReplication post: summary: Add a Replication Site operationId: SiteReplicationInfoAdd @@ -2462,7 +2462,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - SiteReplication put: summary: Edit a Replication Site operationId: SiteReplicationEdit @@ -2482,7 +2482,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - SiteReplication delete: summary: Remove a Replication Site operationId: SiteReplicationRemove @@ -2502,7 +2502,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - SiteReplication /admin/site-replication/status: get: @@ -2549,7 +2549,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - SiteReplication /admin/tiers: get: @@ -2565,7 +2565,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Tiering post: summary: Allows to configure a new tier operationId: AddTier @@ -2583,7 +2583,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Tiering /admin/tiers/{type}/{name}: get: @@ -2612,7 +2612,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Tiering /admin/tiers/{type}/{name}/credentials: put: @@ -2644,7 +2644,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Tiering /nodes: get: @@ -2662,7 +2662,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - System /remote-buckets: get: @@ -2678,7 +2678,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket post: summary: Add Remote Bucket operationId: AddRemoteBucket @@ -2696,7 +2696,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /remote-buckets/{name}: get: @@ -2717,7 +2717,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /remote-buckets/{source-bucket-name}/{arn}: delete: summary: Delete Remote Bucket @@ -2739,7 +2739,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Bucket /logs/search: get: summary: Search the logs @@ -2765,7 +2765,7 @@ paths: - name: order in: query type: string - enum: [timeDesc, timeAsc] + enum: [ timeDesc, timeAsc ] default: timeDesc - name: timeStart in: query @@ -2780,7 +2780,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Logging /admin/inspect: get: @@ -2812,7 +2812,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - AdminAPI + - Inspect definitions: accountChangePasswordRequest: @@ -3579,7 +3579,7 @@ definitions: properties: loginStrategy: type: string - enum: [form, redirect, service-account, redirect-service-account] + enum: [ form, redirect, service-account, redirect-service-account ] redirect: type: string loginOauth2AuthRequest: @@ -3662,7 +3662,7 @@ definitions: type: string status: type: string - enum: [ok] + enum: [ ok ] operator: type: boolean distributedMode: @@ -3683,7 +3683,7 @@ definitions: type: string values: type: array - items: {} + items: { } resultTarget: type: object properties: @@ -3890,9 +3890,9 @@ definitions: type: object properties: status: - type : string + type: string errorDetail: - type : string + type: string peerSiteEditResponse: type: object @@ -3908,9 +3908,9 @@ definitions: type: object properties: name: - type : string + type: string endpoint: - type : string + type: string accessKey: type: string secretKey: @@ -3920,7 +3920,7 @@ definitions: type: object properties: endpoint: - type : string + type: string name: type: string deploymentID: @@ -3934,7 +3934,7 @@ definitions: all: type: boolean sites: - type : array + type: array items: type: string @@ -3961,8 +3961,8 @@ definitions: enabled: type: boolean name: - type: string - sites : + type: string + sites: type: array items: $ref: "#/definitions/peerInfo" @@ -4075,7 +4075,7 @@ definitions: type: string service: type: string - enum: [replication] + enum: [ replication ] syncMode: type: string bandwidth: diff --git a/swagger-operator.yml b/swagger-operator.yml index 529604b07..32c58d6d2 100644 --- a/swagger-operator.yml +++ b/swagger-operator.yml @@ -37,7 +37,7 @@ paths: # Exclude this API from the authentication requirement security: [ ] tags: - - UserAPI + - Auth /login/operator: post: summary: Login to Operator Console. @@ -57,7 +57,7 @@ paths: $ref: "#/definitions/error" security: [ ] tags: - - UserAPI + - Auth /login/oauth2/auth: post: @@ -78,7 +78,7 @@ paths: $ref: "#/definitions/error" security: [ ] tags: - - UserAPI + - Auth /logout: post: @@ -92,7 +92,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Auth /session: get: @@ -108,7 +108,7 @@ paths: schema: $ref: "#/definitions/error" tags: - - UserAPI + - Auth /check-version: get: @@ -1268,7 +1268,7 @@ definitions: properties: loginStrategy: type: string - enum: [form, redirect, service-account, redirect-service-account] + enum: [ form, redirect, service-account, redirect-service-account ] redirect: type: string loginRequest: