ResourceCenter: Improves the invoking resource center api method and …

…supports refreshing credential automatically
aliyun · Dec 23, 2024 · ceacae4 · ceacae4
1 parent 0843860
commit ceacae4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 34 deletions.
diff --git a/alicloud/resource_alicloud_resource_manager_saved_query.go b/alicloud/resource_alicloud_resource_manager_saved_query.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"
@@ -54,24 +53,18 @@ func resourceAliCloudResourceManagerSavedQueryCreate(d *schema.ResourceData, met
 	action := "CreateSavedQuery"
 	var request map[string]interface{}
 	var response map[string]interface{}
+	var err error
 	query := make(map[string]interface{})
-	conn, err := client.NewResourceCenterClient()
-	if err != nil {
-		return WrapError(err)
-	}
 	request = make(map[string]interface{})
 
 	request["Expression"] = d.Get("expression")
 	if v, ok := d.GetOk("description"); ok {
 		request["Description"] = v
 	}
 	request["Name"] = d.Get("saved_query_name")
-	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("2022-12-01"), StringPointer("AK"), query, request, &runtime)
-
+		response, err = client.RpcPost("ResourceCenter", "2022-12-01", action, query, request, false)
 		if err != nil {
 			if NeedRetry(err) {
 				wait()
@@ -118,13 +111,10 @@ func resourceAliCloudResourceManagerSavedQueryUpdate(d *schema.ResourceData, met
 	client := meta.(*connectivity.AliyunClient)
 	var request map[string]interface{}
 	var response map[string]interface{}
+	var err error
 	var query map[string]interface{}
 	update := false
 	action := "UpdateSavedQuery"
-	conn, err := client.NewResourceCenterClient()
-	if err != nil {
-		return WrapError(err)
-	}
 	request = make(map[string]interface{})
 	query = make(map[string]interface{})
 	query["QueryId"] = d.Id()
@@ -142,12 +132,9 @@ func resourceAliCloudResourceManagerSavedQueryUpdate(d *schema.ResourceData, met
 	}
 	request["Name"] = d.Get("saved_query_name")
 	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("2022-12-01"), StringPointer("AK"), query, request, &runtime)
-
+			response, err = client.RpcPost("ResourceCenter", "2022-12-01", action, query, request, false)
 			if err != nil {
 				if NeedRetry(err) {
 					wait()
@@ -172,19 +159,13 @@ func resourceAliCloudResourceManagerSavedQueryDelete(d *schema.ResourceData, met
 	action := "DeleteSavedQuery"
 	var request map[string]interface{}
 	var response map[string]interface{}
+	var err error
 	query := make(map[string]interface{})
-	conn, err := client.NewResourceCenterClient()
-	if err != nil {
-		return WrapError(err)
-	}
 	request = make(map[string]interface{})
 	query["QueryId"] = d.Id()
-
-	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("2022-12-01"), StringPointer("AK"), query, request, &runtime)
+		response, err = client.RpcPost("ResourceCenter", "2022-12-01", action, query, request, false)
 
 		if err != nil {
 			if NeedRetry(err) {

diff --git a/alicloud/service_alicloud_resource_manager_v2.go b/alicloud/service_alicloud_resource_manager_v2.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"
 )
@@ -22,20 +21,13 @@ func (s *ResourceManagerServiceV2) DescribeResourceManagerSavedQuery(id string)
 	var response map[string]interface{}
 	var query map[string]interface{}
 	action := "GetSavedQuery"
-	conn, err := client.NewResourceCenterClient()
-	if err != nil {
-		return object, WrapError(err)
-	}
 	request = make(map[string]interface{})
 	query = make(map[string]interface{})
 	query["QueryId"] = id
 
-	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("2022-12-01"), StringPointer("AK"), query, request, &runtime)
-
+		response, err = client.RpcPost("ResourceCenter", "2022-12-01", action, query, request, true)
 		if err != nil {
 			if NeedRetry(err) {
 				wait()