opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11340 from ioito/hotfix/qx-huawei-group-role

Browse Source 
fix(cloudid): huawei group role attach and detach
This commit is contained in:
Zexi Li
2021-06-08 23:14:58 +08:00
committed by GitHub
parent 044227f20c 85f3ddc3f7
commit 893030a080
3 changed files with 82 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/huawei/client/modules/mod_groups.go
+39
View File
@@ -17,6 +17,9 @@ package modules
import (
"fmt"
"yunion.io/x/pkg/errors"
"yunion.io/x/onecloud/pkg/cloudprovider"
"yunion.io/x/onecloud/pkg/multicloud/huawei/client/auth"
"yunion.io/x/onecloud/pkg/multicloud/huawei/client/responses"
)
@@ -50,6 +53,24 @@ func (manager *SGroupManager) ListRoles(domainId string, groupId string) (*respo
return manager.ListInContextWithSpec(nil, fmt.Sprintf("%s/roles", groupId), nil, "roles")
}
func (manager *SGroupManager) DeleteProjectRole(projectId, groupId, roleId string) error {
if len(projectId) == 0 {
return fmt.Errorf("missing projectId")
}
if len(groupId) == 0 {
return fmt.Errorf("missing groupId")
}
if len(roleId) == 0 {
return fmt.Errorf("missing roleId")
}
manager.SetVersion(fmt.Sprintf("v3/projects/%s", projectId))
_, err := manager.DeleteInContextWithSpec(nil, groupId, fmt.Sprintf("roles/%s", roleId), nil, nil, "")
if err != nil && errors.Cause(err) == cloudprovider.ErrNotFound {
return nil
}
return err
}
func (manager *SGroupManager) DeleteRole(domainId string, groupId, roleId string) error {
if len(domainId) == 0 {
return fmt.Errorf("missing domainId")
@@ -62,6 +83,24 @@ func (manager *SGroupManager) DeleteRole(domainId string, groupId, roleId string
}
manager.SetVersion(fmt.Sprintf("v3/domains/%s", domainId))
_, err := manager.DeleteInContextWithSpec(nil, groupId, fmt.Sprintf("roles/%s", roleId), nil, nil, "")
if err != nil && errors.Cause(err) == cloudprovider.ErrNotFound {
return nil
}
return err
}
func (manager *SGroupManager) AddProjectRole(projectId string, groupId, roleId string) error {
if len(projectId) == 0 {
return fmt.Errorf("missing projectId")
}
if len(groupId) == 0 {
return fmt.Errorf("missing groupId")
}
if len(roleId) == 0 {
return fmt.Errorf("missing roleId")
}
manager.SetVersion(fmt.Sprintf("v3/projects/%s", projectId))
_, err := manager.UpdateInContextWithSpec(nil, groupId, fmt.Sprintf("roles/%s", roleId), nil, "")
return err
}
pkg/multicloud/huawei/cloudgroup.go
+30 -2
View File
@@ -257,7 +257,21 @@ func (self *SHuaweiClient) DetachGroupRole(groupId, roleId string) error {
if err != nil {
return errors.Wrap(err, "newGeneralAPIClient")
}
return client.Groups.DeleteRole(self.ownerId, groupId, roleId)
err = client.Groups.DeleteRole(self.ownerId, groupId, roleId)
if err != nil {
return errors.Wrapf(err, "DeleteRole")
}
projects, err := self.GetProjects()
if err != nil {
return errors.Wrapf(err, "GetProjects")
}
for _, project := range projects {
err = client.Groups.DeleteProjectRole(project.ID, groupId, roleId)
if err != nil {
return errors.Wrapf(err, "DeleteProjectRole")
}
}
return nil
}
func (self *SHuaweiClient) AttachGroupRole(groupId, roleId string) error {
@@ -265,5 +279,19 @@ func (self *SHuaweiClient) AttachGroupRole(groupId, roleId string) error {
if err != nil {
return errors.Wrap(err, "newGeneralAPIClient")
}
return client.Groups.AddRole(self.ownerId, groupId, roleId)
err = client.Groups.AddRole(self.ownerId, groupId, roleId)
if err != nil {
return errors.Wrapf(err, "AddRole")
}
projects, err := self.GetProjects()
if err != nil {
return errors.Wrapf(err, "GetProjects")
}
for _, project := range projects {
err = client.Groups.AddProjectRole(project.ID, groupId, roleId)
if err != nil {
return errors.Wrapf(err, "AddProjectRole")
}
}
return nil
}
pkg/multicloud/huawei/shell/cloudgroup.go
+13
View File
@@ -68,6 +68,19 @@ func init() {
return nil
})
type GroupRoleOptions struct {
GROUP_ID string
ROLE_ID string
}
shellutils.R(&GroupRoleOptions{}, "cloud-group-detach-policy", "Detach group role", func(cli *huawei.SRegion, args *GroupRoleOptions) error {
return cli.GetClient().DetachGroupRole(args.GROUP_ID, args.ROLE_ID)
})
shellutils.R(&GroupRoleOptions{}, "cloud-group-attach-policy", "Detach group role", func(cli *huawei.SRegion, args *GroupRoleOptions) error {
return cli.GetClient().AttachGroupRole(args.GROUP_ID, args.ROLE_ID)
})
type GroupUserListOptions struct {
GROUP_ID string
}