Skip to content

Commit 751ec5e

Browse files
authored
Merge pull request #150 from volcengine/feat/rds
Feat/rds
2 parents e22f65e + 0a60271 commit 751ec5e

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

common/common_volcengine_version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ package common
22

33
const (
44
TerraformProviderName = "terraform-provider-volcengine"
5-
TerraformProviderVersion = "0.0.129"
5+
TerraformProviderVersion = "0.0.130"
66
)

volcengine/rds_mysql/rds_mysql_instance/service_volcengine_rds_mysql_instance.go

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -617,20 +617,27 @@ func (s *VolcengineRdsMysqlInstanceService) ModifyResource(resourceData *schema.
617617

618618
// Parameters
619619
if resourceData.HasChange("parameters") {
620+
modifiedParams, _, _, _ := ve.GetSetDifference("parameters", resourceData, parameterHash, false)
621+
620622
parameterCallback := ve.Callback{
621623
Call: ve.SdkCall{
622624
Action: "ModifyDBInstanceParameters",
623625
ContentType: ve.ContentTypeJson,
624-
ConvertMode: ve.RequestConvertInConvert,
625-
Convert: map[string]ve.RequestConvert{
626-
"parameters": {
627-
ConvertType: ve.ConvertJsonObjectArray,
628-
ForceGet: true,
629-
},
630-
},
626+
ConvertMode: ve.RequestConvertIgnore,
631627
BeforeCall: func(d *schema.ResourceData, client *ve.SdkClient, call ve.SdkCall) (bool, error) {
632-
if len(*call.SdkParam) > 0 {
628+
if modifiedParams != nil && len(modifiedParams.List()) > 0 {
633629
(*call.SdkParam)["InstanceId"] = d.Id()
630+
(*call.SdkParam)["Parameters"] = make([]map[string]interface{}, 0)
631+
for _, v := range modifiedParams.List() {
632+
paramMap, ok := v.(map[string]interface{})
633+
if !ok {
634+
return false, fmt.Errorf("Parameter is not map ")
635+
}
636+
(*call.SdkParam)["Parameters"] = append((*call.SdkParam)["Parameters"].([]map[string]interface{}), map[string]interface{}{
637+
"ParameterName": paramMap["parameter_name"],
638+
"ParameterValue": paramMap["parameter_value"],
639+
})
640+
}
634641
return true, nil
635642
}
636643
return false, nil
@@ -645,7 +652,6 @@ func (s *VolcengineRdsMysqlInstanceService) ModifyResource(resourceData *schema.
645652
},
646653
},
647654
}
648-
649655
callbacks = append(callbacks, parameterCallback)
650656
}
651657

0 commit comments

Comments
 (0)