diff --git a/alicloud/connectivity/client.go b/alicloud/connectivity/client.go index 28fed0d93c07..d0b67eb0ffde 100644 --- a/alicloud/connectivity/client.go +++ b/alicloud/connectivity/client.go @@ -479,33 +479,6 @@ func (client *AliyunClient) NewEcsClient() (*rpc.Client, error) { return conn, nil } - -func (client *AliyunClient) NewVpcClient() (*rpc.Client, error) { - productCode := "vpc" - 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) NewRdsClient() (*rpc.Client, error) { productCode := "rds" endpoint := "rds.aliyuncs.com" diff --git a/alicloud/data_source_alicloud_network_acls.go b/alicloud/data_source_alicloud_network_acls.go index e4957665cefd..3888d003ec79 100644 --- a/alicloud/data_source_alicloud_network_acls.go +++ b/alicloud/data_source_alicloud_network_acls.go @@ -6,7 +6,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -226,16 +225,11 @@ func dataSourceAlicloudNetworkAclsRead(d *schema.ResourceData, meta interface{}) } status, statusOk := d.GetOk("status") var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_bgp_groups.go b/alicloud/data_source_alicloud_vpc_bgp_groups.go index 9dc4289b2fca..4e1978a751cd 100644 --- a/alicloud/data_source_alicloud_vpc_bgp_groups.go +++ b/alicloud/data_source_alicloud_vpc_bgp_groups.go @@ -6,7 +6,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -146,16 +145,11 @@ func dataSourceAlicloudVpcBgpGroupsRead(d *schema.ResourceData, meta interface{} } status, statusOk := d.GetOk("status") var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_bgp_networks.go b/alicloud/data_source_alicloud_vpc_bgp_networks.go index 360a5293458e..dfbf0174303d 100644 --- a/alicloud/data_source_alicloud_vpc_bgp_networks.go +++ b/alicloud/data_source_alicloud_vpc_bgp_networks.go @@ -5,7 +5,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -90,16 +89,11 @@ func dataSourceAlicloudVpcBgpNetworksRead(d *schema.ResourceData, meta interface } status, statusOk := d.GetOk("status") var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_bgp_peers.go b/alicloud/data_source_alicloud_vpc_bgp_peers.go index 104fe540f9d0..5b0576f294b6 100644 --- a/alicloud/data_source_alicloud_vpc_bgp_peers.go +++ b/alicloud/data_source_alicloud_vpc_bgp_peers.go @@ -5,7 +5,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -157,16 +156,11 @@ func dataSourceAlicloudVpcBgpPeersRead(d *schema.ResourceData, meta interface{}) } status, statusOk := d.GetOk("status") var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_dhcp_options_sets.go b/alicloud/data_source_alicloud_vpc_dhcp_options_sets.go index 4b90912ae25c..bc8ef665f33a 100644 --- a/alicloud/data_source_alicloud_vpc_dhcp_options_sets.go +++ b/alicloud/data_source_alicloud_vpc_dhcp_options_sets.go @@ -6,7 +6,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -137,16 +136,11 @@ func dataSourceAlicloudVpcDhcpOptionsSetsRead(d *schema.ResourceData, meta inter } status, statusOk := d.GetOk("status") var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_flow_log_service.go b/alicloud/data_source_alicloud_vpc_flow_log_service.go index 7e3a99b037dc..0dbe99ffcf9c 100644 --- a/alicloud/data_source_alicloud_vpc_flow_log_service.go +++ b/alicloud/data_source_alicloud_vpc_flow_log_service.go @@ -3,7 +3,6 @@ package alicloud import ( "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" @@ -37,22 +36,16 @@ func dataSourceAliCloudVpcFlowLogServiceRead(d *schema.ResourceData, meta interf return nil } - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error action := "GetFlowLogServiceStatus" getFlowLogServiceStatusReq := map[string]interface{}{ "RegionId": client.RegionId, "ClientToken": buildClientToken("GetFlowLogServiceStatus"), } - - 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("2016-04-28"), StringPointer("AK"), nil, getFlowLogServiceStatusReq, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, getFlowLogServiceStatusReq, true) if err != nil { if NeedRetry(err) { wait() @@ -82,7 +75,7 @@ func dataSourceAliCloudVpcFlowLogServiceRead(d *schema.ResourceData, meta interf } err = resource.Retry(3*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, openFlowLogServiceReq, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, openFlowLogServiceReq, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_flow_logs.go b/alicloud/data_source_alicloud_vpc_flow_logs.go index 4b59038cf8b0..ed8388863a51 100644 --- a/alicloud/data_source_alicloud_vpc_flow_logs.go +++ b/alicloud/data_source_alicloud_vpc_flow_logs.go @@ -6,7 +6,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -186,16 +185,11 @@ func dataSourceAlicloudVpcFlowLogsRead(d *schema.ResourceData, meta interface{}) } } var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_nat_ip_cidrs.go b/alicloud/data_source_alicloud_vpc_nat_ip_cidrs.go index bd30918125df..7bbb2796a8fd 100644 --- a/alicloud/data_source_alicloud_vpc_nat_ip_cidrs.go +++ b/alicloud/data_source_alicloud_vpc_nat_ip_cidrs.go @@ -6,7 +6,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -147,17 +146,12 @@ func dataSourceAlicloudVpcNatIpCidrsRead(d *schema.ResourceData, meta interface{ } } var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { request["ClientToken"] = buildClientToken("ListNatIpCidrs") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_nat_ips.go b/alicloud/data_source_alicloud_vpc_nat_ips.go index 7db3634c1151..15bc1aa02809 100644 --- a/alicloud/data_source_alicloud_vpc_nat_ips.go +++ b/alicloud/data_source_alicloud_vpc_nat_ips.go @@ -6,7 +6,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -156,17 +155,12 @@ func dataSourceAlicloudVpcNatIpsRead(d *schema.ResourceData, meta interface{}) e } } var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { request["ClientToken"] = buildClientToken("ListNatIps") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_prefix_lists.go b/alicloud/data_source_alicloud_vpc_prefix_lists.go index a78ef0456590..14efb1a65124 100644 --- a/alicloud/data_source_alicloud_vpc_prefix_lists.go +++ b/alicloud/data_source_alicloud_vpc_prefix_lists.go @@ -6,7 +6,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -138,16 +137,11 @@ func dataSourceAlicloudVpcPrefixListsRead(d *schema.ResourceData, meta interface } } var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_public_ip_address_pool_cidr_blocks.go b/alicloud/data_source_alicloud_vpc_public_ip_address_pool_cidr_blocks.go index 8e2f9c9ad61a..bc82c16e87e7 100644 --- a/alicloud/data_source_alicloud_vpc_public_ip_address_pool_cidr_blocks.go +++ b/alicloud/data_source_alicloud_vpc_public_ip_address_pool_cidr_blocks.go @@ -5,7 +5,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -110,16 +109,11 @@ func dataSourceAlicloudVpcPublicIpAddressPoolCidrBlocksRead(d *schema.ResourceDa } var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_public_ip_address_pools.go b/alicloud/data_source_alicloud_vpc_public_ip_address_pools.go index da07a2b4dae5..e3b002d1a7a7 100644 --- a/alicloud/data_source_alicloud_vpc_public_ip_address_pools.go +++ b/alicloud/data_source_alicloud_vpc_public_ip_address_pools.go @@ -6,7 +6,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -161,16 +160,11 @@ func dataSourceAlicloudVpcPublicIpAddressPoolsRead(d *schema.ResourceData, meta } } var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_traffic_mirror_filter_egress_rules.go b/alicloud/data_source_alicloud_vpc_traffic_mirror_filter_egress_rules.go index 82a2bd78db87..d06ddf9a9eb5 100644 --- a/alicloud/data_source_alicloud_vpc_traffic_mirror_filter_egress_rules.go +++ b/alicloud/data_source_alicloud_vpc_traffic_mirror_filter_egress_rules.go @@ -5,7 +5,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -115,17 +114,12 @@ func dataSourceAlicloudVpcTrafficMirrorFilterEgressRulesRead(d *schema.ResourceD } status, statusOk := d.GetOk("status") var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_traffic_mirror_filter_ingress_rules.go b/alicloud/data_source_alicloud_vpc_traffic_mirror_filter_ingress_rules.go index 385e87013a9b..5f53a113e548 100644 --- a/alicloud/data_source_alicloud_vpc_traffic_mirror_filter_ingress_rules.go +++ b/alicloud/data_source_alicloud_vpc_traffic_mirror_filter_ingress_rules.go @@ -5,7 +5,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -115,17 +114,12 @@ func dataSourceAlicloudVpcTrafficMirrorFilterIngressRulesRead(d *schema.Resource } status, statusOk := d.GetOk("status") var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_traffic_mirror_filters.go b/alicloud/data_source_alicloud_vpc_traffic_mirror_filters.go index 35e8ce371e15..db2da270c10f 100644 --- a/alicloud/data_source_alicloud_vpc_traffic_mirror_filters.go +++ b/alicloud/data_source_alicloud_vpc_traffic_mirror_filters.go @@ -6,7 +6,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -114,16 +113,11 @@ func dataSourceAlicloudVpcTrafficMirrorFiltersRead(d *schema.ResourceData, meta } status, statusOk := d.GetOk("status") var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_traffic_mirror_service.go b/alicloud/data_source_alicloud_vpc_traffic_mirror_service.go index 60e4ab3a813c..cbc69b338d3f 100644 --- a/alicloud/data_source_alicloud_vpc_traffic_mirror_service.go +++ b/alicloud/data_source_alicloud_vpc_traffic_mirror_service.go @@ -3,7 +3,6 @@ package alicloud import ( "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" @@ -36,21 +35,16 @@ func dataSourceAlicloudVpcTrafficMirrorServiceRead(d *schema.ResourceData, meta } client := meta.(*connectivity.AliyunClient) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error var response map[string]interface{} request := map[string]interface{}{} action := "GetTrafficMirrorServiceStatus" request["ClientToken"] = buildClientToken(action) - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(3*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -75,7 +69,7 @@ func dataSourceAlicloudVpcTrafficMirrorServiceRead(d *schema.ResourceData, meta action = "OpenTrafficMirrorService" request["ClientToken"] = buildClientToken(action) err = resource.Retry(3*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpc_traffic_mirror_sessions.go b/alicloud/data_source_alicloud_vpc_traffic_mirror_sessions.go index bc46e936fc1e..e4d883ef37c0 100644 --- a/alicloud/data_source_alicloud_vpc_traffic_mirror_sessions.go +++ b/alicloud/data_source_alicloud_vpc_traffic_mirror_sessions.go @@ -6,7 +6,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -190,16 +189,11 @@ func dataSourceAlicloudVpcTrafficMirrorSessionsRead(d *schema.ResourceData, meta } status, statusOk := d.GetOk("status") var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_vpcs.go b/alicloud/data_source_alicloud_vpcs.go index b8e33fb86ff2..779588fa45cb 100644 --- a/alicloud/data_source_alicloud_vpcs.go +++ b/alicloud/data_source_alicloud_vpcs.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" @@ -266,14 +265,9 @@ func dataSourceAlicloudVpcsRead(d *schema.ResourceData, meta interface{}) error } status, statusOk := d.GetOk("status") var response map[string]interface{} - conn, err := client.NewVpcClient() - 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { return WrapErrorf(err, DataDefaultErrorMsg, "alicloud_vpcs", action, AlibabaCloudSdkGoERROR) } diff --git a/alicloud/data_source_alicloud_vswitches.go b/alicloud/data_source_alicloud_vswitches.go index 6905b29ad506..df68460dd9d7 100644 --- a/alicloud/data_source_alicloud_vswitches.go +++ b/alicloud/data_source_alicloud_vswitches.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" @@ -228,14 +227,9 @@ func dataSourceAlicloudVswitchesRead(d *schema.ResourceData, meta interface{}) e } status, statusOk := d.GetOk("status") var response map[string]interface{} - conn, err := client.NewVpcClient() - 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { return WrapErrorf(err, DataDefaultErrorMsg, "alicloud_vswitches", action, AlibabaCloudSdkGoERROR) } diff --git a/alicloud/resource_alicloud_common_bandwidth_package_test.go b/alicloud/resource_alicloud_common_bandwidth_package_test.go index 11fda43879c6..3e3293a3e744 100644 --- a/alicloud/resource_alicloud_common_bandwidth_package_test.go +++ b/alicloud/resource_alicloud_common_bandwidth_package_test.go @@ -109,8 +109,8 @@ func TestAccAliCloudCommonBandwidthPackage_basic(t *testing.T) { resourceId := "alicloud_common_bandwidth_package.default" ra := resourceAttrInit(resourceId, AlicloudCommonBandwidthPackageMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} - }, "DescribeCommonBandwidthPackage") + return &CbwpServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} + }, "DescribeCbwpCommonBandwidthPackage") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) @@ -224,8 +224,8 @@ func TestAccAliCloudCommonBandwidthPackage_basic1(t *testing.T) { resourceId := "alicloud_common_bandwidth_package.default" ra := resourceAttrInit(resourceId, AlicloudCommonBandwidthPackageMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} - }, "DescribeCommonBandwidthPackage") + return &CbwpServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} + }, "DescribeCbwpCommonBandwidthPackage") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) @@ -331,8 +331,8 @@ func TestAccAliCloudCommonBandwidthPackage_basic2(t *testing.T) { resourceId := "alicloud_common_bandwidth_package.default" ra := resourceAttrInit(resourceId, AlicloudCommonBandwidthPackageMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} - }, "DescribeCommonBandwidthPackage") + return &CbwpServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} + }, "DescribeCbwpCommonBandwidthPackage") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) @@ -387,8 +387,8 @@ func TestAccAliCloudCommonBandwidthPackage_basic3(t *testing.T) { resourceId := "alicloud_common_bandwidth_package.default" ra := resourceAttrInit(resourceId, AlicloudCommonBandwidthPackageMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} - }, "DescribeCommonBandwidthPackage") + return &CbwpServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} + }, "DescribeCbwpCommonBandwidthPackage") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) @@ -442,8 +442,8 @@ func TestAccAliCloudCommonBandwidthPackage_basic4(t *testing.T) { resourceId := "alicloud_common_bandwidth_package.default" ra := resourceAttrInit(resourceId, AlicloudCommonBandwidthPackageMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} - }, "DescribeCommonBandwidthPackage") + return &CbwpServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} + }, "DescribeCbwpCommonBandwidthPackage") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) diff --git a/alicloud/resource_alicloud_eip_address_test.go b/alicloud/resource_alicloud_eip_address_test.go index dfae6057003f..7fef31a9d25b 100644 --- a/alicloud/resource_alicloud_eip_address_test.go +++ b/alicloud/resource_alicloud_eip_address_test.go @@ -124,7 +124,7 @@ func TestAccAliCloudEIPAddress_basic0(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -284,7 +284,7 @@ func TestAccAliCloudEIPAddress_basic1(t *testing.T) { checkoutSupportedRegions(t, true, connectivity.VPCPublicIpAddressPoolCidrBlockSupportRegions) ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap1) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -410,7 +410,7 @@ func TestAccAliCloudEIPAddress_basic2(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap2) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -522,7 +522,7 @@ func SkipTestAccAliCloudEIPAddress_basic3(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap3) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -572,7 +572,7 @@ func TestAccAliCloudEIPAddress_basic4(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap4) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -616,7 +616,7 @@ func SkipTestAccAliCloudEIPAddress_basic5(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -672,7 +672,7 @@ func TestAccAliCloudEIPAddress_basic6(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -726,7 +726,7 @@ func TestAccAliCloudEIPAddress_basic7(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap4) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -770,7 +770,7 @@ func TestAccAliCloudEIPAddress_basic8(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -824,7 +824,7 @@ func TestAccAliCloudEIPAddress_basic9(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -902,7 +902,7 @@ func TestAccAliCloudEIPAddress_basic13(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -959,7 +959,7 @@ func TestAccAliCloudEIPAddress_basic9_ip(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -1016,7 +1016,7 @@ func TestAccAliCloudEIPAddress_basic10(t *testing.T) { resourceId := "alicloud_eip_address.default" ra := resourceAttrInit(resourceId, AlicloudEIPAddressMap4) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAddress") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_eip_association_test.go b/alicloud/resource_alicloud_eip_association_test.go index eacb02fd6538..549820eb43b8 100644 --- a/alicloud/resource_alicloud_eip_association_test.go +++ b/alicloud/resource_alicloud_eip_association_test.go @@ -15,7 +15,7 @@ func TestAccAliCloudEipAssociation_basic0(t *testing.T) { resourceId := "alicloud_eip_association.default" ra := resourceAttrInit(resourceId, AliCloudEipAssociationMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAssociation") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -57,7 +57,7 @@ func TestAccAliCloudEipAssociation_basic0_twin(t *testing.T) { resourceId := "alicloud_eip_association.default" ra := resourceAttrInit(resourceId, AliCloudEipAssociationMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAssociation") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -102,7 +102,7 @@ func TestAccAliCloudEipAssociation_basic1(t *testing.T) { resourceId := "alicloud_eip_association.default" ra := resourceAttrInit(resourceId, AliCloudEipAssociationMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAssociation") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -146,7 +146,7 @@ func TestAccAliCloudEipAssociation_basic1_twin(t *testing.T) { resourceId := "alicloud_eip_association.default" ra := resourceAttrInit(resourceId, AliCloudEipAssociationMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAssociation") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -205,7 +205,7 @@ func TestAccAliCloudEipAssociation_basic2(t *testing.T) { resourceId := "alicloud_eip_association.default" ra := resourceAttrInit(resourceId, AliCloudEipAssociationMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAssociation") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -251,7 +251,7 @@ func TestAccAliCloudEipAssociation_basic2_twin(t *testing.T) { resourceId := "alicloud_eip_association.default" ra := resourceAttrInit(resourceId, AliCloudEipAssociationMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &EipServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeEipAssociation") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_havip_attachment_test.go b/alicloud/resource_alicloud_havip_attachment_test.go index c1b398b197a3..18dd2c28bac5 100644 --- a/alicloud/resource_alicloud_havip_attachment_test.go +++ b/alicloud/resource_alicloud_havip_attachment_test.go @@ -102,7 +102,7 @@ func TestAccAliCloudVPCHavipAttachment_basic(t *testing.T) { resourceId := "alicloud_havip_attachment.default" ra := resourceAttrInit(resourceId, AlicloudHavipAttachmentMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcHaVipAttachment") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -145,7 +145,7 @@ func TestAccAliCloudVPCHavipAttachment_basic1(t *testing.T) { resourceId := "alicloud_havip_attachment.default" ra := resourceAttrInit(resourceId, AlicloudHavipAttachmentMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcHaVipAttachment") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -189,7 +189,7 @@ func TestAccAliCloudVPCHavipAttachment_basic2(t *testing.T) { resourceId := "alicloud_havip_attachment.default" ra := resourceAttrInit(resourceId, AlicloudHavipAttachmentMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcHaVipAttachment") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -243,7 +243,7 @@ func TestAccAliCloudVPCHavipAttachment_basic_multiple_instance_bug_fix(t *testin resourceId := "alicloud_havip_attachment.default" ra := resourceAttrInit(resourceId, AlicloudHavipAttachmentMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcHaVipAttachment") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_network_acl.go b/alicloud/resource_alicloud_network_acl.go index 303dee41dd2e..4608e1df7f86 100644 --- a/alicloud/resource_alicloud_network_acl.go +++ b/alicloud/resource_alicloud_network_acl.go @@ -192,10 +192,7 @@ func resourceAliCloudVpcNetworkAclCreate(d *schema.ResourceData, meta interface{ var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken(action) @@ -220,7 +217,7 @@ func resourceAliCloudVpcNetworkAclCreate(d *schema.ResourceData, meta interface{ 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -343,10 +340,7 @@ func resourceAliCloudVpcNetworkAclUpdate(d *schema.ResourceData, meta interface{ update := false d.Partial(true) action := "ModifyNetworkAclAttributes" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query = make(map[string]interface{}) query["NetworkAclId"] = d.Id() @@ -372,7 +366,7 @@ func resourceAliCloudVpcNetworkAclUpdate(d *schema.ResourceData, meta interface{ 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -398,10 +392,6 @@ func resourceAliCloudVpcNetworkAclUpdate(d *schema.ResourceData, meta interface{ } update = false action = "UpdateNetworkAclEntries" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["NetworkAclId"] = d.Id() @@ -456,7 +446,7 @@ func resourceAliCloudVpcNetworkAclUpdate(d *schema.ResourceData, meta interface{ 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -480,10 +470,6 @@ func resourceAliCloudVpcNetworkAclUpdate(d *schema.ResourceData, meta interface{ } update = false action = "CopyNetworkAclEntries" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["NetworkAclId"] = d.Id() @@ -498,7 +484,7 @@ func resourceAliCloudVpcNetworkAclUpdate(d *schema.ResourceData, meta interface{ 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -531,10 +517,6 @@ func resourceAliCloudVpcNetworkAclUpdate(d *schema.ResourceData, meta interface{ if removed.Len() > 0 { action := "UnassociateNetworkAcl" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["NetworkAclId"] = d.Id() @@ -555,7 +537,7 @@ func resourceAliCloudVpcNetworkAclUpdate(d *schema.ResourceData, meta interface{ 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -581,10 +563,6 @@ func resourceAliCloudVpcNetworkAclUpdate(d *schema.ResourceData, meta interface{ if added.Len() > 0 { action := "AssociateNetworkAcl" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["NetworkAclId"] = d.Id() @@ -605,7 +583,7 @@ func resourceAliCloudVpcNetworkAclUpdate(d *schema.ResourceData, meta interface{ 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -653,10 +631,6 @@ func resourceAliCloudVpcNetworkAclDelete(d *schema.ResourceData, meta interface{ var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query["NetworkAclId"] = d.Id() request["RegionId"] = client.RegionId @@ -667,7 +641,7 @@ func resourceAliCloudVpcNetworkAclDelete(d *schema.ResourceData, meta interface{ 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_network_acl_test.go b/alicloud/resource_alicloud_network_acl_test.go index 3ebc169ff43e..a65fc357f191 100644 --- a/alicloud/resource_alicloud_network_acl_test.go +++ b/alicloud/resource_alicloud_network_acl_test.go @@ -40,15 +40,11 @@ func testSweepNetworkAcl(region string) error { "PageNumber": 1, } var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } networkAclIds := make([]string, 0) for { runtime := util.RuntimeOptions{} runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { log.Printf("Error retrieving network acl: %s", err) return nil @@ -111,7 +107,7 @@ func testSweepNetworkAcl(region string) error { 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -138,7 +134,7 @@ func testSweepNetworkAcl(region string) error { request["RegionId"] = client.RegionId 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_vpc.go b/alicloud/resource_alicloud_vpc.go index 4dd90baf840b..8b9c3e072046 100644 --- a/alicloud/resource_alicloud_vpc.go +++ b/alicloud/resource_alicloud_vpc.go @@ -6,7 +6,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -227,8 +226,6 @@ func resourceAliCloudVpcVpcCreate(d *schema.ResourceData, meta interface{}) erro if v, ok := d.GetOkExists("ipv4_cidr_mask"); ok { request["Ipv4CidrMask"] = v } - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { response, err = client.RpcPost("vpc", "2016-04-28", action, query, request, true) @@ -277,8 +274,6 @@ func resourceAliCloudVpcVpcCreate(d *schema.ResourceData, meta interface{}) erro if v, ok := d.GetOk("resource_group_id"); ok { request["ResourceGroupId"] = v } - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { response, err = client.RpcPost("vpc", "2016-04-28", action, query, request, true) @@ -418,20 +413,14 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro if _, ok := object["ClassicLinkEnabled"]; ok && object["ClassicLinkEnabled"].(bool) != target { if target == true { action := "EnableVpcClassicLink" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) request["VpcId"] = 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.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) if err != nil { if IsExpectedErrors(err, []string{"IncorrectVpcStatus"}) || NeedRetry(err) { wait() @@ -449,20 +438,14 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro } if target == false { action := "DisableVpcClassicLink" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) request["VpcId"] = 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.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) if err != nil { if IsExpectedErrors(err, []string{"InternalError", "IncorrectVpcStatus"}) || NeedRetry(err) { wait() @@ -482,10 +465,7 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro } action := "ModifyVpcAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query = make(map[string]interface{}) request["VpcId"] = d.Id() @@ -524,11 +504,9 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro } 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, false) if err != nil { if IsExpectedErrors(err, []string{"OperationFailed.LastTokenProcessing", "LastTokenProcessing", "OperationFailed.QueryCenIpv6Status", "IncorrectStatus", "OperationConflict", "SystemBusy", "ServiceUnavailable", "IncorrectVpcStatus"}) || NeedRetry(err) { wait() @@ -557,10 +535,6 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro } update = false action = "MoveResourceGroup" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) request["ResourceId"] = d.Id() @@ -571,11 +545,9 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro request["NewResourceGroupId"] = d.Get("resource_group_id") request["ResourceType"] = "VPC" 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, false) if err != nil { if NeedRetry(err) { wait() @@ -592,10 +564,6 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro } update = false action = "ModifyRouteTableAttributes" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["RegionId"] = client.RegionId @@ -630,11 +598,9 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro } 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, false) if err != nil { if NeedRetry(err) { wait() @@ -660,10 +626,6 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro for _, item := range secondaryCidrBlocks { action := "UnassociateVpcCidrBlock" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) request["VpcId"] = d.Id() @@ -675,11 +637,9 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro } request["SecondaryCidrBlock"] = jsonPathResult } - 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, false) if err != nil { if NeedRetry(err) { wait() @@ -707,10 +667,6 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro for _, item := range secondaryCidrBlocks { action := "AssociateVpcCidrBlock" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) request["VpcId"] = d.Id() @@ -730,11 +686,9 @@ func resourceAliCloudVpcVpcUpdate(d *schema.ResourceData, meta interface{}) erro if v, ok := d.GetOkExists("secondary_cidr_mask"); ok { request["SecondaryCidrMask"] = v } - 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, false) if err != nil { if NeedRetry(err) { wait() @@ -774,10 +728,7 @@ func resourceAliCloudVpcVpcDelete(d *schema.ResourceData, meta interface{}) erro var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["VpcId"] = d.Id() request["RegionId"] = client.RegionId @@ -786,11 +737,9 @@ func resourceAliCloudVpcVpcDelete(d *schema.ResourceData, meta interface{}) erro if v, ok := d.GetOkExists("dry_run"); ok { request["DryRun"] = v } - 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) if err != nil { if IsExpectedErrors(err, []string{"DependencyViolation.VSwitch", "DependencyViolation.SecurityGroup", "IncorrectVpcStatus"}) || NeedRetry(err) { diff --git a/alicloud/resource_alicloud_vpc_bgp_group.go b/alicloud/resource_alicloud_vpc_bgp_group.go index 86a23acccd57..2c3316954a39 100644 --- a/alicloud/resource_alicloud_vpc_bgp_group.go +++ b/alicloud/resource_alicloud_vpc_bgp_group.go @@ -75,10 +75,7 @@ func resourceAlicloudVpcBgpGroupCreate(d *schema.ResourceData, meta interface{}) var response map[string]interface{} action := "CreateBgpGroup" request := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOk("auth_key"); ok { request["AuthKey"] = v } @@ -102,7 +99,7 @@ func resourceAlicloudVpcBgpGroupCreate(d *schema.ResourceData, meta interface{}) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { request["ClientToken"] = buildClientToken("CreateBgpGroup") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) || IsExpectedErrors(err, []string{"OperationConflict"}) { wait() @@ -151,10 +148,7 @@ func resourceAlicloudVpcBgpGroupRead(d *schema.ResourceData, meta interface{}) e func resourceAlicloudVpcBgpGroupUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*connectivity.AliyunClient) vpcService := VpcService{client} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error var response map[string]interface{} update := false request := map[string]interface{}{ @@ -199,7 +193,7 @@ func resourceAlicloudVpcBgpGroupUpdate(d *schema.ResourceData, meta interface{}) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { request["ClientToken"] = buildClientToken("ModifyBgpGroupAttribute") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -225,10 +219,7 @@ func resourceAlicloudVpcBgpGroupDelete(d *schema.ResourceData, meta interface{}) vpcService := VpcService{client} action := "DeleteBgpGroup" var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request := map[string]interface{}{ "BgpGroupId": d.Id(), } @@ -239,7 +230,7 @@ func resourceAlicloudVpcBgpGroupDelete(d *schema.ResourceData, meta interface{}) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { request["ClientToken"] = buildClientToken("DeleteBgpGroup") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) || IsExpectedErrors(err, []string{"DependencyViolation.BgpPeer"}) { wait() diff --git a/alicloud/resource_alicloud_vpc_bgp_group_test.go b/alicloud/resource_alicloud_vpc_bgp_group_test.go index 116a6945abbf..d33cbd81f314 100644 --- a/alicloud/resource_alicloud_vpc_bgp_group_test.go +++ b/alicloud/resource_alicloud_vpc_bgp_group_test.go @@ -57,17 +57,10 @@ func testSweepVpcBgpGroup(region string) error { request["PageNumber"] = 1 var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - log.Printf("[ERROR] %s get an error: %#v", action, err) - return nil - } for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(1*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -107,7 +100,7 @@ func testSweepVpcBgpGroup(region string) error { "BgpGroupId": item["BgpGroupId"], "RegionId": client.RegionId, } - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete Vpc Bgp Group (%s): %s", item["Name"].(string), err) } diff --git a/alicloud/resource_alicloud_vpc_bgp_network.go b/alicloud/resource_alicloud_vpc_bgp_network.go index 54a163bf3cb7..ca49b72d5966 100644 --- a/alicloud/resource_alicloud_vpc_bgp_network.go +++ b/alicloud/resource_alicloud_vpc_bgp_network.go @@ -5,7 +5,6 @@ import ( "log" "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" @@ -47,19 +46,14 @@ func resourceAlicloudVpcBgpNetworkCreate(d *schema.ResourceData, meta interface{ var response map[string]interface{} action := "AddBgpNetwork" request := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request["DstCidrBlock"] = d.Get("dst_cidr_block") request["RegionId"] = client.RegionId request["RouterId"] = d.Get("router_id") - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { request["ClientToken"] = buildClientToken("AddBgpNetwork") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -109,22 +103,16 @@ func resourceAlicloudVpcBgpNetworkDelete(d *schema.ResourceData, meta interface{ vpcService := VpcService{client} action := "DeleteBgpNetwork" var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "DstCidrBlock": parts[1], "RouterId": parts[0], } request["RegionId"] = client.RegionId - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { request["ClientToken"] = buildClientToken("DeleteBgpNetwork") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_vpc_bgp_peer_test.go b/alicloud/resource_alicloud_vpc_bgp_peer_test.go index dda6834b471c..f8282dbde989 100644 --- a/alicloud/resource_alicloud_vpc_bgp_peer_test.go +++ b/alicloud/resource_alicloud_vpc_bgp_peer_test.go @@ -16,7 +16,7 @@ func TestAccAliCloudVPCBgpPeer_basic0(t *testing.T) { checkoutSupportedRegions(t, true, connectivity.VPCBgpGroupSupportRegions) ra := resourceAttrInit(resourceId, AlicloudVPCBgpPeerMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcBgpPeer") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -80,7 +80,7 @@ func TestAccAliCloudVPCBgpPeer_basic1(t *testing.T) { checkoutSupportedRegions(t, true, connectivity.VPCBgpGroupSupportRegions) ra := resourceAttrInit(resourceId, AlicloudVPCBgpPeerMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcBgpPeer") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_dhcp_options_set.go b/alicloud/resource_alicloud_vpc_dhcp_options_set.go index 6f2076f4a57b..d9f770374876 100644 --- a/alicloud/resource_alicloud_vpc_dhcp_options_set.go +++ b/alicloud/resource_alicloud_vpc_dhcp_options_set.go @@ -8,7 +8,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -104,10 +103,7 @@ func resourceAliCloudVpcDhcpOptionsSetCreate(d *schema.ResourceData, meta interf var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken(action) @@ -141,11 +137,9 @@ func resourceAliCloudVpcDhcpOptionsSetCreate(d *schema.ResourceData, meta interf request["Tags"] = tagsMap } - runtime := util.RuntimeOptions{} - 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -231,10 +225,7 @@ func resourceAliCloudVpcDhcpOptionsSetUpdate(d *schema.ResourceData, meta interf update := false d.Partial(true) action := "UpdateDhcpOptionsSetAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query = make(map[string]interface{}) query["DhcpOptionsSetId"] = d.Id() @@ -274,11 +265,9 @@ func resourceAliCloudVpcDhcpOptionsSetUpdate(d *schema.ResourceData, meta interf request["DryRun"] = v } 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -302,10 +291,6 @@ func resourceAliCloudVpcDhcpOptionsSetUpdate(d *schema.ResourceData, meta interf } update = false action = "MoveResourceGroup" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["ResourceId"] = d.Id() @@ -317,11 +302,9 @@ func resourceAliCloudVpcDhcpOptionsSetUpdate(d *schema.ResourceData, meta interf request["ResourceType"] = "DhcpOptionsSet" 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, false) if err != nil { if NeedRetry(err) { @@ -350,10 +333,6 @@ func resourceAliCloudVpcDhcpOptionsSetUpdate(d *schema.ResourceData, meta interf for _, item := range associateVpcs { action := "DetachDhcpOptionsSetFromVpc" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["DhcpOptionsSetId"] = d.Id() @@ -369,11 +348,9 @@ func resourceAliCloudVpcDhcpOptionsSetUpdate(d *schema.ResourceData, meta interf if v, ok := item.(map[string]interface{}); ok { request["DryRun"] = v } - 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -403,10 +380,6 @@ func resourceAliCloudVpcDhcpOptionsSetUpdate(d *schema.ResourceData, meta interf for _, item := range associateVpcs { action := "AttachDhcpOptionsSetToVpc" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["DhcpOptionsSetId"] = d.Id() @@ -422,11 +395,9 @@ func resourceAliCloudVpcDhcpOptionsSetUpdate(d *schema.ResourceData, meta interf if v, ok := item.(map[string]interface{}); ok { request["DryRun"] = v } - 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -469,10 +440,7 @@ func resourceAliCloudVpcDhcpOptionsSetDelete(d *schema.ResourceData, meta interf var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query["DhcpOptionsSetId"] = d.Id() request["RegionId"] = client.RegionId @@ -482,11 +450,9 @@ func resourceAliCloudVpcDhcpOptionsSetDelete(d *schema.ResourceData, meta interf if v, ok := d.GetOkExists("dry_run"); ok { request["DryRun"] = v } - 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_dhcp_options_set_attachment.go b/alicloud/resource_alicloud_vpc_dhcp_options_set_attachment.go index b5b4e66d0368..b0be849fbb50 100644 --- a/alicloud/resource_alicloud_vpc_dhcp_options_set_attachment.go +++ b/alicloud/resource_alicloud_vpc_dhcp_options_set_attachment.go @@ -5,7 +5,6 @@ import ( "log" "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" @@ -52,10 +51,7 @@ func resourceAlicloudVpcDhcpOptionsAttachmentCreate(d *schema.ResourceData, meta var response map[string]interface{} action := "AttachDhcpOptionsSetToVpc" request := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request["RegionId"] = client.RegionId request["DhcpOptionsSetId"] = d.Get("dhcp_options_set_id") @@ -65,11 +61,9 @@ func resourceAlicloudVpcDhcpOptionsAttachmentCreate(d *schema.ResourceData, meta request["DryRun"] = v } - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -132,10 +126,7 @@ func resourceAlicloudVpcDhcpOptionsSetAttachmentDelete(d *schema.ResourceData, m client := meta.(*connectivity.AliyunClient) action := "DetachDhcpOptionsSetFromVpc" var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error parts, err := ParseResourceId(d.Id(), 2) if err != nil { return WrapError(err) @@ -150,11 +141,9 @@ func resourceAlicloudVpcDhcpOptionsSetAttachmentDelete(d *schema.ResourceData, m request["DryRun"] = v } - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 10*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if IsExpectedErrors(err, []string{"IncorrectStatus.DhcpOptionsSet"}) || NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_vpc_dhcp_options_set_test.go b/alicloud/resource_alicloud_vpc_dhcp_options_set_test.go index f83c0abd03ab..fff89821e5d3 100644 --- a/alicloud/resource_alicloud_vpc_dhcp_options_set_test.go +++ b/alicloud/resource_alicloud_vpc_dhcp_options_set_test.go @@ -8,8 +8,6 @@ import ( "time" "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/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -39,16 +37,10 @@ func testSweepVpcDhcpOptionsSet(region string) error { request["MaxResults"] = PageSizeLarge request["RegionId"] = client.RegionId var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - log.Printf("[ERROR] %s get an error: %#v", action, err) - } 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -91,7 +83,7 @@ func testSweepVpcDhcpOptionsSet(region string) error { "DhcpOptionsSetId": item["DhcpOptionsSetId"], } request["RegionId"] = client.RegionId - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete Vpc Dhcp Options Set (%s): %s", item["DhcpOptionsSetName"].(string), err) } diff --git a/alicloud/resource_alicloud_vpc_flow_log.go b/alicloud/resource_alicloud_vpc_flow_log.go index 9713f2016ffa..b0966dfb1610 100644 --- a/alicloud/resource_alicloud_vpc_flow_log.go +++ b/alicloud/resource_alicloud_vpc_flow_log.go @@ -7,7 +7,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -109,10 +108,7 @@ func resourceAlicloudVpcFlowLogCreate(d *schema.ResourceData, meta interface{}) action := "CreateFlowLog" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RegionId"] = client.RegionId @@ -140,7 +136,7 @@ func resourceAlicloudVpcFlowLogCreate(d *schema.ResourceData, meta interface{}) request["ResourceType"] = d.Get("resource_type") 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if IsExpectedErrors(err, []string{"TaskConflict", "OperationFailed.LastTokenProcessing", "LastTokenProcessing", "IncorrectStatus", "InvalidHdMonitorStatus", "OperationConflict", "ServiceUnavailable", "SystemBusy", "UnknownError"}) || NeedRetry(err) { @@ -211,10 +207,7 @@ func resourceAlicloudVpcFlowLogUpdate(d *schema.ResourceData, meta interface{}) update := false d.Partial(true) action := "ModifyFlowLogAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["FlowLogId"] = d.Id() @@ -237,7 +230,7 @@ func resourceAlicloudVpcFlowLogUpdate(d *schema.ResourceData, meta interface{}) if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { @@ -263,10 +256,6 @@ func resourceAlicloudVpcFlowLogUpdate(d *schema.ResourceData, meta interface{}) } update = false action = "MoveResourceGroup" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["ResourceId"] = d.Id() @@ -280,7 +269,7 @@ func resourceAlicloudVpcFlowLogUpdate(d *schema.ResourceData, meta interface{}) if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { @@ -310,17 +299,12 @@ func resourceAlicloudVpcFlowLogUpdate(d *schema.ResourceData, meta interface{}) if object["Status"].(string) != target { if target == "Active" { action = "ActiveFlowLog" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) - request["FlowLogId"] = d.Id() request["RegionId"] = client.RegionId 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if IsExpectedErrors(err, []string{"TaskConflict", "LastTokenProcessing", "IncorrectStatus", "IncorrectStatus.flowlog", "InvalidStatus", "OperationConflict", "ServiceUnavailable", "SystemBusy", "UnknownError"}) || NeedRetry(err) { @@ -344,17 +328,13 @@ func resourceAlicloudVpcFlowLogUpdate(d *schema.ResourceData, meta interface{}) } if target == "Inactive" { action = "DeactiveFlowLog" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["FlowLogId"] = d.Id() request["RegionId"] = client.RegionId 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if IsExpectedErrors(err, []string{"TaskConflict", "LastTokenProcessing", "IncorrectStatus", "IncorrectStatus.flowlog", "InvalidStatus", "OperationConflict", "ServiceUnavailable", "SystemBusy", "UnknownError"}) || NeedRetry(err) { @@ -399,10 +379,7 @@ func resourceAlicloudVpcFlowLogDelete(d *schema.ResourceData, meta interface{}) action := "DeleteFlowLog" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["FlowLogId"] = d.Id() @@ -410,7 +387,7 @@ func resourceAlicloudVpcFlowLogDelete(d *schema.ResourceData, meta interface{}) 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if IsExpectedErrors(err, []string{"OperationFailed.LastTokenProcessing", "LastTokenProcessing", "InvalidHdMonitorStatus", "IncorrectStatus", "IncorrectStatus.flowlog", "InvalidStatus", "OperationConflict", "SystemBusy", "ServiceUnavailable"}) || NeedRetry(err) { diff --git a/alicloud/resource_alicloud_vpc_flow_log_test.go b/alicloud/resource_alicloud_vpc_flow_log_test.go index 9f89f8f63fba..006a15d9826e 100644 --- a/alicloud/resource_alicloud_vpc_flow_log_test.go +++ b/alicloud/resource_alicloud_vpc_flow_log_test.go @@ -25,7 +25,7 @@ func TestAccAlicloudVPCFlowLog_basic0(t *testing.T) { resourceId := "alicloud_vpc_flow_log.default" ra := resourceAttrInit(resourceId, AlicloudVpcFlowLogMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcFlowLog") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -127,7 +127,7 @@ func TestAccAlicloudVPCFlowLog_basic1(t *testing.T) { resourceId := "alicloud_vpc_flow_log.default" ra := resourceAttrInit(resourceId, AlicloudVpcFlowLogMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcFlowLog") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_gateway_endpoint.go b/alicloud/resource_alicloud_vpc_gateway_endpoint.go index 457ed92f8e69..0a0c80dbca64 100644 --- a/alicloud/resource_alicloud_vpc_gateway_endpoint.go +++ b/alicloud/resource_alicloud_vpc_gateway_endpoint.go @@ -6,7 +6,6 @@ import ( "log" "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" @@ -77,10 +76,7 @@ func resourceAliCloudVpcGatewayEndpointCreate(d *schema.ResourceData, meta inter action := "CreateVpcGatewayEndpoint" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken(action) @@ -101,7 +97,7 @@ func resourceAliCloudVpcGatewayEndpointCreate(d *schema.ResourceData, meta inter } 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -166,10 +162,7 @@ func resourceAliCloudVpcGatewayEndpointUpdate(d *schema.ResourceData, meta inter update := false d.Partial(true) action := "UpdateVpcGatewayEndpointAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["EndpointId"] = d.Id() request["RegionId"] = client.RegionId @@ -192,7 +185,7 @@ func resourceAliCloudVpcGatewayEndpointUpdate(d *schema.ResourceData, meta inter if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -219,10 +212,6 @@ func resourceAliCloudVpcGatewayEndpointUpdate(d *schema.ResourceData, meta inter } update = false action = "MoveResourceGroup" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["ResourceId"] = d.Id() request["RegionId"] = client.RegionId @@ -235,7 +224,7 @@ func resourceAliCloudVpcGatewayEndpointUpdate(d *schema.ResourceData, meta inter if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { @@ -272,10 +261,7 @@ func resourceAliCloudVpcGatewayEndpointDelete(d *schema.ResourceData, meta inter action := "DeleteVpcGatewayEndpoint" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["EndpointId"] = d.Id() request["RegionId"] = client.RegionId @@ -284,7 +270,7 @@ func resourceAliCloudVpcGatewayEndpointDelete(d *schema.ResourceData, meta inter 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_gateway_endpoint_route_table_attachment.go b/alicloud/resource_alicloud_vpc_gateway_endpoint_route_table_attachment.go index a4e973da1489..eea18ce40f22 100644 --- a/alicloud/resource_alicloud_vpc_gateway_endpoint_route_table_attachment.go +++ b/alicloud/resource_alicloud_vpc_gateway_endpoint_route_table_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" @@ -50,10 +49,7 @@ func resourceAliCloudVpcGatewayEndpointRouteTableAttachmentCreate(d *schema.Reso action := "AssociateRouteTablesWithVpcGatewayEndpoint" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RouteTableIds.1"] = d.Get("route_table_id") request["EndpointId"] = d.Get("gateway_endpoint_id") @@ -62,7 +58,7 @@ func resourceAliCloudVpcGatewayEndpointRouteTableAttachmentCreate(d *schema.Reso 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -125,10 +121,7 @@ func resourceAliCloudVpcGatewayEndpointRouteTableAttachmentDelete(d *schema.Reso action := "DissociateRouteTablesFromVpcGatewayEndpoint" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["EndpointId"] = parts[0] request["RouteTableIds.1"] = parts[1] @@ -138,7 +131,7 @@ func resourceAliCloudVpcGatewayEndpointRouteTableAttachmentDelete(d *schema.Reso 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_gateway_route_table_attachment.go b/alicloud/resource_alicloud_vpc_gateway_route_table_attachment.go index 77ac5aa4e576..e1ca4cd351d2 100644 --- a/alicloud/resource_alicloud_vpc_gateway_route_table_attachment.go +++ b/alicloud/resource_alicloud_vpc_gateway_route_table_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" @@ -59,10 +58,7 @@ func resourceAliCloudVpcGatewayRouteTableAttachmentCreate(d *schema.ResourceData action := "AssociateRouteTableWithGateway" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RouteTableId"] = d.Get("route_table_id") request["GatewayId"] = d.Get("ipv4_gateway_id") @@ -74,7 +70,7 @@ func resourceAliCloudVpcGatewayRouteTableAttachmentCreate(d *schema.ResourceData } 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -137,10 +133,7 @@ func resourceAliCloudVpcGatewayRouteTableAttachmentDelete(d *schema.ResourceData action := "DissociateRouteTableFromGateway" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) parts := strings.Split(d.Id(), ":") @@ -156,7 +149,7 @@ func resourceAliCloudVpcGatewayRouteTableAttachmentDelete(d *schema.ResourceData } 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_gateway_route_table_attachment_test.go b/alicloud/resource_alicloud_vpc_gateway_route_table_attachment_test.go index b0336510dd35..f719bb4fcd81 100644 --- a/alicloud/resource_alicloud_vpc_gateway_route_table_attachment_test.go +++ b/alicloud/resource_alicloud_vpc_gateway_route_table_attachment_test.go @@ -15,7 +15,7 @@ func TestAccAlicloudVpcGatewayRouteTableAttachment_basic0(t *testing.T) { resourceId := "alicloud_vpc_gateway_route_table_attachment.default" ra := resourceAttrInit(resourceId, AlicloudVpcGatewayRouteTableAttachmentMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcGatewayRouteTableAttachment") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_ipv4_cidr_block_test.go b/alicloud/resource_alicloud_vpc_ipv4_cidr_block_test.go index f72d9f8472fe..4f3266c2c302 100644 --- a/alicloud/resource_alicloud_vpc_ipv4_cidr_block_test.go +++ b/alicloud/resource_alicloud_vpc_ipv4_cidr_block_test.go @@ -24,7 +24,7 @@ func TestAccAliCloudVPCIpv4CidrBlock_basic0(t *testing.T) { resourceId := "alicloud_vpc_ipv4_cidr_block.default" ra := resourceAttrInit(resourceId, AlicloudVPCIpv4CidrBlockMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcIpv4CidrBlock") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_ipv4_gateway_test.go b/alicloud/resource_alicloud_vpc_ipv4_gateway_test.go index 61356b535ce2..6b91826ba49d 100644 --- a/alicloud/resource_alicloud_vpc_ipv4_gateway_test.go +++ b/alicloud/resource_alicloud_vpc_ipv4_gateway_test.go @@ -113,7 +113,7 @@ func TestAccAlicloudVPCIpv4Gateway_basic0(t *testing.T) { resourceId := "alicloud_vpc_ipv4_gateway.default" ra := resourceAttrInit(resourceId, AlicloudVPCIpv4GatewayMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcIpv4Gateway") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_ipv6_egress_rule_test.go b/alicloud/resource_alicloud_vpc_ipv6_egress_rule_test.go index 6883c1b2b5fa..eddccd50f645 100644 --- a/alicloud/resource_alicloud_vpc_ipv6_egress_rule_test.go +++ b/alicloud/resource_alicloud_vpc_ipv6_egress_rule_test.go @@ -23,7 +23,7 @@ func TestAccAliCloudVPCIpv6EgressRule_basic0(t *testing.T) { resourceId := "alicloud_vpc_ipv6_egress_rule.default" ra := resourceAttrInit(resourceId, AlicloudVPCIpv6EgressRuleMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcIpv6EgressRule") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -71,7 +71,7 @@ func TestAccAliCloudVPCIpv6EgressRule_basic1(t *testing.T) { resourceId := "alicloud_vpc_ipv6_egress_rule.default" ra := resourceAttrInit(resourceId, AlicloudVPCIpv6EgressRuleMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcIpv6EgressRule") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_ipv6_gateway_test.go b/alicloud/resource_alicloud_vpc_ipv6_gateway_test.go index bb334150583c..f85fec16ec78 100644 --- a/alicloud/resource_alicloud_vpc_ipv6_gateway_test.go +++ b/alicloud/resource_alicloud_vpc_ipv6_gateway_test.go @@ -119,7 +119,7 @@ func TestAccAliCloudVpcIpv6Gateway_basic0(t *testing.T) { resourceId := "alicloud_vpc_ipv6_gateway.default" ra := resourceAttrInit(resourceId, AlicloudVPCIpv6GatewayMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcIpv6Gateway") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_ipv6_internet_bandwidth_test.go b/alicloud/resource_alicloud_vpc_ipv6_internet_bandwidth_test.go index 00cadbcca6cb..b7373d21ca12 100644 --- a/alicloud/resource_alicloud_vpc_ipv6_internet_bandwidth_test.go +++ b/alicloud/resource_alicloud_vpc_ipv6_internet_bandwidth_test.go @@ -25,7 +25,7 @@ func TestAccAlicloudVPCIpv6InternetBandwidth_basic0(t *testing.T) { resourceId := "alicloud_vpc_ipv6_internet_bandwidth.default" ra := resourceAttrInit(resourceId, AlicloudVPCIpv6InternetBandwidthMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcIpv6InternetBandwidth") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_nat_ip.go b/alicloud/resource_alicloud_vpc_nat_ip.go index c55e52696195..a8c483fb4737 100644 --- a/alicloud/resource_alicloud_vpc_nat_ip.go +++ b/alicloud/resource_alicloud_vpc_nat_ip.go @@ -5,7 +5,6 @@ import ( "log" "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" @@ -75,10 +74,7 @@ func resourceAlicloudVpcNatIpCreate(d *schema.ResourceData, meta interface{}) er var response map[string]interface{} action := "CreateNatIp" request := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOkExists("dry_run"); ok { request["DryRun"] = v } @@ -99,12 +95,10 @@ func resourceAlicloudVpcNatIpCreate(d *schema.ResourceData, meta interface{}) er request["NatIpName"] = v } request["RegionId"] = client.RegionId - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { request["ClientToken"] = buildClientToken("CreateNatIp") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if IsExpectedErrors(err, []string{"OperationConflict"}) || NeedRetry(err) { wait() @@ -183,16 +177,10 @@ func resourceAlicloudVpcNatIpUpdate(d *schema.ResourceData, meta interface{}) er } if update { action := "ModifyNatIpAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { request["ClientToken"] = buildClientToken("ModifyNatIpAttribute") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -214,10 +202,7 @@ func resourceAlicloudVpcNatIpDelete(d *schema.ResourceData, meta interface{}) er vpcService := VpcService{client} action := "DeleteNatIp" var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error parts, err := ParseResourceId(d.Id(), 2) if err != nil { return WrapError(err) @@ -230,12 +215,10 @@ func resourceAlicloudVpcNatIpDelete(d *schema.ResourceData, meta interface{}) er request["DryRun"] = v } request["RegionId"] = client.RegionId - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { request["ClientToken"] = buildClientToken("DeleteNatIp") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if IsExpectedErrors(err, []string{"OperationConflict"}) || NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_vpc_nat_ip_cidr.go b/alicloud/resource_alicloud_vpc_nat_ip_cidr.go index 92b1947aac51..8c59727b5edf 100644 --- a/alicloud/resource_alicloud_vpc_nat_ip_cidr.go +++ b/alicloud/resource_alicloud_vpc_nat_ip_cidr.go @@ -5,7 +5,6 @@ import ( "log" "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" @@ -57,10 +56,7 @@ func resourceAlicloudVpcNatIpCidrCreate(d *schema.ResourceData, meta interface{} var response map[string]interface{} action := "CreateNatIpCidr" request := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOkExists("dry_run"); ok { request["DryRun"] = v } @@ -75,12 +71,10 @@ func resourceAlicloudVpcNatIpCidrCreate(d *schema.ResourceData, meta interface{} request["NatIpCidrName"] = v } request["RegionId"] = client.RegionId - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { request["ClientToken"] = buildClientToken("CreateNatIpCidr") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if IsExpectedErrors(err, []string{"OperationConflict"}) || NeedRetry(err) { wait() @@ -155,16 +149,10 @@ func resourceAlicloudVpcNatIpCidrUpdate(d *schema.ResourceData, meta interface{} } if update { action := "ModifyNatIpCidrAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { request["ClientToken"] = buildClientToken("ModifyNatIpCidrAttribute") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -189,10 +177,6 @@ func resourceAlicloudVpcNatIpCidrDelete(d *schema.ResourceData, meta interface{} } action := "DeleteNatIpCidr" var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "NatGatewayId": parts[0], "NatIpCidr": parts[1], @@ -202,12 +186,10 @@ func resourceAlicloudVpcNatIpCidrDelete(d *schema.ResourceData, meta interface{} request["DryRun"] = v } request["RegionId"] = client.RegionId - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { request["ClientToken"] = buildClientToken("DeleteNatIpCidr") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if IsExpectedErrors(err, []string{"OperationConflict"}) || NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_vpc_network_acl_attachment.go b/alicloud/resource_alicloud_vpc_network_acl_attachment.go index 5a55e1c6a49d..46654961da3d 100644 --- a/alicloud/resource_alicloud_vpc_network_acl_attachment.go +++ b/alicloud/resource_alicloud_vpc_network_acl_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" @@ -57,10 +56,7 @@ func resourceAliCloudVpcNetworkAclAttachmentCreate(d *schema.ResourceData, meta action := "AssociateNetworkAcl" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["NetworkAclId"] = d.Get("network_acl_id") @@ -74,11 +70,9 @@ func resourceAliCloudVpcNetworkAclAttachmentCreate(d *schema.ResourceData, meta 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.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -142,10 +136,7 @@ func resourceAliCloudVpcNetworkAclAttachmentDelete(d *schema.ResourceData, meta action := "UnassociateNetworkAcl" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["NetworkAclId"] = parts[0] @@ -159,12 +150,9 @@ func resourceAliCloudVpcNetworkAclAttachmentDelete(d *schema.ResourceData, meta 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_network_acl_attachment_test.go b/alicloud/resource_alicloud_vpc_network_acl_attachment_test.go index 20672cb09c6e..79273ee5dd90 100644 --- a/alicloud/resource_alicloud_vpc_network_acl_attachment_test.go +++ b/alicloud/resource_alicloud_vpc_network_acl_attachment_test.go @@ -25,7 +25,7 @@ func TestAccAliCloudVpcNetworkAclAttachment_basic0(t *testing.T) { resourceId := "alicloud_vpc_network_acl_attachment.default" ra := resourceAttrInit(resourceId, resourceAlicloudVpcNetworkAclAttachmentMap) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcNetworkAclAttachment") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_prefix_list.go b/alicloud/resource_alicloud_vpc_prefix_list.go index d24bab9d201b..8d4f94d6b99b 100644 --- a/alicloud/resource_alicloud_vpc_prefix_list.go +++ b/alicloud/resource_alicloud_vpc_prefix_list.go @@ -7,7 +7,6 @@ import ( "regexp" "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" @@ -139,10 +138,7 @@ func resourceAlicloudVpcPrefixListCreate(d *schema.ResourceData, meta interface{ action := "CreateVpcPrefixList" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken(action) @@ -182,7 +178,7 @@ func resourceAlicloudVpcPrefixListCreate(d *schema.ResourceData, meta interface{ 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -289,10 +285,7 @@ func resourceAlicloudVpcPrefixListUpdate(d *schema.ResourceData, meta interface{ update := false d.Partial(true) action := "ModifyVpcPrefixList" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["PrefixListId"] = d.Id() @@ -323,7 +316,7 @@ func resourceAlicloudVpcPrefixListUpdate(d *schema.ResourceData, meta interface{ if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -345,10 +338,6 @@ func resourceAlicloudVpcPrefixListUpdate(d *schema.ResourceData, meta interface{ } update = false action = "MoveResourceGroup" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["ResourceId"] = d.Id() @@ -365,7 +354,7 @@ func resourceAlicloudVpcPrefixListUpdate(d *schema.ResourceData, meta interface{ if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { @@ -394,10 +383,6 @@ func resourceAlicloudVpcPrefixListUpdate(d *schema.ResourceData, meta interface{ if removed.Len() > 0 { action = "ModifyVpcPrefixList" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["PrefixListId"] = d.Id() @@ -418,7 +403,7 @@ func resourceAlicloudVpcPrefixListUpdate(d *schema.ResourceData, meta interface{ 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -439,10 +424,6 @@ func resourceAlicloudVpcPrefixListUpdate(d *schema.ResourceData, meta interface{ if added.Len() > 0 { action = "ModifyVpcPrefixList" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["PrefixListId"] = d.Id() @@ -463,7 +444,7 @@ func resourceAlicloudVpcPrefixListUpdate(d *schema.ResourceData, meta interface{ 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -503,10 +484,7 @@ func resourceAlicloudVpcPrefixListDelete(d *schema.ResourceData, meta interface{ action := "DeleteVpcPrefixList" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["PrefixListId"] = d.Id() @@ -516,7 +494,7 @@ func resourceAlicloudVpcPrefixListDelete(d *schema.ResourceData, meta interface{ 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_prefix_list_test.go b/alicloud/resource_alicloud_vpc_prefix_list_test.go index 2fdb3647f91e..2e74f2c84047 100644 --- a/alicloud/resource_alicloud_vpc_prefix_list_test.go +++ b/alicloud/resource_alicloud_vpc_prefix_list_test.go @@ -37,29 +37,21 @@ func testSweepVpcPrefixList(region string) error { if err != nil { return fmt.Errorf("error getting Alicloud client: %s", err) } - aliyunClient := rawClient.(*connectivity.AliyunClient) + client := rawClient.(*connectivity.AliyunClient) prefixes := []string{ "tf-testAcc", "tf_testAcc", } action := "ListPrefixLists" request := map[string]interface{}{} - request["RegionId"] = aliyunClient.RegionId - + request["RegionId"] = client.RegionId request["MaxResults"] = PageSizeLarge - var response map[string]interface{} - conn, err := aliyunClient.NewVpcClient() - if err != nil { - log.Printf("[ERROR] %s get an error: %#v", action, err) - return nil - } + for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(1*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -97,9 +89,9 @@ func testSweepVpcPrefixList(region string) error { action := "DeleteVpcPrefixList" request := map[string]interface{}{ "PrefixListId": item["PrefixListId"], - "RegionId": aliyunClient.RegionId, + "RegionId": client.RegionId, } - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete Vpc Prefix List (%s): %s", item["PrefixListName"].(string), err) } @@ -121,7 +113,7 @@ func TestAccAlicloudVPCPrefixList_basic0(t *testing.T) { resourceId := "alicloud_vpc_prefix_list.default" ra := resourceAttrInit(resourceId, AlicloudVPCPrefixListMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcPrefixList") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -188,7 +180,7 @@ func TestAccAlicloudVPCPrefixList_basic1(t *testing.T) { resourceId := "alicloud_vpc_prefix_list.default" ra := resourceAttrInit(resourceId, AlicloudVPCPrefixListMap1) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcPrefixList") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -281,7 +273,7 @@ func TestAccAlicloudVPCPrefixList_basic2(t *testing.T) { resourceId := "alicloud_vpc_prefix_list.default" ra := resourceAttrInit(resourceId, AlicloudVPCPrefixListMap1) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcPrefixList") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_public_ip_address_pool.go b/alicloud/resource_alicloud_vpc_public_ip_address_pool.go index f4cc1c862ec7..d64da4a38c9f 100644 --- a/alicloud/resource_alicloud_vpc_public_ip_address_pool.go +++ b/alicloud/resource_alicloud_vpc_public_ip_address_pool.go @@ -6,7 +6,6 @@ import ( "log" "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 resourceAliCloudVpcPublicIpAddressPoolCreate(d *schema.ResourceData, meta i var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken(action) @@ -134,11 +130,9 @@ func resourceAliCloudVpcPublicIpAddressPoolCreate(d *schema.ResourceData, meta i request["SecurityProtectionTypes"] = securityProtectionTypesMaps } - runtime := util.RuntimeOptions{} - 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) if err != nil { if IsExpectedErrors(err, []string{"OperationConflict", "IncorrectStatus", "SystemBusy", "ServiceUnavailable", "OperationFailed.LastTokenProcessing", "LastTokenProcessing"}) || NeedRetry(err) { wait() @@ -239,10 +233,7 @@ func resourceAliCloudVpcPublicIpAddressPoolUpdate(d *schema.ResourceData, meta i update := false d.Partial(true) action := "UpdatePublicIpAddressPoolAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query = make(map[string]interface{}) query["PublicIpAddressPoolId"] = d.Id() @@ -259,11 +250,9 @@ func resourceAliCloudVpcPublicIpAddressPoolUpdate(d *schema.ResourceData, meta i } 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) if err != nil { if NeedRetry(err) { wait() @@ -280,10 +269,6 @@ func resourceAliCloudVpcPublicIpAddressPoolUpdate(d *schema.ResourceData, meta i } update = false action = "MoveResourceGroup" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["ResourceId"] = d.Id() @@ -295,11 +280,9 @@ func resourceAliCloudVpcPublicIpAddressPoolUpdate(d *schema.ResourceData, meta i request["ResourceType"] = "PUBLICIPADDRESSPOOL" 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, false) if err != nil { if NeedRetry(err) { wait() @@ -332,21 +315,14 @@ func resourceAliCloudVpcPublicIpAddressPoolDelete(d *schema.ResourceData, meta i var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query["PublicIpAddressPoolId"] = d.Id() query["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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_public_ip_address_pool_cidr_block.go b/alicloud/resource_alicloud_vpc_public_ip_address_pool_cidr_block.go index 6db955cf77bc..c52cfbaefc80 100644 --- a/alicloud/resource_alicloud_vpc_public_ip_address_pool_cidr_block.go +++ b/alicloud/resource_alicloud_vpc_public_ip_address_pool_cidr_block.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" @@ -63,10 +62,7 @@ func resourceAliCloudVpcPublicIpAddressPoolCidrBlockCreate(d *schema.ResourceDat var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query["PublicIpAddressPoolId"] = d.Get("public_ip_address_pool_id") query["CidrBlock"] = d.Get("cidr_block") @@ -76,11 +72,9 @@ func resourceAliCloudVpcPublicIpAddressPoolCidrBlockCreate(d *schema.ResourceDat if v, ok := d.GetOk("cidr_mask"); ok { request["CidrMask"] = v } - runtime := util.RuntimeOptions{} - 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -148,22 +142,15 @@ func resourceAliCloudVpcPublicIpAddressPoolCidrBlockDelete(d *schema.ResourceDat var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query["PublicIpAddressPoolId"] = parts[0] query["CidrBlock"] = parts[1] 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("2016-04-28"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_public_ip_address_pool_cidr_block_test.go b/alicloud/resource_alicloud_vpc_public_ip_address_pool_cidr_block_test.go index bafacffa39eb..e7a6f3aa848d 100644 --- a/alicloud/resource_alicloud_vpc_public_ip_address_pool_cidr_block_test.go +++ b/alicloud/resource_alicloud_vpc_public_ip_address_pool_cidr_block_test.go @@ -26,7 +26,7 @@ func TestAccAliCloudVpcPublicIpAddressPoolCidrBlock_basic0(t *testing.T) { checkoutSupportedRegions(t, true, connectivity.VPCPublicIpAddressPoolCidrBlockSupportRegions) ra := resourceAttrInit(resourceId, resourceAlicloudVpcPublicIpAddressPoolCidrBlockMap) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcPublicIpAddressPoolCidrBlock") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -69,7 +69,7 @@ func TestAccAliCloudVpcPublicIpAddressPoolCidrBlock_basic1(t *testing.T) { checkoutSupportedRegions(t, true, connectivity.VPCPublicIpAddressPoolCidrBlockSupportRegions) ra := resourceAttrInit(resourceId, resourceAlicloudVpcPublicIpAddressPoolCidrBlockMap) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcPublicIpAddressPoolCidrBlock") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_public_ip_address_pool_test.go b/alicloud/resource_alicloud_vpc_public_ip_address_pool_test.go index c544b2c04760..2a31122ca030 100644 --- a/alicloud/resource_alicloud_vpc_public_ip_address_pool_test.go +++ b/alicloud/resource_alicloud_vpc_public_ip_address_pool_test.go @@ -37,12 +37,6 @@ func testSweepVpcPublicIpAddressPool(region string) error { return fmt.Errorf("error getting Alicloud client: %s", err) } client := rawClient.(*connectivity.AliyunClient) - - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } - prefixes := []string{ "tf-testAcc", "tf_testAcc", @@ -53,11 +47,9 @@ func testSweepVpcPublicIpAddressPool(region string) error { request["MaxResults"] = PageSizeLarge var response map[string]interface{} VpcPublicIpAddressPoolIds := make([]string, 0) - 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -105,7 +97,7 @@ func testSweepVpcPublicIpAddressPool(region string) error { } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(3*time.Minute, func() *resource.RetryError { - _, err = conn.DoRequest(StringPointer(deleteAction), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + _, err = client.RpcPost("Vpc", "2016-04-28", deleteAction, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -127,7 +119,7 @@ func TestAccAliCloudVpcPublicIpAddressPool_basic0(t *testing.T) { resourceId := "alicloud_vpc_public_ip_address_pool.default" ra := resourceAttrInit(resourceId, resourceAlicloudVpcPublicIpAddressPoolMap) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcPublicIpAddressPool") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -184,7 +176,7 @@ func TestAccAliCloudVpcPublicIpAddressPool_basic1(t *testing.T) { resourceId := "alicloud_vpc_public_ip_address_pool.default" ra := resourceAttrInit(resourceId, resourceAlicloudVpcPublicIpAddressPoolMap) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcPublicIpAddressPool") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_test.go b/alicloud/resource_alicloud_vpc_test.go index 447c5a8f5abd..a6cbee5e0908 100644 --- a/alicloud/resource_alicloud_vpc_test.go +++ b/alicloud/resource_alicloud_vpc_test.go @@ -61,10 +61,6 @@ func testSweepVpcs(region string) error { } vpcIds := make([]string, 0) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } action := "DescribeVpcs" var response map[string]interface{} request := map[string]interface{}{ @@ -73,9 +69,7 @@ func testSweepVpcs(region string) error { "RegionId": client.RegionId, } for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { log.Printf("[ERROR] Failed to retrieve VPC in service list: %s", err) return nil @@ -121,7 +115,7 @@ func testSweepVpcs(region string) error { } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(time.Minute*10, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_vpc_traffic_mirror_filter.go b/alicloud/resource_alicloud_vpc_traffic_mirror_filter.go index ae36c5aa4a68..caee76d1541c 100644 --- a/alicloud/resource_alicloud_vpc_traffic_mirror_filter.go +++ b/alicloud/resource_alicloud_vpc_traffic_mirror_filter.go @@ -6,7 +6,6 @@ import ( "log" "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" @@ -163,10 +162,7 @@ func resourceAliCloudVpcTrafficMirrorFilterCreate(d *schema.ResourceData, meta i action := "CreateTrafficMirrorFilter" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken(action) @@ -219,7 +215,7 @@ func resourceAliCloudVpcTrafficMirrorFilterCreate(d *schema.ResourceData, meta i } 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -315,10 +311,7 @@ func resourceAliCloudVpcTrafficMirrorFilterUpdate(d *schema.ResourceData, meta i update := false d.Partial(true) action := "UpdateTrafficMirrorFilterAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["TrafficMirrorFilterId"] = d.Id() @@ -340,7 +333,7 @@ func resourceAliCloudVpcTrafficMirrorFilterUpdate(d *schema.ResourceData, meta i if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -361,10 +354,6 @@ func resourceAliCloudVpcTrafficMirrorFilterUpdate(d *schema.ResourceData, meta i } update = false action = "MoveResourceGroup" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["ResourceId"] = d.Id() @@ -378,7 +367,7 @@ func resourceAliCloudVpcTrafficMirrorFilterUpdate(d *schema.ResourceData, meta i if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { @@ -416,10 +405,7 @@ func resourceAliCloudVpcTrafficMirrorFilterDelete(d *schema.ResourceData, meta i action := "DeleteTrafficMirrorFilter" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["TrafficMirrorFilterId"] = d.Id() @@ -429,7 +415,7 @@ func resourceAliCloudVpcTrafficMirrorFilterDelete(d *schema.ResourceData, meta i 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_traffic_mirror_filter_egress_rule.go b/alicloud/resource_alicloud_vpc_traffic_mirror_filter_egress_rule.go index 6c1c6bdce295..4c3ccdfd8f7c 100644 --- a/alicloud/resource_alicloud_vpc_traffic_mirror_filter_egress_rule.go +++ b/alicloud/resource_alicloud_vpc_traffic_mirror_filter_egress_rule.go @@ -8,7 +8,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -111,10 +110,7 @@ func resourceAliCloudVpcTrafficMirrorFilterEgressRuleCreate(d *schema.ResourceDa action := "CreateTrafficMirrorFilterRules" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["TrafficMirrorFilterId"] = d.Get("traffic_mirror_filter_id") request["RegionId"] = client.RegionId @@ -146,11 +142,9 @@ func resourceAliCloudVpcTrafficMirrorFilterEgressRuleCreate(d *schema.ResourceDa request["DryRun"] = v } - runtime := util.RuntimeOptions{} - 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -220,10 +214,7 @@ func resourceAliCloudVpcTrafficMirrorFilterEgressRuleUpdate(d *schema.ResourceDa update := false parts := strings.Split(d.Id(), ":") action := "UpdateTrafficMirrorFilterRuleAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["TrafficMirrorFilterRuleId"] = parts[1] request["RegionId"] = client.RegionId @@ -269,11 +260,9 @@ func resourceAliCloudVpcTrafficMirrorFilterEgressRuleUpdate(d *schema.ResourceDa } 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -306,22 +295,16 @@ func resourceAliCloudVpcTrafficMirrorFilterEgressRuleDelete(d *schema.ResourceDa action := "DeleteTrafficMirrorFilterRules" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["TrafficMirrorFilterRuleIds.1"] = parts[1] request["TrafficMirrorFilterId"] = parts[0] 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_traffic_mirror_filter_egress_rule_test.go b/alicloud/resource_alicloud_vpc_traffic_mirror_filter_egress_rule_test.go index b896b2470922..f8e295e6027e 100644 --- a/alicloud/resource_alicloud_vpc_traffic_mirror_filter_egress_rule_test.go +++ b/alicloud/resource_alicloud_vpc_traffic_mirror_filter_egress_rule_test.go @@ -26,7 +26,7 @@ func TestAccAliCloudVPCTrafficMirrorFilterEgressRule_basic0(t *testing.T) { resourceId := "alicloud_vpc_traffic_mirror_filter_egress_rule.default" ra := resourceAttrInit(resourceId, AlicloudVPCTrafficMirrorFilterEgressRuleMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcTrafficMirrorFilterEgressRule") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -167,7 +167,7 @@ func TestAccAliCloudVPCTrafficMirrorFilterEgressRule_basic1(t *testing.T) { resourceId := "alicloud_vpc_traffic_mirror_filter_egress_rule.default" ra := resourceAttrInit(resourceId, AlicloudVPCTrafficMirrorFilterEgressRuleMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcTrafficMirrorFilterEgressRule") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -224,7 +224,7 @@ func TestAccAliCloudVPCTrafficMirrorFilterEgressRule_basic2(t *testing.T) { resourceId := "alicloud_vpc_traffic_mirror_filter_egress_rule.default" ra := resourceAttrInit(resourceId, AlicloudVPCTrafficMirrorFilterEgressRuleMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcTrafficMirrorFilterEgressRule") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_traffic_mirror_filter_ingress_rule.go b/alicloud/resource_alicloud_vpc_traffic_mirror_filter_ingress_rule.go index 1e36a10d4e6a..476de7015450 100644 --- a/alicloud/resource_alicloud_vpc_traffic_mirror_filter_ingress_rule.go +++ b/alicloud/resource_alicloud_vpc_traffic_mirror_filter_ingress_rule.go @@ -8,7 +8,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -111,10 +110,7 @@ func resourceAliCloudVpcTrafficMirrorFilterIngressRuleCreate(d *schema.ResourceD action := "CreateTrafficMirrorFilterRules" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["TrafficMirrorFilterId"] = d.Get("traffic_mirror_filter_id") request["RegionId"] = client.RegionId @@ -143,11 +139,9 @@ func resourceAliCloudVpcTrafficMirrorFilterIngressRuleCreate(d *schema.ResourceD requestIngressRulesMap = append(requestIngressRulesMap, requestIngressRules) request["IngressRules"] = requestIngressRulesMap - runtime := util.RuntimeOptions{} - 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -217,10 +211,7 @@ func resourceAliCloudVpcTrafficMirrorFilterIngressRuleUpdate(d *schema.ResourceD update := false parts := strings.Split(d.Id(), ":") action := "UpdateTrafficMirrorFilterRuleAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["TrafficMirrorFilterRuleId"] = parts[1] request["RegionId"] = client.RegionId @@ -266,11 +257,9 @@ func resourceAliCloudVpcTrafficMirrorFilterIngressRuleUpdate(d *schema.ResourceD } 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -303,22 +292,16 @@ func resourceAliCloudVpcTrafficMirrorFilterIngressRuleDelete(d *schema.ResourceD action := "DeleteTrafficMirrorFilterRules" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["TrafficMirrorFilterRuleIds.1"] = parts[1] request["TrafficMirrorFilterId"] = parts[0] 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_traffic_mirror_filter_ingress_rule_test.go b/alicloud/resource_alicloud_vpc_traffic_mirror_filter_ingress_rule_test.go index 00153ae4f911..ed2be809015f 100644 --- a/alicloud/resource_alicloud_vpc_traffic_mirror_filter_ingress_rule_test.go +++ b/alicloud/resource_alicloud_vpc_traffic_mirror_filter_ingress_rule_test.go @@ -26,7 +26,7 @@ func TestAccAliCloudVPCTrafficMirrorFilterIngressRule_basic0(t *testing.T) { resourceId := "alicloud_vpc_traffic_mirror_filter_ingress_rule.default" ra := resourceAttrInit(resourceId, AlicloudVPCTrafficMirrorFilterIngressRuleMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcTrafficMirrorFilterIngressRule") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -167,7 +167,7 @@ func TestAccAliCloudVPCTrafficMirrorFilterIngressRule_basic1(t *testing.T) { resourceId := "alicloud_vpc_traffic_mirror_filter_ingress_rule.default" ra := resourceAttrInit(resourceId, AlicloudVPCTrafficMirrorFilterIngressRuleMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcTrafficMirrorFilterIngressRule") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -224,7 +224,7 @@ func TestAccAliCloudVPCTrafficMirrorFilterIngressRule_basic2(t *testing.T) { resourceId := "alicloud_vpc_traffic_mirror_filter_ingress_rule.default" ra := resourceAttrInit(resourceId, AlicloudVPCTrafficMirrorFilterIngressRuleMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcTrafficMirrorFilterIngressRule") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_traffic_mirror_filter_test.go b/alicloud/resource_alicloud_vpc_traffic_mirror_filter_test.go index b222fd0f4e2c..ae7bd144565f 100644 --- a/alicloud/resource_alicloud_vpc_traffic_mirror_filter_test.go +++ b/alicloud/resource_alicloud_vpc_traffic_mirror_filter_test.go @@ -51,16 +51,10 @@ func testSweepVPCTrafficMirrorFilter(region string) error { request["RegionId"] = client.RegionId var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - log.Printf("[ERROR] %s get an error: %#v", action, err) - } 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -101,7 +95,7 @@ func testSweepVPCTrafficMirrorFilter(region string) error { "TrafficMirrorFilterId": item["TrafficMirrorFilterId"], } request["RegionId"] = client.RegionId - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete VPC Traffic Mirror Filter (%s): %s", item["TrafficMirrorFilterName"].(string), err) } @@ -122,7 +116,7 @@ func TestAccAlicloudVPCTrafficMirrorFilter_basic0(t *testing.T) { resourceId := "alicloud_vpc_traffic_mirror_filter.default" ra := resourceAttrInit(resourceId, AlicloudVPCTrafficMirrorFilterMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcTrafficMirrorFilter") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -197,7 +191,7 @@ func TestAccAlicloudVPCTrafficMirrorFilter_basic1(t *testing.T) { resourceId := "alicloud_vpc_traffic_mirror_filter.default" ra := resourceAttrInit(resourceId, AlicloudVPCTrafficMirrorFilterMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcTrafficMirrorFilter") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_traffic_mirror_session.go b/alicloud/resource_alicloud_vpc_traffic_mirror_session.go index 07f85f03e9d3..a0c3ac83d5cd 100644 --- a/alicloud/resource_alicloud_vpc_traffic_mirror_session.go +++ b/alicloud/resource_alicloud_vpc_traffic_mirror_session.go @@ -6,7 +6,6 @@ import ( "log" "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" @@ -100,10 +99,7 @@ func resourceAliCloudVpcTrafficMirrorSessionCreate(d *schema.ResourceData, meta action := "CreateTrafficMirrorSession" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken(action) @@ -141,7 +137,7 @@ func resourceAliCloudVpcTrafficMirrorSessionCreate(d *schema.ResourceData, meta 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -214,10 +210,7 @@ func resourceAliCloudVpcTrafficMirrorSessionUpdate(d *schema.ResourceData, meta update := false d.Partial(true) action := "UpdateTrafficMirrorSessionAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["TrafficMirrorSessionId"] = d.Id() @@ -267,7 +260,7 @@ func resourceAliCloudVpcTrafficMirrorSessionUpdate(d *schema.ResourceData, meta if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -299,10 +292,6 @@ func resourceAliCloudVpcTrafficMirrorSessionUpdate(d *schema.ResourceData, meta } update = false action = "MoveResourceGroup" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["ResourceId"] = d.Id() @@ -317,7 +306,7 @@ func resourceAliCloudVpcTrafficMirrorSessionUpdate(d *schema.ResourceData, meta if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { @@ -344,10 +333,6 @@ func resourceAliCloudVpcTrafficMirrorSessionUpdate(d *schema.ResourceData, meta if len(removed.([]interface{})) > 0 { action = "RemoveSourcesFromTrafficMirrorSession" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["TrafficMirrorSessionId"] = d.Id() @@ -359,7 +344,7 @@ func resourceAliCloudVpcTrafficMirrorSessionUpdate(d *schema.ResourceData, meta 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -385,10 +370,6 @@ func resourceAliCloudVpcTrafficMirrorSessionUpdate(d *schema.ResourceData, meta if len(added.([]interface{})) > 0 { action = "AddSourcesToTrafficMirrorSession" - conn, err = client.NewVpcClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) request["TrafficMirrorSessionId"] = d.Id() @@ -400,7 +381,7 @@ func resourceAliCloudVpcTrafficMirrorSessionUpdate(d *schema.ResourceData, meta 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -444,10 +425,7 @@ func resourceAliCloudVpcTrafficMirrorSessionDelete(d *schema.ResourceData, meta action := "DeleteTrafficMirrorSession" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["TrafficMirrorSessionId"] = d.Id() @@ -460,7 +438,7 @@ func resourceAliCloudVpcTrafficMirrorSessionDelete(d *schema.ResourceData, meta } 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { diff --git a/alicloud/resource_alicloud_vpc_traffic_mirror_session_test.go b/alicloud/resource_alicloud_vpc_traffic_mirror_session_test.go index 47d9b735083c..db2efaba88e4 100644 --- a/alicloud/resource_alicloud_vpc_traffic_mirror_session_test.go +++ b/alicloud/resource_alicloud_vpc_traffic_mirror_session_test.go @@ -8,8 +8,6 @@ import ( "time" "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/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -46,16 +44,10 @@ func testSweepVpcTrafficMirrorSession(region string) error { request["MaxResults"] = PageSizeLarge var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - log.Printf("[ERROR] %s get an error: %#v", action, err) - } 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -94,7 +86,7 @@ func testSweepVpcTrafficMirrorSession(region string) error { request := map[string]interface{}{ "TrafficMirrorSessionId": item["TrafficMirrorSessionId"], } - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete Vpc Traffic Mirror Session (%s): %s", item["TrafficMirrorSessionName"].(string), err) } @@ -115,7 +107,7 @@ func TestAccAlicloudVPCTrafficMirrorSession_basic0(t *testing.T) { resourceId := "alicloud_vpc_traffic_mirror_session.default" ra := resourceAttrInit(resourceId, AlicloudVPCTrafficMirrorSessionMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcTrafficMirrorSession") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -346,7 +338,7 @@ func TestAccAlicloudVPCTrafficMirrorSession_basic1(t *testing.T) { resourceId := "alicloud_vpc_traffic_mirror_session.default" ra := resourceAttrInit(resourceId, AlicloudVPCTrafficMirrorSessionMap0) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VpcServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpcTrafficMirrorSession") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpc_vbr_ha.go b/alicloud/resource_alicloud_vpc_vbr_ha.go index e5bc34ce90eb..f79d6d13443c 100644 --- a/alicloud/resource_alicloud_vpc_vbr_ha.go +++ b/alicloud/resource_alicloud_vpc_vbr_ha.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - 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" @@ -66,10 +65,7 @@ func resourceAlicloudVpcVbrHaCreate(d *schema.ResourceData, meta interface{}) er var response map[string]interface{} action := "CreateVbrHa" request := make(map[string]interface{}) - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOk("description"); ok { request["Description"] = v } @@ -82,12 +78,10 @@ func resourceAlicloudVpcVbrHaCreate(d *schema.ResourceData, meta interface{}) er request["Name"] = v } request["VbrId"] = d.Get("vbr_id") - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { request["ClientToken"] = buildClientToken("CreateVbrHa") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -139,21 +133,16 @@ func resourceAlicloudVpcVbrHaDelete(d *schema.ResourceData, meta interface{}) er vpcService := VpcService{client} action := "DeleteVbrHa" var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request := map[string]interface{}{ "InstanceId": d.Id(), } request["RegionId"] = client.RegionId - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { request["ClientToken"] = buildClientToken("DeleteVbrHa") - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_vpc_vswitch_cidr_reservation.go b/alicloud/resource_alicloud_vpc_vswitch_cidr_reservation.go index 00cb45513c9c..061593ca1db6 100644 --- a/alicloud/resource_alicloud_vpc_vswitch_cidr_reservation.go +++ b/alicloud/resource_alicloud_vpc_vswitch_cidr_reservation.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" @@ -93,10 +92,7 @@ func resourceAlicloudVpcVswitchCidrReservationCreate(d *schema.ResourceData, met action := "CreateVSwitchCidrReservation" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["VSwitchId"] = d.Get("vswitch_id") request["RegionId"] = client.RegionId @@ -128,7 +124,7 @@ func resourceAlicloudVpcVswitchCidrReservationCreate(d *schema.ResourceData, met 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -191,10 +187,7 @@ func resourceAlicloudVpcVswitchCidrReservationUpdate(d *schema.ResourceData, met var response map[string]interface{} update := false action := "ModifyVSwitchCidrReservationAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) parts := strings.Split(d.Id(), ":") @@ -219,7 +212,7 @@ func resourceAlicloudVpcVswitchCidrReservationUpdate(d *schema.ResourceData, met if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { @@ -248,10 +241,7 @@ func resourceAlicloudVpcVswitchCidrReservationDelete(d *schema.ResourceData, met action := "DeleteVSwitchCidrReservation" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) parts := strings.Split(d.Id(), ":") @@ -261,7 +251,7 @@ func resourceAlicloudVpcVswitchCidrReservationDelete(d *schema.ResourceData, met 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if IsExpectedErrors(err, []string{"IncorrectStatus.Vpc", "OperationConflict", "IncorrectStatus", "ServiceUnavailable", "SystemBusy", "LastTokenProcessing"}) || NeedRetry(err) { diff --git a/alicloud/resource_alicloud_vpn_connection_test.go b/alicloud/resource_alicloud_vpn_connection_test.go index 3a692c2a471b..65a3dc7bb802 100644 --- a/alicloud/resource_alicloud_vpn_connection_test.go +++ b/alicloud/resource_alicloud_vpn_connection_test.go @@ -291,7 +291,7 @@ func TestAccAliCloudVPNConnection_basic2(t *testing.T) { resourceId := "alicloud_vpn_connection.default" ra := resourceAttrInit(resourceId, AlicloudVpnConnectionMap3) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VPNGatewayServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpnConnection") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpn_customer_gateway_test.go b/alicloud/resource_alicloud_vpn_customer_gateway_test.go index 8258b3953898..07bb07f72511 100644 --- a/alicloud/resource_alicloud_vpn_customer_gateway_test.go +++ b/alicloud/resource_alicloud_vpn_customer_gateway_test.go @@ -281,7 +281,7 @@ func TestAccAliCloudVPNCustomerGateway_basic2(t *testing.T) { resourceId := "alicloud_vpn_customer_gateway.default" ra := resourceAttrInit(resourceId, AlicloudVpnCustomerGatewayMap3) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VPNGatewayServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpnCustomerGateway") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vpn_gateway_test.go b/alicloud/resource_alicloud_vpn_gateway_test.go index d917db056b03..c0b6c9b64672 100644 --- a/alicloud/resource_alicloud_vpn_gateway_test.go +++ b/alicloud/resource_alicloud_vpn_gateway_test.go @@ -375,7 +375,7 @@ func TestAccAliCloudVPNGateway_basic2(t *testing.T) { resourceId := "alicloud_vpn_gateway.default" ra := resourceAttrInit(resourceId, AlicloudVpnGatewayMap3) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VPNGatewayServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpnGateway") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -503,7 +503,7 @@ func TestAccAliCloudVPNGateway_basic3(t *testing.T) { resourceId := "alicloud_vpn_gateway.default" ra := resourceAttrInit(resourceId, AlicloudVpnGatewayMap3) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VPNGatewayServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpnGateway") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() @@ -600,7 +600,7 @@ func TestAccAliCloudVPNGateway_basic4(t *testing.T) { resourceId := "alicloud_vpn_gateway.default" ra := resourceAttrInit(resourceId, AlicloudVpnGatewayMap3) rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} { - return &VpcService{testAccProvider.Meta().(*connectivity.AliyunClient)} + return &VPNGatewayServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)} }, "DescribeVpnGateway") rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() diff --git a/alicloud/resource_alicloud_vswitch.go b/alicloud/resource_alicloud_vswitch.go index d47fa33b9967..7d704048943f 100644 --- a/alicloud/resource_alicloud_vswitch.go +++ b/alicloud/resource_alicloud_vswitch.go @@ -10,7 +10,6 @@ import ( "time" "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" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -116,10 +115,7 @@ func resourceAliCloudVpcVswitchCreate(d *schema.ResourceData, meta interface{}) action := "CreateDefaultVSwitch" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken(action) @@ -138,7 +134,7 @@ func resourceAliCloudVpcVswitchCreate(d *schema.ResourceData, meta interface{}) 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -159,14 +155,10 @@ func resourceAliCloudVpcVswitchCreate(d *schema.ResourceData, meta interface{}) d.SetId(fmt.Sprint(response["VSwitchId"])) } else { - action := "CreateVSwitch" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken(action) @@ -193,7 +185,7 @@ func resourceAliCloudVpcVswitchCreate(d *schema.ResourceData, meta interface{}) } 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -270,10 +262,7 @@ func resourceAliCloudVpcVswitchUpdate(d *schema.ResourceData, meta interface{}) update := false d.Partial(true) action := "ModifyVSwitchAttribute" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["VSwitchId"] = d.Id() @@ -312,7 +301,7 @@ func resourceAliCloudVpcVswitchUpdate(d *schema.ResourceData, meta interface{}) if update { 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if IsExpectedErrors(err, []string{"OperationConflict", "OperationFailed.LastTokenProcessing", "IncorrectStatus.VSwitch", "IncorrectStatus.VpcRouteEntry", "ServiceUnavailable"}) || NeedRetry(err) { @@ -356,10 +345,7 @@ func resourceAliCloudVpcVswitchDelete(d *schema.ResourceData, meta interface{}) action := "DeleteVSwitch" var request map[string]interface{} var response map[string]interface{} - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["VSwitchId"] = d.Id() @@ -367,7 +353,7 @@ func resourceAliCloudVpcVswitchDelete(d *schema.ResourceData, meta interface{}) 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("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if IsExpectedErrors(err, []string{"DependencyViolation.SnatEntry", "DependencyViolation.MulticastDomain", "DependencyViolation", "OperationConflict", "IncorrectRouteEntryStatus", "InternalError", "TaskConflict", "DependencyViolation.EnhancedNatgw", "DependencyViolation.RouteTable", "DependencyViolation.HaVip", "DeleteVSwitch.IncorrectStatus.cbnStatus", "SystemBusy", "IncorrectVSwitchStatus", "LastTokenProcessing", "OperationDenied.OtherSubnetProcessing", "DependencyViolation.SNAT", "DependencyViolation.NetworkAcl"}) || NeedRetry(err) { @@ -424,22 +410,16 @@ func CancelIpv6(d *schema.ResourceData, meta interface{}) error { if v, ok := object["Ipv6CidrBlock"]; ok && fmt.Sprint(v) != "" { var response map[string]interface{} + var err error action := "ModifyVSwitchAttribute" - - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "RegionId": client.RegionId, "VSwitchId": d.Id(), "EnableIPv6": false, } - 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("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_vswitch_test.go b/alicloud/resource_alicloud_vswitch_test.go index ef76f4777907..618a582c49be 100644 --- a/alicloud/resource_alicloud_vswitch_test.go +++ b/alicloud/resource_alicloud_vswitch_test.go @@ -71,10 +71,6 @@ func testSweepVSwitches(region string) error { "tf_testAcc", } action := "DescribeVSwitches" - conn, err := client.NewVpcClient() - if err != nil { - return WrapError(err) - } var response map[string]interface{} request := make(map[string]interface{}) request["PageSize"] = PageSizeLarge @@ -82,9 +78,7 @@ func testSweepVSwitches(region string) error { request["RegionId"] = client.RegionId vswitches := make([]map[string]interface{}, 0) for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, true) if err != nil { log.Printf("[ERROR] Failed to retrieve VSwitch in service list: %s", err) return nil diff --git a/alicloud/service_alicloud_common_test.go b/alicloud/service_alicloud_common_test.go index 418f51787a07..ceda14a20214 100644 --- a/alicloud/service_alicloud_common_test.go +++ b/alicloud/service_alicloud_common_test.go @@ -709,22 +709,20 @@ func (s *VpcService) sweepVpc(id string) error { } func (s *VpcService) sweepVSwitch(id string) error { + client := s.client + var err error if id == "" { return nil } log.Printf("[DEBUG] Deleting Vswitch %s ...", id) action := "DeleteVSwitch" - conn, err := s.client.NewVpcClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "VSwitchId": id, } request["RegionId"] = s.client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(10*time.Second, func() *resource.RetryError { - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2016-04-28"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("Vpc", "2016-04-28", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/website/docs/d/vpc_prefix_lists.html.markdown b/website/docs/d/vpc_prefix_lists.html.markdown index a2774f24f4f8..cf6c720412b1 100644 --- a/website/docs/d/vpc_prefix_lists.html.markdown +++ b/website/docs/d/vpc_prefix_lists.html.markdown @@ -7,11 +7,11 @@ description: |- Provides a list of Vpc Prefix Lists to the user. --- -# alicloud\_vpc\_prefix\_lists +# alicloud_vpc_prefix_lists This data source provides the Vpc Prefix Lists of the current Alibaba Cloud user. --> **NOTE:** Available in v1.182.0+. +-> **NOTE:** Available since v1.182.0. ## Example Usage @@ -41,20 +41,20 @@ The following arguments are supported: * `output_file` - (Optional) File name where to save data source results (after running `terraform plan`). * `prefix_list_name` - (Optional, ForceNew) The name of the prefix list. -## Argument Reference +## Attributes Reference The following attributes are exported in addition to the arguments listed above: * `names` - A list of Prefix List names. * `lists` - A list of Vpc Prefix Lists. Each element contains the following attributes: - * `create_time` - The time when the prefix list was created. - * `entrys` - The CIDR address block list of the prefix list. - * `cidr` - The CIDR address block of the prefix list. - * `description` - The description of the cidr entry. - * `id` - The ID of the Prefix List. - * `ip_version` - The IP version of the prefix list. - * `max_entries` - The maximum number of entries for CIDR address blocks in the prefix list. - * `prefix_list_id` - The ID of the query Prefix List. - * `prefix_list_name` - The name of the prefix list. - * `share_type` - The share type of the prefix list. - * `prefix_list_description` - The description of the prefix list. \ No newline at end of file + * `create_time` - The time when the prefix list was created. + * `entrys` - The CIDR address block list of the prefix list. + * `cidr` - The CIDR address block of the prefix list. + * `description` - The description of the cidr entry. + * `id` - The ID of the Prefix List. + * `ip_version` - The IP version of the prefix list. + * `max_entries` - The maximum number of entries for CIDR address blocks in the prefix list. + * `prefix_list_id` - The ID of the query Prefix List. + * `prefix_list_name` - The name of the prefix list. + * `share_type` - The share type of the prefix list. + * `prefix_list_description` - The description of the prefix list. \ No newline at end of file diff --git a/website/docs/d/vpc_traffic_mirror_filters.html.markdown b/website/docs/d/vpc_traffic_mirror_filters.html.markdown index b4afb86629d6..cc5745140d50 100644 --- a/website/docs/d/vpc_traffic_mirror_filters.html.markdown +++ b/website/docs/d/vpc_traffic_mirror_filters.html.markdown @@ -7,11 +7,11 @@ description: |- Provides a list of Vpc Traffic Mirror Filters to the user. --- -# alicloud\_vpc\_traffic\_mirror\_filters +# alicloud_vpc_traffic_mirror_filters This data source provides the Vpc Traffic Mirror Filters of the current Alibaba Cloud user. --> **NOTE:** Available in v1.140.0+. +-> **NOTE:** Available since v1.140.0. ## Example Usage @@ -59,14 +59,14 @@ The following arguments are supported: * `traffic_mirror_filter_ids` - (Optional, ForceNew) The traffic mirror filter ids. * `traffic_mirror_filter_name` - (Optional, ForceNew) The name of the filter. The name must be `2` to `128` characters in length, and can contain digits, periods (.), underscores (_), and hyphens (-). It must start with a letter and cannot start with `http://` or `https://`. -## Argument Reference +## Attributes Reference The following attributes are exported in addition to the arguments listed above: * `names` - A list of Traffic Mirror Filter names. * `filters` - A list of Vpc Traffic Mirror Filters. Each element contains the following attributes: - * `id` - The ID of the Traffic Mirror Filter. - * `status` - The state of the filter. Valid values:`Creating`, `Created`, `Modifying` and `Deleting`. `Creating`: The filter is being created. `Created`: The filter is created. `Modifying`: The filter is being modified. `Deleting`: The filter is being deleted. - * `traffic_mirror_filter_description` - The description of the filter. - * `traffic_mirror_filter_id` - The ID of the filter. - * `traffic_mirror_filter_name` - The name of the filter. + * `id` - The ID of the Traffic Mirror Filter. + * `status` - The state of the filter. Valid values:`Creating`, `Created`, `Modifying` and `Deleting`. `Creating`: The filter is being created. `Created`: The filter is created. `Modifying`: The filter is being modified. `Deleting`: The filter is being deleted. + * `traffic_mirror_filter_description` - The description of the filter. + * `traffic_mirror_filter_id` - The ID of the filter. + * `traffic_mirror_filter_name` - The name of the filter. diff --git a/website/docs/d/vswitches.html.markdown b/website/docs/d/vswitches.html.markdown index 3eab9e3817fa..fb2a83a62a4f 100644 --- a/website/docs/d/vswitches.html.markdown +++ b/website/docs/d/vswitches.html.markdown @@ -7,7 +7,7 @@ description: |- Provides a list of vSwitch owned by an Alibaba Cloud account. --- -# alicloud\_vswitches +# alicloud_vswitches This data source provides a list of VSwitches owned by an Alibaba Cloud account.