Skip to content

Commit 8ccb800

Browse files
authored
Merge pull request #1685 from tencentcloudstack/feat/sqlserver_basic_support_BSSD
add ckafka whitelist
2 parents d2f8d95 + 013ce5e commit 8ccb800

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.changelog/1685.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_sqlserver_basic_instance: support set `CLOUD_BSSD` and `CLOUD_HSSD`
3+
```

tencentcloud/extension_sqlserver.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ const (
103103
const (
104104
CLOUD_PREMIUM = "CLOUD_PREMIUM"
105105
CLOUD_SSD = "CLOUD_SSD"
106+
CLOUD_BSSD = "CLOUD_BSSD"
107+
CLOUD_HSSD = "CLOUD_HSSD"
106108
)
107109

108110
const (

tencentcloud/resource_tc_sqlserver_basic_instance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ func resourceTencentCloudSqlserverBasicInstance() *schema.Resource {
8080
"machine_type": {
8181
Type: schema.TypeString,
8282
Required: true,
83-
ValidateFunc: validateAllowedStringValue([]string{CLOUD_PREMIUM, CLOUD_SSD}),
84-
Description: "The host type of the purchased instance, `CLOUD_PREMIUM` for virtual machine high-performance cloud disk, `CLOUD_SSD` for virtual machine SSD cloud disk.",
83+
ValidateFunc: validateAllowedStringValue([]string{CLOUD_PREMIUM, CLOUD_SSD, CLOUD_HSSD, CLOUD_BSSD}),
84+
Description: "The host type of the purchased instance, `CLOUD_PREMIUM` for virtual machine high-performance cloud disk, `CLOUD_SSD` for virtual machine SSD cloud disk, `CLOUD_HSSD` for virtual machine enhanced cloud disk, `CLOUD_BSSD` for virtual machine general purpose SSD cloud disk.",
8585
},
8686
"charge_type": {
8787
Type: schema.TypeString,

website/docs/r/sqlserver_basic_instance.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ resource "tencentcloud_sqlserver_basic_instance" "foo" {
4141
The following arguments are supported:
4242

4343
* `cpu` - (Required, Int) The CPU number of the SQL Server basic instance.
44-
* `machine_type` - (Required, String) The host type of the purchased instance, `CLOUD_PREMIUM` for virtual machine high-performance cloud disk, `CLOUD_SSD` for virtual machine SSD cloud disk.
44+
* `machine_type` - (Required, String) The host type of the purchased instance, `CLOUD_PREMIUM` for virtual machine high-performance cloud disk, `CLOUD_SSD` for virtual machine SSD cloud disk, `CLOUD_HSSD` for virtual machine enhanced cloud disk, `CLOUD_BSSD` for virtual machine general purpose SSD cloud disk.
4545
* `memory` - (Required, Int) Memory size (in GB). Allowed value must be larger than `memory` that data source `tencentcloud_sqlserver_specinfos` provides.
4646
* `name` - (Required, String) Name of the SQL Server basic instance.
4747
* `storage` - (Required, Int) Disk size (in GB). Allowed value must be a multiple of 10. The storage must be set with the limit of `storage_min` and `storage_max` which data source `tencentcloud_sqlserver_specinfos` provides.

0 commit comments

Comments
 (0)