Skip to content

Commit 2cbb87d

Browse files
authored
Merge pull request #576 from ttomzhou/master
fix ssl pay certificate
2 parents 412786e + dd4abd0 commit 2cbb87d

File tree

12 files changed

+3448
-31
lines changed

12 files changed

+3448
-31
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
FEATURES:
44

55
* **New Resource**: `tencentcloud_kubernetes_node_pool` to support node management.
6+
* **New Resource**: `tencentcloud_ssl_pay_certificate` to support ssl pay certificate.
67

78
DEPRECATED:
89

tencentcloud/connectivity/client.go

Lines changed: 46 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
redis "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis/v20180412"
3333
scf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416"
3434
sqlserver "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver/v20180328"
35+
sslCertificate "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205"
3536
sts "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sts/v20180813"
3637
tag "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag/v20180813"
3738
tcaplusdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb/v20190823"
@@ -49,37 +50,38 @@ type TencentCloudClient struct {
4950
Protocol string
5051
Domain string
5152

52-
cosConn *s3.S3
53-
mysqlConn *cdb.Client
54-
redisConn *redis.Client
55-
asConn *as.Client
56-
vpcConn *vpc.Client
57-
cbsConn *cbs.Client
58-
cvmConn *cvm.Client
59-
clbConn *clb.Client
60-
dayuConn *dayu.Client
61-
dcConn *dc.Client
62-
tagConn *tag.Client
63-
mongodbConn *mongodb.Client
64-
tkeConn *tke.Client
65-
tcrConn *tcr.Client
66-
camConn *cam.Client
67-
stsConn *sts.Client
68-
gaapConn *gaap.Client
69-
sslConn *ssl.Client
70-
cfsConn *cfs.Client
71-
scfConn *scf.Client
72-
tcaplusConn *tcaplusdb.Client
73-
cdnConn *cdn.Client
74-
monitorConn *monitor.Client
75-
esConn *es.Client
76-
sqlserverConn *sqlserver.Client
77-
postgreConn *postgre.Client
78-
ckafkaConn *ckafka.Client
79-
auditConn *audit.Client
80-
cynosConn *cynosdb.Client
81-
vodConn *vod.Client
82-
apiGatewayConn *apigateway.Client
53+
cosConn *s3.S3
54+
mysqlConn *cdb.Client
55+
redisConn *redis.Client
56+
asConn *as.Client
57+
vpcConn *vpc.Client
58+
cbsConn *cbs.Client
59+
cvmConn *cvm.Client
60+
clbConn *clb.Client
61+
dayuConn *dayu.Client
62+
dcConn *dc.Client
63+
tagConn *tag.Client
64+
mongodbConn *mongodb.Client
65+
tkeConn *tke.Client
66+
tcrConn *tcr.Client
67+
camConn *cam.Client
68+
stsConn *sts.Client
69+
gaapConn *gaap.Client
70+
sslConn *ssl.Client
71+
cfsConn *cfs.Client
72+
scfConn *scf.Client
73+
tcaplusConn *tcaplusdb.Client
74+
cdnConn *cdn.Client
75+
monitorConn *monitor.Client
76+
esConn *es.Client
77+
sqlserverConn *sqlserver.Client
78+
postgreConn *postgre.Client
79+
ckafkaConn *ckafka.Client
80+
auditConn *audit.Client
81+
cynosConn *cynosdb.Client
82+
vodConn *vod.Client
83+
apiGatewayConn *apigateway.Client
84+
sslCertificateConn *sslCertificate.Client
8385
}
8486

8587
// NewClientProfile returns a new ClientProfile
@@ -518,3 +520,16 @@ func (me *TencentCloudClient) UseTCRClient() *tcr.Client {
518520

519521
return me.tcrConn
520522
}
523+
524+
// UseSSLCertificateClient returns SSL Certificate client for service
525+
func (me *TencentCloudClient) UseSSLCertificateClient() *sslCertificate.Client {
526+
if me.sslCertificateConn != nil {
527+
return me.sslCertificateConn
528+
}
529+
530+
cpf := me.NewClientProfile(300)
531+
me.sslCertificateConn, _ = sslCertificate.NewClient(me.Credential, me.Region, cpf)
532+
me.sslCertificateConn.WithHttpTransport(&LogRoundTripper{})
533+
534+
return me.sslCertificateConn
535+
}

tencentcloud/extension_ssl.go

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,36 @@ const (
1212
SSL_CERT_TYPE_CA = "CA"
1313
)
1414

15+
const (
16+
CsrTypeOnline = "online"
17+
CsrTypeParse = "parse"
18+
)
19+
20+
const (
21+
DNSAuto = "DNS_AUTO"
22+
DNS = "DNS"
23+
File = "FILE"
24+
)
25+
26+
const (
27+
InvalidParam = "FailedOperation.InvalidParam"
28+
CertificateNotFound = "FailedOperation.CertificateNotFound"
29+
InvalidParameter = "InvalidParameter"
30+
InvalidParameterValue = "InvalidParameterValue"
31+
CertificateInvalid = "FailedOperation.CertificateInvalid"
32+
)
33+
34+
var CsrTypeArr = []string{
35+
CsrTypeOnline,
36+
CsrTypeParse,
37+
}
38+
39+
var VerifyType = []string{
40+
DNSAuto,
41+
DNS,
42+
File,
43+
}
44+
1545
var SSL_CERT_TYPE = []string{
1646
SSL_CERT_TYPE_SERVER,
1747
SSL_CERT_TYPE_CA,

tencentcloud/provider.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ SSL Certificates
402402
403403
Resource
404404
tencentcloud_ssl_certificate
405+
tencentcloud_ssl_pay_certificate
405406
406407
TcaplusDB
407408
Data Source
@@ -858,6 +859,7 @@ func Provider() terraform.ResourceProvider {
858859
"tencentcloud_gaap_security_rule": resourceTencentCloudGaapSecurityRule(),
859860
"tencentcloud_gaap_domain_error_page": resourceTencentCloudGaapDomainErrorPageInfo(),
860861
"tencentcloud_ssl_certificate": resourceTencentCloudSslCertificate(),
862+
"tencentcloud_ssl_pay_certificate": resourceTencentCloudSSLInstance(),
861863
"tencentcloud_cam_role": resourceTencentCloudCamRole(),
862864
"tencentcloud_cam_user": resourceTencentCloudCamUser(),
863865
"tencentcloud_cam_policy": resourceTencentCloudCamPolicy(),

0 commit comments

Comments
 (0)