Skip to content

Commit 82aedb9

Browse files
SevenEarthSevenEarth
committed
add
1 parent 34e488b commit 82aedb9

File tree

4 files changed

+44
-17
lines changed

4 files changed

+44
-17
lines changed

‎tencentcloud/services/tdmq/service_tencentcloud_tdmq.go

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1672,6 +1672,7 @@ func (me *TdmqService) DescribeTdmqRabbitmqVipInstanceById(ctx context.Context,
16721672
logId := tccommon.GetLogId(ctx)
16731673

16741674
request := tdmq.NewDescribeRabbitMQVipInstanceRequest()
1675+
response := tdmq.NewDescribeRabbitMQVipInstanceResponse()
16751676
request.ClusterId = &instanceId
16761677

16771678
defer func() {
@@ -1680,17 +1681,29 @@ func (me *TdmqService) DescribeTdmqRabbitmqVipInstanceById(ctx context.Context,
16801681
}
16811682
}()
16821683

1683-
ratelimit.Check(request.GetAction())
16841684
var iacExtInfo connectivity.IacExtInfo
1685-
iacExtInfo.InstanceId = instanceId
1686-
response, err := me.client.UseTdmqClient(iacExtInfo).DescribeRabbitMQVipInstance(request)
1685+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
1686+
ratelimit.Check(request.GetAction())
1687+
result, e := me.client.UseTdmqClient(iacExtInfo).DescribeRabbitMQVipInstance(request)
1688+
if e != nil {
1689+
return tccommon.RetryError(e)
1690+
} else {
1691+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
1692+
}
1693+
1694+
if result == nil || result.Response == nil {
1695+
return resource.NonRetryableError(fmt.Errorf("Describe tdmq rabbitmqVipInstance failed, Response is nil."))
1696+
}
1697+
1698+
response = result
1699+
return nil
1700+
})
1701+
16871702
if err != nil {
16881703
errRet = err
16891704
return
16901705
}
16911706

1692-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
1693-
16941707
rabbitmqVipInstance = response.Response
16951708
return
16961709
}

‎tencentcloud/services/trabbit/resource_tc_tdmq_rabbitmq_vip_instance.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,17 +361,22 @@ func resourceTencentCloudTdmqRabbitmqVipInstanceRead(d *schema.ResourceData, met
361361
if vpc.VpcId != nil {
362362
vpcMap["vpc_id"] = vpc.VpcId
363363
}
364+
364365
if vpc.SubnetId != nil {
365366
vpcMap["subnet_id"] = vpc.SubnetId
366367
}
368+
367369
if vpc.VpcEndpoint != nil {
368370
vpcMap["vpc_endpoint"] = vpc.VpcEndpoint
369371
}
372+
370373
if vpc.VpcDataStreamEndpointStatus != nil {
371374
vpcMap["vpc_data_stream_endpoint_status"] = vpc.VpcDataStreamEndpointStatus
372375
}
376+
373377
tmpList = append(tmpList, vpcMap)
374378
}
379+
375380
_ = d.Set("vpcs", tmpList)
376381
}
377382

@@ -467,7 +472,7 @@ func resourceTencentCloudTdmqRabbitmqVipInstanceDelete(d *schema.ResourceData, m
467472
instanceId = d.Id()
468473
)
469474

