Skip to content

fix update issue in resource tencentcloud_vpn_connection #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2020
Merged

fix update issue in resource tencentcloud_vpn_connection #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
## 1.41.2 (Unreleased)

BUG FIXES:
* Resource: `tencentcloud_vpn_connection` fix `security_group_policy` update issue when apply repeatedly.

## 1.41.1 (August 27, 2020)

BUG FIXES:
Expand Down
8 changes: 4 additions & 4 deletions tencentcloud/resource_tc_vpn_connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func resourceTencentCloudVpnConnection() *schema.Resource {
Description: "Pre-shared key of the VPN connection.",
},
"security_group_policy": {
Type: schema.TypeList,
Type: schema.TypeSet,
Required: true,
Description: "Security group policy of the VPN connection.",
Elem: &schema.Resource{
Expand Down Expand Up @@ -320,7 +320,7 @@ func resourceTencentCloudVpnConnectionCreate(d *schema.ResourceData, meta interf

//set up SecurityPolicyDatabases

sgps := d.Get("security_group_policy").([]interface{})
sgps := d.Get("security_group_policy").(*schema.Set).List()
if len(sgps) < 1 {
return fmt.Errorf("Para `security_group_policy` should be set at least one.")
}
Expand Down Expand Up @@ -639,13 +639,13 @@ func resourceTencentCloudVpnConnectionUpdate(d *schema.ResourceData, meta interf

//set up SecurityPolicyDatabases
if d.HasChange("security_group_policy") {
sgps := d.Get("security_group_policy").([]interface{})
sgps := d.Get("security_group_policy").(*schema.Set).List()
if len(sgps) < 1 {
return fmt.Errorf("Para `security_group_policy` should be set at least one.")
}
request.SecurityPolicyDatabases = make([]*vpc.SecurityPolicyDatabase, 0, len(sgps))
for _, v := range sgps {
m := v.(map[string]interface{})
request.SecurityPolicyDatabases = make([]*vpc.SecurityPolicyDatabase, 0, len(sgps))
var sgp vpc.SecurityPolicyDatabase
local := m["local_cidr_block"].(string)
sgp.LocalCidrBlock = &local
Expand Down