Skip to content
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

resource/alicloud_db_instance: add new attributes:bursting_enabled and modify sql_collector_config_value #8071

Merged
merged 1 commit into from
Jan 17, 2025
Merged

resource/alicloud_db_instance: add new attributes:bursting_enabled and modify sql_collector_config_value #8071

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
22 changes: 21 additions & 1 deletion alicloud/resource_alicloud_db_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,12 @@ func resourceAliCloudDBInstance() *schema.Resource {
Type: schema.TypeInt,
Optional: true,
ValidateFunc: IntInSlice([]int{30, 180, 365, 1095, 1825}),
Default: 30,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里的默认值直接删除，会导致用户模板出现非预期的变更

DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
if v, ok := d.GetOk("sql_collector_status"); ok && strings.ToLower(v.(string)) == "enabled" {
return false
}
return true
},
},
"resource_group_id": {
Type: schema.TypeString,
Expand Down Expand Up @@ -638,6 +643,10 @@ func resourceAliCloudDBInstance() *schema.Resource {
return d.Get("engine").(string) != "SQLServer"
},
},
"bursting_enabled": {
Type: schema.TypeBool,
Optional: true,
},
},
}
}
Expand Down Expand Up @@ -1455,6 +1464,13 @@ func resourceAliCloudDBInstanceUpdate(d *schema.ResourceData, meta interface{})
}
request["DBInstanceStorage"] = d.Get("instance_storage")

if d.HasChange("bursting_enabled") {
update = true
}
if v, ok := d.GetOkExists("bursting_enabled"); ok {
request["BurstingEnabled"] = v
}

