From aa90cb5194cfa550492717006a9e68341b276520 Mon Sep 17 00:00:00 2001 From: "guimin.hgm" Date: Mon, 3 Feb 2025 11:39:05 +0800 Subject: [PATCH] OOS: Improves the invoking api method and supports refreshing credential automatically --- ..._source_alicloud_oos_application_groups.go | 10 +- .../data_source_alicloud_oos_applications.go | 10 +- .../data_source_alicloud_oos_executions.go | 10 +- .../data_source_alicloud_oos_parameters.go | 10 +- ...ata_source_alicloud_oos_patch_baselines.go | 10 +- ...a_source_alicloud_oos_secret_parameters.go | 10 +- ...ource_alicloud_oos_state_configurations.go | 10 +- .../data_source_alicloud_oos_templates.go | 10 +- alicloud/resource_alicloud_oos_application.go | 24 +--- ...resource_alicloud_oos_application_group.go | 16 +-- .../resource_alicloud_oos_application_test.go | 10 +- ...rce_alicloud_oos_default_patch_baseline.go | 15 +-- alicloud/resource_alicloud_oos_execution.go | 15 +-- .../resource_alicloud_oos_execution_test.go | 10 +- alicloud/resource_alicloud_oos_parameter.go | 24 +--- .../resource_alicloud_oos_parameter_test.go | 10 +- .../resource_alicloud_oos_patch_baseline.go | 29 +---- ...source_alicloud_oos_patch_baseline_test.go | 10 +- .../resource_alicloud_oos_secret_parameter.go | 28 +---- ...urce_alicloud_oos_secret_parameter_test.go | 10 +- .../resource_alicloud_oos_service_setting.go | 15 +-- ...source_alicloud_oos_state_configuration.go | 28 +---- ...e_alicloud_oos_state_configuration_test.go | 10 +- alicloud/resource_alicloud_oos_template.go | 22 +--- .../resource_alicloud_oos_template_test.go | 10 +- alicloud/service_alicloud_oos.go | 104 ++++-------------- alicloud/service_alicloud_oos_v2.go | 43 +------- 27 files changed, 108 insertions(+), 405 deletions(-) diff --git a/alicloud/data_source_alicloud_oos_application_groups.go b/alicloud/data_source_alicloud_oos_application_groups.go index 48fa1c1e2024..ce1b2035eaa4 100644 --- a/alicloud/data_source_alicloud_oos_application_groups.go +++ b/alicloud/data_source_alicloud_oos_application_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" @@ -132,16 +131,11 @@ func dataSourceAlicloudOosApplicationGroupsRead(d *schema.ResourceData, meta int } } var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_oos_applications.go b/alicloud/data_source_alicloud_oos_applications.go index 7a8aab605928..f50cb3ade75d 100644 --- a/alicloud/data_source_alicloud_oos_applications.go +++ b/alicloud/data_source_alicloud_oos_applications.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" @@ -111,16 +110,11 @@ func dataSourceAlicloudOosApplicationsRead(d *schema.ResourceData, meta interfac tagsMap = v.(map[string]interface{}) } var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_oos_executions.go b/alicloud/data_source_alicloud_oos_executions.go index 421e638d0134..6e37e3109637 100644 --- a/alicloud/data_source_alicloud_oos_executions.go +++ b/alicloud/data_source_alicloud_oos_executions.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/PaesslerAG/jsonpath" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" @@ -264,14 +263,9 @@ func dataSourceAlicloudOosExecutionsRead(d *schema.ResourceData, meta interface{ } } var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { return WrapErrorf(err, DataDefaultErrorMsg, "alicloud_oos_executions", action, AlibabaCloudSdkGoERROR) } diff --git a/alicloud/data_source_alicloud_oos_parameters.go b/alicloud/data_source_alicloud_oos_parameters.go index ed20e7b9b8ad..a0a91d8c14d5 100644 --- a/alicloud/data_source_alicloud_oos_parameters.go +++ b/alicloud/data_source_alicloud_oos_parameters.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" @@ -191,16 +190,11 @@ func dataSourceAlicloudOosParametersRead(d *schema.ResourceData, meta interface{ } } var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_oos_patch_baselines.go b/alicloud/data_source_alicloud_oos_patch_baselines.go index 1a3642244934..a8685845fc55 100644 --- a/alicloud/data_source_alicloud_oos_patch_baselines.go +++ b/alicloud/data_source_alicloud_oos_patch_baselines.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 dataSourceAlicloudOosPatchBaselinesRead(d *schema.ResourceData, meta interf } } var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_oos_secret_parameters.go b/alicloud/data_source_alicloud_oos_secret_parameters.go index 240230d4ac90..a98714814bd1 100644 --- a/alicloud/data_source_alicloud_oos_secret_parameters.go +++ b/alicloud/data_source_alicloud_oos_secret_parameters.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" @@ -202,17 +201,12 @@ func dataSourceAliCloudOosSecretParametersRead(d *schema.ResourceData, meta inte } var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_oos_state_configurations.go b/alicloud/data_source_alicloud_oos_state_configurations.go index b8aee7f1e566..f0ec7c8527d5 100644 --- a/alicloud/data_source_alicloud_oos_state_configurations.go +++ b/alicloud/data_source_alicloud_oos_state_configurations.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" @@ -130,16 +129,11 @@ func dataSourceAlicloudOosStateConfigurationsRead(d *schema.ResourceData, meta i tagsMap = v.(map[string]interface{}) } var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_oos_templates.go b/alicloud/data_source_alicloud_oos_templates.go index bd99cede6c4e..4b15da08410b 100644 --- a/alicloud/data_source_alicloud_oos_templates.go +++ b/alicloud/data_source_alicloud_oos_templates.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" @@ -230,14 +229,9 @@ func dataSourceAlicloudOosTemplatesRead(d *schema.ResourceData, meta interface{} } } var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { return WrapErrorf(err, DataDefaultErrorMsg, "alicloud_oos_templates", action, AlibabaCloudSdkGoERROR) } diff --git a/alicloud/resource_alicloud_oos_application.go b/alicloud/resource_alicloud_oos_application.go index 4125aac7b970..573e1fe75bc5 100644 --- a/alicloud/resource_alicloud_oos_application.go +++ b/alicloud/resource_alicloud_oos_application.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" @@ -45,10 +44,7 @@ func resourceAlicloudOosApplicationCreate(d *schema.ResourceData, meta interface var response map[string]interface{} action := "CreateApplication" request := make(map[string]interface{}) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOk("description"); ok { request["Description"] = v } @@ -65,11 +61,9 @@ func resourceAlicloudOosApplicationCreate(d *schema.ResourceData, meta interface request["Tags"] = respJson } request["ClientToken"] = buildClientToken("CreateApplication") - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -108,10 +102,7 @@ func resourceAlicloudOosApplicationRead(d *schema.ResourceData, meta interface{} } func resourceAlicloudOosApplicationUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*connectivity.AliyunClient) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error var response map[string]interface{} update := false request := map[string]interface{}{ @@ -138,7 +129,7 @@ func resourceAlicloudOosApplicationUpdate(d *schema.ResourceData, meta interface action := "UpdateApplication" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -159,17 +150,14 @@ func resourceAlicloudOosApplicationDelete(d *schema.ResourceData, meta interface client := meta.(*connectivity.AliyunClient) action := "DeleteApplication" var response map[string]interface{} - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request := map[string]interface{}{ "Name": d.Id(), } request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) || IsExpectedErrors(err, []string{"DeleteConflict.Application"}) { wait() diff --git a/alicloud/resource_alicloud_oos_application_group.go b/alicloud/resource_alicloud_oos_application_group.go index 43ff2310d59d..48c628a91355 100644 --- a/alicloud/resource_alicloud_oos_application_group.go +++ b/alicloud/resource_alicloud_oos_application_group.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" @@ -61,10 +60,7 @@ func resourceAlicloudOosApplicationGroupCreate(d *schema.ResourceData, meta inte var response map[string]interface{} action := "CreateApplicationGroup" request := make(map[string]interface{}) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request["Name"] = d.Get("application_group_name") request["ApplicationName"] = d.Get("application_name") request["DeployRegionId"] = d.Get("deploy_region_id") @@ -85,11 +81,9 @@ func resourceAlicloudOosApplicationGroupCreate(d *schema.ResourceData, meta inte } request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken("CreateApplicationGroup") - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) || IsExpectedErrors(err, []string{"AssumeRoleNotExist"}) { wait() @@ -140,10 +134,6 @@ func resourceAlicloudOosApplicationGroupDelete(d *schema.ResourceData, meta inte } action := "DeleteApplicationGroup" var response map[string]interface{} - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "Name": parts[1], "ApplicationName": parts[0], @@ -153,7 +143,7 @@ func resourceAlicloudOosApplicationGroupDelete(d *schema.ResourceData, meta inte wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { diff --git a/alicloud/resource_alicloud_oos_application_test.go b/alicloud/resource_alicloud_oos_application_test.go index a048a40dd6c7..0fab51d857e1 100644 --- a/alicloud/resource_alicloud_oos_application_test.go +++ b/alicloud/resource_alicloud_oos_application_test.go @@ -49,16 +49,10 @@ func testSweepOOSApplication(region string) error { request["MaxResults"] = PageSizeXLarge var response map[string]interface{} - conn, err := client.NewOosClient() - 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(1*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -100,7 +94,7 @@ func testSweepOOSApplication(region string) error { request := map[string]interface{}{ "Name": item["Name"], } - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete OOS Application (%s): %s", item["Name"].(string), err) } diff --git a/alicloud/resource_alicloud_oos_default_patch_baseline.go b/alicloud/resource_alicloud_oos_default_patch_baseline.go index 8ab3efa76404..f1dc373e47f2 100644 --- a/alicloud/resource_alicloud_oos_default_patch_baseline.go +++ b/alicloud/resource_alicloud_oos_default_patch_baseline.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" @@ -43,10 +42,7 @@ func resourceAlicloudOosDefaultPatchBaselineCreate(d *schema.ResourceData, meta request := map[string]interface{}{ "RegionId": client.RegionId, } - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOk("patch_baseline_name"); ok { request["Name"] = v @@ -56,7 +52,7 @@ func resourceAlicloudOosDefaultPatchBaselineCreate(d *schema.ResourceData, meta action := "RegisterDefaultPatchBaseline" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutCreate)), func() *resource.RetryError { - resp, err := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + resp, err := client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -102,10 +98,7 @@ func resourceAlicloudOosDefaultPatchBaselineRead(d *schema.ResourceData, meta in func resourceAlicloudOosDefaultPatchBaselineDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*connectivity.AliyunClient) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error oosService := OosService{client} object, err := oosService.DescribeOosPatchBaseline(d.Id()) @@ -126,7 +119,7 @@ func resourceAlicloudOosDefaultPatchBaselineDelete(d *schema.ResourceData, meta action := "RegisterDefaultPatchBaseline" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutDelete)), func() *resource.RetryError { - resp, err := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + resp, err := client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_oos_execution.go b/alicloud/resource_alicloud_oos_execution.go index 20f5064de515..927217450540 100644 --- a/alicloud/resource_alicloud_oos_execution.go +++ b/alicloud/resource_alicloud_oos_execution.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" @@ -135,10 +134,7 @@ func resourceAlicloudOosExecutionCreate(d *schema.ResourceData, meta interface{} var response map[string]interface{} action := "StartExecution" request := make(map[string]interface{}) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOk("description"); ok { request["Description"] = v } @@ -175,7 +171,7 @@ func resourceAlicloudOosExecutionCreate(d *schema.ResourceData, meta interface{} 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("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -234,10 +230,7 @@ func resourceAlicloudOosExecutionDelete(d *schema.ResourceData, meta interface{} client := meta.(*connectivity.AliyunClient) action := "DeleteExecutions" var response map[string]interface{} - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request := map[string]interface{}{ "ExecutionIds": convertListToJsonString(convertListStringToListInterface([]string{d.Id()})), } @@ -245,7 +238,7 @@ func resourceAlicloudOosExecutionDelete(d *schema.ResourceData, meta interface{} request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_oos_execution_test.go b/alicloud/resource_alicloud_oos_execution_test.go index 44844f184fab..3eeaff6d0481 100644 --- a/alicloud/resource_alicloud_oos_execution_test.go +++ b/alicloud/resource_alicloud_oos_execution_test.go @@ -46,14 +46,8 @@ func testSweepOosExecution(region string) error { } var response map[string]interface{} action := "ListExecutions" - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { return WrapErrorf(err, DataDefaultErrorMsg, "testSweepOosExecution", action, AlibabaCloudSdkGoERROR) } @@ -81,7 +75,7 @@ func testSweepOosExecution(region string) error { request := map[string]interface{}{ "ExecutionIds": convertListToJsonString(convertListStringToListInterface([]string{item["ExecutionId"].(string)})), } - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete OOS Execution (%s): %s", item["ExecutionId"].(string), err) } diff --git a/alicloud/resource_alicloud_oos_parameter.go b/alicloud/resource_alicloud_oos_parameter.go index dcb91885a0b1..53010643c9ff 100644 --- a/alicloud/resource_alicloud_oos_parameter.go +++ b/alicloud/resource_alicloud_oos_parameter.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" @@ -72,10 +71,7 @@ func resourceAlicloudOosParameterCreate(d *schema.ResourceData, meta interface{} var response map[string]interface{} action := "CreateParameter" request := make(map[string]interface{}) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOk("constraints"); ok { request["Constraints"] = v } @@ -96,11 +92,9 @@ func resourceAlicloudOosParameterCreate(d *schema.ResourceData, meta interface{} request["Type"] = d.Get("type") request["Value"] = d.Get("value") request["ClientToken"] = buildClientToken("CreateParameter") - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -143,10 +137,7 @@ func resourceAlicloudOosParameterRead(d *schema.ResourceData, meta interface{}) } func resourceAlicloudOosParameterUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*connectivity.AliyunClient) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error var response map[string]interface{} update := false request := map[string]interface{}{ @@ -182,7 +173,7 @@ func resourceAlicloudOosParameterUpdate(d *schema.ResourceData, meta interface{} action := "UpdateParameter" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -203,16 +194,13 @@ func resourceAlicloudOosParameterDelete(d *schema.ResourceData, meta interface{} client := meta.(*connectivity.AliyunClient) action := "DeleteParameter" var response map[string]interface{} - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request := map[string]interface{}{ "Name": d.Id(), } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_oos_parameter_test.go b/alicloud/resource_alicloud_oos_parameter_test.go index d6f8c0fc5462..925cb56681db 100644 --- a/alicloud/resource_alicloud_oos_parameter_test.go +++ b/alicloud/resource_alicloud_oos_parameter_test.go @@ -55,16 +55,10 @@ func testSweepOosParameter(region string) error { request["MaxResults"] = PageSizeLarge var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -102,7 +96,7 @@ func testSweepOosParameter(region string) error { request := map[string]interface{}{ "Name": item["Name"], } - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete Oos Parameter (%s): %s", item["Name"].(string), err) } diff --git a/alicloud/resource_alicloud_oos_patch_baseline.go b/alicloud/resource_alicloud_oos_patch_baseline.go index 63e75e886fc1..9d5176409e50 100644 --- a/alicloud/resource_alicloud_oos_patch_baseline.go +++ b/alicloud/resource_alicloud_oos_patch_baseline.go @@ -9,7 +9,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" @@ -101,10 +100,7 @@ func resourceAliCloudOosPatchBaselineCreate(d *schema.ResourceData, meta interfa var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query["Name"] = d.Get("patch_baseline_name") request["RegionId"] = client.RegionId @@ -147,12 +143,9 @@ func resourceAliCloudOosPatchBaselineCreate(d *schema.ResourceData, meta interfa sourcesMaps := v.([]interface{}) request["Sources"] = sourcesMaps } - - 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("2019-06-01"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -235,10 +228,7 @@ func resourceAliCloudOosPatchBaselineUpdate(d *schema.ResourceData, meta interfa var query map[string]interface{} update := false action := "UpdatePatchBaseline" - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query = make(map[string]interface{}) query["Name"] = d.Id() @@ -305,11 +295,9 @@ func resourceAliCloudOosPatchBaselineUpdate(d *schema.ResourceData, meta interfa } 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("2019-06-01"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, query, request, true) request["ClientToken"] = buildClientToken(action) if err != nil { @@ -344,19 +332,14 @@ func resourceAliCloudOosPatchBaselineDelete(d *schema.ResourceData, meta interfa var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query["Name"] = d.Id() request["RegionId"] = client.RegionId - 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("2019-06-01"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, query, request, true) if err != nil { if NeedRetry(err) { diff --git a/alicloud/resource_alicloud_oos_patch_baseline_test.go b/alicloud/resource_alicloud_oos_patch_baseline_test.go index d6808b7b1953..3cbfef8489ce 100644 --- a/alicloud/resource_alicloud_oos_patch_baseline_test.go +++ b/alicloud/resource_alicloud_oos_patch_baseline_test.go @@ -54,16 +54,10 @@ func testSweepOosPatchBaseline(region string) error { request["MaxResults"] = PageSizeLarge var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -102,7 +96,7 @@ func testSweepOosPatchBaseline(region string) error { request := map[string]interface{}{ "Name": item["Name"], } - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete Oos Patch Baseline (%s): %s", item["Name"].(string), err) } diff --git a/alicloud/resource_alicloud_oos_secret_parameter.go b/alicloud/resource_alicloud_oos_secret_parameter.go index da2dae444e68..e62efcbd044d 100644 --- a/alicloud/resource_alicloud_oos_secret_parameter.go +++ b/alicloud/resource_alicloud_oos_secret_parameter.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" @@ -89,10 +88,7 @@ func resourceAliCloudOosSecretParameterCreate(d *schema.ResourceData, meta inter var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) if v, ok := d.GetOk("secret_parameter_name"); ok { request["Name"] = v @@ -126,11 +122,9 @@ func resourceAliCloudOosSecretParameterCreate(d *schema.ResourceData, meta inter if v, ok := d.GetOk("dkms_instance_id"); ok { request["DKMSInstanceId"] = 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("2019-06-01"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, query, request, true) if err != nil { if NeedRetry(err) { wait() @@ -214,10 +208,7 @@ func resourceAliCloudOosSecretParameterUpdate(d *schema.ResourceData, meta inter update := false action := "UpdateSecretParameter" - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) query = make(map[string]interface{}) request["Name"] = d.Id() @@ -248,11 +239,9 @@ func resourceAliCloudOosSecretParameterUpdate(d *schema.ResourceData, meta inter } request["Value"] = d.Get("value") 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("2019-06-01"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, query, request, true) if err != nil { if NeedRetry(err) { wait() @@ -278,19 +267,14 @@ func resourceAliCloudOosSecretParameterDelete(d *schema.ResourceData, meta inter var request map[string]interface{} var response map[string]interface{} query := make(map[string]interface{}) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request = make(map[string]interface{}) request["Name"] = d.Id() request["RegionId"] = client.RegionId - 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("2019-06-01"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, query, request, true) if err != nil { if NeedRetry(err) { diff --git a/alicloud/resource_alicloud_oos_secret_parameter_test.go b/alicloud/resource_alicloud_oos_secret_parameter_test.go index 2277fee278bf..72883df7281f 100644 --- a/alicloud/resource_alicloud_oos_secret_parameter_test.go +++ b/alicloud/resource_alicloud_oos_secret_parameter_test.go @@ -56,16 +56,10 @@ func testSweepOosSecretParameter(region string) error { request["MaxResults"] = PageSizeLarge var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -104,7 +98,7 @@ func testSweepOosSecretParameter(region string) error { request := map[string]interface{}{ "Name": item["Name"], } - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete Oos Secret Parameter (%s): %s", item["Name"].(string), err) } diff --git a/alicloud/resource_alicloud_oos_service_setting.go b/alicloud/resource_alicloud_oos_service_setting.go index 2334edf147c7..d3dc9ceb9784 100644 --- a/alicloud/resource_alicloud_oos_service_setting.go +++ b/alicloud/resource_alicloud_oos_service_setting.go @@ -8,7 +8,6 @@ import ( "github.com/google/uuid" - 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" @@ -71,10 +70,7 @@ func resourceAlicloudOosServiceSettingCreate(d *schema.ResourceData, meta interf var response map[string]interface{} action := "SetServiceSettings" request := make(map[string]interface{}) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOk("delivery_oss_bucket_name"); ok { request["DeliveryOssBucketName"] = v } @@ -93,7 +89,7 @@ func resourceAlicloudOosServiceSettingCreate(d *schema.ResourceData, meta interf request["RegionId"] = client.RegionId 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("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -133,10 +129,7 @@ func resourceAlicloudOosServiceSettingRead(d *schema.ResourceData, meta interfac } func resourceAlicloudOosServiceSettingUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*connectivity.AliyunClient) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error var response map[string]interface{} update := false request := map[string]interface{}{} @@ -175,7 +168,7 @@ func resourceAlicloudOosServiceSettingUpdate(d *schema.ResourceData, meta interf request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_oos_state_configuration.go b/alicloud/resource_alicloud_oos_state_configuration.go index f021ef79ba43..e83bd70a2490 100644 --- a/alicloud/resource_alicloud_oos_state_configuration.go +++ b/alicloud/resource_alicloud_oos_state_configuration.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" @@ -84,10 +83,7 @@ func resourceAlicloudOosStateConfigurationCreate(d *schema.ResourceData, meta in var response map[string]interface{} action := "CreateStateConfiguration" request := make(map[string]interface{}) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOk("configure_mode"); ok { request["ConfigureMode"] = v } @@ -116,11 +112,9 @@ func resourceAlicloudOosStateConfigurationCreate(d *schema.ResourceData, meta in request["TemplateVersion"] = v } request["ClientToken"] = buildClientToken("CreateStateConfiguration") - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -165,10 +159,7 @@ func resourceAlicloudOosStateConfigurationRead(d *schema.ResourceData, meta inte } func resourceAlicloudOosStateConfigurationUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*connectivity.AliyunClient) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error var response map[string]interface{} update := false request := map[string]interface{}{ @@ -224,11 +215,9 @@ func resourceAlicloudOosStateConfigurationUpdate(d *schema.ResourceData, meta in if update { action := "UpdateStateConfiguration" request["ClientToken"] = buildClientToken("UpdateStateConfiguration") - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -249,21 +238,16 @@ func resourceAlicloudOosStateConfigurationDelete(d *schema.ResourceData, meta in client := meta.(*connectivity.AliyunClient) action := "DeleteStateConfigurations" var response map[string]interface{} - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request := map[string]interface{}{ "StateConfigurationIds": convertListToJsonString([]interface{}{d.Id()}), } request["RegionId"] = client.RegionId request["ClientToken"] = buildClientToken("DeleteStateConfigurations") - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_oos_state_configuration_test.go b/alicloud/resource_alicloud_oos_state_configuration_test.go index 38b954dad237..fc2b9e28fea7 100644 --- a/alicloud/resource_alicloud_oos_state_configuration_test.go +++ b/alicloud/resource_alicloud_oos_state_configuration_test.go @@ -54,16 +54,10 @@ func testSweepOOSStateConfiguration(region string) error { request["MaxResults"] = PageSizeLarge var response map[string]interface{} - conn, err := client.NewOosClient() - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -101,7 +95,7 @@ func testSweepOOSStateConfiguration(region string) error { request := map[string]interface{}{ "StateConfigurationIds": convertListToJsonString([]interface{}{item["StateConfigurationId"]}), } - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete Oos Patch Baseline (%s): %s", item["Description"].(string), err) } diff --git a/alicloud/resource_alicloud_oos_template.go b/alicloud/resource_alicloud_oos_template.go index 545b885a2ba3..d240b3eb5138 100644 --- a/alicloud/resource_alicloud_oos_template.go +++ b/alicloud/resource_alicloud_oos_template.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" @@ -98,10 +97,7 @@ func resourceAlicloudOosTemplateCreate(d *schema.ResourceData, meta interface{}) var response map[string]interface{} action := "CreateTemplate" request := make(map[string]interface{}) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request["Content"] = d.Get("content") request["RegionId"] = client.RegionId if v, ok := d.GetOk("tags"); ok { @@ -121,7 +117,7 @@ func resourceAlicloudOosTemplateCreate(d *schema.ResourceData, meta interface{}) 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("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -175,10 +171,7 @@ func resourceAlicloudOosTemplateRead(d *schema.ResourceData, meta interface{}) e func resourceAlicloudOosTemplateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*connectivity.AliyunClient) - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error var response map[string]interface{} update := false request := map[string]interface{}{ @@ -209,7 +202,7 @@ func resourceAlicloudOosTemplateUpdate(d *schema.ResourceData, meta interface{}) action := "UpdateTemplate" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -231,10 +224,7 @@ func resourceAlicloudOosTemplateDelete(d *schema.ResourceData, meta interface{}) client := meta.(*connectivity.AliyunClient) action := "DeleteTemplate" var response map[string]interface{} - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } + var err error request := map[string]interface{}{ "TemplateName": d.Id(), } @@ -245,7 +235,7 @@ func resourceAlicloudOosTemplateDelete(d *schema.ResourceData, meta interface{}) request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_oos_template_test.go b/alicloud/resource_alicloud_oos_template_test.go index 5f123c7c80eb..f463c3839a3a 100644 --- a/alicloud/resource_alicloud_oos_template_test.go +++ b/alicloud/resource_alicloud_oos_template_test.go @@ -48,14 +48,8 @@ func testSweepOosTemplate(region string) error { } var response map[string]interface{} action := "ListTemplates" - conn, err := client.NewOosClient() - if err != nil { - return WrapError(err) - } for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { return WrapErrorf(err, DataDefaultErrorMsg, "alicloud_oos_template", action, AlibabaCloudSdkGoERROR) } @@ -82,7 +76,7 @@ func testSweepOosTemplate(region string) error { request := map[string]interface{}{ "TemplateName": item["TemplateName"], } - _, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err = client.RpcPost("oos", "2019-06-01", action, nil, request, false) if err != nil { log.Printf("[ERROR] Failed to delete OOS Template (%s): %s", item["TemplateName"].(string), err) } diff --git a/alicloud/service_alicloud_oos.go b/alicloud/service_alicloud_oos.go index 53059abd6079..6af43caa91fa 100644 --- a/alicloud/service_alicloud_oos.go +++ b/alicloud/service_alicloud_oos.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" @@ -17,18 +16,13 @@ type OosService struct { func (s *OosService) DescribeOosTemplate(id string) (object map[string]interface{}, err error) { var response map[string]interface{} - conn, err := s.client.NewOosClient() - if err != nil { - return nil, WrapError(err) - } + client := s.client action := "GetTemplate" request := map[string]interface{}{ "RegionId": s.client.RegionId, "TemplateName": id, } - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if IsExpectedErrors(err, []string{"EntityNotExists.Template"}) { err = WrapErrorf(Error(GetNotFoundMessage("OosTemplate", id)), NotFoundMsg, ProviderERROR) @@ -48,18 +42,13 @@ func (s *OosService) DescribeOosTemplate(id string) (object map[string]interface func (s *OosService) DescribeOosExecution(id string) (object map[string]interface{}, err error) { var response map[string]interface{} - conn, err := s.client.NewOosClient() - if err != nil { - return nil, WrapError(err) - } + client := s.client action := "ListExecutions" request := map[string]interface{}{ "RegionId": s.client.RegionId, "ExecutionId": id, } - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { err = WrapErrorf(err, DefaultErrorMsg, id, action, AlibabaCloudSdkGoERROR) return @@ -103,20 +92,15 @@ func (s *OosService) OosExecutionStateRefreshFunc(id string, field string, failS func (s *OosService) DescribeOosApplication(id string) (object map[string]interface{}, err error) { var response map[string]interface{} - conn, err := s.client.NewOosClient() - if err != nil { - return nil, WrapError(err) - } + client := s.client action := "GetApplication" request := map[string]interface{}{ "RegionId": s.client.RegionId, "Name": id, } - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -144,10 +128,7 @@ func (s *OosService) DescribeOosApplication(id string) (object map[string]interf func (s *OosService) DescribeOosApplicationGroup(id string) (object map[string]interface{}, err error) { var response map[string]interface{} - conn, err := s.client.NewOosClient() - if err != nil { - return nil, WrapError(err) - } + client := s.client action := "GetApplicationGroup" parts, err := ParseResourceId(id, 2) if err != nil { @@ -159,11 +140,9 @@ func (s *OosService) DescribeOosApplicationGroup(id string) (object map[string]i "Name": parts[1], "ApplicationName": parts[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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -190,19 +169,14 @@ func (s *OosService) DescribeOosApplicationGroup(id string) (object map[string]i func (s *OosService) DescribeOosPatchBaseline(id string) (object map[string]interface{}, err error) { var response map[string]interface{} - conn, err := s.client.NewOosClient() - if err != nil { - return nil, WrapError(err) - } + client := s.client action := "GetPatchBaseline" request := map[string]interface{}{ "Name": id, } - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -228,19 +202,14 @@ func (s *OosService) DescribeOosPatchBaseline(id string) (object map[string]inte } func (s *OosService) DescribeOosStateConfiguration(id string) (object map[string]interface{}, err error) { var response map[string]interface{} - conn, err := s.client.NewOosClient() - if err != nil { - return nil, WrapError(err) - } + client := s.client action := "ListStateConfigurations" request := map[string]interface{}{ "RegionId": s.client.RegionId, } - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -271,19 +240,14 @@ func (s *OosService) DescribeOosStateConfiguration(id string) (object map[string func (s *OosService) DescribeOosServiceSetting(id string) (object map[string]interface{}, err error) { var response map[string]interface{} - conn, err := s.client.NewOosClient() - if err != nil { - return nil, WrapError(err) - } + client := s.client action := "GetServiceSettings" request := map[string]interface{}{ "RegionId": s.client.RegionId, } - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -307,19 +271,14 @@ func (s *OosService) DescribeOosServiceSetting(id string) (object map[string]int func (s *OosService) DescribeOosParameter(id string) (object map[string]interface{}, err error) { var response map[string]interface{} - conn, err := s.client.NewOosClient() - if err != nil { - return nil, WrapError(err) - } + client := s.client action := "GetParameter" request := map[string]interface{}{ "Name": id, } - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -348,21 +307,15 @@ func (s *OosService) DescribeOosSecretParameter(id string) (object map[string]in var response map[string]interface{} action := "GetSecretParameter" - conn, err := s.client.NewOosClient() - if err != nil { - return nil, WrapError(err) - } + client := s.client request := map[string]interface{}{ "RegionId": s.client.RegionId, "Name": id, } - - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -392,10 +345,7 @@ func (s *OosService) DescribeOosSecretParameter(id string) (object map[string]in } func (s *OosService) DescribeOosDefaultPatchBaseline(id string) (object map[string]interface{}, err error) { - conn, err := s.client.NewOosClient() - if err != nil { - return object, WrapError(err) - } + client := s.client request := map[string]interface{}{ "Name": id, @@ -404,11 +354,9 @@ func (s *OosService) DescribeOosDefaultPatchBaseline(id string) (object map[stri var response map[string]interface{} action := "GetPatchBaseline" - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - resp, err := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + resp, err := client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() @@ -436,12 +384,7 @@ func (s *OosService) DescribeOosDefaultPatchBaseline(id string) (object map[stri func (s *OosService) DescribeOosSecretParameterForDataSource(id string, d *schema.ResourceData) (object map[string]interface{}, err error) { var response map[string]interface{} action := "GetSecretParameter" - - conn, err := s.client.NewOosClient() - if err != nil { - return nil, WrapError(err) - } - + client := s.client request := map[string]interface{}{ "RegionId": s.client.RegionId, "Name": id, @@ -450,12 +393,9 @@ func (s *OosService) DescribeOosSecretParameterForDataSource(id string, d *schem if v, ok := d.GetOkExists("with_decryption"); ok { request["WithDecryption"] = v } - - 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("2019-06-01"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/service_alicloud_oos_v2.go b/alicloud/service_alicloud_oos_v2.go index a55d2c007703..5328db625413 100644 --- a/alicloud/service_alicloud_oos_v2.go +++ b/alicloud/service_alicloud_oos_v2.go @@ -6,8 +6,6 @@ import ( "time" "github.com/PaesslerAG/jsonpath" - rpc "github.com/alibabacloud-go/tea-rpc/client" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -25,20 +23,14 @@ func (s *OosServiceV2) DescribeOosPatchBaseline(id string) (object map[string]in var response map[string]interface{} var query map[string]interface{} action := "GetPatchBaseline" - conn, err := client.NewOosClient() - if err != nil { - return object, WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) query["Name"] = id query["RegionId"] = client.RegionId - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(1*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, query, request, true) if err != nil { if NeedRetry(err) { @@ -95,7 +87,6 @@ func (s *OosServiceV2) SetResourceTags(d *schema.ResourceData, resourceType stri if d.HasChange("tags") { var err error var action string - var conn *rpc.Client client := s.client var request map[string]interface{} var response map[string]interface{} @@ -110,10 +101,6 @@ func (s *OosServiceV2) SetResourceTags(d *schema.ResourceData, resourceType stri } if len(removedTagKeys) > 0 { action = "UntagResources" - conn, err = client.NewOosClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) request["ResourceIds"] = "[\"" + d.Id() + "\"]" @@ -123,11 +110,9 @@ func (s *OosServiceV2) SetResourceTags(d *schema.ResourceData, resourceType stri request[fmt.Sprintf("TagKey.%d", i+1)] = key } request["TagKeys"] = convertListToJsonString(convertListStringToListInterface(removedTagKeys)) - 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("2019-06-01"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, query, request, false) if err != nil { if NeedRetry(err) { @@ -147,10 +132,6 @@ func (s *OosServiceV2) SetResourceTags(d *schema.ResourceData, resourceType stri if len(added) > 0 { action = "TagResources" - conn, err = client.NewOosClient() - if err != nil { - return WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) request["ResourceIds"] = "[\"" + d.Id() + "\"]" @@ -158,11 +139,9 @@ func (s *OosServiceV2) SetResourceTags(d *schema.ResourceData, resourceType stri tagsString, _ := convertArrayObjectToJsonString(added) request["Tags"] = tagsString request["ResourceType"] = resourceType - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, query, request, false) if err != nil { if NeedRetry(err) { @@ -194,20 +173,14 @@ func (s *OosServiceV2) DescribeOosSecretParameter(id string) (object map[string] var response map[string]interface{} var query map[string]interface{} action := "GetSecretParameter" - conn, err := client.NewOosClient() - if err != nil { - return object, WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) request["Name"] = id request["RegionId"] = client.RegionId - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(1*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, query, request, true) if err != nil { if NeedRetry(err) { @@ -239,21 +212,15 @@ func (s *OosServiceV2) DescribeSecretParameterListTagResources(id string) (objec var response map[string]interface{} var query map[string]interface{} action := "ListTagResources" - conn, err := client.NewOosClient() - if err != nil { - return object, WrapError(err) - } request = make(map[string]interface{}) query = make(map[string]interface{}) request["ResourceIds"] = expandSingletonToList(id) request["RegionId"] = client.RegionId request["ResourceType"] = "secretparameter" - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 5*time.Second) err = resource.Retry(1*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-06-01"), StringPointer("AK"), query, request, &runtime) + response, err = client.RpcPost("oos", "2019-06-01", action, query, request, true) if err != nil { if NeedRetry(err) {