-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #95 from zheng1/master
Bugfix: attach and detach not work
- Loading branch information
Showing
7 changed files
with
119 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,51 @@ | ||
| package executor | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "github.com/yunify/qingcloud-cloud-controller-manager/pkg/errors" | ||
| "github.com/yunify/qingcloud-sdk-go/service" | ||
| ) | ||
|
|
||
| func AddTagsToResource(tagapi *service.TagService, tags []string, resourceID string, resourceType string) error { | ||
| func AttachTagsToResources(tagapi *service.TagService, tags []string, resourceIDs []string, resourceType string) error { | ||
| input := &service.AttachTagsInput{} | ||
| for _, tag := range tags { | ||
| p := &service.ResourceTagPair{ | ||
| ResourceID: &resourceID, | ||
| TagID: service.String(tag), | ||
| ResourceType: &resourceType, | ||
| for _, resourceID := range resourceIDs { | ||
| p := &service.ResourceTagPair{ | ||
| ResourceID: &resourceID, | ||
| TagID: service.String(tag), | ||
| ResourceType: &resourceType, | ||
| } | ||
| input.ResourceTagPairs = append(input.ResourceTagPairs, p) | ||
| } | ||
| input.ResourceTagPairs = append(input.ResourceTagPairs, p) | ||
| } | ||
| output, err := tagapi.AttachTags(input) | ||
| if err != nil { | ||
| return errors.NewCommonServerError("tag", resourceID, "AddTagsToResource", err.Error()) | ||
| return errors.NewCommonServerError("tag", fmt.Sprintf("%v", resourceIDs), "AttachTagsToResources", err.Error()) | ||
| } | ||
| if *output.RetCode != 0 { | ||
| return errors.NewCommonServerError("tag", resourceID, "AddTagsToResource", *output.Message) | ||
| return errors.NewCommonServerError("tag", fmt.Sprintf("%v", resourceIDs), "AttachTagsToResources", *output.Message) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func DetachTagsFromResources(tagapi *service.TagService, tags []string, resourceIDs []string, resourceType string) error { | ||
| input := &service.DetachTagsInput{} | ||
| for _, tag := range tags { | ||
| for _, resourceID := range resourceIDs { | ||
| p := &service.ResourceTagPair{ | ||
| ResourceID: &resourceID, | ||
| TagID: service.String(tag), | ||
| ResourceType: &resourceType, | ||
| } | ||
| input.ResourceTagPairs = append(input.ResourceTagPairs, p) | ||
| } | ||
| } | ||
| output, err := tagapi.DetachTags(input) | ||
| if err != nil { | ||
| return errors.NewCommonServerError("tag", fmt.Sprintf("%v", resourceIDs), "DetachTagsFromResources", err.Error()) | ||
| } | ||
| if *output.RetCode != 0 { | ||
| return errors.NewCommonServerError("tag", fmt.Sprintf("%v", resourceIDs), "DetachTagsFromResources", *output.Message) | ||
| } | ||
| return nil | ||
| } |