Skip to content

Commit 77f697c

Browse files
SevenEarthSevenEarth
committed
add
1 parent a2b1357 commit 77f697c

28 files changed

+230
-245
lines changed

‎tencentcloud/connectivity/client.go

Lines changed: 125 additions & 125 deletions
Large diffs are not rendered by default.

‎tencentcloud/services/cbs/service_tencentcloud_cbs.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ func (me *CbsService) DescribeDiskById(ctx context.Context, diskId string) (disk
5252
request.Limit = helper.IntUint64(100)
5353
ratelimit.Check(request.GetAction())
5454

55-
var specArgs connectivity.IacExtInfo
56-
specArgs.InstanceId = diskId
57-
58-
response, err := me.client.UseCbsClient(specArgs).DescribeDisks(request)
55+
var iacExtInfo connectivity.IacExtInfo
56+
iacExtInfo.InstanceId = diskId
57+
response, err := me.client.UseCbsClient(iacExtInfo).DescribeDisks(request)
5958
if err != nil {
6059
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
6160
logId, request.GetAction(), request.ToJsonString(), err.Error())
@@ -85,14 +84,13 @@ func (me *CbsService) DescribeDiskList(ctx context.Context, diskIds []*string) (
8584
request.Limit = helper.IntUint64(100)
8685
ratelimit.Check(request.GetAction())
8786

88-
var specArgs connectivity.IacExtInfo
87+
var iacExtInfo connectivity.IacExtInfo
8988
tmpList := make([]string, len(diskIds))
9089
for k, v := range diskIds {
9190
tmpList[k] = *v
9291
}
93-
specArgs.InstanceId = strings.Join(tmpList, tccommon.FILED_SP)
94-
95-
response, err := me.client.UseCbsClient(specArgs).DescribeDisks(request)
92+
iacExtInfo.InstanceId = strings.Join(tmpList, tccommon.FILED_SP)
93+
response, err := me.client.UseCbsClient(iacExtInfo).DescribeDisks(request)
9694
if err != nil {
9795
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
9896
logId, request.GetAction(), request.ToJsonString(), err.Error())

‎tencentcloud/services/cdb/service_tencentcloud_mysql.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -810,9 +810,9 @@ func (me *MysqlService) _innerDescribeDBInstanceById(ctx context.Context, mysqlI
810810
}
811811
}()
812812
ratelimit.Check(request.GetAction())
813-
var specArgs connectivity.IacExtInfo
814-
specArgs.InstanceId = mysqlId
815-
response, err := me.client.UseMysqlClient(specArgs).DescribeDBInstances(request)
813+
var iacExtInfo connectivity.IacExtInfo
814+
iacExtInfo.InstanceId = mysqlId
815+
response, err := me.client.UseMysqlClient(iacExtInfo).DescribeDBInstances(request)
816816
if err != nil {
817817
errRet = err
818818
return

‎tencentcloud/services/cdn/service_tencentcloud_cdn.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ func (me *CdnService) DescribeDomainsConfigByDomain(ctx context.Context, domain
4141
request.Filters = append(request.Filters, filter)
4242

4343
ratelimit.Check(request.GetAction())
44-
var specArgs connectivity.IacExtInfo
45-
specArgs.InstanceId = domain
46-
response, err := me.client.UseCdnClient(specArgs).DescribeDomainsConfig(request)
44+
var iacExtInfo connectivity.IacExtInfo
45+
iacExtInfo.InstanceId = domain
46+
response, err := me.client.UseCdnClient(iacExtInfo).DescribeDomainsConfig(request)
4747
if err != nil {
4848
if sdkErr, ok := err.(*errors.TencentCloudSDKError); ok {
4949
if sdkErr.Code == CDN_HOST_NOT_FOUND {

‎tencentcloud/services/cfw/service_tencentcloud_cfw.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,9 @@ func (me *CfwService) DescribeCfwNatInstanceById(ctx context.Context, natinsId s
245245
}()
246246

247247
ratelimit.Check(request.GetAction())
248-
var specArgs connectivity.IacExtInfo
249-
specArgs.InstanceId = natinsId
250-
response, err := me.client.UseCfwClient(specArgs).DescribeNatFwInstancesInfo(request)
248+
var iacExtInfo connectivity.IacExtInfo
249+
iacExtInfo.InstanceId = natinsId
250+
response, err := me.client.UseCfwClient(iacExtInfo).DescribeNatFwInstancesInfo(request)
251251
if err != nil {
252252
errRet = err
253253
return
@@ -443,10 +443,9 @@ func (me *CfwService) DescribeCfwVpcInstanceById(ctx context.Context, fwGroupId
443443
}()
444444

445445
ratelimit.Check(request.GetAction())
446-
var specArgs connectivity.IacExtInfo
447-
specArgs.InstanceId = fwGroupId
448-
449-
response, err := me.client.UseCfwClient(specArgs).DescribeFwGroupInstanceInfo(request)
446+
var iacExtInfo connectivity.IacExtInfo
447+
iacExtInfo.InstanceId = fwGroupId
448+
response, err := me.client.UseCfwClient(iacExtInfo).DescribeFwGroupInstanceInfo(request)
450449
if err != nil {
451450
errRet = err
452451
return

‎tencentcloud/services/ckafka/service_tencentcloud_ckafka.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ func (me *CkafkaService) DescribeCkafkaInstanceById(ctx context.Context,
8989
}
9090
}()
9191
request.InstanceId = &instanceId
92+
var iacExtInfo connectivity.IacExtInfo
93+
iacExtInfo.InstanceId = instanceId
9294
if err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
93-
var specArgs connectivity.IacExtInfo
94-
specArgs.InstanceId = instanceId
95-
result, err := me.client.UseCkafkaClient(specArgs).DescribeInstancesDetail(request)
95+
result, err := me.client.UseCkafkaClient(iacExtInfo).DescribeInstancesDetail(request)
9696
if err != nil {
9797
return tccommon.RetryError(err)
9898
}

‎tencentcloud/services/clb/service_tencentcloud_clb.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ func (me *ClbService) DescribeLoadBalancerById(ctx context.Context, clbId string
5656
request := clb.NewDescribeLoadBalancersRequest()
5757
request.LoadBalancerIds = []*string{&clbId}
5858
ratelimit.Check(request.GetAction())
59-
var specArgs connectivity.IacExtInfo
60-
specArgs.InstanceId = clbId
61-
response, err := me.client.UseClbClient(specArgs).DescribeLoadBalancers(request)
59+
var iacExtInfo connectivity.IacExtInfo
60+
iacExtInfo.InstanceId = clbId
61+
response, err := me.client.UseClbClient(iacExtInfo).DescribeLoadBalancers(request)
6262
if err != nil {
6363
errRet = errors.WithStack(err)
6464
return

‎tencentcloud/services/cls/service_tencentcloud_cls.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ func (me *ClsService) DescribeClsLogset(ctx context.Context, logsetId string) (l
4848
var offset int64 = 0
4949
var pageSize int64 = 100
5050
instances := make([]*cls.LogsetInfo, 0)
51+
var iacExtInfo connectivity.IacExtInfo
52+
iacExtInfo.InstanceId = logsetId
5153

5254
for {
5355
request.Offset = &offset
5456
request.Limit = &pageSize
5557
ratelimit.Check(request.GetAction())
56-
var specArgs connectivity.IacExtInfo
57-
specArgs.InstanceId = logsetId
58-
response, err := me.client.UseClsClient(specArgs).DescribeLogsets(request)
58+
response, err := me.client.UseClsClient(iacExtInfo).DescribeLogsets(request)
5959
if err != nil {
6060
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
6161
logId, request.GetAction(), request.ToJsonString(), err.Error())
@@ -232,8 +232,8 @@ func (me *ClsService) DescribeClsTopicById(ctx context.Context, topicId string)
232232
},
233233
}
234234
ratelimit.Check(request.GetAction())
235-
var specArgs connectivity.IacExtInfo
236-
specArgs.InstanceId = topicId
235+
var iacExtInfo connectivity.IacExtInfo
236+
iacExtInfo.InstanceId = topicId
237237
var (
238238
offset int64 = 0
239239
pageSize int64 = 100
@@ -244,7 +244,7 @@ func (me *ClsService) DescribeClsTopicById(ctx context.Context, topicId string)
244244
request.Offset = &offset
245245
request.Limit = &pageSize
246246
ratelimit.Check(request.GetAction())
247-
response, err := me.client.UseClsClient(specArgs).DescribeTopics(request)
247+
response, err := me.client.UseClsClient(iacExtInfo).DescribeTopics(request)
248248
if err != nil {
249249
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
250250
logId, request.GetAction(), request.ToJsonString(), err.Error())

‎tencentcloud/services/cvm/service_tencentcloud_cvm.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,10 @@ func (me *CvmService) DescribeInstanceById(ctx context.Context, instanceId strin
6969
request := cvm.NewDescribeInstancesRequest()
7070
request.InstanceIds = []*string{&instanceId}
7171

72-
var specArgs connectivity.IacExtInfo
73-
specArgs.InstanceId = instanceId
74-
72+
var iacExtInfo connectivity.IacExtInfo
73+
iacExtInfo.InstanceId = instanceId
7574
ratelimit.Check(request.GetAction())
76-
response, err := me.client.UseCvmClient(specArgs).DescribeInstances(request)
75+
response, err := me.client.UseCvmClient(iacExtInfo).DescribeInstances(request)
7776
if err != nil {
7877
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
7978
logId, request.GetAction(), request.ToJsonString(), err.Error())

‎tencentcloud/services/es/service_tencentcloud_elasticsearch.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ func (me *ElasticsearchService) DescribeInstanceById(ctx context.Context, instan
3030
request.InstanceIds = []*string{&instanceId}
3131

3232
ratelimit.Check(request.GetAction())
33-
var specArgs connectivity.IacExtInfo
34-
specArgs.InstanceId = instanceId
35-
response, err := me.client.UseEsClient(specArgs).DescribeInstances(request)
33+
var iacExtInfo connectivity.IacExtInfo
34+
iacExtInfo.InstanceId = instanceId
35+
response, err := me.client.UseEsClient(iacExtInfo).DescribeInstances(request)
3636
if err != nil {
3737
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
3838
logId, request.GetAction(), request.ToJsonString(), err.Error())

‎tencentcloud/services/gaap/service_tencentcloud_gaap.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -627,10 +627,10 @@ func (me *GaapService) DescribeProxies(
627627
if err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
628628
ratelimit.Check(request.GetAction())
629629
if len(ids) > 0 {
630-
var specArgs connectivity.IacExtInfo
630+
var iacExtInfo connectivity.IacExtInfo
631631
tmpIds := strings.Join(ids, tccommon.FILED_SP)
632-
specArgs.InstanceId = tmpIds
633-
response, err = me.client.UseGaapClient(specArgs).DescribeProxies(request)
632+
iacExtInfo.InstanceId = tmpIds
633+
response, err = me.client.UseGaapClient(iacExtInfo).DescribeProxies(request)
634634
} else {
635635
response, err = me.client.UseGaapClient().DescribeProxies(request)
636636
}

‎tencentcloud/services/lighthouse/service_tencentcloud_lighthouse.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ func (me *LightHouseService) DescribeLighthouseInstanceById(ctx context.Context,
4040

4141
request.InstanceIds = append(request.InstanceIds, helper.String(instanceId))
4242
ratelimit.Check(request.GetAction())
43-
var specArgs connectivity.IacExtInfo
44-
specArgs.InstanceId = instanceId
43+
var iacExtInfo connectivity.IacExtInfo
44+
iacExtInfo.InstanceId = instanceId
4545

4646
var offset int64 = 0
4747
var pageSize int64 = 100
@@ -51,7 +51,7 @@ func (me *LightHouseService) DescribeLighthouseInstanceById(ctx context.Context,
5151
request.Offset = &offset
5252
request.Limit = &pageSize
5353
ratelimit.Check(request.GetAction())
54-
response, err := me.client.UseLighthouseClient(specArgs).DescribeInstances(request)
54+
response, err := me.client.UseLighthouseClient(iacExtInfo).DescribeInstances(request)
5555
if err != nil {
5656
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
5757
logId, request.GetAction(), request.ToJsonString(), err.Error())

‎tencentcloud/services/mariadb/service_tencentcloud_mariadb.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -755,10 +755,9 @@ func (me *MariadbService) DescribeMariadbDbInstanceDetail(ctx context.Context, i
755755
}()
756756

757757
request.InstanceId = &instanceId
758-
var specArgs connectivity.IacExtInfo
759-
specArgs.InstanceId = instanceId
760-
761-
response, err := me.client.UseMariadbClient(specArgs).DescribeDBInstanceDetail(request)
758+
var iacExtInfo connectivity.IacExtInfo
759+
iacExtInfo.InstanceId = instanceId
760+
response, err := me.client.UseMariadbClient(iacExtInfo).DescribeDBInstanceDetail(request)
762761
if err != nil {
763762
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
764763
logId, request.GetAction(), request.ToJsonString(), err.Error())
@@ -1127,10 +1126,9 @@ func (me *MariadbService) DescribeMariadbInstanceById(ctx context.Context, insta
11271126
}()
11281127

11291128
ratelimit.Check(request.GetAction())
1130-
var specArgs connectivity.IacExtInfo
1131-
specArgs.InstanceId = instanceId
1132-
1133-
response, err := me.client.UseMariadbClient(specArgs).DescribeDBInstances(request)
1129+
var iacExtInfo connectivity.IacExtInfo
1130+
iacExtInfo.InstanceId = instanceId
1131+
response, err := me.client.UseMariadbClient(iacExtInfo).DescribeDBInstances(request)
11341132
if err != nil {
11351133
errRet = err
11361134
return

‎tencentcloud/services/mongodb/service_tencentcloud_mongodb.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,12 @@ func (me *MongodbService) DescribeInstanceById(ctx context.Context, instanceId s
3030
request := mongodb.NewDescribeDBInstancesRequest()
3131
request.InstanceIds = []*string{&instanceId}
3232

33-
var specArgs connectivity.IacExtInfo
34-
specArgs.InstanceId = instanceId
35-
33+
var iacExtInfo connectivity.IacExtInfo
34+
iacExtInfo.InstanceId = instanceId
3635
var response *mongodb.DescribeDBInstancesResponse
3736
err := resource.Retry(20*tccommon.ReadRetryTimeout, func() *resource.RetryError {
3837
ratelimit.Check(request.GetAction())
39-
result, e := me.client.UseMongodbClient(specArgs).DescribeDBInstances(request)
38+
result, e := me.client.UseMongodbClient(iacExtInfo).DescribeDBInstances(request)
4039
if e != nil {
4140
return resource.NonRetryableError(e)
4241
}

‎tencentcloud/services/postgresql/service_tencentcloud_postgresql.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,9 @@ func (me *PostgresqlService) DescribePostgresqlInstanceById(ctx context.Context,
440440
request.DBInstanceId = &instanceId
441441

442442
ratelimit.Check(request.GetAction())
443-
var specArgs connectivity.IacExtInfo
444-
specArgs.InstanceId = instanceId
445-
response, err := me.client.UsePostgresqlClient(specArgs).DescribeDBInstanceAttribute(request)
443+
var iacExtInfo connectivity.IacExtInfo
444+
iacExtInfo.InstanceId = instanceId
445+
response, err := me.client.UsePostgresqlClient(iacExtInfo).DescribeDBInstanceAttribute(request)
446446
if err != nil {
447447
errRet = err
448448
return

‎tencentcloud/services/privatedns/resource_tc_private_dns_zone.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,10 @@ func resourceTencentCloudDPrivateDnsZoneRead(d *schema.ResourceData, meta interf
257257
)
258258

259259
request.ZoneId = &id
260-
var specArgs connectivity.IacExtInfo
261-
specArgs.InstanceId = id
262-
260+
var iacExtInfo connectivity.IacExtInfo
261+
iacExtInfo.InstanceId = id
263262
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
264-
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePrivateDnsClient(specArgs).DescribePrivateZone(request)
263+
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePrivateDnsClient(iacExtInfo).DescribePrivateZone(request)
265264
if e != nil {
266265
return tccommon.RetryError(e)
267266
}

‎tencentcloud/services/scf/service_tencentcloud_scf.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,11 @@ func (me *ScfService) DescribeFunction(ctx context.Context, name, namespace stri
151151
request := scf.NewGetFunctionRequest()
152152
request.FunctionName = &name
153153
request.Namespace = &namespace
154-
154+
var iacExtInfo connectivity.IacExtInfo
155+
iacExtInfo.InstanceId = strings.Join([]string{name, namespace}, tccommon.FILED_SP)
155156
if err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
156157
ratelimit.Check(request.GetAction())
157-
var specArgs connectivity.IacExtInfo
158-
specArgs.InstanceId = strings.Join([]string{name, namespace}, tccommon.FILED_SP)
159-
160-
response, err := me.client.UseScfClient(specArgs).GetFunction(request)
158+
response, err := me.client.UseScfClient(iacExtInfo).GetFunction(request)
161159
if err != nil {
162160
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
163161
for _, code := range SCF_FUNCTIONS_NOT_FOUND_SET {

‎tencentcloud/services/sqlserver/service_tencentcloud_sqlserver.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,14 +331,14 @@ func (me *SqlserverService) DescribeSqlserverInstances(ctx context.Context, inst
331331
}
332332
var offset, limit int64 = 0, 20
333333

334-
var specArgs connectivity.IacExtInfo
335-
specArgs.InstanceId = instanceId
334+
var iacExtInfo connectivity.IacExtInfo
335+
iacExtInfo.InstanceId = instanceId
336336

337337
for {
338338
request.Offset = &offset
339339
request.Limit = &limit
340340
ratelimit.Check(request.GetAction())
341-
response, err := me.client.UseSqlserverClient(specArgs).DescribeDBInstances(request)
341+
response, err := me.client.UseSqlserverClient(iacExtInfo).DescribeDBInstances(request)
342342
if err != nil {
343343
errRet = err
344344
return

‎tencentcloud/services/tcr/service_tencentcloud_tcr.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,9 @@ func (me *TCRService) DescribeTCRInstanceById(ctx context.Context, instanceId st
177177
request.Registryids = []*string{&instanceId}
178178

179179
ratelimit.Check(request.GetAction())
180-
var specArgs connectivity.IacExtInfo
181-
specArgs.InstanceId = instanceId
182-
183-
response, err := me.client.UseTCRClient(specArgs).DescribeInstances(request)
180+
var iacExtInfo connectivity.IacExtInfo
181+
iacExtInfo.InstanceId = instanceId
182+
response, err := me.client.UseTCRClient(iacExtInfo).DescribeInstances(request)
184183
if err != nil {
185184
ee, ok := err.(*sdkErrors.TencentCloudSDKError)
186185
if !ok {

‎tencentcloud/services/tdcpg/service_tencentcloud_tdcpg.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -394,14 +394,14 @@ func (me *TdcpgService) DescribeTdcpgClustersByFilter(ctx context.Context, param
394394
}
395395
}
396396
ratelimit.Check(request.GetAction())
397+
var iacExtInfo connectivity.IacExtInfo
398+
iacExtInfo.InstanceId = tmpId
397399

398400
for {
399401
request.PageNumber = helper.IntUint64(currNumber)
400402
request.PageSize = helper.IntUint64(pageSize)
401403
if tmpId != "" {
402-
var specArgs connectivity.IacExtInfo
403-
specArgs.InstanceId = tmpId
404-
response, err = me.client.UseTdcpgClient(specArgs).DescribeClusters(request)
404+
response, err = me.client.UseTdcpgClient(iacExtInfo).DescribeClusters(request)
405405
} else {
406406
response, err = me.client.UseTdcpgClient().DescribeClusters(request)
407407
}
@@ -487,15 +487,15 @@ func (me *TdcpgService) DescribeTdcpgInstancesByFilter(ctx context.Context, clus
487487
}
488488
}
489489
ratelimit.Check(request.GetAction())
490+
var iacExtInfo connectivity.IacExtInfo
491+
iacExtInfo.InstanceId = tmpId
490492

491493
for {
492494
request.PageNumber = helper.IntUint64(currNumber)
493495
request.PageSize = helper.IntUint64(pageSize)
494496
request.ClusterId = clusterId
495497
if tmpId != "" {
496-
var specArgs connectivity.IacExtInfo
497-
specArgs.InstanceId = tmpId
498-
response, err = me.client.UseTdcpgClient(specArgs).DescribeClusterInstances(request)
498+
response, err = me.client.UseTdcpgClient(iacExtInfo).DescribeClusterInstances(request)
499499
} else {
500500
response, err = me.client.UseTdcpgClient().DescribeClusterInstances(request)
501501
}

0 commit comments

Comments
 (0)