Skip to content

Commit dc946b2

Browse files
SevenEarthSevenEarth
committed
add
1 parent e411236 commit dc946b2

File tree

9 files changed

+165
-19
lines changed

9 files changed

+165
-19
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ 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.1135
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1148
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1149
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1128
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1111
@@ -97,7 +97,7 @@ require (
9797
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674
9898
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.860
9999
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1148
100-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1148
100+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1149
101101
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.792
102102
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199
103103
github.com/tencentyun/cos-go-sdk-v5 v0.7.64

‎go.sum

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -948,6 +948,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1145/go.mod
948948
<<<<<<< HEAD
949949
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1148 h1:+2jHvXzO0ljzTtqdnZ6ug0wMLYSaMwyr1zJa0z/DqyE=
950950
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1148/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
951+
<<<<<<< HEAD
951952
=======
952953
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1147 h1:6v559jM1v6A4KJinNZ28RqVZs+ipKMzCWtYWcWy+zZ4=
953954
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1147/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
@@ -957,6 +958,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1147/go.mod
957958
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1148 h1:+2jHvXzO0ljzTtqdnZ6ug0wMLYSaMwyr1zJa0z/DqyE=
958959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1148/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
959960
>>>>>>> 04ea02554 (add)
961+
=======
962+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1149 h1:a2N8e9YHftVvJmI6PIVJBLfPuy2dn+jZ92atTsmtJuc=
963+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1149/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
964+
>>>>>>> 605e9f3bc (add)
960965
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
961966
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
962967
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -1091,6 +1096,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1147 h1:SxZsn9
10911096
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1147/go.mod h1:T4sxG9+SJ038MBsam2upsEYRpQ82JpX+IkZ08+P9RlE=
10921097
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1148 h1:ILcBbO+ed+ZcIRWrNTQ7/bpI7CP12k4ZDmLLGoTz5/I=
10931098
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1148/go.mod h1:1n+Jj71KPI+7oeySg5l9+JopaMgsIqA0y9ATSi4nx0k=
1099+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1149 h1:SOrBtPoCjS8Jsq1dHa2Ul+ZUPP/vT6j/dJN/08ZEMHM=
1100+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1149/go.mod h1:6e3sb0k9K8kWQdB/WVXVrZxyYxrSC8hN4MWpzYRR80s=
10941101
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.792 h1:NLgKNOIHWa38AmW7dyfI9Jlcp2Kr9VRD94f48pPNmxM=
10951102
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.792/go.mod h1:Xz6vPV3gHlzPwtEcmWdWO1EUXJDgn2p7UMCXbJiVioQ=
10961103
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199 h1:hMBLtiJPnZ9GvA677cTB6ELBR6B68wCR2QY1sNoGQc4=

‎tencentcloud/services/waf/resource_tc_waf_log_post_ckafka_flow.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ func ResourceTencentCloudWafLogPostCkafkaFlow() *schema.Resource {
2020
Read: resourceTencentCloudWafLogPostCkafkaFlowRead,
2121
Update: resourceTencentCloudWafLogPostCkafkaFlowUpdate,
2222
Delete: resourceTencentCloudWafLogPostCkafkaFlowDelete,
23+
Importer: &schema.ResourceImporter{
24+
State: schema.ImportStatePassthrough,
25+
},
2326
Schema: map[string]*schema.Schema{
2427
"ckafka_region": {
2528
Type: schema.TypeString,
@@ -74,6 +77,7 @@ func ResourceTencentCloudWafLogPostCkafkaFlow() *schema.Resource {
7477
"sasl_enable": {
7578
Type: schema.TypeInt,
7679
Optional: true,
80+
Computed: true,
7781
Description: "Whether to enable SASL verification, default not enabled, 0-off, 1-on.",
7882
},
7983

@@ -86,31 +90,36 @@ func ResourceTencentCloudWafLogPostCkafkaFlow() *schema.Resource {
8690
"sasl_password": {
8791
Type: schema.TypeString,
8892
Optional: true,
93+
Sensitive: true,
8994
Description: "SASL password.",
9095
},
9196

9297
"write_config": {
9398
Type: schema.TypeList,
9499
Optional: true,
100+
Computed: true,
95101
MaxItems: 1,
96102
Description: "Enable access to certain fields of the log and check if they have been delivered.",
97103
Elem: &schema.Resource{
98104
Schema: map[string]*schema.Schema{
99105
"enable_headers": {
100106
Type: schema.TypeInt,
101107
Optional: true,
108+
Computed: true,
102109
Description: "1: Enable 0: Do not enable.",
103110
},
104111

105112
"enable_body": {
106113
Type: schema.TypeInt,
107114
Optional: true,
115+
Computed: true,
108116
Description: "1: Enable 0: Do not enable.",
109117
},
110118

111119
"enable_bot": {
112120
Type: schema.TypeInt,
113121
Optional: true,
122+
Computed: true,
114123
Description: "1: Enable 0: Do not enable.",
115124
},
116125
},
@@ -357,6 +366,7 @@ func resourceTencentCloudWafLogPostCkafkaFlowRead(d *schema.ResourceData, meta i
357366
}
358367

359368
tmpList = append(tmpList, dMap)
369+
_ = d.Set("write_config", tmpList)
360370
}
361371

362372
if item.FlowId != nil {
@@ -389,7 +399,7 @@ func resourceTencentCloudWafLogPostCkafkaFlowUpdate(d *schema.ResourceData, meta
389399
request = wafv20180125.NewCreatePostCKafkaFlowRequest()
390400
)
391401

392-
immutableArgs := []string{"vip_type", "log_type"}
402+
immutableArgs := []string{"log_type"}
393403

394404
for _, v := range immutableArgs {
395405
if d.HasChange(v) {

‎tencentcloud/services/waf/resource_tc_waf_log_post_ckafka_flow.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,22 @@ If vip_type is 1
77
```hcl
88
resource "tencentcloud_waf_log_post_ckafka_flow" "example" {
99
ckafka_region = "ap-guangzhou"
10-
ckafka_id = "ckafka-k9m5vwar"
11-
brokers = "ckafka-k9m5vwar.ap-guangzhou.ckafka.tencentcloudmq.com:50000"
10+
ckafka_id = "ckafka-qzoeajkz"
11+
brokers = "ckafka-qzoeajkz.ap-guangzhou.ckafka.tencentcloudmq.com:50000"
1212
compression = "snappy"
1313
vip_type = 1
1414
log_type = 2
15-
topic = "tf-test"
15+
topic = "tf-example"
1616
kafka_version = "2.8.1"
17+
sasl_enable = 1
18+
sasl_user = "ckafka-qzoeajkz#root"
19+
sasl_password = "Password@123"
20+
21+
write_config {
22+
enable_body = 1
23+
enable_bot = 1
24+
enable_headers = 1
25+
}
1726
}
1827
```
1928

@@ -29,6 +38,12 @@ resource "tencentcloud_waf_log_post_ckafka_flow" "example" {
2938
log_type = 1
3039
topic = "tf-example"
3140
kafka_version = "2.8.1"
41+
42+
write_config {
43+
enable_body = 0
44+
enable_bot = 1
45+
enable_headers = 0
46+
}
3247
}
3348
```
3449

‎tencentcloud/services/waf/resource_tc_waf_log_post_ckafka_flow_test.go

Lines changed: 68 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,78 @@ func TestAccTencentCloudWafLogPostCkafkaFlowResource_basic(t *testing.T) {
1515
tcacctest.AccPreCheck(t)
1616
},
1717
Providers: tcacctest.AccProviders,
18-
Steps: []resource.TestStep{{
19-
Config: testAccWafLogPostCkafkaFlow,
20-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.waf_log_post_ckafka_flow", "id")),
21-
}, {
22-
ResourceName: "tencentcloud_waf_log_post_ckafka_flow.waf_log_post_ckafka_flow",
23-
ImportState: true,
24-
ImportStateVerify: true,
25-
}},
18+
Steps: []resource.TestStep{
19+
{
20+
Config: testAccWafLogPostCkafkaFlow,
21+
Check: resource.ComposeTestCheckFunc(
22+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "id"),
23+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "ckafka_region"),
24+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "ckafka_id"),
25+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "brokers"),
26+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "compression"),
27+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "vip_type"),
28+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "log_type"),
29+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "topic"),
30+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "kafka_version"),
31+
),
32+
},
33+
{
34+
Config: testAccWafLogPostCkafkaFlowUpdate,
35+
Check: resource.ComposeTestCheckFunc(
36+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "id"),
37+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "ckafka_region"),
38+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "ckafka_id"),
39+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "brokers"),
40+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "compression"),
41+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "vip_type"),
42+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "log_type"),
43+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "topic"),
44+
resource.TestCheckResourceAttrSet("tencentcloud_waf_log_post_ckafka_flow.example", "kafka_version"),
45+
),
46+
},
47+
{
48+
ResourceName: "tencentcloud_waf_log_post_ckafka_flow.example",
49+
ImportState: true,
50+
ImportStateVerify: true,
51+
},
52+
},
2653
})
2754
}
2855

2956
const testAccWafLogPostCkafkaFlow = `
57+
resource "tencentcloud_waf_log_post_ckafka_flow" "example" {
58+
ckafka_region = "ap-guangzhou"
59+
ckafka_id = "ckafka-k9m5vwar"
60+
brokers = "11.135.14.110:18737"
61+
compression = "snappy"
62+
vip_type = 2
63+
log_type = 1
64+
topic = "tf-example"
65+
kafka_version = "2.8.1"
66+
67+
write_config {
68+
enable_body = 0
69+
enable_bot = 0
70+
enable_headers = 0
71+
}
72+
}
73+
`
74+
75+
const testAccWafLogPostCkafkaFlowUpdate = `
76+
resource "tencentcloud_waf_log_post_ckafka_flow" "example" {
77+
ckafka_region = "ap-guangzhou"
78+
ckafka_id = "ckafka-k9m5vwar"
79+
brokers = "11.135.14.110:18737"
80+
compression = "snappy"
81+
vip_type = 2
82+
log_type = 1
83+
topic = "tf-example"
84+
kafka_version = "2.8.1"
3085
31-
resource "tencentcloud_waf_log_post_ckafka_flow" "waf_log_post_ckafka_flow" {
86+
write_config {
87+
enable_body = 1
88+
enable_bot = 1
89+
enable_headers = 1
90+
}
3291
}
3392
`

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

Lines changed: 4 additions & 0 deletions
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/waf/v20180125/models.go

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

‎vendor/modules.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,6 +1168,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319
11681168
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
11691169
<<<<<<< HEAD
11701170
<<<<<<< HEAD
1171+
<<<<<<< HEAD
11711172
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1148
11721173
=======
11731174
<<<<<<< HEAD
@@ -1179,6 +1180,9 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
11791180
=======
11801181
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1148
11811182
>>>>>>> 04ea02554 (add)
1183+
=======
1184+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1149
1185+
>>>>>>> 605e9f3bc (add)
11821186
## explicit; go 1.11
11831187
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
11841188
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors
@@ -1364,7 +1368,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717
13641368
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1148
13651369
## explicit; go 1.14
13661370
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312
1367-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1148
1371+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1149
13681372
## explicit; go 1.14
13691373
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125
13701374
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.792

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,22 @@ Provides a resource to create a WAF log post ckafka flow
1818
```hcl
1919
resource "tencentcloud_waf_log_post_ckafka_flow" "example" {
2020
ckafka_region = "ap-guangzhou"
21-
ckafka_id = "ckafka-k9m5vwar"
22-
brokers = "ckafka-k9m5vwar.ap-guangzhou.ckafka.tencentcloudmq.com:50000"
21+
ckafka_id = "ckafka-qzoeajkz"
22+
brokers = "ckafka-qzoeajkz.ap-guangzhou.ckafka.tencentcloudmq.com:50000"
2323
compression = "snappy"
2424
vip_type = 1
2525
log_type = 2
26-
topic = "tf-test"
26+
topic = "tf-example"
2727
kafka_version = "2.8.1"
28+
sasl_enable = 1
29+
sasl_user = "ckafka-qzoeajkz#root"
30+
sasl_password = "Password@123"
31+
32+
write_config {
33+
enable_body = 1
34+
enable_bot = 1
35+
enable_headers = 1
36+
}
2837
}
2938
```
3039

@@ -40,6 +49,12 @@ resource "tencentcloud_waf_log_post_ckafka_flow" "example" {
4049
log_type = 1
4150
topic = "tf-example"
4251
kafka_version = "2.8.1"
52+
53+
write_config {
54+
enable_body = 0
55+
enable_bot = 1
56+
enable_headers = 0
57+
}
4358
}
4459
```
4560

0 commit comments

Comments
 (0)