Skip to content

Commit b33d1e4

Browse files
authored
Merge pull request #2087 from tencentcloudstack/fix/tdmq
fix/tdmq
2 parents eeb98cb + efd0c37 commit b33d1e4

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.changelog/2087.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/tencentcloud_tdmq_rocketmq_group: Fix the issue of inconsistent return values.
3+
```

tencentcloud/service_tencentcloud_tdmq_rocketmq.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ func (me *TdmqRocketmqService) DescribeTdmqRocketmqGroup(ctx context.Context, cl
321321

322322
var offset uint64 = 0
323323
var pageSize uint64 = 100
324-
result = make([]*tdmqRocketmq.RocketMQGroup, 0)
324+
tmpResult := make([]*tdmqRocketmq.RocketMQGroup, 0)
325325

326326
for {
327327
request.Offset = &offset
@@ -334,19 +334,29 @@ func (me *TdmqRocketmqService) DescribeTdmqRocketmqGroup(ctx context.Context, cl
334334
errRet = err
335335
return
336336
}
337+
337338
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
338339
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
339340

340341
if response == nil || len(response.Response.Groups) < 1 {
341342
break
342343
}
343-
result = append(result, response.Response.Groups...)
344+
345+
tmpResult = append(tmpResult, response.Response.Groups...)
344346
if len(response.Response.Groups) < int(pageSize) {
345347
break
346348
}
349+
347350
offset += pageSize
348351
}
349352

353+
for _, item := range tmpResult {
354+
if *item.Name == groupId {
355+
result = append(result, item)
356+
return
357+
}
358+
}
359+
350360
return
351361
}
352362

0 commit comments

Comments
 (0)