Skip to content
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.

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

resource/alicloud_cloud_connect_network: add retry code for CreateCloudConnectNetwork. #6976

Merged
merged 1 commit into from
Feb 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 18 additions & 4 deletions alicloud/resource_alicloud_cloud_connect_network.go
Expand Up @@ -4,8 +4,10 @@ import (
"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
"github.com/aliyun/alibaba-cloud-sdk-go/services/smartag"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"time"
)

func resourceAlicloudCloudConnectNetwork() *schema.Resource {
Expand Down Expand Up @@ -57,14 +59,26 @@ func resourceAlicloudCloudConnectNetworkCreate(d *schema.ResourceData, meta inte
request.CidrBlock = v.(string)
}

raw, err := client.WithSagClient(func(sagClient *smartag.Client) (interface{}, error) {
return sagClient.CreateCloudConnectNetwork(request)
var err error
var raw interface{}
wait := incrementalWait(3*time.Second, 3*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
raw, err = client.WithSagClient(func(sagClient *smartag.Client) (interface{}, error) {
return sagClient.CreateCloudConnectNetwork(request)
})
if err != nil {
addDebug(request.GetActionName(), raw, request.RpcRequest, request)
if IsExpectedErrors(err, []string{"ResourceInOperating", "InternalError"}) {
wait()
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
return nil
})
if err != nil {
return WrapErrorf(err, DefaultErrorMsg, "alicloud_cloud_connect_network", request.GetActionName(), AlibabaCloudSdkGoERROR)
}

addDebug(request.GetActionName(), raw, request.RpcRequest, request)
response, _ := raw.(*smartag.CreateCloudConnectNetworkResponse)
d.SetId(response.CcnId)

Expand Down