Skip to content

fix: modify cynosdb test #2063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2023
Merged

fix: modify cynosdb test #2063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tencentcloud/resource_tc_cynosdb_cluster_password_complexity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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"),
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
37 changes: 30 additions & 7 deletions tencentcloud/resource_tc_cynosdb_param_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down