Skip to content

Commit 4cd9eb6

Browse files
SevenEarthSevenEarth
authored
feat(waf): [123540800] add new resource (#3355)
* add * add * add * add * add * add
1 parent 1892474 commit 4cd9eb6

24 files changed

+2347
-117
lines changed

‎.changelog/3355.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:new-resource
2+
tencentcloud_waf_bot_scene_status_config
3+
```
4+
5+
```release-note:new-resource
6+
tencentcloud_waf_bot_status_config
7+
```

‎tencentcloud/provider.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2238,8 +2238,11 @@ func Provider() *schema.Provider {
22382238
"tencentcloud_waf_ip_access_control_v2": waf.ResourceTencentCloudWafIpAccessControlV2(),
22392239
"tencentcloud_waf_log_post_cls_flow": waf.ResourceTencentCloudWafLogPostClsFlow(),
22402240
"tencentcloud_waf_log_post_ckafka_flow": waf.ResourceTencentCloudWafLogPostCkafkaFlow(),
2241-
"tencentcloud_waf_domain_post_action": waf.ResourceTencentCloudWafDomainPostAction(),
2242-
"tencentcloud_waf_instance_attack_log_post": waf.ResourceTencentCloudWafInstanceAttackLogPost(),
2241+
"tencentcloud_waf_domain_post_action_config": waf.ResourceTencentCloudWafDomainPostActionConfig(),
2242+
"tencentcloud_waf_instance_attack_log_post_config": waf.ResourceTencentCloudWafInstanceAttackLogPostConfig(),
2243+
"tencentcloud_waf_bot_scene_status_config": waf.ResourceTencentCloudWafBotSceneStatusConfig(),
2244+
"tencentcloud_waf_bot_status_config": waf.ResourceTencentCloudWafBotStatusConfig(),
2245+
"tencentcloud_waf_bot_scene_ucb_rule": waf.ResourceTencentCloudWafBotSceneUCBRule(),
22432246
"tencentcloud_wedata_rule_template": wedata.ResourceTencentCloudWedataRuleTemplate(),
22442247
"tencentcloud_wedata_datasource": wedata.ResourceTencentCloudWedataDatasource(),
22452248
"tencentcloud_wedata_function": wedata.ResourceTencentCloudWedataFunction(),

‎tencentcloud/provider.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2183,8 +2183,10 @@ tencentcloud_waf_ip_access_control
21832183
tencentcloud_waf_ip_access_control_v2
21842184
tencentcloud_waf_log_post_cls_flow
21852185
tencentcloud_waf_log_post_ckafka_flow
2186-
tencentcloud_waf_domain_post_action
2187-
tencentcloud_waf_instance_attack_log_post
2186+
tencentcloud_waf_domain_post_action_config
2187+
tencentcloud_waf_instance_attack_log_post_config
2188+
tencentcloud_waf_bot_scene_status_config
2189+
tencentcloud_waf_bot_status_config
21882190

21892191
Wedata
21902192
Data Source

‎tencentcloud/services/waf/resource_tc_waf_bot_scene_status_config.go

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
package waf
2+
3+
import (
4+
"context"
5+
"fmt"
6+
"log"
7+
"strings"
8+
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
10+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
11+
wafv20180125 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125"
12+
13+
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
14+
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
15+
)
16+
17+
func ResourceTencentCloudWafBotSceneStatusConfig() *schema.Resource {
18+
return &schema.Resource{
19+
Create: resourceTencentCloudWafBotSceneStatusConfigCreate,
20+
Read: resourceTencentCloudWafBotSceneStatusConfigRead,
21+
Update: resourceTencentCloudWafBotSceneStatusConfigUpdate,
22+
Delete: resourceTencentCloudWafBotSceneStatusConfigDelete,
23+
Importer: &schema.ResourceImporter{
24+
State: schema.ImportStatePassthrough,
25+
},
26+
Schema: map[string]*schema.Schema{
27+
"domain": {
28+
Type: schema.TypeString,
29+
Required: true,
30+
ForceNew: true,
31+
Description: "Domain.",
32+
},
33+
34+
"scene_id": {
35+
Type: schema.TypeString,
36+
Required: true,
37+
ForceNew: true,
38+
Description: "Scene ID.",
39+
},
40+
41+
"status": {
42+
Type: schema.TypeBool,
43+
Required: true,
44+
Description: "Bot status. true - enable; false - disable.",
45+
},
46+
47+
"type": {
48+
Type: schema.TypeString,
49+
Computed: true,
50+
Description: "Scene type, default: Default scenario, custom: Non default scenario.",
51+
},
52+
53+
"scene_name": {
54+
Type: schema.TypeString,
55+
Computed: true,
56+
Description: "Scene name.",
57+
},
58+
59+
"priority": {
60+
Type: schema.TypeInt,
61+
Computed: true,
62+
Description: "Priority.",
63+
},
64+
},
65+
}
66+
}
67+
68+
func resourceTencentCloudWafBotSceneStatusConfigCreate(d *schema.ResourceData, meta interface{}) error {
69+
defer tccommon.LogElapsed("resource.tencentcloud_waf_bot_scene_status_config.create")()
70+
defer tccommon.InconsistentCheck(d, meta)()
71+
72+
var (
73+
domain string
74+
sceneId string
75+
)
76+
77+
if v, ok := d.GetOk("domain"); ok {
78+
domain = v.(string)
79+
}
80+
81+
if v, ok := d.GetOk("scene_id"); ok {
82+
sceneId = v.(string)
83+
}
84+
85+
d.SetId(strings.Join([]string{domain, sceneId}, tccommon.FILED_SP))
86+
87+
return resourceTencentCloudWafBotSceneStatusConfigUpdate(d, meta)
88+
}
89+
90+
func resourceTencentCloudWafBotSceneStatusConfigRead(d *schema.ResourceData, meta interface{}) error {
91+
defer tccommon.LogElapsed("resource.tencentcloud_waf_bot_scene_status_config.read")()
92+
defer tccommon.InconsistentCheck(d, meta)()
93+
94+
var (
95+
logId = tccommon.GetLogId(tccommon.ContextNil)
96+
ctx = tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
97+
service = WafService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
98+
)
99+
100+
idSplit := strings.Split(d.Id(), tccommon.FILED_SP)
101+
if len(idSplit) != 2 {
102+
return fmt.Errorf("id is broken,%s", d.Id())
103+
}
104+
105+
domain := idSplit[0]
106+
sceneId := idSplit[1]
107+
108+
respData, err := service.DescribeWafBotSceneStatusConfigById(ctx, domain, sceneId)
109+
if err != nil {
110+
return err
111+
}
112+
113+
if respData == nil {
114+
d.SetId("")
115+
log.Printf("[WARN]%s resource `waf_bot_scene_status_config` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
116+
return nil
117+
}
118+
119+
_ = d.Set("domain", domain)
120+
_ = d.Set("scene_id", sceneId)
121+
122+
if respData.SceneStatus != nil {
123+
_ = d.Set("status", respData.SceneStatus)
124+
}
125+
126+
if respData.Type != nil {
127+
_ = d.Set("type", respData.Type)
128+
}
129+
130+
if respData.SceneName != nil {
131+
_ = d.Set("scene_name", respData.SceneName)
132+
}
133+
134+
if respData.Priority != nil {
135+
_ = d.Set("priority", respData.Priority)
136+
}
137+
138+
return nil
139+
}
140+
141+
func resourceTencentCloudWafBotSceneStatusConfigUpdate(d *schema.ResourceData, meta interface{}) error {
142+
defer tccommon.LogElapsed("resource.tencentcloud_waf_bot_scene_status_config.update")()
143+
defer tccommon.InconsistentCheck(d, meta)()
144+
145+
var (
146+
logId = tccommon.GetLogId(tccommon.ContextNil)
147+
ctx = tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
148+
request = wafv20180125.NewModifyBotSceneStatusRequest()
149+
)
150+
151+
idSplit := strings.Split(d.Id(), tccommon.FILED_SP)
152+
if len(idSplit) != 2 {
153+
return fmt.Errorf("id is broken,%s", d.Id())
154+
}
155+
156+
domain := idSplit[0]
157+
sceneId := idSplit[1]
158+
159+
if v, ok := d.GetOkExists("status"); ok {
160+
request.Status = helper.Bool(v.(bool))
161+
}
162+
163+
request.Domain = &domain
164+
request.SceneId = &sceneId
165+
reqErr := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
166+
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseWafV20180125Client().ModifyBotSceneStatusWithContext(ctx, request)
167+
if e != nil {
168+
return tccommon.RetryError(e)
169+
} else {
170+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
171+
}
172+
173+
return nil
174+
})
175+
176+
if reqErr != nil {
177+
log.Printf("[CRITAL]%s update waf bot scene status config failed, reason:%+v", logId, reqErr)
178+
return reqErr
179+
}
180+
181+
return resourceTencentCloudWafBotSceneStatusConfigRead(d, meta)
182+
}
183+
184+
func resourceTencentCloudWafBotSceneStatusConfigDelete(d *schema.ResourceData, meta interface{}) error {
185+
defer tccommon.LogElapsed("resource.tencentcloud_waf_bot_scene_status_config.delete")()
186+
defer tccommon.InconsistentCheck(d, meta)()
187+
188+
return nil
189+
}

‎tencentcloud/services/waf/resource_tc_waf_bot_scene_status_config.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Provides a resource to create a WAF bot scene status config
2+
3+
Example Usage
4+
5+
```hcl
6+
resource "tencentcloud_waf_bot_scene_status_config" "example" {
7+
domain = "example.com"
8+
scene_id = "3024324123"
9+
status = true
10+
}
11+
```
12+
13+
Import
14+
15+
WAF bot scene status config can be imported using the id, e.g.
16+
17+
```
18+
terraform import tencentcloud_waf_bot_scene_status_config.example example.com#3024324123
19+
```

‎tencentcloud/services/waf/resource_tc_waf_bot_scene_status_config_test.go

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
package waf_test
2+
3+
import (
4+
"testing"
5+
6+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
7+
8+
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
9+
)
10+
11+
func TestAccTencentCloudWafBotSceneStatusConfigResource_basic(t *testing.T) {
12+
t.Parallel()
13+
resource.Test(t, resource.TestCase{
14+
PreCheck: func() {
15+
tcacctest.AccPreCheck(t)
16+
},
17+
Providers: tcacctest.AccProviders,
18+
Steps: []resource.TestStep{
19+
{
20+
Config: testAccWafBotSceneStatusConfig,
21+
Check: resource.ComposeTestCheckFunc(
22+
resource.TestCheckResourceAttrSet("tencentcloud_waf_bot_scene_status_config.example", "id"),
23+
resource.TestCheckResourceAttrSet("tencentcloud_waf_bot_scene_status_config.example", "domain"),
24+
resource.TestCheckResourceAttrSet("tencentcloud_waf_bot_scene_status_config.example", "scene_id"),
25+
resource.TestCheckResourceAttrSet("tencentcloud_waf_bot_scene_status_config.example", "status"),
26+
),
27+
},
28+
{
29+
Config: testAccWafBotSceneStatusConfigUpdate,
30+
Check: resource.ComposeTestCheckFunc(
31+
resource.TestCheckResourceAttrSet("tencentcloud_waf_bot_scene_status_config.example", "id"),
32+
resource.TestCheckResourceAttrSet("tencentcloud_waf_bot_scene_status_config.example", "domain"),
33+
resource.TestCheckResourceAttrSet("tencentcloud_waf_bot_scene_status_config.example", "scene_id"),
34+
resource.TestCheckResourceAttrSet("tencentcloud_waf_bot_scene_status_config.example", "status"),
35+
),
36+
},
37+
{
38+
ResourceName: "tencentcloud_waf_bot_scene_status_config.example",
39+
ImportState: true,
40+
ImportStateVerify: true,
41+
},
42+
},
43+
})
44+
}
45+
46+
const testAccWafBotSceneStatusConfig = `
47+
resource "tencentcloud_waf_bot_scene_status_config" "example" {
48+
domain = "example.com"
49+
scene_id = "3024324123"
50+
status = true
51+
}
52+
`
53+
54+
const testAccWafBotSceneStatusConfigUpdate = `
55+
resource "tencentcloud_waf_bot_scene_status_config" "example" {
56+
domain = "example.com"
57+
scene_id = "3024324123"
58+
status = false
59+
}
60+
`

0 commit comments

Comments
 (0)