MongoDB: Improves the invoking api method and supports refreshing cre…

…dential automatically
aliyun · Feb 9, 2025 · fdbce62 · fdbce62
1 parent e29fc03
commit fdbce62
Show file tree

Hide file tree

Showing 16 changed files with 130 additions and 521 deletions.
diff --git a/alicloud/data_source_alicloud_mongodb_accounts.go b/alicloud/data_source_alicloud_mongodb_accounts.go
@@ -8,7 +8,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 
 	"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"
@@ -80,15 +79,10 @@ func dataSourceAlicloudMongodbAccountsRead(d *schema.ResourceData, meta interfac
 	}
 	var objects []map[string]interface{}
 	var response map[string]interface{}
-	conn, err := client.NewDdsClient()
-	if err != nil {
-		return WrapError(err)
-	}
-	runtime := util.RuntimeOptions{}
-	runtime.SetAutoretry(true)
+	var err error
 	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("2015-12-01"), StringPointer("AK"), nil, request, &runtime)
+		response, err = client.RpcPost("Dbs", "2015-12-01", action, nil, request, true)
 		if err != nil {
 			if NeedRetry(err) {
 				wait()

diff --git a/alicloud/data_source_alicloud_mongodb_serverless_instances.go b/alicloud/data_source_alicloud_mongodb_serverless_instances.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"
@@ -268,16 +267,11 @@ func dataSourceAlicloudMongodbServerlessInstancesRead(d *schema.ResourceData, me
 		}
 	}
 	var response map[string]interface{}
-	conn, err := client.NewDdsClient()
-	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("2015-12-01"), StringPointer("AK"), nil, request, &runtime)
+			response, err = client.RpcPost("Dbs", "2015-12-01", action, nil, request, true)
 			if err != nil {
 				if NeedRetry(err) {
 					wait()

diff --git a/alicloud/data_source_alicloud_mongodb_sharding_network_private_addresses.go b/alicloud/data_source_alicloud_mongodb_sharding_network_private_addresses.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 
 	"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"
@@ -105,15 +104,10 @@ func dataSourceAlicloudMongodbShardingNetworkPrivateAddressesRead(d *schema.Reso
 	role, roleOk := d.GetOk("role")
 	var objects []map[string]interface{}
 	var response map[string]interface{}
-	conn, err := client.NewDdsClient()
-	if err != nil {
-		return WrapError(err)
-	}
-	runtime := util.RuntimeOptions{}
-	runtime.SetAutoretry(true)
+	var err error
 	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("2015-12-01"), StringPointer("AK"), nil, request, &runtime)
+		response, err = client.RpcPost("Dbs", "2015-12-01", action, nil, request, true)
 		if err != nil {
 			if NeedRetry(err) {
 				wait()

diff --git a/alicloud/data_source_alicloud_mongodb_sharding_network_public_addresses.go b/alicloud/data_source_alicloud_mongodb_sharding_network_public_addresses.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 
 	"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"
@@ -106,15 +105,10 @@ func dataSourceAlicloudMongodbShardingNetworkPublicAddressesRead(d *schema.Resou
 	role, roleOk := d.GetOk("role")
 	var response map[string]interface{}
 	var objects []map[string]interface{}
-	conn, err := client.NewDdsClient()
-	if err != nil {
-		return WrapError(err)
-	}
-	runtime := util.RuntimeOptions{}
-	runtime.SetAutoretry(true)
+	var err error
 	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("2015-12-01"), StringPointer("AK"), nil, request, &runtime)
+		response, err = client.RpcPost("Dbs", "2015-12-01", action, nil, request, true)
 		if err != nil {
 			if NeedRetry(err) {
 				wait()

diff --git a/alicloud/resource_alicloud_mongodb_account.go b/alicloud/resource_alicloud_mongodb_account.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"
@@ -64,15 +63,12 @@ func resourceAliCloudMongodbAccount() *schema.Resource {
 func resourceAliCloudMongodbAccountCreate(d *schema.ResourceData, meta interface{}) error {
 
 	client := meta.(*connectivity.AliyunClient)
+	var err error
 	if v, ok := d.GetOk("character_type"); ok && InArray(fmt.Sprint(v), []string{"db"}) {
 		action := "CreateAccount"
 		var request map[string]interface{}
 		var response map[string]interface{}
 		query := make(map[string]interface{})
-		conn, err := client.NewDdsClient()
-		if err != nil {
-			return WrapError(err)
-		}
 		request = make(map[string]interface{})
 		if v, ok := d.GetOk("account_name"); ok {
 			request["AccountName"] = v
@@ -83,11 +79,9 @@ func resourceAliCloudMongodbAccountCreate(d *schema.ResourceData, meta interface
 		request["RegionId"] = client.RegionId
 
 		request["AccountPassword"] = d.Get("account_password")
-		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("2015-12-01"), StringPointer("AK"), query, request, &runtime)
+			response, err = client.RpcPost("Dbs", "2015-12-01", action, query, request, true)
 			if err != nil {
 				if NeedRetry(err) {
 					wait()
@@ -125,10 +119,6 @@ func resourceAliCloudMongodbAccountCreate(d *schema.ResourceData, meta interface
 		var request map[string]interface{}
 		var response map[string]interface{}
 		query := make(map[string]interface{})
-		conn, err := client.NewDdsClient()
-		if err != nil {
-			return WrapError(err)
-		}
 		request = make(map[string]interface{})
 		if v, ok := d.GetOk("account_name"); ok {
 			request["AccountName"] = v
@@ -142,11 +132,9 @@ func resourceAliCloudMongodbAccountCreate(d *schema.ResourceData, meta interface
 		if v, ok := d.GetOk("character_type"); ok {
 			request["CharacterType"] = 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("2015-12-01"), StringPointer("AK"), query, request, &runtime)
+			response, err = client.RpcPost("Dbs", "2015-12-01", action, query, request, true)
 			if err != nil {
 				if NeedRetry(err) {
 					wait()
@@ -213,15 +201,12 @@ func resourceAliCloudMongodbAccountUpdate(d *schema.ResourceData, meta interface
 	var request map[string]interface{}
 	var response map[string]interface{}
 	var query map[string]interface{}
+	var err error
 	update := false
 	d.Partial(true)
 
 	parts := strings.Split(d.Id(), ":")
 	action := "ResetAccountPassword"
-	conn, err := client.NewDdsClient()
-	if err != nil {
-		return WrapError(err)
-	}
 	request = make(map[string]interface{})
 	query = make(map[string]interface{})
 	request["AccountName"] = parts[1]
@@ -237,11 +222,9 @@ func resourceAliCloudMongodbAccountUpdate(d *schema.ResourceData, meta interface
 	}
 
 	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("2015-12-01"), StringPointer("AK"), query, request, &runtime)
+			response, err = client.RpcPost("Dbs", "2015-12-01", action, query, request, true)
 			if err != nil {
 				if NeedRetry(err) {
 					wait()
@@ -264,10 +247,6 @@ func resourceAliCloudMongodbAccountUpdate(d *schema.ResourceData, meta interface
 	update = false
 	parts = strings.Split(d.Id(), ":")
 	action = "ModifyAccountDescription"
-	conn, err = client.NewDdsClient()
-	if err != nil {
-		return WrapError(err)
-	}
 	request = make(map[string]interface{})
 	query = make(map[string]interface{})
 	request["AccountName"] = parts[1]
@@ -278,11 +257,9 @@ func resourceAliCloudMongodbAccountUpdate(d *schema.ResourceData, meta interface
 	}
 	request["AccountDescription"] = d.Get("account_description")
 	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("2015-12-01"), StringPointer("AK"), query, request, &runtime)
+			response, err = client.RpcPost("Dbs", "2015-12-01", action, query, request, true)
 			if err != nil {
 				if NeedRetry(err) {
 					wait()

diff --git a/alicloud/resource_alicloud_mongodb_audit_policy.go b/alicloud/resource_alicloud_mongodb_audit_policy.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"
@@ -50,10 +49,7 @@ func resourceAlicloudMongodbAuditPolicyCreate(d *schema.ResourceData, meta inter
 	var response map[string]interface{}
 	action := "ModifyAuditPolicy"
 	request := make(map[string]interface{})
-	conn, err := client.NewDdsClient()
-	if err != nil {
-		return WrapError(err)
-	}
+	var err error
 	request["DBInstanceId"] = d.Get("db_instance_id")
 	request["AuditStatus"] = d.Get("audit_status")
 	request["ServiceType"] = "Standard"
@@ -62,7 +58,7 @@ func resourceAlicloudMongodbAuditPolicyCreate(d *schema.ResourceData, meta inter
 	}
 	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("2015-12-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
+		response, err = client.RpcPost("Dbs", "2015-12-01", action, nil, request, false)
 		if err != nil {
 			if NeedRetry(err) || IsExpectedErrors(err, []string{"OperationDenied.DBInstanceStatus"}) {
 				wait()
@@ -105,10 +101,7 @@ func resourceAlicloudMongodbAuditPolicyRead(d *schema.ResourceData, meta interfa
 }
 func resourceAlicloudMongodbAuditPolicyUpdate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*connectivity.AliyunClient)
-	conn, err := client.NewDdsClient()
-	if err != nil {
-		return WrapError(err)
-	}
+	var err error
 	var response map[string]interface{}
 	update := false
 	request := map[string]interface{}{
@@ -126,7 +119,7 @@ func resourceAlicloudMongodbAuditPolicyUpdate(d *schema.ResourceData, meta inter
 		action := "ModifyAuditPolicy"
 		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("2015-12-01"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
+			response, err = client.RpcPost("Dbs", "2015-12-01", action, nil, request, false)
 			if err != nil {
 				if NeedRetry(err) || IsExpectedErrors(err, []string{"OperationDenied.DBInstanceStatus"}) {
 					wait()