Skip to content

Commit 8e18d7e

Browse files
committed
fix: modify doc
1 parent 561e262 commit 8e18d7e

File tree

6 files changed

+28
-5
lines changed

6 files changed

+28
-5
lines changed

.changelog/3157.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ resource/tencentcloud_instance: update doc
1212

1313
```release-note:enhancement
1414
resource/tencentcloud_instance_set: Added a new field `private_ip_addresses` to support specifying multiple IPs to create instances
15+
```
16+
17+
```release-note:enhancement
18+
data-source/tencentcloud_eips: Abandon `public_ip` and add `address_ip`
1519
```

tencentcloud/services/cfs/resource_tc_cfs_user_quota.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Provides a resource to create a cfs user_quota
22

3+
~> **NOTE:** Only some Turbo instances can be used. If you need to call it, please submit a ticket to contact us.
4+
35
Example Usage
46

57
```hcl

tencentcloud/services/cvm/data_source_tc_eips.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ func DataSourceTencentCloudEips() *schema.Resource {
3434
Type: schema.TypeString,
3535
Optional: true,
3636
Description: "The elastic ip address.",
37+
Deprecated: "Use 'address_ip' instead.",
38+
},
39+
"address_ip": {
40+
Type: schema.TypeString,
41+
Optional: true,
42+
Description: "The elastic ip address.",
3743
},
3844
"tags": {
3945
Type: schema.TypeMap,
@@ -77,6 +83,11 @@ func DataSourceTencentCloudEips() *schema.Resource {
7783
Computed: true,
7884
Description: "The elastic ip address.",
7985
},
86+
"address_ip": {
87+
Type: schema.TypeString,
88+
Computed: true,
89+
Description: "The elastic ip address.",
90+
},
8091
"instance_id": {
8192
Type: schema.TypeString,
8293
Computed: true,
@@ -124,6 +135,9 @@ func dataSourceTencentCloudEipsRead(d *schema.ResourceData, meta interface{}) er
124135
if v, ok := d.GetOk("public_ip"); ok {
125136
filter["public-ip"] = []string{v.(string)}
126137
}
138+
if v, ok := d.GetOk("address_ip"); ok {
139+
filter["address-ip"] = []string{v.(string)}
140+
}
127141

128142
tags := helper.GetTags(d, "tags")
129143

@@ -163,6 +177,7 @@ EIP_LOOP:
163177
"eip_type": eip.AddressType,
164178
"status": eip.AddressStatus,
165179
"public_ip": eip.AddressIp,
180+
"address_ip": eip.AddressIp,
166181
"instance_id": eip.InstanceId,
167182
"eni_id": eip.NetworkInterfaceId,
168183
"create_time": eip.CreatedTime,

tencentcloud/services/cvm/resource_tc_instance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func ResourceTencentCloudInstance() *schema.Resource {
245245
Type: schema.TypeString,
246246
Optional: true,
247247
Computed: true,
248-
Description: "System disk snapshot ID used to initialize the system disk. When system disk type is `LOCAL_BASIC` and `LOCAL_SSD`, disk id is not supported.",
248+
Description: "System disk snapshot ID used to initialize the system disk. When system disk type is `LOCAL_BASIC` and `LOCAL_SSD`, disk id is not supported. Input not supported.",
249249
},
250250
"system_disk_name": {
251251
Type: schema.TypeString,
@@ -293,7 +293,7 @@ func ResourceTencentCloudInstance() *schema.Resource {
293293
Type: schema.TypeString,
294294
Optional: true,
295295
Computed: true,
296-
Description: "Data disk ID used to initialize the data disk. When data disk type is `LOCAL_BASIC` and `LOCAL_SSD`, disk id is not supported.",
296+
Description: "Data disk ID used to initialize the data disk. When data disk type is `LOCAL_BASIC` and `LOCAL_SSD`, disk id is not supported. Input not supported.",
297297
},
298298
"delete_with_instance": {
299299
Type: schema.TypeBool,

website/docs/d/eips.html.markdown

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ data "tencentcloud_eips" "example" {
5757

5858
The following arguments are supported:
5959

60+
* `address_ip` - (Optional, String) The elastic ip address.
6061
* `eip_id` - (Optional, String) ID of the EIP to be queried.
6162
* `eip_name` - (Optional, String) Name of the EIP to be queried.
62-
* `public_ip` - (Optional, String) The elastic ip address.
63+
* `public_ip` - (Optional, String, **Deprecated**) Use 'address_ip' instead. The elastic ip address.
6364
* `result_output_file` - (Optional, String) Used to save results.
6465
* `tags` - (Optional, Map) The tags of EIP.
6566

@@ -68,6 +69,7 @@ The following arguments are supported:
6869
In addition to all arguments above, the following attributes are exported:
6970

7071
* `eip_list` - An information list of EIP. Each element contains the following attributes:
72+
* `address_ip` - The elastic ip address.
7173
* `create_time` - Creation time of the EIP.
7274
* `eip_id` - ID of the EIP.
7375
* `eip_name` - Name of the EIP.

website/docs/r/instance.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ The following arguments are supported:
252252
* `spot_max_price` - (Optional, String, ForceNew) Max price of a spot instance, is the format of decimal string, for example "0.50". Note: it only works when instance_charge_type is set to `SPOTPAID`.
253253
* `stopped_mode` - (Optional, String) Billing method of a pay-as-you-go instance after shutdown. Available values: `KEEP_CHARGING`,`STOP_CHARGING`. Default `KEEP_CHARGING`.Need to be used with the running_flag field set to `false`.
254254
* `subnet_id` - (Optional, String) The ID of a VPC subnet. If you want to create instances in a VPC network, this parameter must be set.
255-
* `system_disk_id` - (Optional, String) System disk snapshot ID used to initialize the system disk. When system disk type is `LOCAL_BASIC` and `LOCAL_SSD`, disk id is not supported.
255+
* `system_disk_id` - (Optional, String) System disk snapshot ID used to initialize the system disk. When system disk type is `LOCAL_BASIC` and `LOCAL_SSD`, disk id is not supported. Input not supported.
256256
* `system_disk_name` - (Optional, String) Name of the system disk.
257257
* `system_disk_resize_online` - (Optional, Bool) Resize online.
258258
* `system_disk_size` - (Optional, Int) Size of the system disk. unit is GB, Default is 50GB. If modified, the instance may force stop.
@@ -266,7 +266,7 @@ The `data_disks` object supports the following:
266266

267267
* `data_disk_size` - (Required, Int) Size of the data disk, and unit is GB.
268268
* `data_disk_type` - (Required, String, ForceNew) Data disk type. For more information about limits on different data disk types, see [Storage Overview](https://intl.cloud.tencent.com/document/product/213/4952). Valid values: LOCAL_BASIC: local disk, LOCAL_SSD: local SSD disk, LOCAL_NVME: local NVME disk, specified in the InstanceType, LOCAL_PRO: local HDD disk, specified in the InstanceType, CLOUD_BASIC: HDD cloud disk, CLOUD_PREMIUM: Premium Cloud Storage, CLOUD_SSD: SSD, CLOUD_HSSD: Enhanced SSD, CLOUD_TSSD: Tremendous SSD, CLOUD_BSSD: Balanced SSD.
269-
* `data_disk_id` - (Optional, String) Data disk ID used to initialize the data disk. When data disk type is `LOCAL_BASIC` and `LOCAL_SSD`, disk id is not supported.
269+
* `data_disk_id` - (Optional, String) Data disk ID used to initialize the data disk. When data disk type is `LOCAL_BASIC` and `LOCAL_SSD`, disk id is not supported. Input not supported.
270270
* `data_disk_name` - (Optional, String) Name of data disk.
271271
* `data_disk_snapshot_id` - (Optional, String, ForceNew) Snapshot ID of the data disk. The selected data disk snapshot size must be smaller than the data disk size.
272272
* `delete_with_instance_prepaid` - (Optional, Bool, ForceNew) Decides whether the disk is deleted with instance(only applied to `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM` disk with `PREPAID` instance), default is false.

0 commit comments

Comments
 (0)