From 065080145e86ae2241e4b73da8340e2d69f3f723 Mon Sep 17 00:00:00 2001
From: arunma <arunma@tencent.com>
Date: Mon, 21 Aug 2023 11:14:26 +0800
Subject: [PATCH] fix: modify cynosdb test

---
 ...ynosdb_cluster_password_complexity_test.go | 12 +++---
 .../resource_tc_cynosdb_param_template.go     | 37 +++++++++++++++----
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/tencentcloud/resource_tc_cynosdb_cluster_password_complexity_test.go b/tencentcloud/resource_tc_cynosdb_cluster_password_complexity_test.go
index 15c25f32f5..be65eeeeda 100644
--- a/tencentcloud/resource_tc_cynosdb_cluster_password_complexity_test.go
+++ b/tencentcloud/resource_tc_cynosdb_cluster_password_complexity_test.go
@@ -22,7 +22,7 @@ func TestAccTencentCloudCynosdbClusterPasswordComplexityResource_basic(t *testin
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCynosdbClusterPasswordComplexityExists("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity"),
 					resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "id"),
-					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "cluster_id", "cynosdbmysql-cgd2gpwr"),
+					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "cluster_id", defaultCynosdbClusterId),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "validate_password_length", "8"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "validate_password_mixed_case_count", "1"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "validate_password_special_char_count", "1"),
@@ -41,7 +41,7 @@ func TestAccTencentCloudCynosdbClusterPasswordComplexityResource_basic(t *testin
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCynosdbClusterPasswordComplexityExists("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity"),
 					resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "id"),
-					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "cluster_id", "cynosdbmysql-cgd2gpwr"),
+					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "cluster_id", defaultCynosdbClusterId),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "validate_password_length", "10"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "validate_password_mixed_case_count", "2"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_password_complexity.cluster_password_complexity", "validate_password_special_char_count", "2"),
@@ -104,10 +104,10 @@ func testAccCheckCynosdbClusterPasswordComplexityExists(n string) resource.TestC
 	}
 }
 
-const testAccCynosdbClusterPasswordComplexity = `
+const testAccCynosdbClusterPasswordComplexity = CommonCynosdb + `
 
 resource "tencentcloud_cynosdb_cluster_password_complexity" "cluster_password_complexity" {
-	cluster_id                           = "cynosdbmysql-cgd2gpwr"
+	cluster_id                           = var.cynosdb_cluster_id
 	validate_password_length             = 8
 	validate_password_mixed_case_count   = 1
 	validate_password_special_char_count = 1
@@ -122,10 +122,10 @@ resource "tencentcloud_cynosdb_cluster_password_complexity" "cluster_password_co
 
 `
 
-const testAccCynosdbClusterPasswordComplexityUp = `
+const testAccCynosdbClusterPasswordComplexityUp = CommonCynosdb + `
 
 resource "tencentcloud_cynosdb_cluster_password_complexity" "cluster_password_complexity" {
-	cluster_id                           = "cynosdbmysql-cgd2gpwr"
+	cluster_id                           = var.cynosdb_cluster_id
 	validate_password_length             = 10
 	validate_password_mixed_case_count   = 2
 	validate_password_special_char_count = 2
diff --git a/tencentcloud/resource_tc_cynosdb_param_template.go b/tencentcloud/resource_tc_cynosdb_param_template.go
index 8fa91607f1..e87933a679 100644
--- a/tencentcloud/resource_tc_cynosdb_param_template.go
+++ b/tencentcloud/resource_tc_cynosdb_param_template.go
@@ -206,15 +206,38 @@ func resourceTencentCloudCynosdbParamTemplateRead(d *schema.ResourceData, meta i
 		_ = d.Set("db_mode", paramTemplate.DbMode)
 	}
 
+	params := make([]string, 0)
+	if v, ok := d.GetOk("param_list"); ok {
+		for _, item := range v.(*schema.Set).List() {
+			if item != nil {
+				dMap := item.(map[string]interface{})
+				if v, ok := dMap["param_name"]; ok {
+					params = append(params, v.(string))
+				}
+			}
+		}
+	}
+
 	if paramTemplate.Items != nil {
-		paramInfoSetList := []interface{}{}
-		for _, paramInfoSet := range paramTemplate.Items {
-			paramInfoSetList = append(paramInfoSetList, map[string]interface{}{
-				"param_name":    *paramInfoSet.ParamName,
-				"current_value": *paramInfoSet.CurrentValue,
-			})
+		if len(params) > 0 {
+			paramInfoSetList := make([]map[string]interface{}, 0, len(params))
+			for _, param := range params {
+				for _, paramList := range paramTemplate.Items {
+					if *paramList.ParamName == param {
+						paramListMap := map[string]interface{}{}
+						if paramList.ParamName != nil {
+							paramListMap["param_name"] = paramList.ParamName
+						}
+						if paramList.CurrentValue != nil {
+							paramListMap["current_value"] = paramList.CurrentValue
+						}
+						paramInfoSetList = append(paramInfoSetList, paramListMap)
+						break
+					}
+				}
+			}
+			_ = d.Set("param_list", paramInfoSetList)
 		}
-		_ = d.Set("param_list", paramInfoSetList)
 	}
 
 	return nil