Skip to content

Commit 4995a8c

Browse files
authored
fix(cvm): [120747889] change reset to reinstall (#3285)
* change reset to install * change reset to install
1 parent 4d892ca commit 4995a8c

File tree

5 files changed

+33
-30
lines changed

5 files changed

+33
-30
lines changed

Diff for: .changelog/3285.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_instance: change `reset` to `reinstall`
3+
```

Diff for: tencentcloud/services/cvm/resource_tc_instance.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func ResourceTencentCloudInstance() *schema.Resource {
4343
"image_id": {
4444
Type: schema.TypeString,
4545
Required: true,
46-
Description: "The image to use for the instance. Changing `image_id` will cause the instance reset.",
46+
Description: "The image to use for the instance. Modifications may lead to the reinstallation of the instance's operating system..",
4747
},
4848
"availability_zone": {
4949
Type: schema.TypeString,
@@ -81,7 +81,7 @@ func ResourceTencentCloudInstance() *schema.Resource {
8181
"hostname": {
8282
Type: schema.TypeString,
8383
Optional: true,
84-
Description: "The hostname of the instance. Windows instance: The name should be a combination of 2 to 15 characters comprised of letters (case insensitive), numbers, and hyphens (-). Period (.) is not supported, and the name cannot be a string of pure numbers. Other types (such as Linux) of instances: The name should be a combination of 2 to 60 characters, supporting multiple periods (.). The piece between two periods is composed of letters (case insensitive), numbers, and hyphens (-). Modifying will cause the instance reset.",
84+
Description: "The hostname of the instance. Windows instance: The name should be a combination of 2 to 15 characters comprised of letters (case insensitive), numbers, and hyphens (-). Period (.) is not supported, and the name cannot be a string of pure numbers. Other types (such as Linux) of instances: The name should be a combination of 2 to 60 characters, supporting multiple periods (.). The piece between two periods is composed of letters (case insensitive), numbers, and hyphens (-). Modifications may lead to the reinstallation of the instance's operating system.",
8585
},
8686
"project_id": {
8787
Type: schema.TypeInt,
@@ -331,19 +331,19 @@ func ResourceTencentCloudInstance() *schema.Resource {
331331
Type: schema.TypeBool,
332332
Optional: true,
333333
Default: false,
334-
Description: "Disable enhance service for security, it is enabled by default. When this options is set, security agent won't be installed. Modifying will cause the instance reset.",
334+
Description: "Disable enhance service for security, it is enabled by default. When this options is set, security agent won't be installed. Modifications may lead to the reinstallation of the instance's operating system.",
335335
},
336336
"disable_monitor_service": {
337337
Type: schema.TypeBool,
338338
Optional: true,
339339
Default: false,
340-
Description: "Disable enhance service for monitor, it is enabled by default. When this options is set, monitor agent won't be installed. Modifying will cause the instance reset.",
340+
Description: "Disable enhance service for monitor, it is enabled by default. When this options is set, monitor agent won't be installed. Modifications may lead to the reinstallation of the instance's operating system.",
341341
},
342342
"disable_automation_service": {
343343
Type: schema.TypeBool,
344344
Optional: true,
345345
Default: false,
346-
Description: "Disable enhance service for automation, it is enabled by default. When this options is set, monitor agent won't be installed. Modifying will cause the instance reset.",
346+
Description: "Disable enhance service for automation, it is enabled by default. When this options is set, monitor agent won't be installed. Modifications may lead to the reinstallation of the instance's operating system.",
347347
},
348348
// login
349349
"key_name": {
@@ -352,22 +352,22 @@ func ResourceTencentCloudInstance() *schema.Resource {
352352
Computed: true,
353353
Deprecated: "Please use `key_ids` instead.",
354354
ConflictsWith: []string{"key_ids"},
355-
Description: "The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifying will cause the instance reset.",
355+
Description: "The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifications may lead to the reinstallation of the instance's operating system.",
356356
},
357357
"key_ids": {
358358
Type: schema.TypeSet,
359359
Optional: true,
360360
Computed: true,
361361
ConflictsWith: []string{"key_name", "password"},
362-
Description: "The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifying will cause the instance reset.",
362+
Description: "The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifications may lead to the reinstallation of the instance's operating system.",
363363
Set: schema.HashString,
364364
Elem: &schema.Schema{Type: schema.TypeString},
365365
},
366366
"password": {
367367
Type: schema.TypeString,
368368
Optional: true,
369369
Sensitive: true,
370-
Description: "Password for the instance. In order for the new password to take effect, the instance will be restarted after the password change. Modifying will cause the instance reset.",
370+
Description: "Password for the instance. In order for the new password to take effect, the instance will be restarted after the password change. Modifications may lead to the reinstallation of the instance's operating system.",
371371
},
372372
"keep_image_login": {
373373
Type: schema.TypeBool,
@@ -381,7 +381,7 @@ func ResourceTencentCloudInstance() *schema.Resource {
381381
}
382382
},
383383
ConflictsWith: []string{"key_name", "key_ids", "password"},
384-
Description: "Whether to keep image login or not, default is `false`. When the image type is private or shared or imported, this parameter can be set `true`. Modifying will cause the instance reset.",
384+
Description: "Whether to keep image login or not, default is `false`. When the image type is private or shared or imported, this parameter can be set `true`. Modifications may lead to the reinstallation of the instance's operating system..",
385385
},
386386
"user_data": {
387387
Type: schema.TypeString,

Diff for: tencentcloud/services/cvm/resource_tc_instance_set.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func ResourceTencentCloudInstanceSet() *schema.Resource {
7575
"hostname": {
7676
Type: schema.TypeString,
7777
Optional: true,
78-
Description: "The hostname of the instance. Windows instance: The name should be a combination of 2 to 15 characters comprised of letters (case insensitive), numbers, and hyphens (-). Period (.) is not supported, and the name cannot be a string of pure numbers. Other types (such as Linux) of instances: The name should be a combination of 2 to 60 characters, supporting multiple periods (.). The piece between two periods is composed of letters (case insensitive), numbers, and hyphens (-). Modifying will cause the instance reset.",
78+
Description: "The hostname of the instance. Windows instance: The name should be a combination of 2 to 15 characters comprised of letters (case insensitive), numbers, and hyphens (-). Period (.) is not supported, and the name cannot be a string of pure numbers. Other types (such as Linux) of instances: The name should be a combination of 2 to 60 characters, supporting multiple periods (.). The piece between two periods is composed of letters (case insensitive), numbers, and hyphens (-). Modifications may lead to the reinstallation of the instance's operating system..",
7979
},
8080
"project_id": {
8181
Type: schema.TypeInt,
@@ -177,26 +177,26 @@ func ResourceTencentCloudInstanceSet() *schema.Resource {
177177
Type: schema.TypeBool,
178178
Optional: true,
179179
Default: false,
180-
Description: "Disable enhance service for security, it is enabled by default. When this options is set, security agent won't be installed. Modifying will cause the instance reset.",
180+
Description: "Disable enhance service for security, it is enabled by default. When this options is set, security agent won't be installed. Modifications may lead to the reinstallation of the instance's operating system.",
181181
},
182182
"disable_monitor_service": {
183183
Type: schema.TypeBool,
184184
Optional: true,
185185
Default: false,
186-
Description: "Disable enhance service for monitor, it is enabled by default. When this options is set, monitor agent won't be installed. Modifying will cause the instance reset.",
186+
Description: "Disable enhance service for monitor, it is enabled by default. When this options is set, monitor agent won't be installed. Modifications may lead to the reinstallation of the instance's operating system.",
187187
},
188188
// login
189189
"key_name": {
190190
Type: schema.TypeString,
191191
Optional: true,
192192
Computed: true,
193-
Description: "The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifying will cause the instance reset.",
193+
Description: "The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifications may lead to the reinstallation of the instance's operating system.",
194194
},
195195
"password": {
196196
Type: schema.TypeString,
197197
Optional: true,
198198
Sensitive: true,
199-
Description: "Password for the instance. In order for the new password to take effect, the instance will be restarted after the password change. Modifying will cause the instance reset.",
199+
Description: "Password for the instance. In order for the new password to take effect, the instance will be restarted after the password change. Modifications may lead to the reinstallation of the instance's operating system.",
200200
},
201201
"keep_image_login": {
202202
Type: schema.TypeBool,
@@ -210,7 +210,7 @@ func ResourceTencentCloudInstanceSet() *schema.Resource {
210210
}
211211
},
212212
ConflictsWith: []string{"key_name", "password"},
213-
Description: "Whether to keep image login or not, default is `false`. When the image type is private or shared or imported, this parameter can be set `true`. Modifying will cause the instance reset.",
213+
Description: "Whether to keep image login or not, default is `false`. When the image type is private or shared or imported, this parameter can be set `true`. Modifications may lead to the reinstallation of the instance's operating system.",
214214
},
215215
"user_data": {
216216
Type: schema.TypeString,

Diff for: website/docs/r/instance.html.markdown

+9-9
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ resource "tencentcloud_instance" "example" {
216216
The following arguments are supported:
217217

218218
* `availability_zone` - (Required, String, ForceNew) The available zone for the CVM instance.
219-
* `image_id` - (Required, String) The image to use for the instance. Changing `image_id` will cause the instance reset.
219+
* `image_id` - (Required, String) The image to use for the instance. Modifications may lead to the reinstallation of the instance's operating system..
220220
* `allocate_public_ip` - (Optional, Bool, ForceNew) Associate a public IP address with an instance in a VPC or Classic. Boolean value, Default is false.
221221
* `bandwidth_package_id` - (Optional, String) bandwidth package id. if user is standard user, then the bandwidth_package_id is needed, or default has bandwidth_package_id.
222222
* `cam_role_name` - (Optional, String) CAM role name authorized to access.
@@ -225,11 +225,11 @@ The following arguments are supported:
225225
* `data_disks` - (Optional, List, ForceNew) Settings for data disks.
226226
* `dedicated_cluster_id` - (Optional, String, ForceNew) Exclusive cluster id.
227227
* `disable_api_termination` - (Optional, Bool) Whether the termination protection is enabled. Default is `false`. If set true, which means that this instance can not be deleted by an API action.
228-
* `disable_automation_service` - (Optional, Bool) Disable enhance service for automation, it is enabled by default. When this options is set, monitor agent won't be installed. Modifying will cause the instance reset.
229-
* `disable_monitor_service` - (Optional, Bool) Disable enhance service for monitor, it is enabled by default. When this options is set, monitor agent won't be installed. Modifying will cause the instance reset.
230-
* `disable_security_service` - (Optional, Bool) Disable enhance service for security, it is enabled by default. When this options is set, security agent won't be installed. Modifying will cause the instance reset.
228+
* `disable_automation_service` - (Optional, Bool) Disable enhance service for automation, it is enabled by default. When this options is set, monitor agent won't be installed. Modifications may lead to the reinstallation of the instance's operating system.
229+
* `disable_monitor_service` - (Optional, Bool) Disable enhance service for monitor, it is enabled by default. When this options is set, monitor agent won't be installed. Modifications may lead to the reinstallation of the instance's operating system.
230+
* `disable_security_service` - (Optional, Bool) Disable enhance service for security, it is enabled by default. When this options is set, security agent won't be installed. Modifications may lead to the reinstallation of the instance's operating system.
231231
* `force_delete` - (Optional, Bool) Indicate whether to force delete the instance. Default is `false`. If set true, the instance will be permanently deleted instead of being moved into the recycle bin. Note: only works for `PREPAID` instance.
232-
* `hostname` - (Optional, String) The hostname of the instance. Windows instance: The name should be a combination of 2 to 15 characters comprised of letters (case insensitive), numbers, and hyphens (-). Period (.) is not supported, and the name cannot be a string of pure numbers. Other types (such as Linux) of instances: The name should be a combination of 2 to 60 characters, supporting multiple periods (.). The piece between two periods is composed of letters (case insensitive), numbers, and hyphens (-). Modifying will cause the instance reset.
232+
* `hostname` - (Optional, String) The hostname of the instance. Windows instance: The name should be a combination of 2 to 15 characters comprised of letters (case insensitive), numbers, and hyphens (-). Period (.) is not supported, and the name cannot be a string of pure numbers. Other types (such as Linux) of instances: The name should be a combination of 2 to 60 characters, supporting multiple periods (.). The piece between two periods is composed of letters (case insensitive), numbers, and hyphens (-). Modifications may lead to the reinstallation of the instance's operating system.
233233
* `instance_charge_type_prepaid_period` - (Optional, Int) The tenancy (time unit is month) of the prepaid instance, NOTE: it only works when instance_charge_type is set to `PREPAID`. Valid values are `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9`, `10`, `11`, `12`, `24`, `36`, `48`, `60`.
234234
* `instance_charge_type_prepaid_renew_flag` - (Optional, String) Auto renewal flag. Valid values: `NOTIFY_AND_AUTO_RENEW`: notify upon expiration and renew automatically, `NOTIFY_AND_MANUAL_RENEW`: notify upon expiration but do not renew automatically, `DISABLE_NOTIFY_AND_MANUAL_RENEW`: neither notify upon expiration nor renew automatically. Default value: `NOTIFY_AND_MANUAL_RENEW`. If this parameter is specified as `NOTIFY_AND_AUTO_RENEW`, the instance will be automatically renewed on a monthly basis if the account balance is sufficient. NOTE: it only works when instance_charge_type is set to `PREPAID`.
235235
* `instance_charge_type` - (Optional, String) The charge type of instance. Valid values are `PREPAID`, `POSTPAID_BY_HOUR`, `SPOTPAID`, `CDHPAID` and `CDCPAID`. The default is `POSTPAID_BY_HOUR`. Note: TencentCloud International only supports `POSTPAID_BY_HOUR` and `CDHPAID`. `PREPAID` instance may not allow to delete before expired. `SPOTPAID` instance must set `spot_instance_type` and `spot_max_price` at the same time. `CDHPAID` instance must set `cdh_instance_type` and `cdh_host_id`.
@@ -238,11 +238,11 @@ The following arguments are supported:
238238
* `instance_type` - (Optional, String) The type of the instance.
239239
* `internet_charge_type` - (Optional, String) Internet charge type of the instance, Valid values are `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `BANDWIDTH_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`. If not set, internet charge type are consistent with the cvm charge type by default. This value takes NO Effect when changing and does not need to be set when `allocate_public_ip` is false.
240240
* `internet_max_bandwidth_out` - (Optional, Int) Maximum outgoing bandwidth to the public network, measured in Mbps (Mega bits per second). This value does not need to be set when `allocate_public_ip` is false.
241-
* `keep_image_login` - (Optional, Bool) Whether to keep image login or not, default is `false`. When the image type is private or shared or imported, this parameter can be set `true`. Modifying will cause the instance reset.
242-
* `key_ids` - (Optional, Set: [`String`]) The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifying will cause the instance reset.
243-
* `key_name` - (Optional, String, **Deprecated**) Please use `key_ids` instead. The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifying will cause the instance reset.
241+
* `keep_image_login` - (Optional, Bool) Whether to keep image login or not, default is `false`. When the image type is private or shared or imported, this parameter can be set `true`. Modifications may lead to the reinstallation of the instance's operating system..
242+
* `key_ids` - (Optional, Set: [`String`]) The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifications may lead to the reinstallation of the instance's operating system.
243+
* `key_name` - (Optional, String, **Deprecated**) Please use `key_ids` instead. The key pair to use for the instance, it looks like `skey-16jig7tx`. Modifications may lead to the reinstallation of the instance's operating system.
244244
* `orderly_security_groups` - (Optional, List: [`String`]) A list of orderly security group IDs to associate with.
245-
* `password` - (Optional, String) Password for the instance. In order for the new password to take effect, the instance will be restarted after the password change. Modifying will cause the instance reset.
245+
* `password` - (Optional, String) Password for the instance. In order for the new password to take effect, the instance will be restarted after the password change. Modifications may lead to the reinstallation of the instance's operating system.
246246
* `placement_group_id` - (Optional, String, ForceNew) The ID of a placement group.
247247
* `private_ip` - (Optional, String) The private IP to be assigned to this instance, must be in the provided subnet and available.
248248
* `project_id` - (Optional, Int) The project the instance belongs to, default to 0.

0 commit comments

Comments
 (0)