Skip to content

Commit c7864d4

Browse files
gailwanggailwang
authored
Merge pull request #567 from brickzzhang/master
[optimize document]
2 parents 8f96509 + 4439a44 commit c7864d4

18 files changed

+67
-67
lines changed

‎tencentcloud/data_source_tc_sqlserver_basic_instances.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func dataSourceTencentCloudSqlserverBasicInstances() *schema.Resource {
8787
"engine_version": {
8888
Type: schema.TypeString,
8989
Computed: true,
90-
Description: "Version of the SQL Server basic database engine. Allowed values are `2008R2`(SQL Server 2008 Enerprise), `2012SP3`(SQL Server 2012 Enterprise), `2016SP1` (SQL Server 2016 Enterprise), `201602`(SQL Server 2016 Standard) and `2017`(SQL Server 2017 Enterprise). Default is `2008R2`.",
90+
Description: "Version of the SQL Server basic database engine. Allowed values are `2008R2`(SQL Server 2008 Enterprise), `2012SP3`(SQL Server 2012 Enterprise), `2016SP1` (SQL Server 2016 Enterprise), `201602`(SQL Server 2016 Standard) and `2017`(SQL Server 2017 Enterprise). Default is `2008R2`.",
9191
},
9292
"vpc_id": {
9393
Type: schema.TypeString,

‎tencentcloud/data_source_tc_sqlserver_instances.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ func dataSourceTencentCloudSqlserverInstances() *schema.Resource {
8181
"engine_version": {
8282
Type: schema.TypeString,
8383
Computed: true,
84-
Description: "Version of the SQL Server database engine. Allowed values are `2008R2`(SQL Server 2008 Enerprise), `2012SP3`(SQL Server 2012 Enterprise), `2016SP1` (SQL Server 2016 Enterprise), `201602`(SQL Server 2016 Standard) and `2017`(SQL Server 2017 Enterprise). Default is `2008R2`.",
84+
Description: "Version of the SQL Server database engine. Allowed values are `2008R2`(SQL Server 2008 Enterprise), `2012SP3`(SQL Server 2012 Enterprise), `2016SP1` (SQL Server 2016 Enterprise), `201602`(SQL Server 2016 Standard) and `2017`(SQL Server 2017 Enterprise). Default is `2008R2`.",
8585
},
8686
"ha_type": {
8787
Type: schema.TypeString,
8888
Computed: true,
89-
Description: "Instance type.",
89+
Description: "Instance type. `DUAL` (dual-server high availability), `CLUSTER` (cluster).",
9090
},
9191
"vpc_id": {
9292
Type: schema.TypeString,
@@ -116,7 +116,7 @@ func dataSourceTencentCloudSqlserverInstances() *schema.Resource {
116116
"ro_flag": {
117117
Type: schema.TypeString,
118118
Computed: true,
119-
Description: "Readonly flag. `RO` for readonly instance, `MASTER` for master instance, `` for not readonly instance.",
119+
Description: "Readonly flag. `RO` (read-only instance), `MASTER` (primary instance with read-only instances). If it is left empty, it refers to an instance which is not read-only and has no RO group.",
120120
},
121121
"availability_zone": {
122122
Type: schema.TypeString,

‎tencentcloud/data_source_tc_sqlserver_publish_subscribes.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,32 @@ func dataSourceTencentSqlserverPublishSubscribes() *schema.Resource {
4242
"pub_or_sub_instance_id": {
4343
Type: schema.TypeString,
4444
Optional: true,
45-
Description: "The subscribe/publish instance ID is related to whether the `instance_id` is a publish instance or a subscribe instance. when `instance_id` is a publish instance, this field is filtered according to the subscribe instance ID; when `instance_id` is a subscribe instance, this field is filtering according to the publish instance ID.",
45+
Description: "The subscribe/publish instance ID. It is related to whether the `instance_id` is a publish instance or a subscribe instance. when `instance_id` is a publish instance, this field is filtered according to the subscribe instance ID; when `instance_id` is a subscribe instance, this field is filtering according to the publish instance ID.",
4646
},
4747
"pub_or_sub_instance_ip": {
4848
Type: schema.TypeString,
4949
Optional: true,
50-
Description: "The intranet IP of the subscribe/publish instance is related to whether the `instance_id` is a publish instance or a subscribe instance. when `instance_id` is a publish instance, this field is filtered according to the intranet IP of the subscribe instance; when `instance_id` is a subscribe instance, this field is based on the publish instance intranet IP filter.",
50+
Description: "The intranet IP of the subscribe/publish instance. It is related to whether the `instance_id` is a publish instance or a subscribe instance. when `instance_id` is a publish instance, this field is filtered according to the intranet IP of the subscribe instance; when `instance_id` is a subscribe instance, this field is based on the publish instance intranet IP filter.",
5151
},
5252
"publish_subscribe_id": {
5353
Type: schema.TypeInt,
5454
Optional: true,
55-
Description: "The id of the Publish and Subscribe in the SQLServer instance.",
55+
Description: "The id of the Publish and Subscribe.",
5656
},
5757
"publish_subscribe_name": {
5858
Type: schema.TypeString,
5959
Optional: true,
60-
Description: "The name of the Publish and Subscribe in the SQLServer instance.",
60+
Description: "The name of the Publish and Subscribe.",
6161
},
6262
"publish_database": {
6363
Type: schema.TypeString,
6464
Optional: true,
65-
Description: "Publish the database.",
65+
Description: "Name of publish database.",
6666
},
6767
"subscribe_database": {
6868
Type: schema.TypeString,
6969
Optional: true,
70-
Description: "Subscribe to the database.",
70+
Description: "Name of subscribe database.",
7171
},
7272
"publish_subscribe_list": {
7373
Type: schema.TypeList,
@@ -78,42 +78,42 @@ func dataSourceTencentSqlserverPublishSubscribes() *schema.Resource {
7878
"publish_subscribe_id": {
7979
Type: schema.TypeInt,
8080
Computed: true,
81-
Description: "The id of the Publish and Subscribe in the SQLServer instance.",
81+
Description: "The id of the Publish and Subscribe.",
8282
},
8383
"publish_subscribe_name": {
8484
Type: schema.TypeString,
8585
Computed: true,
86-
Description: "The name of the Publish and Subscribe in the SQLServer instance.",
86+
Description: "The name of the Publish and Subscribe.",
8787
},
8888
"publish_instance_id": {
8989
Type: schema.TypeString,
9090
Computed: true,
91-
Description: "Publish the instance ID in the SQLServer instance.",
91+
Description: "ID of the SQL Server instance which publish.",
9292
},
9393
"publish_instance_name": {
9494
Type: schema.TypeString,
9595
Computed: true,
96-
Description: "Publish the instance name in the SQLServer instance.",
96+
Description: "Name of the SQL Server instance which publish.",
9797
},
9898
"publish_instance_ip": {
9999
Type: schema.TypeString,
100100
Computed: true,
101-
Description: "Publish the instance IP in the SQLServer instance.",
101+
Description: "IP of the the SQL Server instance which publish.",
102102
},
103103
"subscribe_instance_id": {
104104
Type: schema.TypeString,
105105
Computed: true,
106-
Description: "Subscribe the instance ID in the SQLServer instance.",
106+
Description: "ID of the SQL Server instance which subscribe.",
107107
},
108108
"subscribe_instance_name": {
109109
Type: schema.TypeString,
110110
Computed: true,
111-
Description: "Subscribe the instance name in the SQLServer instance.",
111+
Description: "Name of the SQL Server instance which subscribe.",
112112
},
113113
"subscribe_instance_ip": {
114114
Type: schema.TypeString,
115115
Computed: true,
116-
Description: "Subscribe the instance IP in the SQLServer instance.",
116+
Description: "IP of the SQL Server instance which subscribe.",
117117
},
118118
"database_tuples": {
119119
Type: schema.TypeSet,
@@ -124,12 +124,12 @@ func dataSourceTencentSqlserverPublishSubscribes() *schema.Resource {
124124
"publish_database": {
125125
Type: schema.TypeString,
126126
Computed: true,
127-
Description: "Publish the database.",
127+
Description: "Name of the publish SQL Server instance.",
128128
},
129129
"subscribe_database": {
130130
Type: schema.TypeString,
131131
Computed: true,
132-
Description: "Subscribe to the database.",
132+
Description: "Name of the subscribe SQL Server instance.",
133133
},
134134
"last_sync_time": {
135135
Type: schema.TypeString,
@@ -139,7 +139,7 @@ func dataSourceTencentSqlserverPublishSubscribes() *schema.Resource {
139139
"status": {
140140
Type: schema.TypeString,
141141
Computed: true,
142-
Description: "Publish and subscribe status between databases `running`, `success`, `fail`, `unknow`.",
142+
Description: "Publish and subscribe status between databases, valid values are `running`, `success`, `fail`, `unknow`.",
143143
},
144144
},
145145
},

‎tencentcloud/data_source_tc_sqlserver_readonly_groups.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func dataSourceTencentCloudSqlserverReadonlyGroups() *schema.Resource {
9191
"status": {
9292
Type: schema.TypeInt,
9393
Computed: true,
94-
Description: "Status of the readonly group. 1 for running, 5 for applying.",
94+
Description: "Status of the readonly group. `1` for running, `5` for applying.",
9595
},
9696
},
9797
},

‎tencentcloud/resource_tc_sqlserver_basic_instance.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func resourceTencentCloudSqlserverBasicInstance() *schema.Resource {
108108
ForceNew: true,
109109
Optional: true,
110110
Default: "2008R2",
111-
Description: "Version of the SQL Server basic database engine. Allowed values are `2008R2`(SQL Server 2008 Enerprise), `2012SP3`(SQL Server 2012 Enterprise), `2016SP1` (SQL Server 2016 Enterprise), `201602`(SQL Server 2016 Standard) and `2017`(SQL Server 2017 Enterprise). Default is `2008R2`.",
111+
Description: "Version of the SQL Server basic database engine. Allowed values are `2008R2`(SQL Server 2008 Enterprise), `2012SP3`(SQL Server 2012 Enterprise), `2016SP1` (SQL Server 2016 Enterprise), `201602`(SQL Server 2016 Standard) and `2017`(SQL Server 2017 Enterprise). Default is `2008R2`.",
112112
},
113113
"period": {
114114
Type: schema.TypeInt,

‎tencentcloud/resource_tc_sqlserver_db.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ func resourceTencentCloudSqlserverDB() *schema.Resource {
4545
Type: schema.TypeString,
4646
Required: true,
4747
ForceNew: true,
48-
Description: "SQLServer instance ID which DB belongs to.",
48+
Description: "SQL Server instance ID which DB belongs to.",
4949
},
5050
"name": {
5151
Type: schema.TypeString,
5252
Required: true,
5353
ForceNew: true,
54-
Description: "Name of SQL Server DB. The DataBase name must be unique and must be composed of numbers, letters and underlines, and the first one can not be underline.",
54+
Description: "Name of SQL Server DB. The database name must be unique and must be composed of numbers, letters and underlines, and the first one can not be underline.",
5555
},
5656
"charset": {
5757
Type: schema.TypeString,

‎tencentcloud/resource_tc_sqlserver_instance.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func TencentSqlServerBasicInfo() map[string]*schema.Schema {
9393
"ro_flag": {
9494
Type: schema.TypeString,
9595
Computed: true,
96-
Description: "Readonly flag. `RO` for readonly instance, `MASTER` for master instance, `` for not readonly instance.",
96+
Description: "Readonly flag. `RO` (read-only instance), `MASTER` (primary instance with read-only instances). If it is left empty, it refers to an instance which is not read-only and has no RO group.",
9797
},
9898
"vip": {
9999
Type: schema.TypeString,
@@ -138,14 +138,14 @@ func resourceTencentCloudSqlserverInstance() *schema.Resource {
138138
ForceNew: true,
139139
Optional: true,
140140
Default: "2008R2",
141-
Description: "Version of the SQL Server database engine. Allowed values are `2008R2`(SQL Server 2008 Enerprise), `2012SP3`(SQL Server 2012 Enterprise), `2016SP1` (SQL Server 2016 Enterprise), `201602`(SQL Server 2016 Standard) and `2017`(SQL Server 2017 Enterprise). Default is `2008R2`.",
141+
Description: "Version of the SQL Server database engine. Allowed values are `2008R2`(SQL Server 2008 Enterprise), `2012SP3`(SQL Server 2012 Enterprise), `2016SP1` (SQL Server 2016 Enterprise), `201602`(SQL Server 2016 Standard) and `2017`(SQL Server 2017 Enterprise). Default is `2008R2`.",
142142
},
143143
"ha_type": {
144144
Type: schema.TypeString,
145145
ForceNew: true,
146146
Optional: true,
147147
Default: "DUAL",
148-
Description: "Instance type. Valid value are `DUAL`, `CLUSTER`. Default is `DUAL`.",
148+
Description: "Instance type. `DUAL` (dual-server high availability), `CLUSTER` (cluster). Default is `DUAL`.",
149149
},
150150
"maintenance_week_set": {
151151
Type: schema.TypeSet,

‎tencentcloud/resource_tc_sqlserver_publish_subscribe.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,25 @@ func resourceTencentCloudSqlserverPublishSubscribe() *schema.Resource {
4949
Type: schema.TypeString,
5050
Required: true,
5151
ForceNew: true,
52-
Description: "Publish the instance ID in the SQLServer instance.",
52+
Description: "ID of the SQL Server instance which publish.",
5353
},
5454
"subscribe_instance_id": {
5555
Type: schema.TypeString,
5656
Required: true,
5757
ForceNew: true,
58-
Description: "Subscribe the instance ID in the SQLServer instance.",
58+
Description: "ID of the SQL Server instance which subscribe.",
5959
},
6060
"publish_subscribe_name": {
6161
Type: schema.TypeString,
6262
Optional: true,
6363
Default: "default_name",
64-
Description: "The name of the Publish and Subscribe in the SQLServer instance. default is `default_name`.",
64+
Description: "The name of the Publish and Subscribe. Default is `default_name`.",
6565
},
6666
"delete_subscribe_db": {
6767
Type: schema.TypeBool,
6868
Optional: true,
6969
Default: false,
70-
Description: "Whether to delete the subscriber database when deleting the Publish and Subscribe in the SQLServer instance. `true` for deletes the subscribe database, `false` for does not delete the subscribe database. default is `false`.",
70+
Description: "Whether to delete the subscriber database when deleting the Publish and Subscribe. `true` for deletes the subscribe database, `false` for does not delete the subscribe database. default is `false`.",
7171
},
7272
"database_tuples": {
7373
Type: schema.TypeSet,

‎tencentcloud/resource_tc_sqlserver_readonly_instance.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func resourceTencentCloudSqlserverReadonlyInstance() *schema.Resource {
5050
ForceNew: true,
5151
Required: true,
5252
ValidateFunc: validateAllowedIntValue([]int{1, 3}),
53-
Description: "Type of readonly group. Valid values: 1, 3. 1 for one auto-assigned readonly instance per one readonly group, 2 for creating new readonly group, 3 for all exist readonly instances stay in the exist readonly group. For now, only 1 and 3 are supported.",
53+
Description: "Type of readonly group. Valid values: `1`, `3`. `1` for one auto-assigned readonly instance per one readonly group, `2` for creating new readonly group, `3` for all exist readonly instances stay in the exist readonly group. For now, only `1` and `3` are supported.",
5454
},
5555
"force_upgrade": {
5656
Type: schema.TypeBool,

‎website/docs/d/sqlserver_basic_instances.html.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ In addition to all arguments above, the following attributes are exported:
5252
* `charge_type` - Pay type of the SQL Server basic instance. For now, only `POSTPAID_BY_HOUR` is valid.
5353
* `cpu` - The CPU number of the SQL Server basic instance.
5454
* `create_time` - Create time of the SQL Server basic instance.
55-
* `engine_version` - Version of the SQL Server basic database engine. Allowed values are `2008R2`(SQL Server 2008 Enerprise), `2012SP3`(SQL Server 2012 Enterprise), `2016SP1` (SQL Server 2016 Enterprise), `201602`(SQL Server 2016 Standard) and `2017`(SQL Server 2017 Enterprise). Default is `2008R2`.
55+
* `engine_version` - Version of the SQL Server basic database engine. Allowed values are `2008R2`(SQL Server 2008 Enterprise), `2012SP3`(SQL Server 2012 Enterprise), `2016SP1` (SQL Server 2016 Enterprise), `201602`(SQL Server 2016 Standard) and `2017`(SQL Server 2017 Enterprise). Default is `2008R2`.
5656
* `id` - ID of the SQL Server basic instance.
5757
* `memory` - Memory size (in GB). Allowed value must be larger than `memory` that data source `tencentcloud_sqlserver_specinfos` provides.
5858
* `name` - Name of the SQL Server basic instance.

0 commit comments

Comments
 (0)