Skip to content

Commit 1df7fca

Browse files
authored
fix(cynosdb): [128988314]supports modification of is_open_global_encryption (#3631)
* fix: supports modification of is_open_global_encryption * feat: add changelog
1 parent a7de095 commit 1df7fca

File tree

9 files changed

+305
-10
lines changed

9 files changed

+305
-10
lines changed

.changelog/3631.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_cynosdb_cluster_transparent_encrypt: Supports modification of is_open_global_encryption.
3+
```

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.7
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
52-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.1.52
52+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.7
5353
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
5454
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dbbrain v1.0.652
5555
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc v1.0.633

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.3 h1:r05ohL
947947
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.3/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
948948
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4 h1:k8QEWznn11evs+N5ZGQMCCPnzAHxnul2mRIZJB8Lwbo=
949949
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
950+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.7 h1:MCrz0g4LDxoCdCgz6Dtas8b7HHLMfgTpIIF/tlor0Hw=
951+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.7/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
950952
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
951953
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
952954
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -957,6 +959,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762 h1:2egy69S
957959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762/go.mod h1:1XylIfNUbAzmNqi4XMhwcM3VhmUHdu1OYybOeaJ4sOw=
958960
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.1.52 h1:h/OquZHmxmfZXHfo07dmh74DrclFVjyUV3tfk66oP9o=
959961
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.1.52/go.mod h1:0F66TApiFl1wlux8XGoJTVLbrE48FNd5OJOX5V9OvBQ=
962+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.7 h1:HvkbNkVwUdg//O4BKwd87BqSJIH3NJKOLVROdHeCcVQ=
963+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.7/go.mod h1:k0qhXvE8aIHsC3tjaXr7VvOxcD8pEW+ohsFS5vMZquE=
960964
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970 h1:qVIRHgG1twsqF4aVN/x2T2yMRfPpsZBTNefDkqzM06M=
961965
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970/go.mod h1:NJuuQD4z6vcnsZnC7Tvz2U9hElNS1wroc34UQbZvP2U=
962966
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335 h1:D8qrelkK5udv8RzJJIABMzItGIyaZoYnxEVeIsYqiNw=

tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster_transparent_encrypt.go

Lines changed: 31 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster_transparent_encrypt_test.go

Lines changed: 107 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,64 @@ func TestAccTencentCloudCynosdbClusterTransparentEncryptResource_basic(t *testin
2929
ResourceName: "tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt",
3030
ImportState: true,
3131
},
32+
{
33+
Config: testAccCynosdbClusterTransparentEncryptUp,
34+
Check: resource.ComposeTestCheckFunc(
35+
resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt", "id"),
36+
resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt", "key_id"),
37+
resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt", "key_region"),
38+
resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt", "key_type"),
39+
resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt", "is_open_global_encryption", "true"),
40+
),
41+
},
3242
},
3343
})
3444
}
3545

36-
const testAccCynosdbClusterTransparentEncrypt = testAccCynosdbCluster + `
46+
const testAccCynosdbClusterTransparentEncrypt = `
47+
resource "tencentcloud_cynosdb_cluster" "foo" {
48+
auto_renew_flag = 0
49+
available_zone = "ap-guangzhou-3"
50+
charge_type = "POSTPAID_BY_HOUR"
51+
cluster_name = "cynosdbmysql-8iy4bgap"
52+
db_type = "MYSQL"
53+
db_version = "8.0"
54+
instance_cpu_core = 2
55+
instance_maintain_duration = 3600
56+
instance_maintain_start_time = 10800
57+
force_delete = true
58+
# cynos_version = "3.1.15.006"
59+
instance_maintain_weekdays = [
60+
"Fri",
61+
"Mon",
62+
"Sat",
63+
"Sun",
64+
"Thu",
65+
"Tue",
66+
"Wed",
67+
]
68+
instance_memory_size = 4
69+
port = 3306
70+
project_id = 0
71+
password = "iac@123456"
72+
rw_group_sg = [
73+
"sg-5275dorp",
74+
]
75+
serverless_status = null
76+
storage_pay_mode = 0
77+
subnet_id = "subnet-oi7ya2j6"
78+
tags = {}
79+
vpc_id = "vpc-axrsmmrv"
80+
param_items {
81+
name = "lower_case_table_names"
82+
current_value = "0"
83+
}
84+
lifecycle {
85+
ignore_changes = [
86+
param_items["lower_case_table_names"]
87+
]
88+
}
89+
}
3790
resource "tencentcloud_cynosdb_cluster_transparent_encrypt" "cynosdb_cluster_transparent_encrypt" {
3891
cluster_id = tencentcloud_cynosdb_cluster.foo.id
3992
is_open_global_encryption = false
@@ -42,3 +95,56 @@ resource "tencentcloud_cynosdb_cluster_transparent_encrypt" "cynosdb_cluster_tra
4295
key_type = "custom"
4396
}
4497
`
98+
99+
const testAccCynosdbClusterTransparentEncryptUp = `
100+
resource "tencentcloud_cynosdb_cluster" "foo" {
101+
auto_renew_flag = 0
102+
available_zone = "ap-guangzhou-3"
103+
charge_type = "POSTPAID_BY_HOUR"
104+
cluster_name = "cynosdbmysql-8iy4bgap"
105+
db_type = "MYSQL"
106+
db_version = "8.0"
107+
instance_cpu_core = 2
108+
instance_maintain_duration = 3600
109+
instance_maintain_start_time = 10800
110+
force_delete = true
111+
# cynos_version = "3.1.15.006"
112+
instance_maintain_weekdays = [
113+
"Fri",
114+
"Mon",
115+
"Sat",
116+
"Sun",
117+
"Thu",
118+
"Tue",
119+
"Wed",
120+
]
121+
instance_memory_size = 4
122+
port = 3306
123+
project_id = 0
124+
password = "iac@123456"
125+
rw_group_sg = [
126+
"sg-5275dorp",
127+
]
128+
serverless_status = null
129+
storage_pay_mode = 0
130+
subnet_id = "subnet-oi7ya2j6"
131+
tags = {}
132+
vpc_id = "vpc-axrsmmrv"
133+
param_items {
134+
name = "lower_case_table_names"
135+
current_value = "0"
136+
}
137+
lifecycle {
138+
ignore_changes = [
139+
param_items["lower_case_table_names"]
140+
]
141+
}
142+
}
143+
resource "tencentcloud_cynosdb_cluster_transparent_encrypt" "cynosdb_cluster_transparent_encrypt" {
144+
cluster_id = tencentcloud_cynosdb_cluster.foo.id
145+
is_open_global_encryption = true
146+
key_id = "f063c18b-654b-11ef-9d9f-525400d3a886"
147+
key_region = "ap-guangzhou"
148+
key_type = "custom"
149+
}
150+
`

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107/client.go

Lines changed: 56 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)