Skip to content

tcr support modify tags #669

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
Sep 23, 2021
Merged

tcr support modify tags #669

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
26 changes: 23 additions & 3 deletions tencentcloud/resource_tc_tcr_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ func resourceTencentCloudTcrInstance() *schema.Resource {
"tags": {
Type: schema.TypeMap,
Optional: true,
ForceNew: true,
Description: "The available tags within this TCR instance.",
},
"open_public_operation": {
Expand Down Expand Up @@ -110,15 +109,14 @@ func resourceTencentCloudTcrInstanceCreate(d *schema.ResourceData, meta interfac
var (
name = d.Get("name").(string)
insType = d.Get("instance_type").(string)
tags = helper.GetTags(d, "tags")
outErr, inErr error
instanceId string
instanceStatus string
operation bool
)

outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
instanceId, inErr = tcrService.CreateTCRInstance(ctx, name, insType, tags)
instanceId, inErr = tcrService.CreateTCRInstance(ctx, name, insType, map[string]string{})
if inErr != nil {
return retryError(inErr)
}
Expand Down Expand Up @@ -168,6 +166,15 @@ func resourceTencentCloudTcrInstanceCreate(d *schema.ResourceData, meta interfac
}
}

if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
tagService := TagService{client: meta.(*TencentCloudClient).apiV3Conn}
region := meta.(*TencentCloudClient).apiV3Conn.Region
resourceName := BuildTagResourceName("tcr", "instance", region, d.Id())
if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
return err
}
}

return resourceTencentCloudTcrInstanceRead(d, meta)
}

Expand Down Expand Up @@ -269,6 +276,19 @@ func resourceTencentCloudTcrInstanceUpdate(d *schema.ResourceData, meta interfac
return outErr
}
}

if d.HasChange("tags") {
oldTags, newTags := d.GetChange("tags")
replaceTags, deleteTags := diffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))
region := meta.(*TencentCloudClient).apiV3Conn.Region
resourceName := BuildTagResourceName("tcr", "instance", region, d.Id())
tagService := TagService{client: meta.(*TencentCloudClient).apiV3Conn}
if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
return err
}

d.SetPartial("tags")
}
return resourceTencentCloudTcrInstanceRead(d, meta)
}

Expand Down