Skip to content

Commit 3be320c

Browse files
SevenEarthSevenEarth
committed
add
1 parent b414e30 commit 3be320c

5 files changed

+25
-20
lines changed

‎tencentcloud/services/vpn/resource_tc_vpn_customer_gateway.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ func ResourceTencentCloudVpnCustomerGateway() *schema.Resource {
5050
"bgp_asn": {
5151
Type: schema.TypeInt,
5252
Optional: true,
53-
Computed: true,
54-
Description: "BGP ASN. Value range: 1 - 4294967295. Using BGP requires configuring ASN.",
53+
Description: "BGP ASN. Value range: 1 - 4294967295. Using BGP requires configuring ASN. 139341, 45090, and 58835 are not available.",
5554
},
5655
"create_time": {
5756
Type: schema.TypeString,
@@ -214,7 +213,7 @@ func resourceTencentCloudVpnCustomerGatewayRead(d *schema.ResourceData, meta int
214213
_ = d.Set("public_ip_address", gateway.IpAddress)
215214
}
216215

217-
if gateway.BgpAsn != nil {
216+
if gateway.BgpAsn != nil && *gateway.BgpAsn != 0 {
218217
_ = d.Set("bgp_asn", gateway.BgpAsn)
219218
}
220219

@@ -321,6 +320,10 @@ func resourceTencentCloudVpnCustomerGatewayDelete(d *schema.ResourceData, meta i
321320
logId, tRequest.GetAction(), tRequest.ToJsonString(), e.Error())
322321
return tccommon.RetryError(e)
323322
} else {
323+
if result == nil || result.Response == nil || result.Response.VpnConnectionSet == nil {
324+
return resource.NonRetryableError(fmt.Errorf("Read VPN connections failed, Response is nil."))
325+
}
326+
324327
if len(result.Response.VpnConnectionSet) == 0 {
325328
return nil
326329
} else {
@@ -368,6 +371,10 @@ func resourceTencentCloudVpnCustomerGatewayDelete(d *schema.ResourceData, meta i
368371
return tccommon.RetryError(e)
369372
}
370373
} else {
374+
if result == nil || result.Response == nil || result.Response.CustomerGatewaySet == nil {
375+
return resource.NonRetryableError(fmt.Errorf("Read VPN customer gateways failed, Response is nil."))
376+
}
377+
371378
//if not, quit
372379
if len(result.Response.CustomerGatewaySet) == 0 {
373380
return nil

‎tencentcloud/services/vpn/resource_tc_vpn_gateway.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ func ResourceTencentCloudVpnGateway() *schema.Resource {
137137
"bgp_asn": {
138138
Type: schema.TypeInt,
139139
Optional: true,
140-
Computed: true,
141140
Description: "BGP ASN. Value range: 1 - 4294967295. Using BGP requires configuring ASN.",
142141
},
143142
"create_time": {
@@ -269,10 +268,8 @@ func resourceTencentCloudVpnGatewayCreate(d *schema.ResourceData, meta interface
269268
//modify tags
270269
if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
271270
tagService := svctag.NewTagService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
272-
273271
region := meta.(tccommon.ProviderMeta).GetAPIV3Conn().Region
274272
resourceName := tccommon.BuildTagResourceName("vpc", "vpngw", region, gatewayId)
275-
276273
if err := tagService.ModifyTags(ctx, resourceName, tags, nil); err != nil {
277274
return err
278275
}
@@ -297,6 +294,7 @@ func resourceTencentCloudVpnGatewayRead(d *schema.ResourceData, meta interface{}
297294
log.Printf("[CRITAL]%s read VPN gateway failed, reason:%s\n", logId, err.Error())
298295
return err
299296
}
297+
300298
if !has {
301299
d.SetId("")
302300
return nil
@@ -321,7 +319,7 @@ func resourceTencentCloudVpnGatewayRead(d *schema.ResourceData, meta interface{}
321319
_ = d.Set("zone", gateway.Zone)
322320
_ = d.Set("cdc_id", gateway.CdcId)
323321
_ = d.Set("max_connection", gateway.MaxConnection)
324-
if gateway.BgpAsn != nil {
322+
if gateway.BgpAsn != nil && *gateway.BgpAsn != 0 {
325323
_ = d.Set("bgp_asn", gateway.BgpAsn)
326324
}
327325

‎tencentcloud/services/vpn/resource_tc_vpn_gateway.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ resource "tencentcloud_vpn_gateway" "example" {
1515
vpc_id = "vpc-86v957zb"
1616
1717
tags = {
18-
createBy = "terraform"
18+
createBy = "Terraform"
1919
}
2020
}
2121
```
@@ -30,7 +30,7 @@ resource "tencentcloud_vpn_gateway" "example" {
3030
type = "IPSEC"
3131
3232
tags = {
33-
createBy = "terraform"
33+
createBy = "Terraform"
3434
}
3535
}
3636
```
@@ -45,7 +45,7 @@ resource "tencentcloud_vpn_gateway" "example" {
4545
type = "SSL_CCN"
4646
4747
tags = {
48-
createBy = "terraform"
48+
createBy = "Terraform"
4949
}
5050
}
5151
```
@@ -60,7 +60,7 @@ resource "tencentcloud_vpn_gateway" "example" {
6060
bgp_asn = 9000
6161
6262
tags = {
63-
createBy = "terraform"
63+
createBy = "Terraform"
6464
}
6565
}
6666
```
@@ -75,7 +75,7 @@ resource "tencentcloud_vpn_gateway" "example" {
7575
zone = "ap-guangzhou-3"
7676
7777
tags = {
78-
createBy = "terraform"
78+
createBy = "Terraform"
7979
}
8080
}
8181
```
@@ -92,7 +92,7 @@ resource "tencentcloud_vpn_gateway" "example" {
9292
prepaid_period = 1
9393
9494
tags = {
95-
createBy = "terraform"
95+
createBy = "Terraform"
9696
}
9797
}
9898
```

‎website/docs/r/vpn_customer_gateway.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The following arguments are supported:
2929

3030
* `name` - (Required, String) Name of the customer gateway. The length of character is limited to 1-60.
3131
* `public_ip_address` - (Required, String, ForceNew) Public IP of the customer gateway.
32-
* `bgp_asn` - (Optional, Int) BGP ASN. Value range: 1 - 4294967295. Using BGP requires configuring ASN.
32+
* `bgp_asn` - (Optional, Int) BGP ASN. Value range: 1 - 4294967295. Using BGP requires configuring ASN. 139341, 45090, and 58835 are not available.
3333
* `tags` - (Optional, Map) A list of tags used to associate different resources.
3434

3535
## Attributes Reference

‎website/docs/r/vpn_gateway.html.markdown

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ resource "tencentcloud_vpn_gateway" "example" {
2626
vpc_id = "vpc-86v957zb"
2727
2828
tags = {
29-
createBy = "terraform"
29+
createBy = "Terraform"
3030
}
3131
}
3232
```
@@ -41,7 +41,7 @@ resource "tencentcloud_vpn_gateway" "example" {
4141
type = "IPSEC"
4242
4343
tags = {
44-
createBy = "terraform"
44+
createBy = "Terraform"
4545
}
4646
}
4747
```
@@ -56,7 +56,7 @@ resource "tencentcloud_vpn_gateway" "example" {
5656
type = "SSL_CCN"
5757
5858
tags = {
59-
createBy = "terraform"
59+
createBy = "Terraform"
6060
}
6161
}
6262
```
@@ -71,7 +71,7 @@ resource "tencentcloud_vpn_gateway" "example" {
7171
bgp_asn = 9000
7272
7373
tags = {
74-
createBy = "terraform"
74+
createBy = "Terraform"
7575
}
7676
}
7777
```
@@ -86,7 +86,7 @@ resource "tencentcloud_vpn_gateway" "example" {
8686
zone = "ap-guangzhou-3"
8787
8888
tags = {
89-
createBy = "terraform"
89+
createBy = "Terraform"
9090
}
9191
}
9292
```
@@ -103,7 +103,7 @@ resource "tencentcloud_vpn_gateway" "example" {
103103
prepaid_period = 1
104104
105105
tags = {
106-
createBy = "terraform"
106+
createBy = "Terraform"
107107
}
108108
}
109109
```

0 commit comments

Comments
 (0)