Skip to content

Commit e5ae032

Browse files
SevenEarthSevenEarth
authored
fix/waf (#2458)
* fix/waf * fix/waf * fix/waf
1 parent e7df0c0 commit e5ae032

File tree

13 files changed

+214
-121
lines changed

13 files changed

+214
-121
lines changed

‎.changelog/2458.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_waf_saas_domain: Adapt to more scenarios of `bot_status`
3+
```
4+
5+
```release-note:enhancement
6+
resource/tencentcloud_waf_clb_domain: Adapt to more scenarios of `bot_status`
7+
```

‎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.693
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.711
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.831
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.833
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -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.199
9999
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.779
100-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.802
100+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.833
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.42-0.20230629101357-7edd77448a0f

‎go.sum

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -935,8 +935,9 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.825 h1:ijG2
935935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.825/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
936936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.829 h1:5Wx+X/EmjEU6T9WHjc/vBPvW97OUe3Bi8BGdQBD8pJM=
937937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.829/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
938-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.831 h1:3hMsWgpFCyVmpm9KzgyHNRhYSqAn9EPr5WlZYWoJSMw=
939938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.831/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
939+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.833 h1:EE3PbnS+BiCjPcfbf2Tel03YglInffxV+mIbmzoFEag=
940+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.833/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
940941
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
941942
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624/go.mod h1:+TXSVyeKwt1IhZRqKPbTREteBcP+K07Q846/ilNzLWA=
942943
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762 h1:2egy69SP/wPsmnfozcQVZ6tUY6F6N/TpEe/7xtXrc/8=
@@ -955,8 +956,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb v1.0.673 h1:YyjGLj
955956
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb v1.0.673/go.mod h1:hXPMop1kJFqAvHj+7TyxxxXS/HGUP4SuKx5gGoAl0Zc=
956957
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.0.797 h1:6hfb2rnbkT2hth7rXFY6diu23kRVCdLQb0dOfMYYy60=
957958
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc v1.0.797/go.mod h1:7nIkeQ6XbNx8aLuX5MxZExH0WVmQDIsHbb7Mk/JunPg=
958-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.781 h1:rtHjLafb2uko1yiEhNJ9/WubfGYUOdLB6NB25kQxDYA=
959-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.781/go.mod h1:VK9QaPb0RIRLBciYTKqj+Enfq6ZUfv0mmhtM6bTwwAk=
960959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.831 h1:i9HuRYmEzqPwExDt/hRsjP6Rw5S6aoinKzqe0OLkFQg=
961960
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.831/go.mod h1:OtG3j11r/hDfZufRkTux+XHnfHw5UGqlMgrZxtUbsSs=
962961
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/domain v1.0.414 h1:egwjvOEUKBaxsoRVn/YSEhp2E8qdh77Ous9A/wftDo0=
@@ -985,10 +984,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.815 h1:wsT
985984
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.815/go.mod h1:0nU7o/VOMYZ1/xjIsFVivQ3RZkdDeGTdezSlyjyG7GI=
986985
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.777 h1:SoH/KkqkEUw8iDmQDZCw5Saf319Ceyt3v8Vqodo8DiY=
987986
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.777/go.mod h1:sBmwqD3GkczHFiArdYpHPp9QriIbzNtO99DueYVyGwE=
988-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.810 h1:P9eQ4I/cFcLnNGH8tjZsFVNTpJ4iizI5RBEkNfyKbDg=
989-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.810/go.mod h1:jWIMZDz6D+bwcfc1n4idP3S1581bOqRPaXjU4wllnZ8=
990-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.829 h1:+7Qwa1c6sgbBreu18IDYGmGGaoFwQVen3hmPQlALR4E=
991-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.829/go.mod h1:ftIGeNWJScZOiWWEmJWRww65CMxsj26Vscc8A0yAObM=
992987
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.831 h1:oyazF5wgAgoinGo/SDGfUReE3JFxqcpI6/pstWhK7yE=
993988
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.831/go.mod h1:2WuTlTnKCnZoa6l0JxY9GNfo0UG6nU7AEsljF8rMMsM=
994989
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.770 h1:Ksu947uY/fafnlILemfMuyKqL/RxHh9dfVowWX8paeQ=
@@ -1011,8 +1006,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.0.486 h1:eHLaL+h
10111006
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.0.486/go.mod h1:MSsho0YlAsoPCOMqdBfwqGd/SMQ0FTGh0a6emBy2X+g=
10121007
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver v1.0.816 h1:ESXJjklPGlKzdprjW5F2DM/NRcG/A6Vq3l3LcBvIvZI=
10131008
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver v1.0.816/go.mod h1:J9Ce9D/ewpqzUsBAwINc+59qpDqYT9egjwyUsMHpDwA=
1014-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.750 h1:NjStL4fGljYfdmlvUxAROKmZFiagWXKNo4KOMWwxUag=
1015-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.750/go.mod h1:Z/ycmVll9kddil+V9p5QFtQTcwKycwr3C8AagDjZ9Gk=
10161009
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.822 h1:Hbtl5PDb3LnYGkQ26PUXYdqRMVw4YemkvFKVklFSkfU=
10171010
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.822/go.mod h1:ld+y2FwgxEjaY5MJrp4rgEGxM8FRfxxfPZalVD3eOEU=
10181011
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssm v1.0.691 h1:UE55TqueOP889MDcJ+cBW+MBjtzvWUw5fuOBWGCBIjs=
@@ -1031,8 +1024,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.696 h1:hTfJtxk
10311024
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.696/go.mod h1:DgY9Kgh9093fBl2M/vEFGJZwytDIrPQlYoxoT4rE7O0=
10321025
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg v1.0.533 h1:r6HQhmHzPp1oSGhwkNzUzIRlpnpb8Jhtcn1yKhg9ml4=
10331026
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg v1.0.533/go.mod h1:5sIIchyV9sXIVAqsD3UWts+qQJ0qoc55sL2WuiY8Ugs=
1034-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.817 h1:KHixP2PFfgqP6LKa4xWIQbfHr0xZf8QnGGi7XW+Ku9k=
1035-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.817/go.mod h1:mp2KGLedUqpSWLAC+l9OaJ0DCoUnPg1AQO5M4pUr6JI=
10361027
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.825 h1:jIAqpu+EeiKK1U0Sb7l1I6hMATYyXtv7IU8ZWNHPrgM=
10371028
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.825/go.mod h1:aaOidZKQTtM6vVgs5pnHryaLj9f+egPBpdQEylQxka4=
10381029
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578 h1:vBpQhUroO+FAslUmsDWGi8nvczsqZBWVgQwlnyT0Aj8=
@@ -1051,17 +1042,15 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199 h1:6Yt74l4
10511042
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199/go.mod h1:Yw6OQ33z3s4k0HVYTNSffB12qOzEJ2Zf1Vj4+5S3sRs=
10521043
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.779 h1:4NpjQiFgnIH662ydP7AecllyrhH+CVoGlzQ9V7RfD08=
10531044
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.779/go.mod h1:kYBG2jgpjL7CuhYM+K1fkEtbWvNXrtt7NSLwXVCqmKA=
1054-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.802 h1:ezxDJsbS0shcpDmyyxbPS3hxp92r9lujsj1/vr5tZXk=
1055-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.802/go.mod h1:yX7LqAVM/vOt7bGz4AaFEQEJVfp0uJ5W6eEUCzsMXOI=
1045+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.833 h1:avaBlZ+Qqv7bfMg/u0jlRsbEBbE18CfqKWbfGc84PLg=
1046+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.833/go.mod h1:fUWG217b//46Oa3VXxC5mgeYeewVAbF+lc81uET89EM=
10561047
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.792 h1:NLgKNOIHWa38AmW7dyfI9Jlcp2Kr9VRD94f48pPNmxM=
10571048
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.792/go.mod h1:Xz6vPV3gHlzPwtEcmWdWO1EUXJDgn2p7UMCXbJiVioQ=
10581049
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199 h1:hMBLtiJPnZ9GvA677cTB6ELBR6B68wCR2QY1sNoGQc4=
10591050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199/go.mod h1:nnY91/H3j/Gu7V/oCA6Zeg8T5D3q36EUdBh4EjmHwqY=
10601051
github.com/tencentyun/cos-go-sdk-v5 v0.7.42-0.20230629101357-7edd77448a0f h1:yTMDoBvFuXjZat10d98DIKbPnN9FQG+drt1SbNfMW5U=
10611052
github.com/tencentyun/cos-go-sdk-v5 v0.7.42-0.20230629101357-7edd77448a0f/go.mod h1:LUFnaqRmGk6pEHOaRmdn2dCZR2j0cSsM5xowWFPTPao=
1062-
github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA=
10631053
github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0=
1064-
github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag=
10651054
github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY=
10661055
github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw=
10671056
github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8=
@@ -1099,7 +1088,6 @@ github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37w
10991088
github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
11001089
github.com/wI2L/jsondiff v0.3.0 h1:iTzQ9u/d86GE9RsBzVHX88f2EA1vQUboHwLhSQFc1s4=
11011090
github.com/wI2L/jsondiff v0.3.0/go.mod h1:y1IMzNNjlSsk3IUoJdRJO7VRBtzMvRgyo4Vu0LdHpTc=
1102-
github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
11031091
github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
11041092
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
11051093
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
@@ -1138,7 +1126,6 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
11381126
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
11391127
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
11401128
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
1141-
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
11421129
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
11431130
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
11441131
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
@@ -1382,7 +1369,6 @@ golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
13821369
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
13831370
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
13841371
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
1385-
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
13861372
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
13871373
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
13881374
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1590,7 +1576,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
15901576
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
15911577
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
15921578
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
1593-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
15941579
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
15951580
gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
15961581
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
@@ -1600,7 +1585,6 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
16001585
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
16011586
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
16021587
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
1603-
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
16041588
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
16051589
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
16061590
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -1648,5 +1632,4 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
16481632
sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
16491633
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
16501634
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
1651-
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
16521635
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

‎tencentcloud/services/waf/extension_waf.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ var CLS_STATUS = []int{
103103
const (
104104
BOT_STATUS_0 = 0
105105
BOT_STATUS_1 = 1
106+
BOT_STATUS_2 = 2
107+
BOT_STATUS_3 = 3
106108
)
107109

108110
var BOT_STATUS = []int{

‎tencentcloud/services/waf/resource_tc_waf_clb_domain.go

Lines changed: 40 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -411,14 +411,16 @@ func resourceTencentCloudWafClbDomainCreate(d *schema.ResourceData, meta interfa
411411
if v, ok := d.GetOkExists("bot_status"); ok {
412412
tmpBotStatus := v.(int)
413413

414-
if tmpBotStatus != BOT_STATUS_0 {
414+
if tmpBotStatus == BOT_STATUS_1 {
415415
botStatus = uint64(tmpBotStatus)
416416
modifyBotStatusRequest := waf.NewModifyBotStatusRequest()
417417
modifyBotStatusRequest.Domain = &domain
418418
modifyBotStatusRequest.InstanceID = &instanceID
419419
tmpStatus := strconv.FormatUint(botStatus, 10)
420420
modifyBotStatusRequest.Status = &tmpStatus
421421
modifyBotStatusRequest.Category = common.StringPtr("bot")
422+
modifyBotStatusRequest.IsVersionFour = common.BoolPtr(true)
423+
modifyBotStatusRequest.BotVersion = common.StringPtr("4.1.0")
422424

423425
err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
424426
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseWafClient().ModifyBotStatus(modifyBotStatusRequest)
@@ -442,7 +444,7 @@ func resourceTencentCloudWafClbDomainCreate(d *schema.ResourceData, meta interfa
442444
if v, ok := d.GetOkExists("api_safe_status"); ok {
443445
tmpApiSafeStatus := v.(int)
444446

445-
if tmpApiSafeStatus != API_SAFE_STATUS_0 {
447+
if tmpApiSafeStatus == API_SAFE_STATUS_1 {
446448
apiSafeStatus = uint64(tmpApiSafeStatus)
447449
modifyApiAnalyzeStatusRequest := waf.NewModifyApiAnalyzeStatusRequest()
448450
modifyApiAnalyzeStatusRequest.Domain = &domain
@@ -471,7 +473,7 @@ func resourceTencentCloudWafClbDomainCreate(d *schema.ResourceData, meta interfa
471473
if v, ok := d.GetOkExists("cls_status"); ok {
472474
tmpClsStatus := v.(int)
473475

474-
if tmpClsStatus != CLS_STATUS_0 {
476+
if tmpClsStatus == CLS_STATUS_1 {
475477
clsStatus = uint64(tmpClsStatus)
476478
modifyDomainsCLSStatusRequest := waf.NewModifyDomainsCLSStatusRequest()
477479
modifyDomainsCLSStatusRequest.Domains = []*waf.DomainURI{
@@ -505,7 +507,7 @@ func resourceTencentCloudWafClbDomainCreate(d *schema.ResourceData, meta interfa
505507
if v, ok := d.GetOkExists("status"); ok {
506508
tmpWafStatus := v.(int)
507509

508-
if tmpWafStatus != CLB_DOMAIN_STATUS_1 {
510+
if tmpWafStatus == CLB_DOMAIN_STATUS_0 {
509511
wafStatus = uint64(tmpWafStatus)
510512
modifyHostStatusRequest := waf.NewModifyHostStatusRequest()
511513
modifyHostStatusRequest.HostsStatus = []*waf.HostStatus{
@@ -658,7 +660,13 @@ func resourceTencentCloudWafClbDomainRead(d *schema.ResourceData, meta interface
658660
}
659661

660662
if domainInfo.BotStatus != nil {
661-
_ = d.Set("bot_status", domainInfo.BotStatus)
663+
if *domainInfo.BotStatus == BOT_STATUS_0 || *domainInfo.BotStatus == BOT_STATUS_1 {
664+
_ = d.Set("bot_status", BOT_STATUS_0)
665+
} else if *domainInfo.BotStatus == BOT_STATUS_2 || *domainInfo.BotStatus == BOT_STATUS_3 {
666+
_ = d.Set("bot_status", BOT_STATUS_1)
667+
} else {
668+
_ = d.Set("bot_status", domainInfo.BotStatus)
669+
}
662670
}
663671

664672
if domainInfo.ApiStatus != nil {
@@ -935,6 +943,8 @@ func resourceTencentCloudWafClbDomainUpdate(d *schema.ResourceData, meta interfa
935943
tmpStatus := strconv.FormatUint(botStatus, 10)
936944
modifyBotStatusRequest.Status = &tmpStatus
937945
modifyBotStatusRequest.Category = common.StringPtr("bot")
946+
modifyBotStatusRequest.IsVersionFour = common.BoolPtr(true)
947+
modifyBotStatusRequest.BotVersion = common.StringPtr("4.1.0")
938948

939949
err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
940950
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseWafClient().ModifyBotStatus(modifyBotStatusRequest)
@@ -982,32 +992,34 @@ func resourceTencentCloudWafClbDomainUpdate(d *schema.ResourceData, meta interfa
982992
}
983993

984994
// set cls
985-
if v, ok := d.GetOkExists("cls_status"); ok {
986-
clsStatus = uint64(v.(int))
987-
modifyDomainsCLSStatusRequest := waf.NewModifyDomainsCLSStatusRequest()
988-
modifyDomainsCLSStatusRequest.Domains = []*waf.DomainURI{
989-
{
990-
Domain: common.StringPtr(domain),
991-
Edition: common.StringPtr("clb-waf"),
992-
InstanceID: common.StringPtr(instanceID),
993-
},
994-
}
995-
modifyDomainsCLSStatusRequest.Status = &clsStatus
996-
997-
err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
998-
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseWafClient().ModifyDomainsCLSStatus(modifyDomainsCLSStatusRequest)
999-
if e != nil {
1000-
return tccommon.RetryError(e)
1001-
} else {
1002-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, modifyDomainsCLSStatusRequest.GetAction(), modifyDomainsCLSStatusRequest.ToJsonString(), result.ToJsonString())
995+
if d.HasChange("cls_status") {
996+
if v, ok := d.GetOkExists("cls_status"); ok {
997+
clsStatus = uint64(v.(int))
998+
modifyDomainsCLSStatusRequest := waf.NewModifyDomainsCLSStatusRequest()
999+
modifyDomainsCLSStatusRequest.Domains = []*waf.DomainURI{
1000+
{
1001+
Domain: common.StringPtr(domain),
1002+
Edition: common.StringPtr("clb-waf"),
1003+
InstanceID: common.StringPtr(instanceID),
1004+
},
10031005
}
1006+
modifyDomainsCLSStatusRequest.Status = &clsStatus
10041007

1005-
return nil
1006-
})
1008+
err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
1009+
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseWafClient().ModifyDomainsCLSStatus(modifyDomainsCLSStatusRequest)
1010+
if e != nil {
1011+
return tccommon.RetryError(e)
1012+
} else {
1013+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, modifyDomainsCLSStatusRequest.GetAction(), modifyDomainsCLSStatusRequest.ToJsonString(), result.ToJsonString())
1014+
}
10071015

1008-
if err != nil {
1009-
log.Printf("[CRITAL]%s modify waf clbDomain cls_status failed, reason:%+v", logId, err)
1010-
return err
1016+
return nil
1017+
})
1018+
1019+
if err != nil {
1020+
log.Printf("[CRITAL]%s modify waf clbDomain cls_status failed, reason:%+v", logId, err)
1021+
return err
1022+
}
10111023
}
10121024
}
10131025

0 commit comments

Comments
 (0)