Skip to content

fix ssl client and fix clb doc #932

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
Mar 30, 2022
Merged

fix ssl client and fix clb doc #932

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
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_clb_target_group_attachment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ resource "tencentcloud_clb_target_group_attachment" "group" {
clb_id = tencentcloud_clb_instance.clb_basic.id
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id
targrt_group_id = tencentcloud_clb_target_group.test.id
target_group_id = tencentcloud_clb_target_group.test.id
}
```

Expand Down
37 changes: 25 additions & 12 deletions tencentcloud/resource_tc_vpn_ssl_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,32 @@ func resourceTencentCloudVpnSslClientCreate(d *schema.ResourceData, meta interfa
ctx := context.WithValue(context.TODO(), logIdKey, logId)

var (
vpcService = VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
request = vpc.NewCreateVpnGatewaySslClientRequest()
sslVpnServerId string
vpcService = VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
request = vpc.NewCreateVpnGatewaySslClientRequest()
sslVpnServerId string
sslVpnClientName string
)

if v, ok := d.GetOk("ssl_vpn_server_id"); ok {
sslVpnServerId = v.(string)
request.SslVpnServerId = helper.String(sslVpnServerId)
}
if v, ok := d.GetOk("ssl_vpn_client_name"); ok {
request.SslVpnClientName = helper.String(v.(string))
sslVpnClientName = v.(string)
request.SslVpnClientName = helper.String(sslVpnClientName)
}

// make sure client name is unique
filter := make(map[string]string)
filter["ssl-vpn-server-id"] = sslVpnServerId
filter["ssl-vpn-client-name"] = sslVpnClientName

existIns, err := vpcService.DescribeVpnGwSslClientByFilter(ctx, filter)
if err != nil {
return fmt.Errorf("get instance list error: %s", err.Error())
}
if len(existIns) > 0 {
return fmt.Errorf("ssl client with same name already exist.")
}

var taskId *uint64
Expand All @@ -98,24 +113,22 @@ func resourceTencentCloudVpnSslClientCreate(d *schema.ResourceData, meta interfa
return err
}

err := vpcService.DescribeTaskResult(ctx, helper.Uint64(*taskId))
err = vpcService.DescribeTaskResult(ctx, helper.Uint64(*taskId))
if err != nil {
return err
}

// add protect
time.Sleep(3)

filter := make(map[string]string)
filter["ssl-vpn-server-id"] = sslVpnServerId

instances, err := vpcService.DescribeVpnGwSslClientByFilter(ctx, filter)

newIns, err := vpcService.DescribeVpnGwSslClientByFilter(ctx, filter)
if err != nil {
return fmt.Errorf("get instance list error: %s", err.Error())
}
if len(newIns) != 1 {
return fmt.Errorf("create ssl client error")
}

sslClient := instances[0]
sslClient := newIns[0]
d.SetId(*sslClient.SslVpnClientId)

return resourceTencentCloudVpnSslClientRead(d, meta)
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/clb_target_group_attachment.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ resource "tencentcloud_clb_target_group_attachment" "group" {
clb_id = tencentcloud_clb_instance.clb_basic.id
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id
targrt_group_id = tencentcloud_clb_target_group.test.id
target_group_id = tencentcloud_clb_target_group.test.id
}
```

Expand Down