Skip to content

Commit 25c7ae7

Browse files
committed
update var
1 parent 072bcd6 commit 25c7ae7

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tencentcloud/services/cvm/service_tencentcloud_cvm.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2279,7 +2279,7 @@ func (me *CvmService) DescribeImageByFilter(ctx context.Context, param map[strin
22792279
return
22802280
}
22812281

2282-
func (me *CvmService) DescribeImagesByFilter(ctx context.Context, param map[string]interface{}) (ret *cvm.DescribeImagesResponseParams, errRet error) {
2282+
func (me *CvmService) DescribeImagesByFilter(ctx context.Context, param map[string]interface{}) (ret []*cvm.Image, errRet error) {
22832283
var (
22842284
logId = tccommon.GetLogId(ctx)
22852285
request = cvm.NewDescribeImagesRequest()
@@ -2314,10 +2314,10 @@ func (me *CvmService) DescribeImagesByFilter(ctx context.Context, param map[stri
23142314
}
23152315
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
23162316

2317-
if response == nil || response.Response == nil {
2317+
if response == nil || len(response.Response.ImageSet) < 1 {
23182318
break
23192319
}
2320-
ret = response.Response
2320+
ret = append(ret, response.Response.ImageSet...)
23212321
if len(response.Response.ImageSet) < int(limit) {
23222322
break
23232323
}
@@ -2328,7 +2328,7 @@ func (me *CvmService) DescribeImagesByFilter(ctx context.Context, param map[stri
23282328
return
23292329
}
23302330

2331-
func (me *CvmService) DescribeInstancesSetByFilter(ctx context.Context, param map[string]interface{}) (ret *cvm.DescribeInstancesResponseParams, errRet error) {
2331+
func (me *CvmService) DescribeInstancesSetByFilter(ctx context.Context, param map[string]interface{}) (ret []*cvm.Instance, errRet error) {
23322332
var (
23332333
logId = tccommon.GetLogId(ctx)
23342334
request = cvm.NewDescribeInstancesRequest()
@@ -2362,10 +2362,10 @@ func (me *CvmService) DescribeInstancesSetByFilter(ctx context.Context, param ma
23622362
}
23632363
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
23642364

2365-
if response == nil || response.Response == nil {
2365+
if response == nil || len(response.Response.InstanceSet) < 1 {
23662366
break
23672367
}
2368-
ret = response.Response
2368+
ret = append(ret, response.Response.InstanceSet...)
23692369
if len(response.Response.InstanceSet) < int(limit) {
23702370
break
23712371
}
@@ -2376,7 +2376,7 @@ func (me *CvmService) DescribeInstancesSetByFilter(ctx context.Context, param ma
23762376
return
23772377
}
23782378

2379-
func (me *CvmService) DescribeKeyPairsByFilter(ctx context.Context, param map[string]interface{}) (ret *cvm.DescribeKeyPairsResponseParams, errRet error) {
2379+
func (me *CvmService) DescribeKeyPairsByFilter(ctx context.Context, param map[string]interface{}) (ret []*cvm.KeyPair, errRet error) {
23802380
var (
23812381
logId = tccommon.GetLogId(ctx)
23822382
request = cvm.NewDescribeKeyPairsRequest()
@@ -2408,10 +2408,10 @@ func (me *CvmService) DescribeKeyPairsByFilter(ctx context.Context, param map[st
24082408
}
24092409
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
24102410

2411-
if response == nil || response.Response == nil {
2411+
if response == nil || len(response.Response.KeyPairSet) < 1 {
24122412
break
24132413
}
2414-
ret = response.Response
2414+
ret = append(ret, response.Response.KeyPairSet...)
24152415
if len(response.Response.KeyPairSet) < int(limit) {
24162416
break
24172417
}
@@ -2422,7 +2422,7 @@ func (me *CvmService) DescribeKeyPairsByFilter(ctx context.Context, param map[st
24222422
return
24232423
}
24242424

2425-
func (me *CvmService) DescribePlacementGroupsByFilter(ctx context.Context, param map[string]interface{}) (ret *cvm.DescribeDisasterRecoverGroupsResponseParams, errRet error) {
2425+
func (me *CvmService) DescribePlacementGroupsByFilter(ctx context.Context, param map[string]interface{}) (ret []*cvm.DisasterRecoverGroup, errRet error) {
24262426
var (
24272427
logId = tccommon.GetLogId(ctx)
24282428
request = cvm.NewDescribeDisasterRecoverGroupsRequest()
@@ -2459,10 +2459,10 @@ func (me *CvmService) DescribePlacementGroupsByFilter(ctx context.Context, param
24592459
}
24602460
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
24612461

2462-
if response == nil || response.Response == nil {
2462+
if response == nil || len(response.Response.DisasterRecoverGroupSet) < 1 {
24632463
break
24642464
}
2465-
ret = response.Response
2465+
ret = append(ret, response.Response.DisasterRecoverGroupSet...)
24662466
if len(response.Response.DisasterRecoverGroupSet) < int(limit) {
24672467
break
24682468
}

0 commit comments

Comments
 (0)