if d.HasChange("serverless_config") {
update = true
if v, ok := d.GetOk("serverless_config"); ok {
Expand Down Expand Up @@ -1814,6 +1830,7 @@ func resourceAliCloudDBInstanceRead(d *schema.ResourceData, meta interface{}) er
d.Set("zone_id", instance["ZoneId"])
d.Set("status", instance["DBInstanceStatus"])
d.Set("create_time", instance["CreationTime"])
d.Set("bursting_enabled", instance["BurstingEnabled"])
d.Set("pg_bouncer_enabled", instance["PGBouncerEnabled"])

// MySQL Serverless instance query PayType return SERVERLESS, need to be consistent with the participant.
Expand Down Expand Up @@ -2075,6 +2092,9 @@ func buildDBCreateRequest(d *schema.ResourceData, meta interface{}) (map[string]
if v, ok := d.GetOk("port"); ok && v.(string) != "" {
request["Port"] = v
}
if v, ok := d.GetOkExists("bursting_enabled"); ok {
request["BurstingEnabled"] = v
}

if request["Engine"] == "MySQL" || request["Engine"] == "PostgreSQL" || request["Engine"] == "SQLServer" {
if v, ok := d.GetOk("role_arn"); ok && v.(string) != "" {
Expand Down
56 changes: 37 additions & 19 deletions alicloud/resource_alicloud_db_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ func TestAccAliCloudRdsDBInstance_VpcId(t *testing.T) {
Config: testAccConfig(map[string]interface{}{
"engine": "MySQL",
"engine_version": "5.7",
"instance_type": "${data.alicloud_db_instance_classes.default.instance_classes.1.instance_class}",
"instance_type": "rds.mysql.t1.small",
"instance_storage": "${data.alicloud_db_instance_classes.default.instance_classes.1.storage_range.min}",
"instance_charge_type": "Postpaid",
"instance_name": "${var.name}",
Expand Down Expand Up @@ -868,7 +868,7 @@ func TestAccAliCloudRdsDBInstance_Mysql_5_7_HighAvailabilityInstance(t *testing.
Config: testAccConfig(map[string]interface{}{
"engine": "MySQL",
"engine_version": "5.7",
"instance_type": "${data.alicloud_db_instance_classes.default.instance_classes.1.instance_class}",
"instance_type": "rds.mysql.t1.small",
"instance_storage": "${data.alicloud_db_instance_classes.default.instance_classes.1.storage_range.min}",
"instance_charge_type": "Postpaid",
"instance_name": "${var.name}",
Expand Down Expand Up @@ -993,7 +993,7 @@ func TestAccAliCloudRdsDBInstance_SQLServer(t *testing.T) {
Config: testAccConfig(map[string]interface{}{
"engine": "SQLServer",
"engine_version": "2012_std_ha",
"instance_type": "${data.alicloud_db_instance_classes.default.instance_classes.0.instance_class}",
"instance_type": "mssql.x4.medium.s2",
"instance_storage": "${data.alicloud_db_instance_classes.default.instance_classes.0.storage_range.min}",
"db_instance_storage_type": "cloud_essd",
"instance_charge_type": "Postpaid",
Expand All @@ -1007,7 +1007,7 @@ func TestAccAliCloudRdsDBInstance_SQLServer(t *testing.T) {
"engine": "SQLServer",
"engine_version": "2012_std_ha",
"instance_type": CHECKSET,
"instance_storage": "20",
"instance_storage": CHECKSET,
"db_instance_storage_type": "cloud_essd",
"category": "HighAvailability",
}),
Expand Down Expand Up @@ -1106,7 +1106,7 @@ func TestAccAliCloudRdsDBInstance_SQLServer(t *testing.T) {
Config: testAccConfig(map[string]interface{}{
"engine": "SQLServer",
"engine_version": "2012_std_ha",
"instance_type": "${data.alicloud_db_instance_classes.default.instance_classes.0.instance_class}",
"instance_type": "mssql.x4.large.s2",
"instance_storage": "50",
"db_instance_storage_type": "cloud_essd",
"instance_charge_type": "Postpaid",
Expand Down Expand Up @@ -1382,7 +1382,6 @@ func TestAccAliCloudRdsDBInstance_PostgreSQL_12_0(t *testing.T) {
"vswitch_id": "${local.vswitch_id}",
"security_group_ids": []string{},
"monitoring_period": "60",
"encryption_key": "${alicloud_kms_key.default.id}",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为什么删除

"category": "HighAvailability",
"db_instance_storage_type": "cloud_essd2",
"connection_string_prefix": connectionStringPrefixSecond,
Expand Down Expand Up @@ -1499,7 +1498,7 @@ func TestAccAliCloudRdsDBInstance_PostgreSQL_13_0_SSL(t *testing.T) {
Config: testAccConfig(map[string]interface{}{
"engine": "PostgreSQL",
"engine_version": "13.0",
"instance_type": "${data.alicloud_db_instance_classes.default.instance_classes.0.instance_class}",
"instance_type": "pg.x2.medium.2c",
"instance_storage": "${data.alicloud_db_instance_classes.default.instance_classes.0.storage_range.min}",
"db_instance_storage_type": "cloud_essd",
"zone_id": "${data.alicloud_db_instance_classes.default.instance_classes.0.zone_ids.0.id}",
Expand Down Expand Up @@ -1575,7 +1574,7 @@ func TestAccAliCloudRdsDBInstance_PostgreSQL_13_0_SSL(t *testing.T) {
},
{
Config: testAccConfig(map[string]interface{}{
"instance_type": "${data.alicloud_db_instance_classes.default.instance_classes.1.instance_class}",
"instance_type": "pg.x4.medium.2c",
}),
Check: resource.ComposeTestCheckFunc(
testAccCheck(map[string]string{
Expand Down Expand Up @@ -1689,14 +1688,13 @@ func TestAccAliCloudRdsDBInstance_PostgreSQL_13_0_SSL(t *testing.T) {
Config: testAccConfig(map[string]interface{}{
"engine": "PostgreSQL",
"engine_version": "13.0",
"instance_type": "${data.alicloud_db_instance_classes.default.instance_classes.0.instance_class}",
"instance_type": "pg.x8.medium.2c",
"instance_storage": "${data.alicloud_db_instance_classes.default.instance_classes.0.storage_range.min + data.alicloud_db_instance_classes.default.instance_classes.0.storage_range.step}",
"instance_charge_type": "Postpaid",
"instance_name": "${var.name}",
"vswitch_id": "${local.vswitch_id}",
"security_group_ids": []string{},
"monitoring_period": "60",
"encryption_key": "${alicloud_kms_key.default.id}",
"ssl_action": "Open",
"ca_type": "aliyun",
"client_ca_enabled": "1",
Expand Down Expand Up @@ -2003,7 +2001,6 @@ func TestAccAliCloudRdsDBInstance_PostgreSQL_15_0_Babelfish(t *testing.T) {
"vswitch_id": "${local.vswitch_id}",
"security_group_ids": []string{},
"monitoring_period": "60",
"encryption_key": "${alicloud_kms_key.default.id}",
"ssl_action": "Open",
"ca_type": "aliyun",
"client_ca_enabled": "1",
Expand Down Expand Up @@ -2372,7 +2369,7 @@ func TestAccAliCloudRdsDBInstance_Mysql_8_0_MultiAZ(t *testing.T) {
Config: testAccConfig(map[string]interface{}{
"engine": "MySQL",
"engine_version": "8.0",
"instance_type": "${data.alicloud_db_instance_classes.default.instance_classes.1.instance_class}",
"instance_type": "rds.mysql.t1.small",
"instance_storage": "${data.alicloud_db_instance_classes.default.instance_classes.1.storage_range.min}",
"zone_id": "${data.alicloud_db_instance_classes.default.instance_classes.0.zone_ids.0.id}",
"instance_name": "${var.name}",
Expand Down Expand Up @@ -2425,7 +2422,7 @@ func TestAccAliCloudRdsDBInstance_Mysql_8_0_PrePaid(t *testing.T) {
Config: testAccConfig(map[string]interface{}{
"engine": "MySQL",
"engine_version": "8.0",
"instance_type": "${data.alicloud_db_instance_classes.default.instance_classes.1.instance_class}",
"instance_type": "rds.mysql.s1.small",
"instance_storage": "${data.alicloud_db_instance_classes.default.instance_classes.1.storage_range.min}",
"instance_charge_type": "Prepaid",
"period": "1",
Expand Down Expand Up @@ -2525,7 +2522,7 @@ func TestAccAliCloudRdsDBInstance_Mysql_8_0_Cluster(t *testing.T) {
Config: testAccConfig(map[string]interface{}{
"engine": "MySQL",
"engine_version": "8.0",
"instance_type": "${data.alicloud_db_instance_classes.default.instance_classes.1.instance_class}",
"instance_type": "mysql.x2.medium.xc",
"instance_storage": "${data.alicloud_db_instance_classes.default.instance_classes.1.storage_range.min}",
"instance_charge_type": "Postpaid",
"instance_name": "${var.name}",
Expand Down Expand Up @@ -3144,7 +3141,7 @@ func TestAccAliCloudRdsDBInstance_SQLServer_2019_ServerlessHA(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() {
testAccPreCheck(t)
testAccPreCheckWithRegions(t, true, connectivity.ServerlessSupportRegions)
testAccPreCheckWithRegions(t, true, connectivity.RDSInstanceClassesSupportRegions)
},

// module name
Expand Down Expand Up @@ -3714,7 +3711,7 @@ variable "name" {
data "alicloud_db_zones" "default"{
engine = "MySQL"
engine_version = "8.0"
instance_charge_type = "PostPaid"
instance_charge_type = "PrePaid"
category = "HighAvailability"
db_instance_storage_type = "local_ssd"
}
Expand Down Expand Up @@ -3753,14 +3750,14 @@ data "alicloud_resource_manager_resource_groups" "default" {
}

resource "alicloud_security_group" "default" {
name = var.name
security_group_name = var.name
vpc_id = data.alicloud_vpcs.default.ids.0
}

resource "alicloud_kms_key" "default" {
description = var.name
pending_window_in_days = 7
key_state = "Enabled"
status = "Enabled"
}

`, name)
Expand Down Expand Up @@ -3925,6 +3922,7 @@ func TestAccAliCloudRdsDBInstanceMysql_general_essd(t *testing.T) {
"instance_name": "${var.name}",
"vswitch_id": "${data.alicloud_vswitches.default.ids.0}",
"db_instance_storage_type": "general_essd",
"bursting_enabled": "true",
}),
Check: resource.ComposeTestCheckFunc(
testAccCheck(map[string]string{
Expand All @@ -3936,6 +3934,27 @@ func TestAccAliCloudRdsDBInstanceMysql_general_essd(t *testing.T) {
"instance_name": name,
"db_instance_storage_type": "general_essd",
"monitoring_period": CHECKSET,
"bursting_enabled": CHECKSET,
}),
),
},
{
Config: testAccConfig(map[string]interface{}{
"bursting_enabled": "false",
}),
Check: resource.ComposeTestCheckFunc(
testAccCheck(map[string]string{
"bursting_enabled": "false",
}),
),
},
{
Config: testAccConfig(map[string]interface{}{
"bursting_enabled": "true",
}),
Check: resource.ComposeTestCheckFunc(
testAccCheck(map[string]string{
"bursting_enabled": "true",
}),
),
},
Expand Down Expand Up @@ -4208,7 +4227,6 @@ var instanceBasicMap2 = map[string]string{
"engine": "MySQL",
"engine_version": "5.7",
"instance_type": CHECKSET,
"instance_storage": "5",
"instance_name": "tf-testAccDBInstanceConfig_slave_zone",
"monitoring_period": "60",
"zone_id": CHECKSET,
Expand Down
7 changes: 5 additions & 2 deletions website/docs/r/db_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ The following arguments are supported:

-> **NOTE:** You can specify the time zone when you create a primary instance. You cannot specify the time zone when you create a read-only instance. Read-only instances inherit the time zone of their primary instance. If you do not specify this parameter, the system assigns the default time zone of the region where the instance resides.
* `sql_collector_status` - (Optional, Available since 1.70.0) The sql collector status of the instance. Valid values are `Enabled`, `Disabled`, Default to `Disabled`.
* `sql_collector_config_value` - (Optional, Available since 1.70.0) The sql collector keep time of the instance. Valid values are `30`, `180`, `365`, `1095`, `1825`, Default to `30`.
* `sql_collector_config_value` - (Optional, Available since 1.70.0) The sql collector keep time of the instance. Valid values are `30`, `180`, `365`, `1095`, `1825`.

* `instance_name` - (Optional) The name of DB instance. It a string of 2 to 256 characters.
* `connection_string_prefix` - (Optional, Available since 1.126.0) The private connection string prefix. If you want to update public connection string prefix, please use resource alicloud_db_connection [connection_prefix](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/db_connection#connection_prefix).
Expand Down Expand Up @@ -770,7 +770,10 @@ The following arguments are supported:
-> **NOTE:** This parameter is not required when you create an instance that runs MySQL, PostgreSQL, or SQL Server. You need to only specify the RoleARN parameter to create an instance that has cloud disk encryption enabled by using the obtained key ID.
You can configure RAM authorization to require a RAM user to enable cloud disk encryption when the RAM user is used to create an instance. If cloud disk encryption is disabled during the instance creation, the creation operation fails. To complete the configuration, you can attach the following policy to the RAM user: {"Version":"1","Statement":[{"Effect":"Deny","Action":"rds:CreateDBInstance","Resource":"*","Condition":{"StringEquals":{"rds:DiskEncryptionRequired":"false"}}}]}
* `direction` - (Optional, Available since v1.209.1) The instance configuration type. Valid values: ["Up", "Down", "TempUpgrade", "Serverless"]

* `bursting_enabled` - (Optional, Available since 1.242.0) Specifies whether to enable the I/O burst feature of general
ESSDs. Valid values:
- true
- false

* `node_id` - (Optional, Available since v1.213.1) The globally unique identifier (GUID) of the secondary instance. You can call the DescribeDBInstanceHAConfig operation to query the GUID of the secondary instance.
* `force` - (Optional, ForceNew, Available since v1.213.1) Specifies whether to enable forcible switching. Valid values:
Expand Down
Loading