Implements remove user API (#42)

* Implementation of RemoveUser from madmin

* Added removeUser structure.

* Added removeUserResponse actions

* Added delete API to swagger

* Added tests to removeUser functions

* Removed extra space at EOF

* Changed context to be a parameter in admin_users functions

Co-authored-by: Benjamin Perez <benjamin@bexsoft.net>

restapi/admin_users.go

@@ -46,14 +46,21 @@ func registerUsersHandlers(api *operations.McsAPI) {
 		}
 		return admin_api.NewAddUserCreated().WithPayload(userResponse)
 	})
+	// Remove User
+	api.AdminAPIRemoveUserHandler = admin_api.RemoveUserHandlerFunc(func(params admin_api.RemoveUserParams, principal *models.Principal) middleware.Responder {
+		err := getRemoveUserResponse(params)
+		if err != nil {
+			return admin_api.NewRemoveUserDefault(500).WithPayload(&models.Error{Code: 500, Message: swag.String(err.Error())})
+		}
+		return admin_api.NewRemoveUserNoContent()
+	})
 }
 
-func listUsers(client MinioAdmin) ([]*models.User, error) {
+func listUsers(ctx context.Context, client MinioAdmin) ([]*models.User, error) {
 
 	// Get list of all users in the MinIO
 	// This call requires explicit authentication, no anonymous requests are
 	// allowed for listing users.
-	ctx := context.Background()
 	userMap, err := client.listUsers(ctx)
 	if err != nil {
 		return []*models.User{}, err
@@ -75,6 +82,7 @@ func listUsers(client MinioAdmin) ([]*models.User, error) {
 
 // getListUsersResponse performs listUsers() and serializes it to the handler's output
 func getListUsersResponse() (*models.ListUsersResponse, error) {
+	ctx := context.Background()
 	mAdmin, err := newMAdminClient()
 	if err != nil {
 		log.Println("error creating Madmin Client:", err)
@@ -84,7 +92,7 @@ func getListUsersResponse() (*models.ListUsersResponse, error) {
 	// defining the client to be used
 	adminClient := adminClient{client: mAdmin}
 
-	users, err := listUsers(adminClient)
+	users, err := listUsers(ctx, adminClient)
 	if err != nil {
 		log.Println("error listing users:", err)
 		return nil, err
@@ -97,9 +105,8 @@ func getListUsersResponse() (*models.ListUsersResponse, error) {
 }
 
 // addUser invokes adding a users on `MinioAdmin` and builds the response `models.User`
-func addUser(client MinioAdmin, accessKey, secretKey *string) (*models.User, error) {
+func addUser(ctx context.Context, client MinioAdmin, accessKey, secretKey *string) (*models.User, error) {
 	// Calls into MinIO to add a new user if there's an error return it
-	ctx := context.Background()
 	err := client.addUser(ctx, *accessKey, *secretKey)
 	if err != nil {
 		return nil, err
@@ -113,6 +120,7 @@ func addUser(client MinioAdmin, accessKey, secretKey *string) (*models.User, err
 }
 
 func getUserAddResponse(params admin_api.AddUserParams) (*models.User, error) {
+	ctx := context.Background()
 	mAdmin, err := newMAdminClient()
 	if err != nil {
 		log.Println("error creating Madmin Client:", err)
@@ -122,10 +130,40 @@ func getUserAddResponse(params admin_api.AddUserParams) (*models.User, error) {
 	// defining the client to be used
 	adminClient := adminClient{client: mAdmin}
 
-	user, err := addUser(adminClient, params.Body.AccessKey, params.Body.SecretKey)
+	user, err := addUser(ctx, adminClient, params.Body.AccessKey, params.Body.SecretKey)
 	if err != nil {
 		log.Println("error adding user:", err)
 		return nil, err
 	}
 	return user, nil
 }
+
+//removeUser invokes removing an user on `MinioAdmin`, then we return the response from API
+func removeUser(ctx context.Context, client MinioAdmin, accessKey string) error {
+	if err := client.removeUser(ctx, accessKey); err != nil {
+		return err
+	}
+	return nil
+}
+
+func getRemoveUserResponse(params admin_api.RemoveUserParams) error {
+	ctx := context.Background()
+
+	mAdmin, err := newMAdminClient()
+	if err != nil {
+		log.Println("error creating Madmin Client:", err)
+		return err
+	}
+
+	// create a minioClient interface implementation
+	// defining the client to be used
+	adminClient := adminClient{client: mAdmin}
+
+	if err := removeUser(ctx, adminClient, params.Name); err != nil {
+		log.Println("error removing user:", err)
+		return err
+	}
+
+	log.Println("User removed successfully:", params.Name)
+	return nil
+}

restapi/admin_users_test.go

@@ -31,6 +31,7 @@ import (
 // assigning mock at runtime instead of compile time
 var minioListUsersMock func() (map[string]madmin.UserInfo, error)
 var minioAddUserMock func(accessKey, secreyKey string) error
+var minioRemoveUserMock func(accessKey string) error
 
 // mock function of listUsers()
 func (ac adminClientMock) listUsers(ctx context.Context) (map[string]madmin.UserInfo, error) {
@@ -42,9 +43,15 @@ func (ac adminClientMock) addUser(ctx context.Context, accessKey, secretKey stri
 	return minioAddUserMock(accessKey, secretKey)
 }
 
+// mock function of removeUser()
+func (ac adminClientMock) removeUser(ctx context.Context, accessKey string) error {
+	return minioRemoveUserMock(accessKey)
+}
+
 func TestListUsers(t *testing.T) {
 	assert := asrt.New(t)
 	adminClient := adminClientMock{}
+	ctx := context.Background()
 	// Test-1 : listUsers() Get response from minio client with two users and return the same number on listUsers()
 	// mock minIO client
 	mockUserMap := map[string]madmin.UserInfo{
@@ -69,7 +76,7 @@ func TestListUsers(t *testing.T) {
 	// get list users response this response should have Name, CreationDate, Size and Access
 	// as part of of each user
 	function := "listUsers()"
-	userMap, err := listUsers(adminClient)
+	userMap, err := listUsers(ctx, adminClient)
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
 	}
@@ -87,7 +94,7 @@ func TestListUsers(t *testing.T) {
 	minioListUsersMock = func() (map[string]madmin.UserInfo, error) {
 		return nil, errors.New("error")
 	}
-	_, err = listUsers(adminClient)
+	_, err = listUsers(ctx, adminClient)
 	if assert.Error(err) {
 		assert.Equal("error", err.Error())
 	}
@@ -96,7 +103,7 @@ func TestListUsers(t *testing.T) {
 func TestAddUser(t *testing.T) {
 	assert := asrt.New(t)
 	adminClient := adminClientMock{}
-
+	ctx := context.Background()
 	// Test-1: valid case of adding a user with a proper access key
 	accessKey := "ABCDEFGHI"
 	secretKey := "ABCDEFGHIABCDEFGHI"
@@ -107,7 +114,7 @@ func TestAddUser(t *testing.T) {
 	}
 	// adds a valid user to MinIO
 	function := "addUser()"
-	user, err := addUser(adminClient, &accessKey, &secretKey)
+	user, err := addUser(ctx, adminClient, &accessKey, &secretKey)
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
 	}
@@ -124,7 +131,7 @@ func TestAddUser(t *testing.T) {
 		return errors.New("error")
 	}
 
-	user, err = addUser(adminClient, &accessKey, &secretKey)
+	user, err = addUser(ctx, adminClient, &accessKey, &secretKey)
 
 	// no error should have been returned
 	assert.Nil(user, "User is not null")
@@ -134,3 +141,31 @@ func TestAddUser(t *testing.T) {
 		assert.Equal("error", err.Error())
 	}
 }
+
+func TestRemoveUser(t *testing.T) {
+	assert := asrt.New(t)
+	// mock minIO client
+	adminClient := adminClientMock{}
+	ctx := context.Background()
+	function := "removeUser()"
+
+	// Test-1: removeUser() delete a user
+	// mock function response from removeUser(accessKey)
+	minioRemoveUserMock = func(accessKey string) error {
+		return nil
+	}
+
+	if err := removeUser(ctx, adminClient, "ABCDEFGHI"); err != nil {
+		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
+	}
+
+	// Test-2: removeUser() make sure errors are handled correctly when error on DeleteUser()
+	// mock function response from removeUser(accessKey)
+	minioRemoveUserMock = func(accessKey string) error {
+		return errors.New("error")
+	}
+
+	if err := removeUser(ctx, adminClient, "notexistentuser"); assert.Error(err) {
+		assert.Equal("error", err.Error())
+	}
+}

restapi/client-admin.go

@@ -57,6 +57,7 @@ var s3AdminNew = mcCmd.NewAdminFactory()
 type MinioAdmin interface {
 	listUsers(ctx context.Context) (map[string]madmin.UserInfo, error)
 	addUser(ctx context.Context, acessKey, SecretKey string) error
+	removeUser(ctx context.Context, accessKey string) error
 	listGroups(ctx context.Context) ([]string, error)
 	updateGroupMembers(ctx context.Context, greq madmin.GroupAddRemove) error
 	getGroupDescription(ctx context.Context, group string) (*madmin.GroupDesc, error)
@@ -93,6 +94,11 @@ func (ac adminClient) addUser(ctx context.Context, acessKey, secretKey string) e
 	return ac.client.AddUser(ctx, acessKey, secretKey)
 }
 
+// implements madmin.RemoveUser()
+func (ac adminClient) removeUser(ctx context.Context, accessKey string) error {
+	return ac.client.RemoveUser(ctx, accessKey)
+}
+
 // implements madmin.ListGroups()
 func (ac adminClient) listGroups(ctx context.Context) ([]string, error) {
 	return ac.client.ListGroups(ctx)

restapi/embedded_spec.go

@@ -987,6 +987,34 @@ func init() {
           }
         }
       }
+    },
+    "/users/{name}": {
+      "delete": {
+        "tags": [
+          "AdminAPI"
+        ],
+        "summary": "Remove user",
+        "operationId": "RemoveUser",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "A successful response."
+          },
+          "default": {
+            "description": "Generic error response.",
+            "schema": {
+              "$ref": "#/definitions/error"
+            }
+          }
+        }
+      }
     }
   },
   "definitions": {
@@ -2522,6 +2550,34 @@ func init() {
           }
         }
       }
+    },
+    "/users/{name}": {
+      "delete": {
+        "tags": [
+          "AdminAPI"
+        ],
+        "summary": "Remove user",
+        "operationId": "RemoveUser",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "name",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "A successful response."
+          },
+          "default": {
+            "description": "Generic error response.",
+            "schema": {
+              "$ref": "#/definitions/error"
+            }
+          }
+        }
+      }
     }
   },
   "definitions": {

restapi/operations/admin_api/remove_user.go

@@ -0,0 +1,90 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+package admin_api
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime/middleware"
+
+	"github.com/minio/mcs/models"
+)
+
+// RemoveUserHandlerFunc turns a function with the right signature into a remove user handler
+type RemoveUserHandlerFunc func(RemoveUserParams, *models.Principal) middleware.Responder
+
+// Handle executing the request and returning a response
+func (fn RemoveUserHandlerFunc) Handle(params RemoveUserParams, principal *models.Principal) middleware.Responder {
+	return fn(params, principal)
+}
+
+// RemoveUserHandler interface for that can handle valid remove user params
+type RemoveUserHandler interface {
+	Handle(RemoveUserParams, *models.Principal) middleware.Responder
+}
+
+// NewRemoveUser creates a new http.Handler for the remove user operation
+func NewRemoveUser(ctx *middleware.Context, handler RemoveUserHandler) *RemoveUser {
+	return &RemoveUser{Context: ctx, Handler: handler}
+}
+
+/*RemoveUser swagger:route DELETE /users/{name} AdminAPI removeUser
+
+Remove user
+
+*/
+type RemoveUser struct {
+	Context *middleware.Context
+	Handler RemoveUserHandler
+}
+
+func (o *RemoveUser) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	route, rCtx, _ := o.Context.RouteInfo(r)
+	if rCtx != nil {
+		r = rCtx
+	}
+	var Params = NewRemoveUserParams()
+
+	uprinc, aCtx, err := o.Context.Authorize(r, route)
+	if err != nil {
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+	if aCtx != nil {
+		r = aCtx
+	}
+	var principal *models.Principal
+	if uprinc != nil {
+		principal = uprinc.(*models.Principal) // this is really a models.Principal, I promise
+	}
+
+	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+
+	res := o.Handler.Handle(Params, principal) // actually handle the request
+
+	o.Context.Respond(rw, r, route.Produces, route, res)
+
+}

restapi/operations/admin_api/remove_user_parameters.go

@@ -0,0 +1,89 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+package admin_api
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+)
+
+// NewRemoveUserParams creates a new RemoveUserParams object
+// no default values defined in spec.
+func NewRemoveUserParams() RemoveUserParams {
+
+	return RemoveUserParams{}
+}
+
+// RemoveUserParams contains all the bound params for the remove user operation
+// typically these are obtained from a http.Request
+//
+// swagger:parameters RemoveUser
+type RemoveUserParams struct {
+
+	// HTTP Request Object
+	HTTPRequest *http.Request `json:"-"`
+
+	/*
+	  Required: true
+	  In: path
+	*/
+	Name string
+}
+
+// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
+// for simple values it will use straight method calls.
+//
+// To ensure default values, the struct must have been initialized with NewRemoveUserParams() beforehand.
+func (o *RemoveUserParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
+	var res []error
+
+	o.HTTPRequest = r
+
+	rName, rhkName, _ := route.Params.GetOK("name")
+	if err := o.bindName(rName, rhkName, route.Formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+// bindName binds and validates parameter Name from path.
+func (o *RemoveUserParams) bindName(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: true
+	// Parameter is provided by construction from the route
+
+	o.Name = raw
+
+	return nil
+}

restapi/operations/admin_api/remove_user_responses.go

@@ -0,0 +1,113 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+package admin_api
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime"
+
+	"github.com/minio/mcs/models"
+)
+
+// RemoveUserNoContentCode is the HTTP code returned for type RemoveUserNoContent
+const RemoveUserNoContentCode int = 204
+
+/*RemoveUserNoContent A successful response.
+
+swagger:response removeUserNoContent
+*/
+type RemoveUserNoContent struct {
+}
+
+// NewRemoveUserNoContent creates RemoveUserNoContent with default headers values
+func NewRemoveUserNoContent() *RemoveUserNoContent {
+
+	return &RemoveUserNoContent{}
+}
+
+// WriteResponse to the client
+func (o *RemoveUserNoContent) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(204)
+}
+
+/*RemoveUserDefault Generic error response.
+
+swagger:response removeUserDefault
+*/
+type RemoveUserDefault struct {
+	_statusCode int
+
+	/*
+	  In: Body
+	*/
+	Payload *models.Error `json:"body,omitempty"`
+}
+
+// NewRemoveUserDefault creates RemoveUserDefault with default headers values
+func NewRemoveUserDefault(code int) *RemoveUserDefault {
+	if code <= 0 {
+		code = 500
+	}
+
+	return &RemoveUserDefault{
+		_statusCode: code,
+	}
+}
+
+// WithStatusCode adds the status to the remove user default response
+func (o *RemoveUserDefault) WithStatusCode(code int) *RemoveUserDefault {
+	o._statusCode = code
+	return o
+}
+
+// SetStatusCode sets the status to the remove user default response
+func (o *RemoveUserDefault) SetStatusCode(code int) {
+	o._statusCode = code
+}
+
+// WithPayload adds the payload to the remove user default response
+func (o *RemoveUserDefault) WithPayload(payload *models.Error) *RemoveUserDefault {
+	o.Payload = payload
+	return o
+}
+
+// SetPayload sets the payload to the remove user default response
+func (o *RemoveUserDefault) SetPayload(payload *models.Error) {
+	o.Payload = payload
+}
+
+// WriteResponse to the client
+func (o *RemoveUserDefault) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.WriteHeader(o._statusCode)
+	if o.Payload != nil {
+		payload := o.Payload
+		if err := producer.Produce(rw, payload); err != nil {
+			panic(err) // let the recovery middleware deal with this
+		}
+	}
+}

restapi/operations/admin_api/remove_user_urlbuilder.go

@@ -0,0 +1,116 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+package admin_api
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"errors"
+	"net/url"
+	golangswaggerpaths "path"
+	"strings"
+)
+
+// RemoveUserURL generates an URL for the remove user operation
+type RemoveUserURL struct {
+	Name string
+
+	_basePath string
+	// avoid unkeyed usage
+	_ struct{}
+}
+
+// WithBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *RemoveUserURL) WithBasePath(bp string) *RemoveUserURL {
+	o.SetBasePath(bp)
+	return o
+}
+
+// SetBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *RemoveUserURL) SetBasePath(bp string) {
+	o._basePath = bp
+}
+
+// Build a url path and query string
+func (o *RemoveUserURL) Build() (*url.URL, error) {
+	var _result url.URL
+
+	var _path = "/users/{name}"
+
+	name := o.Name
+	if name != "" {
+		_path = strings.Replace(_path, "{name}", name, -1)
+	} else {
+		return nil, errors.New("name is required on RemoveUserURL")
+	}
+
+	_basePath := o._basePath
+	if _basePath == "" {
+		_basePath = "/api/v1"
+	}
+	_result.Path = golangswaggerpaths.Join(_basePath, _path)
+
+	return &_result, nil
+}
+
+// Must is a helper function to panic when the url builder returns an error
+func (o *RemoveUserURL) Must(u *url.URL, err error) *url.URL {
+	if err != nil {
+		panic(err)
+	}
+	if u == nil {
+		panic("url can't be nil")
+	}
+	return u
+}
+
+// String returns the string representation of the path with query string
+func (o *RemoveUserURL) String() string {
+	return o.Must(o.Build()).String()
+}
+
+// BuildFull builds a full url with scheme, host, path and query string
+func (o *RemoveUserURL) BuildFull(scheme, host string) (*url.URL, error) {
+	if scheme == "" {
+		return nil, errors.New("scheme is required for a full url on RemoveUserURL")
+	}
+	if host == "" {
+		return nil, errors.New("host is required for a full url on RemoveUserURL")
+	}
+
+	base, err := o.Build()
+	if err != nil {
+		return nil, err
+	}
+
+	base.Scheme = scheme
+	base.Host = host
+	return base, nil
+}
+
+// StringFull returns the string representation of a complete url
+func (o *RemoveUserURL) StringFull(scheme, host string) string {
+	return o.Must(o.BuildFull(scheme, host)).String()
+}

restapi/operations/mcs_api.go

@@ -138,6 +138,9 @@ func NewMcsAPI(spec *loads.Document) *McsAPI {
 		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")
 		}),
+		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")
+		}),
 		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")
 		}),
