From 4a0439da82e58a41deb11ba48dc76ef60af3e5d1 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Sat, 15 Aug 2020 20:54:22 +0800 Subject: [PATCH] fix: allow delete shared role and policy --- pkg/keystone/models/policies.go | 6 +++--- pkg/keystone/models/roles.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/keystone/models/policies.go b/pkg/keystone/models/policies.go index 2446e2fb8a..9e19f75da7 100644 --- a/pkg/keystone/models/policies.go +++ b/pkg/keystone/models/policies.go @@ -263,9 +263,9 @@ func (policy *SPolicy) Delete(ctx context.Context, userCred mcclient.TokenCreden } func (policy *SPolicy) ValidateDeleteCondition(ctx context.Context) error { - if policy.IsShared() { - return httperrors.NewInvalidStatusError("cannot delete shared policy") - } + // if policy.IsShared() { + // return httperrors.NewInvalidStatusError("cannot delete shared policy") + // } if policy.Enabled.IsTrue() { return httperrors.NewInvalidStatusError("cannot delete enabled policy") } diff --git a/pkg/keystone/models/roles.go b/pkg/keystone/models/roles.go index 82f2272a0d..46af0d0bff 100644 --- a/pkg/keystone/models/roles.go +++ b/pkg/keystone/models/roles.go @@ -188,9 +188,9 @@ func (role *SRole) IsSystemRole() bool { } func (role *SRole) ValidateDeleteCondition(ctx context.Context) error { - if role.IsShared() { - return httperrors.NewInvalidStatusError("cannot delete shared role") - } + // if role.IsShared() { + // return httperrors.NewInvalidStatusError("cannot delete shared role") + // } if role.IsSystemRole() { return httperrors.NewForbiddenError("cannot delete system role") }