From 17543cfef63a1d040a2234bd63b210fb9c4f6015 Mon Sep 17 00:00:00 2001 From: hackerman <3372410+aeneasr@users.noreply.github.com> Date: Thu, 2 Apr 2020 10:45:14 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20use=20correct=20response=20mode=20for=20?= =?UTF-8?q?removeOryAccessControlPolicyRoleMe=E2=80=A6=20(#161)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/api.swagger.json | 2 +- engine/ladon/handler.go | 2 +- .../client/engines/engines_client.go | 6 +++--- ...s_control_policy_role_members_responses.go | 20 +++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/api.swagger.json b/docs/api.swagger.json index 8f34786af..339ca844e 100755 --- a/docs/api.swagger.json +++ b/docs/api.swagger.json @@ -925,7 +925,7 @@ } ], "responses": { - "201": { + "200": { "description": "An empty response" }, "500": { diff --git a/engine/ladon/handler.go b/engine/ladon/handler.go index 98691a526..b2e11d65b 100644 --- a/engine/ladon/handler.go +++ b/engine/ladon/handler.go @@ -283,7 +283,7 @@ func (e *Engine) Register(r *httprouter.Router) { // Schemes: http, https // // Responses: - // 201: emptyResponse + // 200: emptyResponse // 500: genericError r.DELETE(BasePath+"/roles/:id/members/:member", e.sh.Upsert(e.rolesMembersRemove)) } diff --git a/internal/httpclient/client/engines/engines_client.go b/internal/httpclient/client/engines/engines_client.go index caef06e16..770860dfa 100644 --- a/internal/httpclient/client/engines/engines_client.go +++ b/internal/httpclient/client/engines/engines_client.go @@ -43,7 +43,7 @@ type ClientService interface { ListOryAccessControlPolicyRoles(params *ListOryAccessControlPolicyRolesParams) (*ListOryAccessControlPolicyRolesOK, error) - RemoveOryAccessControlPolicyRoleMembers(params *RemoveOryAccessControlPolicyRoleMembersParams) (*RemoveOryAccessControlPolicyRoleMembersCreated, error) + RemoveOryAccessControlPolicyRoleMembers(params *RemoveOryAccessControlPolicyRoleMembersParams) (*RemoveOryAccessControlPolicyRoleMembersOK, error) UpsertOryAccessControlPolicy(params *UpsertOryAccessControlPolicyParams) (*UpsertOryAccessControlPolicyOK, error) @@ -346,7 +346,7 @@ func (a *Client) ListOryAccessControlPolicyRoles(params *ListOryAccessControlPol Roles group several subjects into one. Rules can be assigned to ORY Access Control Policy (OACP) by using the Role ID as subject in the OACP. */ -func (a *Client) RemoveOryAccessControlPolicyRoleMembers(params *RemoveOryAccessControlPolicyRoleMembersParams) (*RemoveOryAccessControlPolicyRoleMembersCreated, error) { +func (a *Client) RemoveOryAccessControlPolicyRoleMembers(params *RemoveOryAccessControlPolicyRoleMembersParams) (*RemoveOryAccessControlPolicyRoleMembersOK, error) { // TODO: Validate the params before sending if params == nil { params = NewRemoveOryAccessControlPolicyRoleMembersParams() @@ -367,7 +367,7 @@ func (a *Client) RemoveOryAccessControlPolicyRoleMembers(params *RemoveOryAccess if err != nil { return nil, err } - success, ok := result.(*RemoveOryAccessControlPolicyRoleMembersCreated) + success, ok := result.(*RemoveOryAccessControlPolicyRoleMembersOK) if ok { return success, nil } diff --git a/internal/httpclient/client/engines/remove_ory_access_control_policy_role_members_responses.go b/internal/httpclient/client/engines/remove_ory_access_control_policy_role_members_responses.go index eaf9f080e..5dde53d96 100644 --- a/internal/httpclient/client/engines/remove_ory_access_control_policy_role_members_responses.go +++ b/internal/httpclient/client/engines/remove_ory_access_control_policy_role_members_responses.go @@ -22,8 +22,8 @@ type RemoveOryAccessControlPolicyRoleMembersReader struct { // ReadResponse reads a server response into the received o. func (o *RemoveOryAccessControlPolicyRoleMembersReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { switch response.Code() { - case 201: - result := NewRemoveOryAccessControlPolicyRoleMembersCreated() + case 200: + result := NewRemoveOryAccessControlPolicyRoleMembersOK() if err := result.readResponse(response, consumer, o.formats); err != nil { return nil, err } @@ -40,23 +40,23 @@ func (o *RemoveOryAccessControlPolicyRoleMembersReader) ReadResponse(response ru } } -// NewRemoveOryAccessControlPolicyRoleMembersCreated creates a RemoveOryAccessControlPolicyRoleMembersCreated with default headers values -func NewRemoveOryAccessControlPolicyRoleMembersCreated() *RemoveOryAccessControlPolicyRoleMembersCreated { - return &RemoveOryAccessControlPolicyRoleMembersCreated{} +// NewRemoveOryAccessControlPolicyRoleMembersOK creates a RemoveOryAccessControlPolicyRoleMembersOK with default headers values +func NewRemoveOryAccessControlPolicyRoleMembersOK() *RemoveOryAccessControlPolicyRoleMembersOK { + return &RemoveOryAccessControlPolicyRoleMembersOK{} } -/*RemoveOryAccessControlPolicyRoleMembersCreated handles this case with default header values. +/*RemoveOryAccessControlPolicyRoleMembersOK handles this case with default header values. An empty response */ -type RemoveOryAccessControlPolicyRoleMembersCreated struct { +type RemoveOryAccessControlPolicyRoleMembersOK struct { } -func (o *RemoveOryAccessControlPolicyRoleMembersCreated) Error() string { - return fmt.Sprintf("[DELETE /engines/acp/ory/{flavor}/roles/{id}/members/{member}][%d] removeOryAccessControlPolicyRoleMembersCreated ", 201) +func (o *RemoveOryAccessControlPolicyRoleMembersOK) Error() string { + return fmt.Sprintf("[DELETE /engines/acp/ory/{flavor}/roles/{id}/members/{member}][%d] removeOryAccessControlPolicyRoleMembersOK ", 200) } -func (o *RemoveOryAccessControlPolicyRoleMembersCreated) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { +func (o *RemoveOryAccessControlPolicyRoleMembersOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { return nil }