Merge pull request #576 from ttomzhou/master

fix ssl pay certificate

Author: gailwang

CHANGELOG.md

@@ -3,6 +3,7 @@
 FEATURES:
 
 * **New Resource**: `tencentcloud_kubernetes_node_pool` to support node management.
+* **New Resource**: `tencentcloud_ssl_pay_certificate` to support ssl pay certificate.
 
 DEPRECATED:
 

tencentcloud/connectivity/client.go

@@ -32,6 +32,7 @@ import (
 	redis "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis/v20180412"
 	scf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416"
 	sqlserver "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver/v20180328"
+	sslCertificate "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205"
 	sts "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sts/v20180813"
 	tag "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag/v20180813"
 	tcaplusdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb/v20190823"
@@ -49,37 +50,38 @@ type TencentCloudClient struct {
 	Protocol   string
 	Domain     string
 
-	cosConn        *s3.S3
-	mysqlConn      *cdb.Client
-	redisConn      *redis.Client
-	asConn         *as.Client
-	vpcConn        *vpc.Client
-	cbsConn        *cbs.Client
-	cvmConn        *cvm.Client
-	clbConn        *clb.Client
-	dayuConn       *dayu.Client
-	dcConn         *dc.Client
-	tagConn        *tag.Client
-	mongodbConn    *mongodb.Client
-	tkeConn        *tke.Client
-	tcrConn        *tcr.Client
-	camConn        *cam.Client
-	stsConn        *sts.Client
-	gaapConn       *gaap.Client
-	sslConn        *ssl.Client
-	cfsConn        *cfs.Client
-	scfConn        *scf.Client
-	tcaplusConn    *tcaplusdb.Client
-	cdnConn        *cdn.Client
-	monitorConn    *monitor.Client
-	esConn         *es.Client
-	sqlserverConn  *sqlserver.Client
-	postgreConn    *postgre.Client
-	ckafkaConn     *ckafka.Client
-	auditConn      *audit.Client
-	cynosConn      *cynosdb.Client
-	vodConn        *vod.Client
-	apiGatewayConn *apigateway.Client
+	cosConn            *s3.S3
+	mysqlConn          *cdb.Client
+	redisConn          *redis.Client
+	asConn             *as.Client
+	vpcConn            *vpc.Client
+	cbsConn            *cbs.Client
+	cvmConn            *cvm.Client
+	clbConn            *clb.Client
+	dayuConn           *dayu.Client
+	dcConn             *dc.Client
+	tagConn            *tag.Client
+	mongodbConn        *mongodb.Client
+	tkeConn            *tke.Client
+	tcrConn            *tcr.Client
+	camConn            *cam.Client
+	stsConn            *sts.Client
+	gaapConn           *gaap.Client
+	sslConn            *ssl.Client
+	cfsConn            *cfs.Client
+	scfConn            *scf.Client
+	tcaplusConn        *tcaplusdb.Client
+	cdnConn            *cdn.Client
+	monitorConn        *monitor.Client
+	esConn             *es.Client
+	sqlserverConn      *sqlserver.Client
+	postgreConn        *postgre.Client
+	ckafkaConn         *ckafka.Client
+	auditConn          *audit.Client
+	cynosConn          *cynosdb.Client
+	vodConn            *vod.Client
+	apiGatewayConn     *apigateway.Client
+	sslCertificateConn *sslCertificate.Client
 }
 
 // NewClientProfile returns a new ClientProfile
@@ -518,3 +520,16 @@ func (me *TencentCloudClient) UseTCRClient() *tcr.Client {
 
 	return me.tcrConn
 }
+
+// UseSSLCertificateClient returns SSL Certificate client for service
+func (me *TencentCloudClient) UseSSLCertificateClient() *sslCertificate.Client {
+	if me.sslCertificateConn != nil {
+		return me.sslCertificateConn
+	}
+
+	cpf := me.NewClientProfile(300)
+	me.sslCertificateConn, _ = sslCertificate.NewClient(me.Credential, me.Region, cpf)
+	me.sslCertificateConn.WithHttpTransport(&LogRoundTripper{})
+
+	return me.sslCertificateConn
+}

tencentcloud/extension_ssl.go

@@ -12,6 +12,36 @@ const (
 	SSL_CERT_TYPE_CA     = "CA"
 )
 
+const (
+	CsrTypeOnline = "online"
+	CsrTypeParse  = "parse"
+)
+
+const (
+	DNSAuto = "DNS_AUTO"
+	DNS     = "DNS"
+	File    = "FILE"
+)
+
+const (
+	InvalidParam          = "FailedOperation.InvalidParam"
+	CertificateNotFound   = "FailedOperation.CertificateNotFound"
+	InvalidParameter      = "InvalidParameter"
+	InvalidParameterValue = "InvalidParameterValue"
+	CertificateInvalid    = "FailedOperation.CertificateInvalid"
+)
+
+var CsrTypeArr = []string{
+	CsrTypeOnline,
+	CsrTypeParse,
+}
+
+var VerifyType = []string{
+	DNSAuto,
+	DNS,
+	File,
+}
+
 var SSL_CERT_TYPE = []string{
 	SSL_CERT_TYPE_SERVER,
 	SSL_CERT_TYPE_CA,

tencentcloud/provider.go

@@ -402,6 +402,7 @@ SSL Certificates
 
   Resource
     tencentcloud_ssl_certificate
+    tencentcloud_ssl_pay_certificate
 
 TcaplusDB
   Data Source
@@ -858,6 +859,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_gaap_security_rule":                      resourceTencentCloudGaapSecurityRule(),
 			"tencentcloud_gaap_domain_error_page":                  resourceTencentCloudGaapDomainErrorPageInfo(),
 			"tencentcloud_ssl_certificate":                         resourceTencentCloudSslCertificate(),
+			"tencentcloud_ssl_pay_certificate":                     resourceTencentCloudSSLInstance(),
 			"tencentcloud_cam_role":                                resourceTencentCloudCamRole(),
 			"tencentcloud_cam_user":                                resourceTencentCloudCamUser(),
 			"tencentcloud_cam_policy":                              resourceTencentCloudCamPolicy(),