diff --git a/alicloud/connectivity/client.go b/alicloud/connectivity/client.go index 52fbce5e907c..1564e6b051f5 100644 --- a/alicloud/connectivity/client.go +++ b/alicloud/connectivity/client.go @@ -2222,102 +2222,6 @@ func (client *AliyunClient) WithRKvstoreClient(do func(*r_kvstore.Client) (inter return do(client.r_kvstoreConn) } -func (client *AliyunClient) NewMseClient() (*rpc.Client, error) { - productCode := "mse" - endpoint := "" - if v, exist := client.config.Endpoints.Load(productCode); !exist || v.(string) == "" { - if err := client.loadEndpoint(productCode); err != nil { - return nil, err - } - } - if v, exist := client.config.Endpoints.Load(productCode); exist && v.(string) != "" { - endpoint = v.(string) - } - if endpoint == "" { - return nil, fmt.Errorf("[ERROR] missing the product %s endpoint.", productCode) - } - sdkConfig := client.teaSdkConfig - sdkConfig.SetEndpoint(endpoint) - conn, err := rpc.NewClient(&sdkConfig) - if err != nil { - return nil, fmt.Errorf("unable to initialize the %s client: %#v", productCode, err) - } - return conn, nil -} - -func (client *AliyunClient) NewHitsdbClient() (*rpc.Client, error) { - productCode := "hitsdb" - endpoint := "" - if v, ok := client.config.Endpoints.Load(productCode); !ok || v.(string) == "" { - if err := client.loadEndpoint(productCode); err != nil { - return nil, err - } - } - if v, ok := client.config.Endpoints.Load(productCode); ok && v.(string) != "" { - endpoint = v.(string) - } - if endpoint == "" { - return nil, fmt.Errorf("[ERROR] missing the product %s endpoint.", productCode) - } - sdkConfig := client.teaSdkConfig - sdkConfig.SetEndpoint(endpoint) - conn, err := rpc.NewClient(&sdkConfig) - if err != nil { - return nil, fmt.Errorf("unable to initialize the %s client: %#v", productCode, err) - } - return conn, nil -} - -func (client *AliyunClient) NewAistudioClient() (*rpc.Client, error) { - productCode := "brain_industrial" - endpoint := "" - if v, ok := client.config.Endpoints.Load(productCode); !ok || v.(string) == "" { - if err := client.loadEndpoint(productCode); err != nil { - endpoint = "brain-industrial.cn-hangzhou.aliyuncs.com" - client.config.Endpoints.Store(productCode, endpoint) - log.Printf("[ERROR] loading %s endpoint got an error: %#v. Using the central endpoint %s instead.", productCode, err, endpoint) - } - } - if v, ok := client.config.Endpoints.Load(productCode); ok && v.(string) != "" { - endpoint = v.(string) - } - if endpoint == "" { - return nil, fmt.Errorf("[ERROR] missing the product %s endpoint.", productCode) - } - sdkConfig := client.teaSdkConfig - sdkConfig.SetEndpoint(endpoint) - conn, err := rpc.NewClient(&sdkConfig) - if err != nil { - return nil, fmt.Errorf("unable to initialize the %s client: %#v", productCode, err) - } - return conn, nil -} - -func (client *AliyunClient) NewEipanycastClient() (*rpc.Client, error) { - productCode := "eipanycast" - endpoint := "" - if v, ok := client.config.Endpoints.Load(productCode); !ok || v.(string) == "" { - if err := client.loadEndpoint(productCode); err != nil { - endpoint = "eipanycast.cn-hangzhou.aliyuncs.com" - client.config.Endpoints.Store(productCode, endpoint) - log.Printf("[ERROR] loading %s endpoint got an error: %#v. Using the central endpoint %s instead.", productCode, err, endpoint) - } - } - if v, ok := client.config.Endpoints.Load(productCode); ok && v.(string) != "" { - endpoint = v.(string) - } - if endpoint == "" { - return nil, fmt.Errorf("[ERROR] missing the product %s endpoint.", productCode) - } - sdkConfig := client.teaSdkConfig - sdkConfig.SetEndpoint(endpoint) - conn, err := rpc.NewClient(&sdkConfig) - if err != nil { - return nil, fmt.Errorf("unable to initialize the %s client: %#v", productCode, err) - } - return conn, nil -} - func (client *AliyunClient) NewOosClient() (*rpc.Client, error) { productCode := "oos" endpoint := "" diff --git a/alicloud/data_source_alicloud_eipanycast_anycast_eip_addresses.go b/alicloud/data_source_alicloud_eipanycast_anycast_eip_addresses.go index 72fa0693b6bb..0f1c0dfb3fb4 100644 --- a/alicloud/data_source_alicloud_eipanycast_anycast_eip_addresses.go +++ b/alicloud/data_source_alicloud_eipanycast_anycast_eip_addresses.go @@ -5,7 +5,6 @@ import ( "regexp" "github.com/PaesslerAG/jsonpath" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" @@ -220,14 +219,9 @@ func dataSourceAlicloudEipanycastAnycastEipAddressesRead(d *schema.ResourceData, } } var response map[string]interface{} - conn, err := client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } + var err error for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, nil, request, true) if err != nil { return WrapErrorf(err, DataDefaultErrorMsg, "alicloud_eipanycast_anycast_eip_addresses", action, AlibabaCloudSdkGoERROR) } diff --git a/alicloud/resource_alicloud_eipanycast_anycast_eip_address.go b/alicloud/resource_alicloud_eipanycast_anycast_eip_address.go index ed730817c703..12a5be577c2b 100644 --- a/alicloud/resource_alicloud_eipanycast_anycast_eip_address.go +++ b/alicloud/resource_alicloud_eipanycast_anycast_eip_address.go @@ -84,10 +84,7 @@ func resourceAliCloudEipanycastAnycastEipAddressCreate(d *schema.ResourceData, m var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken(action) @@ -115,7 +112,7 @@ func resourceAliCloudEipanycastAnycastEipAddressCreate(d *schema.ResourceData, m runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -182,10 +179,7 @@ func resourceAliCloudEipanycastAnycastEipAddressUpdate(d *schema.ResourceData, m update := false d.Partial(true) action := "ModifyAnycastEipAddressAttribute" - conn, err := client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query = make(map[string]interface{}) query["AnycastId"] = d.Id() @@ -201,11 +195,9 @@ func resourceAliCloudEipanycastAnycastEipAddressUpdate(d *schema.ResourceData, m } if update { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, query, request, true) if err != nil { if NeedRetry(err) { @@ -225,10 +217,6 @@ func resourceAliCloudEipanycastAnycastEipAddressUpdate(d *schema.ResourceData, m } update = false action = "ModifyAnycastEipAddressSpec" - conn, err = client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["AnycastId"] = d.Id() @@ -239,11 +227,9 @@ func resourceAliCloudEipanycastAnycastEipAddressUpdate(d *schema.ResourceData, m } if update { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, query, request, true) if err != nil { if NeedRetry(err) { @@ -267,10 +253,6 @@ func resourceAliCloudEipanycastAnycastEipAddressUpdate(d *schema.ResourceData, m } update = false action = "ChangeResourceGroup" - conn, err = client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["ResourceId"] = d.Id() @@ -282,11 +264,9 @@ func resourceAliCloudEipanycastAnycastEipAddressUpdate(d *schema.ResourceData, m } if update { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, query, request, true) if err != nil { if NeedRetry(err) { @@ -322,21 +302,15 @@ func resourceAliCloudEipanycastAnycastEipAddressDelete(d *schema.ResourceData, m var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query["AnycastId"] = d.Id() request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken(action) - - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_eipanycast_anycast_eip_address_attachment.go b/alicloud/resource_alicloud_eipanycast_anycast_eip_address_attachment.go index 18df9a40ab3f..6ee049b8fa61 100644 --- a/alicloud/resource_alicloud_eipanycast_anycast_eip_address_attachment.go +++ b/alicloud/resource_alicloud_eipanycast_anycast_eip_address_attachment.go @@ -7,7 +7,6 @@ import ( "strings" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -96,10 +95,7 @@ func resourceAliCloudEipanycastAnycastEipAddressAttachmentCreate(d *schema.Resou action := "AssociateAnycastEipAddress" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["BindInstanceType"] = d.Get("bind_instance_type") request["AnycastId"] = d.Get("anycast_id") @@ -126,10 +122,8 @@ func resourceAliCloudEipanycastAnycastEipAddressAttachmentCreate(d *schema.Resou } wait := incrementalWait(3*time.Second, 5*time.Second) - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -203,10 +197,7 @@ func resourceAliCloudEipanycastAnycastEipAddressAttachmentUpdate(d *schema.Resou update := false parts := strings.Split(d.Id(), ":") action := "UpdateAnycastEipAddressAssociations" - conn, err := client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["BindInstanceId"] = parts[1] request["AnycastId"] = parts[0] @@ -220,9 +211,7 @@ func resourceAliCloudEipanycastAnycastEipAddressAttachmentUpdate(d *schema.Resou if update { wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -255,10 +244,6 @@ func resourceAliCloudEipanycastAnycastEipAddressAttachmentUpdate(d *schema.Resou if removed.Len() > 0 { parts := strings.Split(d.Id(), ":") action := "UpdateAnycastEipAddressAssociations" - conn, err := client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["BindInstanceId"] = parts[1] request["AnycastId"] = parts[0] @@ -276,9 +261,7 @@ func resourceAliCloudEipanycastAnycastEipAddressAttachmentUpdate(d *schema.Resou wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -305,10 +288,6 @@ func resourceAliCloudEipanycastAnycastEipAddressAttachmentUpdate(d *schema.Resou if added.Len() > 0 { parts := strings.Split(d.Id(), ":") action := "UpdateAnycastEipAddressAssociations" - conn, err := client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["BindInstanceId"] = parts[1] request["AnycastId"] = parts[0] @@ -326,9 +305,7 @@ func resourceAliCloudEipanycastAnycastEipAddressAttachmentUpdate(d *schema.Resou wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -363,10 +340,7 @@ func resourceAliCloudEipanycastAnycastEipAddressAttachmentDelete(d *schema.Resou action := "UnassociateAnycastEipAddress" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["BindInstanceType"] = parts[3] request["AnycastId"] = parts[0] @@ -381,9 +355,7 @@ func resourceAliCloudEipanycastAnycastEipAddressAttachmentDelete(d *schema.Resou } wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_eipanycast_anycast_eip_address_test.go b/alicloud/resource_alicloud_eipanycast_anycast_eip_address_test.go index d535976ae1f6..c7ffb0d5f27e 100644 --- a/alicloud/resource_alicloud_eipanycast_anycast_eip_address_test.go +++ b/alicloud/resource_alicloud_eipanycast_anycast_eip_address_test.go @@ -39,11 +39,6 @@ func testSweepEipanycastAnycastEipAddress(region string) error { // delete all resource. prefixes := []string{} - conn, err := client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } - action := "ListAnycastEipAddresses" request := map[string]interface{}{ "MaxResults": PageSizeLarge, @@ -51,11 +46,9 @@ func testSweepEipanycastAnycastEipAddress(region string) error { addressIds := make([]string, 0) var response map[string]interface{} for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -98,17 +91,13 @@ func testSweepEipanycastAnycastEipAddress(region string) error { for _, addressId := range addressIds { log.Printf("[INFO] Deleting Eip Address: (%s)", addressId) action := "ReleaseAnycastEipAddress" - conn, err := client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "AnycastId": addressId, } request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(time.Minute*9, func() *resource.RetryError { - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("Eipanycast", "2020-03-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/service_alicloud_eipanycast.go b/alicloud/service_alicloud_eipanycast.go index fd74a1b7eef4..97707f7731c1 100644 --- a/alicloud/service_alicloud_eipanycast.go +++ b/alicloud/service_alicloud_eipanycast.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/PaesslerAG/jsonpath" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" ) @@ -15,18 +14,13 @@ type EipanycastService struct { func (s *EipanycastService) DescribeEipanycastAnycastEipAddress(id string) (object map[string]interface{}, err error) { var response map[string]interface{} - conn, err := s.client.NewEipanycastClient() - if err != nil { - return nil, WrapError(err) - } + client := s.client action := "DescribeAnycastEipAddress" request := map[string]interface{}{ "RegionId": s.client.RegionId, "AnycastId": id, } - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, nil, request, true) if err != nil { err = WrapErrorf(err, DefaultErrorMsg, id, action, AlibabaCloudSdkGoERROR) return @@ -66,18 +60,13 @@ func (s *EipanycastService) DescribeEipanycastAnycastEipAddressAttachment(id str return nil, WrapError(err) } var response map[string]interface{} - conn, err := s.client.NewEipanycastClient() - if err != nil { - return nil, WrapError(err) - } + client := s.client action := "DescribeAnycastEipAddress" request := map[string]interface{}{ "RegionId": s.client.RegionId, "AnycastId": parts[0], } - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, nil, request, true) if err != nil { err = WrapErrorf(err, DefaultErrorMsg, id, action, AlibabaCloudSdkGoERROR) return diff --git a/alicloud/service_alicloud_eipanycast_v2.go b/alicloud/service_alicloud_eipanycast_v2.go index 765f9a2f439d..aa88d996faa7 100644 --- a/alicloud/service_alicloud_eipanycast_v2.go +++ b/alicloud/service_alicloud_eipanycast_v2.go @@ -7,7 +7,6 @@ import ( "github.com/PaesslerAG/jsonpath" - rpc "github.com/alibabacloud-go/tea-rpc/client" util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -26,10 +25,6 @@ func (s *EipanycastServiceV2) DescribeEipanycastAnycastEipAddress(id string) (ob var response map[string]interface{} var query map[string]interface{} action := "DescribeAnycastEipAddress" - conn, err := client.NewEipanycastClient() - if err != nil { - return object, WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["AnycastId"] = id @@ -39,7 +34,7 @@ func (s *EipanycastServiceV2) DescribeEipanycastAnycastEipAddress(id string) (ob runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(1*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, query, request, true) if err != nil { if NeedRetry(err) { @@ -92,7 +87,6 @@ func (s *EipanycastServiceV2) SetResourceTags(d *schema.ResourceData, resourceTy if d.HasChange("tags") { var err error var action string - var conn *rpc.Client client := s.client var request map[string]interface{} var response map[string]interface{} @@ -107,10 +101,6 @@ func (s *EipanycastServiceV2) SetResourceTags(d *schema.ResourceData, resourceTy } if len(removedTagKeys) > 0 { action = "UntagResources" - conn, err = client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) request["ResourceId.1"] = d.Id() @@ -120,11 +110,9 @@ func (s *EipanycastServiceV2) SetResourceTags(d *schema.ResourceData, resourceTy } request["ResourceType"] = resourceType - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, query, request, false) if err != nil { if NeedRetry(err) { @@ -144,10 +132,6 @@ func (s *EipanycastServiceV2) SetResourceTags(d *schema.ResourceData, resourceTy if len(added) > 0 { action = "TagResources" - conn, err = client.NewEipanycastClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) request["ResourceId.1"] = d.Id() @@ -160,11 +144,9 @@ func (s *EipanycastServiceV2) SetResourceTags(d *schema.ResourceData, resourceTy } request["ResourceType"] = resourceType - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, query, request, false) if err != nil { if NeedRetry(err) { @@ -202,10 +184,6 @@ func (s *EipanycastServiceV2) DescribeEipanycastAnycastEipAddressAttachment(id s err = WrapError(fmt.Errorf("invalid Resource Id %s. Expected parts' length %d, got %d", id, 4, len(parts))) } action := "DescribeAnycastEipAddress" - conn, err := client.NewEipanycastClient() - if err != nil { - return object, WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["AnycastId"] = parts[0] @@ -214,7 +192,7 @@ func (s *EipanycastServiceV2) DescribeEipanycastAnycastEipAddressAttachment(id s wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(1*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-03-09"), StringPointer("AK"), query, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Eipanycast", "2020-03-09", action, query, request, true) if err != nil { if NeedRetry(err) {