Skip to content

fix(cynosdb): [116884831]modify tag #2674

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 2 commits into from
Jun 11, 2024
Merged

fix(cynosdb): [116884831]modify tag #2674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d41544
fix: modify tag
gitmkn Apr 29, 2024
f6e6899
feat: add changelog
gitmkn Jun 11, 2024
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
3 changes: 3 additions & 0 deletions .changelog/2674.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_cynosdb_cluster: modify tag.
```
6 changes: 3 additions & 3 deletions tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ func resourceTencentCloudCynosdbClusterCreate(d *schema.ResourceData, meta inter

// set tags
if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
resourceName := tccommon.BuildTagResourceName("cynosdb", "cluster", region, id)
resourceName := tccommon.BuildTagResourceName("cynosdb", "instance", region, id)
if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
return err
}
Expand Down Expand Up @@ -352,7 +352,7 @@ func resourceTencentCloudCynosdbClusterRead(d *schema.ResourceData, meta interfa

//tag
tagService := svctag.NewTagService(client)
tags, err := tagService.DescribeResourceTags(ctx, "cynosdb", "cluster", client.Region, id)
tags, err := tagService.DescribeResourceTags(ctx, "cynosdb", "instance", client.Region, id)
if err != nil {
return err
}
Expand Down Expand Up @@ -652,7 +652,7 @@ func resourceTencentCloudCynosdbClusterUpdate(d *schema.ResourceData, meta inter
oldTags, newTags := d.GetChange("tags")
replaceTags, deleteTags := svctag.DiffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))

resourceName := tccommon.BuildTagResourceName("cynosdb", "cluster", region, clusterId)
resourceName := tccommon.BuildTagResourceName("cynosdb", "instance", region, clusterId)
if err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
return err
}
Expand Down
72 changes: 37 additions & 35 deletions tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ func TestAccTencentCloudCynosdbClusterResourceBasic(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckCynosdbClusterExists("tencentcloud_cynosdb_cluster.foo"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "available_zone", "ap-guangzhou-4"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "vpc_id", "vpc-4owdpnwr"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "subnet_id", "subnet-qpxez62e"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "vpc_id", "vpc-m0d2dbnn"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "subnet_id", "subnet-j10lsueq"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "db_type", "MYSQL"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "db_version", "5.7"),
// resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "storage_limit", "1000"),
Expand All @@ -79,7 +79,7 @@ func TestAccTencentCloudCynosdbClusterResourceBasic(t *testing.T) {
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "instance_maintain_weekdays.#", "7"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "instance_cpu_core", "1"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "instance_memory_size", "2"),
//resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "tags.test", "test"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "tags.test", "test"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "force_delete", "true"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "rw_group_sg.#", "1"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "ro_group_sg.#", "1"),
Expand Down Expand Up @@ -116,22 +116,22 @@ func TestAccTencentCloudCynosdbClusterResourceBasic(t *testing.T) {
{
Config: testAccCynosdbCluster_update,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "vpc_id", "vpc-k1t8ickr"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "subnet_id", "subnet-jdi5xn22"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "instance_maintain_duration", "7200"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "instance_maintain_start_time", "21600"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "instance_maintain_weekdays.#", "6"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "vpc_id", "vpc-m0d2dbnn"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "subnet_id", "subnet-j10lsueq"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "instance_maintain_duration", "3600"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "instance_maintain_start_time", "10800"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "instance_maintain_weekdays.#", "7"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "instance_cpu_core", "2"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "instance_memory_size", "4"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "rw_group_sg.#", "1"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "ro_group_sg.#", "1"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.#", "2"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.0.name", "character_set_server"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.0.old_value", "utf8"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.0.current_value", "utf8mb4"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.0.current_value", "utf8"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.1.name", "time_zone"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.1.old_value", "+09:00"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.1.current_value", "+08:00"),
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.1.current_value", "+09:00"),
),
},
},
Expand Down Expand Up @@ -238,22 +238,26 @@ func testAccCheckCynosdbClusterExists(n string) resource.TestCheckFunc {
}
}

const testAccCynosdbBasic = tcacctest.DefaultSecurityGroupData + `
const testAccCynosdbBasic = `
variable "availability_zone" {
default = "ap-guangzhou-4"
}

variable "my_vpc" {
default = "vpc-4owdpnwr"
default = "vpc-m0d2dbnn"
}

variable "my_subnet" {
default = "subnet-qpxez62e"
default = "subnet-j10lsueq"
}

variable "my_param_template" {
default = "15765"
}

variable "rw_group_sg" {
default = "sg-05f7wnhn"
}
`

const testAccCynosdbCluster = testAccCynosdbBasic + `
Expand Down Expand Up @@ -289,70 +293,68 @@ resource "tencentcloud_cynosdb_cluster" "foo" {
current_value = "+09:00"
}

# tags = {
# test = "test"
# }
tags = {
test = "test"
}

force_delete = true

rw_group_sg = [
local.sg_id
var.rw_group_sg
]
ro_group_sg = [
local.sg_id
var.rw_group_sg
]
prarm_template_id = var.my_param_template
# prarm_template_id = var.my_param_template
}
`

const testAccCynosdbCluster_update = testAccCynosdbBasic + `
resource "tencentcloud_cynosdb_cluster" "foo" {
available_zone = var.availability_zone
vpc_id = "vpc-k1t8ickr"
subnet_id = "subnet-jdi5xn22"
old_ip_reserve_hours = 1
vpc_id = var.my_vpc
subnet_id = var.my_subnet
db_type = "MYSQL"
db_version = "5.7"
storage_limit = 1000
cluster_name = "tf-cynosdb-update"
password = "cynos@123"
instance_maintain_duration = 7200
instance_maintain_start_time = 21600
instance_maintain_duration = 3600
instance_maintain_start_time = 10800
instance_maintain_weekdays = [
"Fri",
"Mon",
"Sat",
"Sun",
"Thu",
"Wed",
"Tue",
]

instance_cpu_core = 2
instance_memory_size = 4

param_items {
name = "character_set_server"
old_value = "utf8"
current_value = "utf8mb4"
old_value = "utf8"
current_value = "utf8"
}

param_items {
name = "time_zone"
old_value = "+09:00"
current_value = "+08:00"
old_value = "+09:00"
current_value = "+09:00"
}

# tags = {
# test = "test-update"
# }
tags = {
test = "test"
}

force_delete = true

rw_group_sg = [
local.sg_id2
var.rw_group_sg
]
ro_group_sg = [
local.sg_id2
var.rw_group_sg
]
}
`
Expand Down
Loading