Skip to content

Commit 18a785a

Browse files
authored
fix(teo): [122612321] modify l7 acc rule (#3247)
* fix(teo): [122612321] modify l7 acc rule * feat: add changelog * fix: modify test * fix: modify rule * fix: modify rule content
1 parent 18da9ae commit 18a785a

7 files changed

+165
-266
lines changed

.changelog/3247.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_teo_l7_acc_rule: Fix the problem of modifying rules and supporting the order of rules.
3+
```

tencentcloud/services/teo/resource_tc_teo_l7_acc_rule.go

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

tencentcloud/services/teo/resource_tc_teo_l7_acc_rule.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Provides a resource to create a teo l7_acc_rule
22

3+
~> **NOTE:** This feature only supports the sites in the plans of the Standard Edition and the Enterprise Edition.
4+
35
Example Usage
46

57
```hcl
@@ -8,7 +10,6 @@ resource "tencentcloud_teo_l7_acc_rule" "teo_l7_acc_rule" {
810
rules {
911
description = ["1"]
1012
rule_name = "网站加速"
11-
status = "disable"
1213
branches {
1314
condition = "$${http.request.host} in ['aaa.makn.cn']"
1415
actions {
@@ -66,7 +67,6 @@ resource "tencentcloud_teo_l7_acc_rule" "teo_l7_acc_rule" {
6667
rules {
6768
description = ["2"]
6869
rule_name = "音视频直播"
69-
status = "enable"
7070
branches {
7171
condition = "$${http.request.host} in ['aaa.makn.cn']"
7272
sub_rules {
@@ -117,7 +117,6 @@ resource "tencentcloud_teo_l7_acc_rule" "teo_l7_acc_rule" {
117117
rules {
118118
description = ["3"]
119119
rule_name = "大文件下载"
120-
status = "enable"
121120
branches {
122121
condition = "$${http.request.host} in ['aaa.makn.cn']"
123122
actions {
@@ -168,7 +167,6 @@ resource "tencentcloud_teo_l7_acc_rule" "teo_l7_acc_rule" {
168167
rules {
169168
description = ["4"]
170169
rule_name = "音视频点播"
171-
status = "enable"
172170
branches {
173171
condition = "$${http.request.host} in ['aaa.makn.cn']"
174172
actions {
@@ -219,7 +217,6 @@ resource "tencentcloud_teo_l7_acc_rule" "teo_l7_acc_rule" {
219217
rules {
220218
description = ["5"]
221219
rule_name = "API 加速"
222-
status = "enable"
223220
branches {
224221
condition = "$${http.request.host} in ['aaa.makn.cn']"
225222
actions {
@@ -241,7 +238,6 @@ resource "tencentcloud_teo_l7_acc_rule" "teo_l7_acc_rule" {
241238
rules {
242239
description = ["6"]
243240
rule_name = "WordPress 建站"
244-
status = "enable"
245241
branches {
246242
condition = "$${http.request.host} in ['aaa.makn.cn']"
247243
sub_rules {

tencentcloud/services/teo/resource_tc_teo_l7_acc_rule_extension.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package teo
22

33
import (
4+
"encoding/json"
5+
46
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
57
teo "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901"
68
teov20220901 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901"
@@ -2464,3 +2466,19 @@ func resourceTencentCloudTeoL7AccRuleSetBranchs(ruleBranches []*teo.RuleBranch)
24642466
}
24652467
return branchesList
24662468
}
2469+
2470+
func resourceTencentCloudTeoL7AccRuleContent(rules []*teo.RuleEngineItem) (string, error) {
2471+
type Content struct {
2472+
FormatVersion string `json:"FormatVersion,omitempty"`
2473+
Rules []*teo.RuleEngineItem `json:"Rules,omitempty"`
2474+
}
2475+
content := Content{
2476+
FormatVersion: "1.0",
2477+
Rules: rules,
2478+
}
2479+
contentBytes, err := json.Marshal(content)
2480+
if err != nil {
2481+
return "", err
2482+
}
2483+
return string(contentBytes), nil
2484+
}

0 commit comments

Comments
 (0)