@@ -252,6 +255,8 @@ type McsAPI struct {
 	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
 	// AdminAPIRestartServiceHandler sets the operation handler for the restart service operation
 	AdminAPIRestartServiceHandler admin_api.RestartServiceHandler
 	// UserAPISessionCheckHandler sets the operation handler for the session check operation
@@ -410,6 +415,9 @@ func (o *McsAPI) Validate() error {
 	if o.AdminAPIRemovePolicyHandler == nil {
 		unregistered = append(unregistered, "admin_api.RemovePolicyHandler")
 	}
+	if o.AdminAPIRemoveUserHandler == nil {
+		unregistered = append(unregistered, "admin_api.RemoveUserHandler")
+	}
 	if o.AdminAPIRestartServiceHandler == nil {
 		unregistered = append(unregistered, "admin_api.RestartServiceHandler")
 	}
@@ -625,6 +633,10 @@ func (o *McsAPI) initHandlerCache() {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/policies/{name}"] = admin_api.NewRemovePolicy(o.context, o.AdminAPIRemovePolicyHandler)
+	if o.handlers["DELETE"] == nil {
+		o.handlers["DELETE"] = make(map[string]http.Handler)
+	}
+	o.handlers["DELETE"]["/users/{name}"] = admin_api.NewRemoveUser(o.context, o.AdminAPIRemoveUserHandler)
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}

swagger.yml

@@ -228,6 +228,24 @@ paths:
             $ref: "#/definitions/error"
       tags:
         - AdminAPI
+  /users/{name}:
+    delete:
+      summary: Remove user
+      operationId: RemoveUser
+      parameters:
+        - name: name
+          in: path
+          required: true
+          type: string
+      responses:
+        204:
+          description: A successful response.
+        default:
+          description: Generic error response.
+          schema:
+            $ref: "#/definitions/error"
+      tags:
+        - AdminAPI
   /groups:
     get:
       summary: List Groups