Skip to content

fix(eb): [123456789]add retry #3289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2025
Merged

fix(eb): [123456789]add retry #3289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tencentcloud/services/eb/resource_tc_eb_event_bus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func testAccTencentCloudEbEventBusDestroy(s *terraform.State) error {

securityGroup, err := service.DescribeEbEventBusById(ctx, rs.Primary.ID)
if err != nil {
if err.(*sdkErrors.TencentCloudSDKError).Code == "ResourceNotFound.EventBus" {
if err.(*sdkErrors.TencentCloudSDKError).Code == "ResourceNotFound" {
return nil
}
return err
Expand Down
21 changes: 6 additions & 15 deletions tencentcloud/services/eb/resource_tc_eb_event_connector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,14 @@ func TestAccTencentCloudEbEventConnectorResource_basic(t *testing.T) {
resource.TestCheckResourceAttr("tencentcloud_eb_event_connector.event_connector", "connection_name", "tf-event-connector"),
resource.TestCheckResourceAttr("tencentcloud_eb_event_connector.event_connector", "description", "event connector desc"),
resource.TestCheckResourceAttr("tencentcloud_eb_event_connector.event_connector", "enable", "true"),
resource.TestCheckResourceAttr("tencentcloud_eb_event_connector.event_connector", "type", "ckafka"),
resource.TestCheckResourceAttr("tencentcloud_eb_event_connector.event_connector", "type", "tdmq"),
resource.TestCheckResourceAttr("tencentcloud_eb_event_connector.event_connector", "connection_description.#", "1"),
resource.TestCheckResourceAttrSet("tencentcloud_eb_event_connector.event_connector", "connection_description.0.resource_description"),
resource.TestCheckResourceAttr("tencentcloud_eb_event_connector.event_connector", "connection_description.0.ckafka_params.#", "1"),
resource.TestCheckResourceAttr("tencentcloud_eb_event_connector.event_connector", "connection_description.0.ckafka_params.0.offset", "latest"),
resource.TestCheckResourceAttr("tencentcloud_eb_event_connector.event_connector", "connection_description.0.ckafka_params.0.topic_name", "dasdasd"),
),
},
{
ResourceName: "tencentcloud_eb_event_connector.event_connector",
ImportState: true,
ImportStateVerify: true,
ResourceName: "tencentcloud_eb_event_connector.event_connector",
ImportState: true,
},
},
})
Expand All @@ -69,7 +65,7 @@ func testAccCheckEbEventConnectorDestroy(s *terraform.State) error {

connector, err := service.DescribeEbEventConnectorById(ctx, connectionId, eventBusId)
if err != nil {
if err.(*sdkErrors.TencentCloudSDKError).Code == "ResourceNotFound.EventBus" {
if err.(*sdkErrors.TencentCloudSDKError).Code == "ResourceNotFound" {
return nil
}
return err
Expand Down Expand Up @@ -130,7 +126,6 @@ resource "tencentcloud_eb_event_bus" "foo" {
}

locals {
ckafka_id = "ckafka-qzoeaqx8"
uin = data.tencentcloud_user_info.foo.owner_uin
}

Expand All @@ -139,14 +134,10 @@ resource "tencentcloud_eb_event_connector" "event_connector" {
connection_name = "tf-event-connector"
description = "event connector desc"
enable = true
type = "ckafka"
type = "tdmq"

connection_description {
resource_description = "qcs::ckafka:ap-guangzhou:uin/${local.uin}:ckafkaId/uin/${local.uin}/${local.ckafka_id}"
ckafka_params {
offset = "latest"
topic_name = "dasdasd"
}
resource_description = "qcs::tdmq:ap-guangzhou:uin/${local.uin}:subscriptionName/pulsar-pb5xp2wwxepd/keep-tdmq-ns/keep-tdmq-topic1/test"
}
}

Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/services/eb/resource_tc_eb_event_rule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func testAccCheckEbEventRuleDestroy(s *terraform.State) error {

rule, err := service.DescribeEbEventRuleById(ctx, eventBusId, ruleId)
if err != nil {
if err.(*sdkErrors.TencentCloudSDKError).Code == "ResourceNotFound.Rule" {
if err.(*sdkErrors.TencentCloudSDKError).Code == "ResourceNotFound" {
return nil
}
return err
Expand Down
117 changes: 74 additions & 43 deletions tencentcloud/services/eb/service_tencentcloud_eb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"log"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"

eb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/eb/v20210416"
Expand Down Expand Up @@ -155,20 +156,22 @@ func (me *EbService) DescribeEbEventBusById(ctx context.Context, eventBusId stri
}
}()

ratelimit.Check(request.GetAction())

response, err := me.client.UseEbClient().GetEventBus(request)
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
response, e := me.client.UseEbClient().GetEventBus(request)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
}
event = response.Response
return nil
})
if err != nil {
errRet = err
return
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

if response.Response == nil {
return
}

event = response.Response
return
}

Expand All @@ -184,14 +187,20 @@ func (me *EbService) DeleteEbEventBusById(ctx context.Context, eventBusId string
}
}()

ratelimit.Check(request.GetAction())

response, err := me.client.UseEbClient().DeleteEventBus(request)
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
response, e := me.client.UseEbClient().DeleteEventBus(request)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
}
return nil
})
if err != nil {
errRet = err
return
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

return
}
Expand Down Expand Up @@ -271,20 +280,26 @@ func (me *EbService) DescribeEbEventRuleById(ctx context.Context, eventBusId str
}
}()

ratelimit.Check(request.GetAction())
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
response, e := me.client.UseEbClient().GetRule(request)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
}
if response.Response == nil {
return nil
}

response, err := me.client.UseEbClient().GetRule(request)
rule = response.Response
return nil
})
if err != nil {
errRet = err
return
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

if response.Response == nil {
return
}

rule = response.Response
return
}

Expand All @@ -301,14 +316,20 @@ func (me *EbService) DeleteEbEventRuleById(ctx context.Context, eventBusId strin
}
}()

ratelimit.Check(request.GetAction())

response, err := me.client.UseEbClient().DeleteRule(request)
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
response, e := me.client.UseEbClient().DeleteRule(request)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
}
return nil
})
if err != nil {
errRet = err
return
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

return
}
Expand Down Expand Up @@ -436,24 +457,28 @@ func (me *EbService) DescribeEbEventConnectorById(ctx context.Context, connectio
}
}()

ratelimit.Check(request.GetAction())

response, err := me.client.UseEbClient().ListConnections(request)
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
response, e := me.client.UseEbClient().ListConnections(request)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
}
if len(response.Response.Connections) < 1 {
return nil
}
for _, v := range response.Response.Connections {
if *v.ConnectionId == connectionId {
eventConnector = v
}
}
return nil
})
if err != nil {
errRet = err
return
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

if len(response.Response.Connections) < 1 {
return
}

for _, v := range response.Response.Connections {
if *v.ConnectionId == connectionId {
eventConnector = v
}
}

return
}
Expand All @@ -471,14 +496,20 @@ func (me *EbService) DeleteEbEventConnectorById(ctx context.Context, connectionI
}
}()

ratelimit.Check(request.GetAction())

response, err := me.client.UseEbClient().DeleteConnection(request)
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
response, e := me.client.UseEbClient().DeleteConnection(request)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
}
return nil
})
if err != nil {
errRet = err
return
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

return
}
Expand Down
Loading