Skip to content

fix vpn ssl #1021

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
May 2, 2022
Merged

fix vpn ssl #1021

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: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.377
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.391
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.392
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.385
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.359
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
Expand All @@ -57,7 +57,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.381
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.357
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.392
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199
github.com/tencentyun/cos-go-sdk-v5 v0.7.33
github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.389 h1:Ndw5
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.389/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.391 h1:aygYrFPSM5eFw2ysGJH4eAV4UXxl+zbPNaQWOHPlS3o=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.391/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.392 h1:UqcmPErxEm77NwqaRq6J1i2rcbhXcZHzq7WOuc9clAQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.392/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199 h1:ajgJogYSIQ5u1PIbiV5nsvr5K0fYpm1/T7Dy+mxEM6U=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199/go.mod h1:AqyM/ZZMD7q5mHBqNY9YImbSpEpoEe7E/vrTbUWX+po=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.351 h1:zqJsH5pxGT57La7NAOOyMQxsuM11pupNBwV1dzXcT24=
Expand Down Expand Up @@ -617,6 +619,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.199 h1:UDZ59pv
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.199/go.mod h1:SKgeSsIfPEM6BeoIFiGHsWG9UsEXzkK0SkWx51H/OS8=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.357 h1:fltPXAHX1pQRXX94LEzJbWaDzNsculh70XA9NN+9DFY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.357/go.mod h1:vuWreRMZo2kArdDtpXIjTf//ckEMRSot1msuSsmtQ0I=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.392 h1:nx8MQ8yJ3srpfEAlKLQKtOsBCBc30QJ3Q0RsSOGSphQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.392/go.mod h1:IAl660UAxdUtp1rHUwbUwxFCVqwk61xAIRbBk6QtTy8=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199 h1:hMBLtiJPnZ9GvA677cTB6ELBR6B68wCR2QY1sNoGQc4=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199/go.mod h1:nnY91/H3j/Gu7V/oCA6Zeg8T5D3q36EUdBh4EjmHwqY=
github.com/tencentyun/cos-go-sdk-v5 v0.7.31-0.20210902132439-360bc9b1be6b h1:rLl5sAeLt382023Kd3X4TaOEaT2hdgXWwTGyKiy16Zo=
Expand Down
33 changes: 7 additions & 26 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 @@ -23,7 +23,6 @@ package tencentcloud

import (
"context"
"fmt"
"log"
"time"

Expand Down Expand Up @@ -83,20 +82,10 @@ func resourceTencentCloudVpnSslClientCreate(d *schema.ResourceData, meta interfa
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
var (
taskId *uint64
sslClientId *string
)
if err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
response, err := vpcService.client.UseVpcClient().CreateVpnGatewaySslClient(request)
Expand All @@ -108,28 +97,20 @@ func resourceTencentCloudVpnSslClientCreate(d *schema.ResourceData, meta interfa
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
taskId = response.Response.TaskId
sslClientId = response.Response.SslVpnClientId
return nil
}); err != nil {
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)

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 := newIns[0]
d.SetId(*sslClient.SslVpnClientId)
d.SetId(*sslClientId)

return resourceTencentCloudVpnSslClientRead(d, meta)
}
Expand Down
20 changes: 6 additions & 14 deletions tencentcloud/resource_tc_vpn_ssl_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ package tencentcloud

import (
"context"
"fmt"
"log"
"time"

Expand Down Expand Up @@ -161,7 +160,10 @@ func resourceTencentCloudVpnSslServerCreate(d *schema.ResourceData, meta interfa
request.Compress = helper.Bool(v.(bool))
}

var taskId *int64
var (
taskId *int64
sslServerId *string
)
if err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
response, err := vpcService.client.UseVpcClient().CreateVpnGatewaySslServer(request)
Expand All @@ -173,6 +175,7 @@ func resourceTencentCloudVpnSslServerCreate(d *schema.ResourceData, meta interfa
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
taskId = response.Response.TaskId
sslServerId = response.Response.SslVpnServerId
return nil
}); err != nil {
return err
Expand All @@ -185,18 +188,7 @@ func resourceTencentCloudVpnSslServerCreate(d *schema.ResourceData, meta interfa

// add protect
time.Sleep(3)

filter := make(map[string]string)
filter["vpn-gateway-id"] = vpnGatewayId

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

if err != nil {
return fmt.Errorf("get instance list error: %s", err.Error())
}

sslServer := instances[0]
d.SetId(*sslServer.SslVpnServerId)
d.SetId(*sslServerId)

return resourceTencentCloudVpnSslServerRead(d, meta)
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading