Skip to content

Commit 9e39546

Browse files
gitmkngitmkn
committed
feat: support teo security
1 parent 17fefaf commit 9e39546

File tree

13 files changed

+2838
-257
lines changed

13 files changed

+2838
-257
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.984
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1012
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1013
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -90,7 +90,7 @@ require (
9090
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg v1.0.533
9191
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.955
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
93-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912
93+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1013
9494
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008
9595
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947
9696
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857

‎go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -929,6 +929,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1011 h1:cjq
929929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1011/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
930930
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1012 h1:OoaOmkAWsCfP8CZ2RUkwYtFciN1sJBcp6FmQJf0WGSY=
931931
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1012/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
932+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1013 h1:Q+QHJ/OUKnofZG742sk0Xtzdb5uAWq8OkhpdQE0UgXY=
933+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1013/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
932934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
933935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
934936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -1027,6 +1029,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578 h1:vBpQhUr
10271029
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578/go.mod h1:UlojGQh/9wb7/uXPNi7PvMral1CNAskVDNgqJEV83l0=
10281030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912 h1:XGOKd5umgbXDDTSOuLmoLDfNdh712lCIgIzw5SQItrA=
10291031
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912/go.mod h1:iqTDU0pVTQ8RCeMJPk/PAWl9HeI1DFMd1h07yMH7RGU=
1032+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1013 h1:Vcub4gbcTIs/uYINllI8eHXAhv652PpPLM+f/LWZroA=
1033+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1013/go.mod h1:QUt5DeP3jmoYPrWwgupRPg/Xus21MjEiUzzhEUv0tOY=
10301034
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0dVKQTD06xJ84B5asHViNJHrZmGojdAWEPIsITM=
10311035
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
10321036
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008 h1:Cz7JSuS2zxIBzAuZ2bKk3EmrZ1QgS2QAHmCDTDPWBz0=

‎tencentcloud/provider.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"strings"
1313

1414
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
15+
"github.com/mitchellh/go-homedir"
1516
sdkcommon "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
1617
commonJson "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/json"
1718
sdksts "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sts/v20180813"

‎tencentcloud/services/teo/resource_tc_teo_security_ip_group.go

Lines changed: 15 additions & 10 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_security_ip_group.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ Example Usage
44

55
```hcl
66
resource "tencentcloud_teo_security_ip_group" "teo_security_ip_group" {
7-
ip_group = {
7+
zone_id = "zone-2qtuhspy7cr6"
8+
ip_group {
9+
content = [
10+
"10.1.1.1",
11+
"10.1.1.2",
12+
"10.1.1.3",
13+
]
14+
name = "bbbbb"
815
}
916
}
1017
```
@@ -14,5 +21,5 @@ Import
1421
teo teo_security_ip_group can be imported using the id, e.g.
1522

1623
```
17-
terraform import tencentcloud_teo_security_ip_group.teo_security_ip_group teo_security_ip_group_id
24+
terraform import tencentcloud_teo_security_ip_group.teo_security_ip_group zone_id#group_id
1825
```

‎tencentcloud/services/teo/resource_tc_teo_security_ip_group_extension.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,18 @@
11
package teo
2+
3+
import (
4+
"context"
5+
6+
v20220901 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901"
7+
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
8+
)
9+
10+
func resourceTencentCloudTeoSecurityIpGroupCreatePostFillRequest0(ctx context.Context, req *v20220901.CreateSecurityIPGroupRequest) error {
11+
req.IPGroup.GroupId = helper.IntInt64(0)
12+
return nil
13+
}
14+
15+
func resourceTencentCloudTeoSecurityIpGroupUpdatePostFillRequest0(ctx context.Context, req *v20220901.ModifySecurityIPGroupRequest) error {
16+
req.Mode = helper.String("update")
17+
return nil
18+
}

‎tencentcloud/services/teo/resource_tc_teo_security_ip_group_test.go

Lines changed: 52 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package teo
1+
package teo_test
22

33
import (
44
"testing"
@@ -8,28 +8,69 @@ import (
88
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
99
)
1010

11+
// go test -test.run TestAccTencentCloudTeoSecurityIpGroupResource_basic -v
1112
func TestAccTencentCloudTeoSecurityIpGroupResource_basic(t *testing.T) {
1213
t.Parallel()
1314
resource.Test(t, resource.TestCase{
1415
PreCheck: func() {
1516
tcacctest.AccPreCheck(t)
1617
},
1718
Providers: tcacctest.AccProviders,
18-
Steps: []resource.TestStep{{
19-
Config: testAccTeoSecurityIpGroup,
20-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_teo_security_ip_group.teo_security_ip_group", "id")),
21-
}, {
22-
ResourceName: "tencentcloud_teo_security_ip_group.teo_security_ip_group",
23-
ImportState: true,
24-
ImportStateVerify: true,
25-
}},
19+
Steps: []resource.TestStep{
20+
{
21+
Config: testAccTeoSecurityIpGroup,
22+
Check: resource.ComposeTestCheckFunc(
23+
resource.TestCheckResourceAttrSet("tencentcloud_teo_security_ip_group.teo_security_ip_group", "id"),
24+
resource.TestCheckResourceAttr("tencentcloud_teo_security_ip_group.teo_security_ip_group", "ip_group.#", "1"),
25+
resource.TestCheckResourceAttr("tencentcloud_teo_security_ip_group.teo_security_ip_group", "ip_group.0.name", "aaaaa"),
26+
resource.TestCheckResourceAttr("tencentcloud_teo_security_ip_group.teo_security_ip_group", "ip_group.0.content.#", "2"),
27+
),
28+
},
29+
{
30+
ResourceName: "tencentcloud_teo_security_ip_group.teo_security_ip_group",
31+
ImportState: true,
32+
ImportStateVerify: true,
33+
},
34+
{
35+
Config: testAccTeoSecurityIpGroupUp,
36+
Check: resource.ComposeTestCheckFunc(
37+
resource.TestCheckResourceAttrSet("tencentcloud_teo_security_ip_group.teo_security_ip_group", "id"),
38+
resource.TestCheckResourceAttr("tencentcloud_teo_security_ip_group.teo_security_ip_group", "ip_group.#", "1"),
39+
resource.TestCheckResourceAttr("tencentcloud_teo_security_ip_group.teo_security_ip_group", "ip_group.0.name", "bbbbb"),
40+
resource.TestCheckResourceAttr("tencentcloud_teo_security_ip_group.teo_security_ip_group", "ip_group.0.content.#", "3"),
41+
),
42+
},
43+
},
2644
})
2745
}
2846

2947
const testAccTeoSecurityIpGroup = `
3048
3149
resource "tencentcloud_teo_security_ip_group" "teo_security_ip_group" {
32-
ip_group = {
33-
}
50+
zone_id = "zone-2qtuhspy7cr6"
51+
52+
ip_group {
53+
content = [
54+
"10.1.1.1",
55+
"10.1.1.2",
56+
]
57+
name = "aaaaa"
58+
}
59+
}
60+
`
61+
62+
const testAccTeoSecurityIpGroupUp = `
63+
64+
resource "tencentcloud_teo_security_ip_group" "teo_security_ip_group" {
65+
zone_id = "zone-2qtuhspy7cr6"
66+
67+
ip_group {
68+
content = [
69+
"10.1.1.1",
70+
"10.1.1.2",
71+
"10.1.1.3",
72+
]
73+
name = "bbbbb"
74+
}
3475
}
3576
`

‎tencentcloud/services/teo/service_tencentcloud_teo.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,11 +1139,12 @@ func (me *TeoService) DescribeTeoRealtimeLogDeliveryById(ctx context.Context, zo
11391139
return
11401140
}
11411141

1142-
func (me *TeoService) DescribeTeoSecurityIpGroupById(ctx context.Context) (ret *teo.DescribeSecurityIPGroupResponseParams, errRet error) {
1142+
func (me *TeoService) DescribeTeoSecurityIpGroupById(ctx context.Context, zoneId string, groupId string) (ret *teo.DescribeSecurityIPGroupResponseParams, errRet error) {
11431143
logId := tccommon.GetLogId(ctx)
11441144

11451145
request := teo.NewDescribeSecurityIPGroupRequest()
1146-
request.GroupIds = helper.StrToInt64Point(originGroupId)
1146+
request.ZoneId = helper.String(zoneId)
1147+
request.GroupIds = []*int64{helper.StrToInt64Point(groupId)}
11471148

11481149
defer func() {
11491150
if errRet != nil {

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)