470-
err := resource.Retry(tccommon.WaitReadTimeout, func() *resource.RetryError {
475+
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
471476
e := service.DeleteTdmqRabbitmqVipInstanceById(ctx, instanceId)
472477
if e != nil {
473478
return tccommon.RetryError(e)

‎tencentcloud/services/trabbit/resource_tc_tdmq_rabbitmq_vip_instance.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ Provides a resource to create a TDMQ rabbitmq vip instance
22

33
Example Usage
44

5+
Create prepaid rabbitmq instance
6+
57
```hcl
68
data "tencentcloud_availability_zones" "zones" {
79
name = "ap-guangzhou-6"
@@ -27,7 +29,7 @@ resource "tencentcloud_tdmq_rabbitmq_vip_instance" "example" {
2729
zone_ids = [data.tencentcloud_availability_zones.zones.zones.0.id]
2830
vpc_id = tencentcloud_vpc.vpc.id
2931
subnet_id = tencentcloud_subnet.subnet.id
30-
cluster_name = "tf-example-rabbitmq-vip-instance"
32+
cluster_name = "tf-example"
3133
node_spec = "rabbit-vip-basic-1"
3234
node_num = 1
3335
storage_size = 200
@@ -38,13 +40,16 @@ resource "tencentcloud_tdmq_rabbitmq_vip_instance" "example" {
3840
createBy = "Terraform"
3941
}
4042
}
43+
```
4144

42-
# create postpaid rabbitmq instance
43-
resource "tencentcloud_tdmq_rabbitmq_vip_instance" "example2" {
45+
Create postpaid rabbitmq instance
46+
47+
```hcl
48+
resource "tencentcloud_tdmq_rabbitmq_vip_instance" "example" {
4449
zone_ids = [data.tencentcloud_availability_zones.zones.zones.0.id]
4550
vpc_id = tencentcloud_vpc.vpc.id
4651
subnet_id = tencentcloud_subnet.subnet.id
47-
cluster_name = "tf-example-rabbitmq-vip-instance"
52+
cluster_name = "tf-example"
4853
node_spec = "rabbit-vip-basic-1"
4954
node_num = 1
5055
storage_size = 200
@@ -54,7 +59,7 @@ resource "tencentcloud_tdmq_rabbitmq_vip_instance" "example2" {
5459
pay_mode = 0
5560
cluster_version = "3.11.8"
5661
tags = {
57-
createBy = "Terraform1"
62+
createBy = "Terraform"
5863
}
5964
}
6065
```
@@ -66,4 +71,3 @@ TDMQ rabbitmq vip instance can be imported using the id, e.g.
6671
```
6772
terraform import tencentcloud_tdmq_rabbitmq_vip_instance.example amqp-mok52gmn
6873
```
69-

‎website/docs/r/tdmq_rabbitmq_vip_instance.html.markdown

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Provides a resource to create a TDMQ rabbitmq vip instance
1313

1414
## Example Usage
1515

16+
### Create prepaid rabbitmq instance
17+
1618
```hcl
1719
data "tencentcloud_availability_zones" "zones" {
1820
name = "ap-guangzhou-6"
@@ -38,7 +40,7 @@ resource "tencentcloud_tdmq_rabbitmq_vip_instance" "example" {
3840
zone_ids = [data.tencentcloud_availability_zones.zones.zones.0.id]
3941
vpc_id = tencentcloud_vpc.vpc.id
4042
subnet_id = tencentcloud_subnet.subnet.id
41-
cluster_name = "tf-example-rabbitmq-vip-instance"
43+
cluster_name = "tf-example"
4244
node_spec = "rabbit-vip-basic-1"
4345
node_num = 1
4446
storage_size = 200
@@ -49,13 +51,16 @@ resource "tencentcloud_tdmq_rabbitmq_vip_instance" "example" {
4951
createBy = "Terraform"
5052
}
5153
}
54+
```
55+
56+
### Create postpaid rabbitmq instance
5257

53-
# create postpaid rabbitmq instance
54-
resource "tencentcloud_tdmq_rabbitmq_vip_instance" "example2" {
58+
```hcl
59+
resource "tencentcloud_tdmq_rabbitmq_vip_instance" "example" {
5560
zone_ids = [data.tencentcloud_availability_zones.zones.zones.0.id]
5661
vpc_id = tencentcloud_vpc.vpc.id
5762
subnet_id = tencentcloud_subnet.subnet.id
58-
cluster_name = "tf-example-rabbitmq-vip-instance"
63+
cluster_name = "tf-example"
5964
node_spec = "rabbit-vip-basic-1"
6065
node_num = 1
6166
storage_size = 200
@@ -65,7 +70,7 @@ resource "tencentcloud_tdmq_rabbitmq_vip_instance" "example2" {
6570
pay_mode = 0
6671
cluster_version = "3.11.8"
6772
tags = {
68-
createBy = "Terraform1"
73+
createBy = "Terraform"
6974
}
7075
}
7176
```

0 commit comments

Comments
 (0)