Merge pull request #440 from tencentyun/master

add set provider protocol and domain

Author: oliverpei

tencentcloud/config.go

@@ -26,6 +26,7 @@ import (
 	monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
 	redis "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis/v20180412"
 	scf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416"
+	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"
 	tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
@@ -35,8 +36,10 @@ import (
 
 // TencentCloudClient is client for all TencentCloud service
 type TencentCloudClient struct {
-	Region     string
 	Credential *common.Credential
+	Region     string
+	Protocol   string
+	Domain     string
 
 	cosConn     *s3.S3
 	mysqlConn   *cdb.Client
@@ -52,6 +55,7 @@ type TencentCloudClient struct {
 	mongodbConn *mongodb.Client
 	tkeConn     *tke.Client
 	camConn     *cam.Client
+	stsConn     *sts.Client
 	gaapConn    *gaap.Client
 	sslConn     *ssl.Client
 	cfsConn     *cfs.Client
@@ -62,26 +66,18 @@ type TencentCloudClient struct {
 	esConn      *es.Client
 }
 
-// NewTencentCloudClient returns a new TencentCloudClient
-func NewTencentCloudClient(secretId, secretKey, securityToken, region string) *TencentCloudClient {
-	return &TencentCloudClient{
-		Region: region,
-		Credential: common.NewTokenCredential(
-			secretId,
-			secretKey,
-			securityToken,
-		),
-	}
-}
-
-// NewTencentCloudClientProfile returns a new ClientProfile
-func NewTencentCloudClientProfile(timeout int) *profile.ClientProfile {
+// NewClientProfile returns a new ClientProfile
+func (me *TencentCloudClient) NewClientProfile(timeout int) *profile.ClientProfile {
 	cpf := profile.NewClientProfile()
 
 	// all request use method POST
 	cpf.HttpProfile.ReqMethod = "POST"
 	// request timeout
 	cpf.HttpProfile.ReqTimeout = timeout
+	// request protocol
+	cpf.HttpProfile.Scheme = me.Protocol
+	// request domain
+	cpf.HttpProfile.RootDomain = me.Domain
 	// default language
 	cpf.Language = "en-US"
 
@@ -120,7 +116,7 @@ func (me *TencentCloudClient) UseMysqlClient() *cdb.Client {
 		return me.mysqlConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.mysqlConn, _ = cdb.NewClient(me.Credential, me.Region, cpf)
 	me.mysqlConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -133,7 +129,7 @@ func (me *TencentCloudClient) UseRedisClient() *redis.Client {
 		return me.redisConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.redisConn, _ = redis.NewClient(me.Credential, me.Region, cpf)
 	me.redisConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -146,7 +142,7 @@ func (me *TencentCloudClient) UseAsClient() *as.Client {
 		return me.asConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.asConn, _ = as.NewClient(me.Credential, me.Region, cpf)
 	me.asConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -159,7 +155,7 @@ func (me *TencentCloudClient) UseVpcClient() *vpc.Client {
 		return me.vpcConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.vpcConn, _ = vpc.NewClient(me.Credential, me.Region, cpf)
 	me.vpcConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -172,7 +168,7 @@ func (me *TencentCloudClient) UseCbsClient() *cbs.Client {
 		return me.cbsConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.cbsConn, _ = cbs.NewClient(me.Credential, me.Region, cpf)
 	me.cbsConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -185,7 +181,7 @@ func (me *TencentCloudClient) UseDcClient() *dc.Client {
 		return me.dcConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.dcConn, _ = dc.NewClient(me.Credential, me.Region, cpf)
 	me.dcConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -198,7 +194,7 @@ func (me *TencentCloudClient) UseMongodbClient() *mongodb.Client {
 		return me.mongodbConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.mongodbConn, _ = mongodb.NewClient(me.Credential, me.Region, cpf)
 	me.mongodbConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -211,7 +207,7 @@ func (me *TencentCloudClient) UseClbClient() *clb.Client {
 		return me.clbConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.clbConn, _ = clb.NewClient(me.Credential, me.Region, cpf)
 	me.clbConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -224,7 +220,7 @@ func (me *TencentCloudClient) UseCvmClient() *cvm.Client {
 		return me.cvmConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.cvmConn, _ = cvm.NewClient(me.Credential, me.Region, cpf)
 	me.cvmConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -237,7 +233,7 @@ func (me *TencentCloudClient) UseTagClient() *tag.Client {
 		return me.tagConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.tagConn, _ = tag.NewClient(me.Credential, me.Region, cpf)
 	me.tagConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -250,7 +246,7 @@ func (me *TencentCloudClient) UseTkeClient() *tke.Client {
 		return me.tkeConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.tkeConn, _ = tke.NewClient(me.Credential, me.Region, cpf)
 	me.tkeConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -263,7 +259,7 @@ func (me *TencentCloudClient) UseGaapClient() *gaap.Client {
 		return me.gaapConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.gaapConn, _ = gaap.NewClient(me.Credential, me.Region, cpf)
 	me.gaapConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -276,7 +272,7 @@ func (me *TencentCloudClient) UseSslClient() *ssl.Client {
 		return me.sslConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.sslConn, _ = ssl.NewClient(me.Credential, me.Region, cpf)
 	me.sslConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -289,20 +285,36 @@ func (me *TencentCloudClient) UseCamClient() *cam.Client {
 		return me.camConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.camConn, _ = cam.NewClient(me.Credential, me.Region, cpf)
 	me.camConn.WithHttpTransport(&LogRoundTripper{})
 
 	return me.camConn
 }
 
+// UseStsClient returns sts client for service
+func (me *TencentCloudClient) UseStsClient() *sts.Client {
+	/*
+		me.Credential will changed, don't cache it
+		if me.stsConn != nil {
+			return me.stsConn
+		}
+	*/
+
+	cpf := me.NewClientProfile(300)
+	me.stsConn, _ = sts.NewClient(me.Credential, me.Region, cpf)
+	me.stsConn.WithHttpTransport(&LogRoundTripper{})
+
+	return me.stsConn
+}
+
 // UseCfsClient returns cfs client for service
 func (me *TencentCloudClient) UseCfsClient() *cfs.Client {
 	if me.cfsConn != nil {
 		return me.cfsConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.cfsConn, _ = cfs.NewClient(me.Credential, me.Region, cpf)
 	me.cfsConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -315,7 +327,7 @@ func (me *TencentCloudClient) UseScfClient() *scf.Client {
 		return me.scfConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.scfConn, _ = scf.NewClient(me.Credential, me.Region, cpf)
 	me.scfConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -328,7 +340,7 @@ func (me *TencentCloudClient) UseTcaplusClient() *tcaplusdb.Client {
 		return me.tcaplusConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.tcaplusConn, _ = tcaplusdb.NewClient(me.Credential, me.Region, cpf)
 	me.tcaplusConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -341,7 +353,7 @@ func (me *TencentCloudClient) UseDayuClient() *dayu.Client {
 		return me.dayuConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.dayuConn, _ = dayu.NewClient(me.Credential, me.Region, cpf)
 	me.dayuConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -354,7 +366,7 @@ func (me *TencentCloudClient) UseCdnClient() *cdn.Client {
 		return me.cdnConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.cdnConn, _ = cdn.NewClient(me.Credential, me.Region, cpf)
 	me.cdnConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -367,7 +379,7 @@ func (me *TencentCloudClient) UseMonitorClient() *monitor.Client {
 		return me.monitorConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.monitorConn, _ = monitor.NewClient(me.Credential, me.Region, cpf)
 	me.monitorConn.WithHttpTransport(&LogRoundTripper{})
 
@@ -380,7 +392,7 @@ func (me *TencentCloudClient) UseEsClient() *es.Client {
 		return me.esConn
 	}
 
-	cpf := NewTencentCloudClientProfile(300)
+	cpf := me.NewClientProfile(300)
 	me.esConn, _ = es.NewClient(me.Credential, me.Region, cpf)
 	me.esConn.WithHttpTransport(&LogRoundTripper{})