Skip to content

Commit 9eb079e

Browse files
SevenEarthSevenEarth
authored
fix(vpc): [120743758] tencentcloud_vpc_flow_logsupport modifying tags (#2963)
* add * add
1 parent 5f3a2c2 commit 9eb079e

File tree

4 files changed

+42
-41
lines changed

4 files changed

+42
-41
lines changed

‎.changelog/2963.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_vpc_flow_log: support modifying `tags`
3+
```

‎tencentcloud/services/fl/resource_tc_vpc_flow_log.go

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -325,33 +325,31 @@ func resourceTencentCloudVpcFlowLogUpdate(d *schema.ResourceData, meta interface
325325
}
326326
}
327327

328-
request.FlowLogId = &flowLogId
329-
request.VpcId = &vpcId
330-
331-
if d.HasChange("flow_log_name") {
328+
if d.HasChange("flow_log_name") || d.HasChange("flow_log_description") {
332329
if v, ok := d.GetOk("flow_log_name"); ok {
333330
request.FlowLogName = helper.String(v.(string))
334331
}
335-
}
336332

337-
if d.HasChange("flow_log_description") {
338333
if v, ok := d.GetOk("flow_log_description"); ok {
339334
request.FlowLogDescription = helper.String(v.(string))
340335
}
341-
}
342336

343-
err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
344-
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseVpcClient().ModifyFlowLogAttribute(request)
345-
if e != nil {
346-
return tccommon.RetryError(e)
347-
} else {
348-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
337+
request.FlowLogId = &flowLogId
338+
request.VpcId = &vpcId
339+
err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
340+
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseVpcClient().ModifyFlowLogAttribute(request)
341+
if e != nil {
342+
return tccommon.RetryError(e)
343+
} else {
344+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
345+
}
346+
return nil
347+
})
348+
349+
if err != nil {
350+
log.Printf("[CRITAL]%s update vpc flowLog failed, reason:%+v", logId, err)
351+
return err
349352
}
350-
return nil
351-
})
352-
if err != nil {
353-
log.Printf("[CRITAL]%s update vpc flowLog failed, reason:%+v", logId, err)
354-
return err
355353
}
356354

357355
if d.HasChange("tags") {

‎tencentcloud/services/fl/resource_tc_vpc_flow_log.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ data "tencentcloud_instance_types" "instance_types" {
3030
}
3131
3232
resource "tencentcloud_cls_logset" "logset" {
33-
logset_name = "delogsetmo"
34-
tags = {
35-
"test" = "test"
33+
logset_name = "logset"
34+
tags = {
35+
createBy = "Terraform"
3636
}
3737
}
3838
@@ -44,34 +44,34 @@ resource "tencentcloud_cls_topic" "topic" {
4444
partition_count = 1
4545
period = 10
4646
storage_type = "hot"
47-
tags = {
48-
"test" = "test",
47+
tags = {
48+
createBy = "Terraform"
4949
}
5050
}
5151
5252
resource "tencentcloud_vpc" "vpc" {
53-
name = "vpc-flow-log-vpc"
53+
name = "vpc"
5454
cidr_block = "10.0.0.0/16"
5555
}
5656
5757
resource "tencentcloud_subnet" "subnet" {
5858
availability_zone = data.tencentcloud_availability_zones.zones.zones.0.name
59-
name = "vpc-flow-log-subnet"
59+
name = "subnet"
6060
vpc_id = tencentcloud_vpc.vpc.id
6161
cidr_block = "10.0.0.0/16"
6262
is_multicast = false
6363
}
6464
6565
resource "tencentcloud_eni" "example" {
66-
name = "vpc-flow-log-eni"
66+
name = "tf-example"
6767
vpc_id = tencentcloud_vpc.vpc.id
6868
subnet_id = tencentcloud_subnet.subnet.id
6969
description = "eni desc"
7070
ipv4_count = 1
7171
}
7272
7373
resource "tencentcloud_instance" "example" {
74-
instance_name = "ci-test-eni-attach"
74+
instance_name = "tf-example"
7575
availability_zone = data.tencentcloud_availability_zones.zones.zones.0.name
7676
image_id = data.tencentcloud_images.image.images.0.image_id
7777
instance_type = data.tencentcloud_instance_types.instance_types.instance_types.0.instance_type
@@ -88,16 +88,16 @@ resource "tencentcloud_eni_attachment" "example" {
8888
}
8989
9090
resource "tencentcloud_vpc_flow_log" "example" {
91-
flow_log_name = "tf-example-vpc-flow-log"
91+
flow_log_name = "tf-example"
9292
resource_type = "NETWORKINTERFACE"
9393
resource_id = tencentcloud_eni_attachment.example.eni_id
9494
traffic_type = "ACCEPT"
9595
vpc_id = tencentcloud_vpc.vpc.id
9696
flow_log_description = "this is a testing flow log"
9797
cloud_log_id = tencentcloud_cls_topic.topic.id
9898
storage_type = "cls"
99-
tags = {
100-
"testKey" = "testValue"
99+
tags = {
100+
createBy = "Terraform"
101101
}
102102
}
103103
```
@@ -107,5 +107,5 @@ Import
107107
vpc flow_log can be imported using the flow log Id combine vpc Id, e.g.
108108

109109
```
110-
$ terraform import tencentcloud_vpc_flow_log.flow_log flow_log_id fl-xxxx1234#vpc-yyyy5678
110+
$ terraform import tencentcloud_vpc_flow_log.example fl-7k59x22l#vpc-n6qjlen5
111111
```

‎website/docs/r/vpc_flow_log.html.markdown

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ data "tencentcloud_instance_types" "instance_types" {
4141
}
4242
4343
resource "tencentcloud_cls_logset" "logset" {
44-
logset_name = "delogsetmo"
44+
logset_name = "logset"
4545
tags = {
46-
"test" = "test"
46+
createBy = "Terraform"
4747
}
4848
}
4949
@@ -56,33 +56,33 @@ resource "tencentcloud_cls_topic" "topic" {
5656
period = 10
5757
storage_type = "hot"
5858
tags = {
59-
"test" = "test",
59+
createBy = "Terraform"
6060
}
6161
}
6262
6363
resource "tencentcloud_vpc" "vpc" {
64-
name = "vpc-flow-log-vpc"
64+
name = "vpc"
6565
cidr_block = "10.0.0.0/16"
6666
}
6767
6868
resource "tencentcloud_subnet" "subnet" {
6969
availability_zone = data.tencentcloud_availability_zones.zones.zones.0.name
70-
name = "vpc-flow-log-subnet"
70+
name = "subnet"
7171
vpc_id = tencentcloud_vpc.vpc.id
7272
cidr_block = "10.0.0.0/16"
7373
is_multicast = false
7474
}
7575
7676
resource "tencentcloud_eni" "example" {
77-
name = "vpc-flow-log-eni"
77+
name = "tf-example"
7878
vpc_id = tencentcloud_vpc.vpc.id
7979
subnet_id = tencentcloud_subnet.subnet.id
8080
description = "eni desc"
8181
ipv4_count = 1
8282
}
8383
8484
resource "tencentcloud_instance" "example" {
85-
instance_name = "ci-test-eni-attach"
85+
instance_name = "tf-example"
8686
availability_zone = data.tencentcloud_availability_zones.zones.zones.0.name
8787
image_id = data.tencentcloud_images.image.images.0.image_id
8888
instance_type = data.tencentcloud_instance_types.instance_types.instance_types.0.instance_type
@@ -99,7 +99,7 @@ resource "tencentcloud_eni_attachment" "example" {
9999
}
100100
101101
resource "tencentcloud_vpc_flow_log" "example" {
102-
flow_log_name = "tf-example-vpc-flow-log"
102+
flow_log_name = "tf-example"
103103
resource_type = "NETWORKINTERFACE"
104104
resource_id = tencentcloud_eni_attachment.example.eni_id
105105
traffic_type = "ACCEPT"
@@ -108,7 +108,7 @@ resource "tencentcloud_vpc_flow_log" "example" {
108108
cloud_log_id = tencentcloud_cls_topic.topic.id
109109
storage_type = "cls"
110110
tags = {
111-
"testKey" = "testValue"
111+
createBy = "Terraform"
112112
}
113113
}
114114
```
@@ -147,6 +147,6 @@ In addition to all arguments above, the following attributes are exported:
147147
vpc flow_log can be imported using the flow log Id combine vpc Id, e.g.
148148

149149
```
150-
$ terraform import tencentcloud_vpc_flow_log.flow_log flow_log_id fl-xxxx1234#vpc-yyyy5678
150+
$ terraform import tencentcloud_vpc_flow_log.example fl-7k59x22l#vpc-n6qjlen5
151151
```
152152

0 commit comments

Comments
 (0)