Skip to content

Commit 29e64ee

Browse files
authored
add network egress (#2129)
* add network egress * add network egress
1 parent 543feb5 commit 29e64ee

File tree

10 files changed

+4891
-3364
lines changed

10 files changed

+4891
-3364
lines changed

.changelog/2129.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_eip: support set network egress

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.693
4343
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4444
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.711
45-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.748
45+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.749
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -92,7 +92,7 @@ require (
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.732
9393
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674
9494
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199
95-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.706
95+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.749
9696
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.725
9797
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199
9898
github.com/tencentyun/cos-go-sdk-v5 v0.7.42-0.20230629101357-7edd77448a0f

go.sum

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -859,12 +859,11 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.732/go.mod
859859
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.734/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
860860
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.736/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
861861
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.737/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
862-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.743/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
863862
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.745/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
864-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.746 h1:HR4eaIyJhb4sDK8G9W/EuX+ZTgV7mKsd4t4/y5I3mtU=
865863
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.746/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
866-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.748 h1:QKUyqL7RO9fy20Bk/D0jzbcLboyweT6HGVmWlK6Cgqg=
867864
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.748/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
865+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.749 h1:zqRnwIFnylN9TF+Rsds8JCLZr/ZugEEJcr7mpClbVS4=
866+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.749/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
868867
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
869868
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624/go.mod h1:+TXSVyeKwt1IhZRqKPbTREteBcP+K07Q846/ilNzLWA=
870869
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589 h1:LZihgirMH0vsaGScYexxwY0fTss9vHaSZs/YOQUVESg=
@@ -923,8 +922,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/rum v1.0.542 h1:/U0rTVK
923922
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/rum v1.0.542/go.mod h1:QF1J13hmuMY5gMrBopRFmHWFs/KsLr5uCNBRJt5aA1M=
924923
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf v1.0.729 h1:UWTpLpN3UngFNTuMosxSMCcmuoLksvuc9tt7ulCe0D8=
925924
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf v1.0.729/go.mod h1:P5cLcaPdmOiRhv79OAvAKf+9JTg/64N7ZxwZHBW2mZA=
926-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ses v1.0.743 h1:loQWl2qSlclwPrgAyvkIODDXbwy3ZPynAxiMf+TJdjY=
927-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ses v1.0.743/go.mod h1:oqFIxpm3Pu3cT9qAALFw2VqcC4g/tVyWGOkjVkpJakA=
928925
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ses v1.0.748 h1:pG2i5MHLmDkn8RC5wGjqRUx2db4L79JmV7qJyFzK5cs=
929926
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ses v1.0.748/go.mod h1:ZADb5YPBRKNvhdQVl74jPKf9gMCDX8rxtDkBsYMSDfU=
930927
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.0.486 h1:eHLaL+hl5X5f8Apuf2SGVclO3MRev/E3AfA/0aZQGUA=
@@ -965,8 +962,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674 h1:VsMV1/v
965962
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674/go.mod h1:6+MWxaNR4y+spZHYNntulOyj628owTLuWmEFebJOWdA=
966963
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199 h1:6Yt74l4pA5QtzhwMNIEUt0spXdSBKH744DDqTHJOCP0=
967964
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199/go.mod h1:Yw6OQ33z3s4k0HVYTNSffB12qOzEJ2Zf1Vj4+5S3sRs=
968-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.706 h1:qJUOUJ0RjB74eTk8faReVjYNN8SJtUT1CS25YXTYEfE=
969-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.706/go.mod h1:VWt0lgvRxyTJKjzadc8T+PM+/M7kfQZdNtYHQ7wQsBU=
965+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.749 h1:KcbXniSZIi6ND5I9PFO8m5GOwSIRQfLmSop/ZaXDI0o=
966+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.749/go.mod h1:1uL+/zlzqRHbtWpgUmOs5UELr4KbsgB7tiaUajpAF94=
970967
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.725 h1:ETqP+erlPnDK1zafCmyDYNkZLcY+dAG3143Ihk5vFHk=
971968
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.725/go.mod h1:YPB08jHrJ3GJJ09ZTEBLnMvI+lqQEtu17jJjyfq8+sU=
972969
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199 h1:hMBLtiJPnZ9GvA677cTB6ELBR6B68wCR2QY1sNoGQc4=

tencentcloud/resource_tc_eip.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,18 @@ resource "tencentcloud_eip" "foo" {
2828
}
2929
```
3030
31+
Eip With Network Egress
32+
```
33+
resource "tencentcloud_eip" "foo" {
34+
name = "egress_eip"
35+
egress = "center_egress2"
36+
internet_charge_type = "BANDWIDTH_PACKAGE"
37+
internet_service_provider = "CMCC"
38+
internet_max_bandwidth_out = 1
39+
type = "EIP"
40+
}
41+
```
42+
3143
Import
3244
3345
EIP can be imported using the id, e.g.
@@ -129,6 +141,12 @@ func resourceTencentCloudEip() *schema.Resource {
129141
Computed: true,
130142
Description: "ID of bandwidth package, it will set when `internet_charge_type` is `BANDWIDTH_PACKAGE`.",
131143
},
144+
"egress": {
145+
Type: schema.TypeString,
146+
Optional: true,
147+
Computed: true,
148+
Description: "Network egress. It defaults to `center_egress1`. If you want to try the egress feature, please [submit a ticket](https://console.cloud.tencent.com/workorder/category).",
149+
},
132150
"anti_ddos_package_id": {
133151
Type: schema.TypeString,
134152
Optional: true,
@@ -205,6 +223,9 @@ func resourceTencentCloudEipCreate(d *schema.ResourceData, meta interface{}) err
205223
if v, ok := d.GetOk("name"); ok {
206224
request.AddressName = helper.String(v.(string))
207225
}
226+
if v, ok := d.GetOk("egress"); ok {
227+
request.Egress = helper.String(v.(string))
228+
}
208229
if v, ok := d.GetOk("anti_ddos_package_id"); ok {
209230
request.AntiDDoSPackageId = helper.String(v.(string))
210231
}
@@ -310,6 +331,10 @@ func resourceTencentCloudEipRead(d *schema.ResourceData, meta interface{}) error
310331
_ = d.Set("internet_max_bandwidth_out", eip.Bandwidth)
311332
}
312333

334+
if eip.Egress != nil {
335+
_ = d.Set("egress", eip.Egress)
336+
}
337+
313338
if eip.AntiDDoSPackageId != nil {
314339
_ = d.Set("anti_ddos_package_id", eip.AntiDDoSPackageId)
315340
}
@@ -338,6 +363,7 @@ func resourceTencentCloudEipUpdate(d *schema.ResourceData, meta interface{}) err
338363
unsupportedUpdateFields := []string{
339364
"bandwidth_package_id",
340365
"anti_ddos_package_id",
366+
"egress",
341367
}
342368
for _, field := range unsupportedUpdateFields {
343369
if d.HasChange(field) {

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)