Skip to content

fix description #463

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
Jul 3, 2020
Merged

fix description #463

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
2 changes: 1 addition & 1 deletion tencentcloud/data_source_tc_mysql_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func dataSourceTencentCloudMysqlInstance() *schema.Resource {
"pay_type": {
Type: schema.TypeInt,
Optional: true,
Deprecated: "It has been deprecated from version 1.36.0.",
Deprecated: "It has been deprecated from version 1.36.0. Please use `charge_type` instead.",
ValidateFunc: validateAllowedIntValue([]int{0, 1}),
Description: "Pay type of instance, 0: prepay, 1: postpay.",
},
Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/resource_tc_mysql_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func TencentMsyqlBasicInfo() map[string]*schema.Schema {
},
"pay_type": {
Type: schema.TypeInt,
Deprecated: "It has been deprecated from version 1.36.0.",
Deprecated: "It has been deprecated from version 1.36.0. Please use `charge_type` instead.",
Optional: true,
ValidateFunc: validateAllowedIntValue([]int{MysqlPayByMonth, MysqlPayByUse}),
ConflictsWith: []string{"charge_type", "prepaid_period"},
Expand Down Expand Up @@ -96,7 +96,7 @@ func TencentMsyqlBasicInfo() map[string]*schema.Schema {
},
"period": {
Type: schema.TypeInt,
Deprecated: "It has been deprecated from version 1.36.0.",
Deprecated: "It has been deprecated from version 1.36.0. Please use `prepaid_period` instead.",
Optional: true,
Default: -1,
ConflictsWith: []string{"charge_type", "prepaid_period"},
Expand Down
2 changes: 1 addition & 1 deletion website/docs/d/mysql_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ The following arguments are supported:
* `limit` - (Optional) Number of results returned for a single request. Default is 20, and maximum is 2000.
* `mysql_id` - (Optional) Instance ID, such as cdb-c1nl9rpv. It is identical to the instance ID displayed in the database console page.
* `offset` - (Optional) Record offset. Default is 0.
* `pay_type` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Pay type of instance, 0: prepay, 1: postpay.
* `pay_type` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Please use `charge_type` instead. Pay type of instance, 0: prepay, 1: postpay.
* `result_output_file` - (Optional) Used to store results.
* `security_group_id` - (Optional) Security groups ID of instance.
* `status` - (Optional) Instance status. Available values: 0 - Creating; 1 - Running; 4 - Isolating; 5 - Isolated.
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/mysql_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ The following arguments are supported:
* `internet_service` - (Optional) Indicates whether to enable the access to an instance from public network: 0 - No, 1 - Yes.
* `intranet_port` - (Optional) Public access port, rang form 1024 to 65535 and default value is 3306.
* `parameters` - (Optional) List of parameters to use.
* `pay_type` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Pay type of instance, 0: prepaid, 1: postpaid.
* `period` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Period of instance. NOTES: Only supported prepaid instance.
* `pay_type` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Please use `charge_type` instead. Pay type of instance, 0: prepaid, 1: postpaid.
* `period` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Please use `prepaid_period` instead. Period of instance. NOTES: Only supported prepaid instance.
* `prepaid_period` - (Optional) Period of instance. NOTES: Only supported prepaid instance.
* `project_id` - (Optional) Project ID, default value is 0.
* `second_slave_zone` - (Optional, ForceNew) Zone information about second slave instance.
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/mysql_readonly_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ The following arguments are supported:
* `charge_type` - (Optional, ForceNew) Pay type of instance, valid values are `PREPAID`, `POSTPAID`. Default is `POSTPAID`.
* `force_delete` - (Optional) Indicate whether to delete instance directly or not. Default is false. If set true, the instance will be deleted instead of staying recycle bin. Note: only works for `PREPAID` instance. When the main mysql instance set true, this para of the readonly mysql instance will not take effect.
* `intranet_port` - (Optional) Public access port, rang form 1024 to 65535 and default value is 3306.
* `pay_type` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Pay type of instance, 0: prepaid, 1: postpaid.
* `period` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Period of instance. NOTES: Only supported prepaid instance.
* `pay_type` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Please use `charge_type` instead. Pay type of instance, 0: prepaid, 1: postpaid.
* `period` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Please use `prepaid_period` instead. Period of instance. NOTES: Only supported prepaid instance.
* `prepaid_period` - (Optional) Period of instance. NOTES: Only supported prepaid instance.
* `security_groups` - (Optional) Security groups to use.
* `subnet_id` - (Optional) Private network ID. If vpc_id is set, this value is required.
Expand Down