Skip to content

fix: gaap realserver tags #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2022
Merged

fix: gaap realserver tags #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions tencentcloud/resource_tc_gaap_realserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,6 @@ func resourceTencentCloudGaapRealserverCreate(d *schema.ResourceData, m interfac

name := d.Get("name").(string)
projectId := d.Get("project_id").(int)

tags := helper.GetTags(d, "tags")

service := GaapService{client: m.(*TencentCloudClient).apiV3Conn}

realservers, err := service.DescribeRealservers(ctx, &address, nil, nil, -1)
Expand All @@ -121,11 +118,20 @@ func resourceTencentCloudGaapRealserverCreate(d *schema.ResourceData, m interfac
return fmt.Errorf("the realserver with ip/domain %s already exists", address)
}

id, err := service.CreateRealserver(ctx, address, name, projectId, tags)
id, err := service.CreateRealserver(ctx, address, name, projectId)
if err != nil {
return err
}

if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
tagClient := m.(*TencentCloudClient).apiV3Conn
tagService := &TagService{client: tagClient}
resourceName := BuildTagResourceName("gaap", "realServer", tagClient.Region, id)
if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
return err
}
}

d.SetId(id)

return resourceTencentCloudGaapRealserverRead(d, m)
Expand Down Expand Up @@ -183,14 +189,13 @@ func resourceTencentCloudGaapRealserverRead(d *schema.ResourceData, m interface{
}
_ = d.Set("project_id", realserver.ProjectId)

respTags := make(map[string]string, len(realserver.TagSet))
for _, tag := range realserver.TagSet {
if tag.TagKey == nil || tag.TagValue == nil {
return errors.New("realserver tag key or value is nil")
}
respTags[*tag.TagKey] = *tag.TagValue
tagClient := m.(*TencentCloudClient).apiV3Conn
tagService := TagService{client: tagClient}
tags, err := tagService.DescribeResourceTags(ctx, "gaap", "realServer", tagClient.Region, id)
if err != nil {
return err
}
_ = d.Set("tags", respTags)
_ = d.Set("tags", tags)

return nil
}
Expand Down Expand Up @@ -223,7 +228,7 @@ func resourceTencentCloudGaapRealserverUpdate(d *schema.ResourceData, m interfac
tagService := TagService{client: m.(*TencentCloudClient).apiV3Conn}

region := m.(*TencentCloudClient).apiV3Conn.Region
resourceName := fmt.Sprintf("qcs::gaap:%s:uin/:realserver/%s", region, id)
resourceName := BuildTagResourceName("gaap", "realServer", region, id)

if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
return err
Expand Down
4 changes: 1 addition & 3 deletions tencentcloud/resource_tc_gaap_realserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"fmt"
"strconv"
"testing"
"time"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down Expand Up @@ -117,8 +116,7 @@ func TestAccTencentCloudGaapRealserver_updateTags(t *testing.T) {
),
},
{
PreConfig: func() { time.Sleep(time.Duration(time.Second * 10)) },
Config: testAccGaapRealserverUpdateTags,
Config: testAccGaapRealserverUpdateTags,
Check: resource.ComposeTestCheckFunc(
testAccCheckGaapRealserverExists("tencentcloud_gaap_realserver.foo", id),
resource.TestCheckResourceAttr("tencentcloud_gaap_realserver.foo", "tags.test", "test"),
Expand Down
8 changes: 1 addition & 7 deletions tencentcloud/service_tencentcloud_gaap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,13 @@ type GaapService struct {
client *connectivity.TencentCloudClient
}

func (me *GaapService) CreateRealserver(ctx context.Context, address, name string, projectId int, tags map[string]string) (id string, err error) {
func (me *GaapService) CreateRealserver(ctx context.Context, address, name string, projectId int) (id string, err error) {
logId := getLogId(ctx)

request := gaap.NewAddRealServersRequest()
request.RealServerName = &name
request.RealServerIP = []*string{&address}
request.ProjectId = helper.IntUint64(projectId)
for k, v := range tags {
request.TagSet = append(request.TagSet, &gaap.TagPair{
TagKey: helper.String(k),
TagValue: helper.String(v),
})
}

if err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
Expand Down