Skip to content

Commit 4693e92

Browse files
SevenEarthSevenEarth
committed
add
1 parent d044247 commit 4693e92

9 files changed

+24
-20
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ require (
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.962
4949
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.967
50-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.959
50+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
5353
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335

‎go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -956,12 +956,16 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.967 h1:ui73
956956
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.967/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
957957
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.959 h1:GZUqSDQkttkhH2hxWNj5apDo1/YhQwML0Q68wW60LSA=
958958
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.959/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
959+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.960 h1:hde8uWA3624nGUvC8QPf9njcyBZ7A9weqscRrqyM1Rk=
960+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.960/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
959961
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
960962
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
961963
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
962964
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624/go.mod h1:+TXSVyeKwt1IhZRqKPbTREteBcP+K07Q846/ilNzLWA=
963965
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.959 h1:emP+GzlX//OAxHNobuy6IXtARWDzBwhRyZ8DcVTd3V8=
964966
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.959/go.mod h1:ebfFKD4tyPNUpSkJXCawYy4XQbeILQ6WXHuCCaD4Hgs=
967+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960 h1:Tpz3KVUfaJ7b98wQDYZSbmoKIn0hlH0oHPOzWMzE5Q8=
968+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960/go.mod h1:BuUugHS9C2Nz9JrAPwrxLQjFhUc7xCy+UE4TbBM0OLo=
965969
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762 h1:2egy69SP/wPsmnfozcQVZ6tUY6F6N/TpEe/7xtXrc/8=
966970
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762/go.mod h1:1XylIfNUbAzmNqi4XMhwcM3VhmUHdu1OYybOeaJ4sOw=
967971
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692 h1:lD44AqXCzkraZiCeMjL7dZmvuyurpyQRKwPHA6Ux5To=

‎tencentcloud/services/cvm/data_source_tc_cvm_chc_hosts.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,10 @@ func DataSourceTencentCloudCvmChcHosts() *schema.Resource {
109109
Description: "ID list of CDHs from which the instance can be created. If you have purchased CDHs and specify this parameter, the instances you purchase will be randomly deployed on the CDHs.",
110110
},
111111
"host_ips": {
112-
Type: schema.TypeSet,
113-
Elem: &schema.Schema{
114-
Type: schema.TypeString,
115-
},
112+
Type: schema.TypeSet,
113+
Elem: &schema.Schema{Type: schema.TypeString},
116114
Computed: true,
115+
Deprecated: "It has been deprecated from version 1.81.108.",
117116
Description: "IPs of the hosts to create CVMs.",
118117
},
119118
"host_id": {
@@ -374,6 +373,7 @@ func dataSourceTencentCloudCvmChcHostsRead(d *schema.ResourceData, meta interfac
374373
placementMap["host_ids"] = chcHost.Placement.HostIds
375374
}
376375

376+
// It has been deprecated from version 1.81.108
377377
//if chcHost.Placement.HostIps != nil {
378378
// placementMap["host_ips"] = chcHost.Placement.HostIps
379379
//}

‎tencentcloud/services/cvm/resource_tc_cvm_launch_template.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,16 @@ func ResourceTencentCloudCvmLaunchTemplate() *schema.Resource {
4545
Description: "The project ID of the instance.",
4646
},
4747
"host_ids": {
48-
Type: schema.TypeSet,
49-
Elem: &schema.Schema{
50-
Type: schema.TypeString,
51-
},
48+
Type: schema.TypeSet,
49+
Elem: &schema.Schema{Type: schema.TypeString},
5250
Optional: true,
5351
Description: "The CDH ID list of the instance(input).",
5452
},
5553
"host_ips": {
56-
Type: schema.TypeSet,
57-
Elem: &schema.Schema{
58-
Type: schema.TypeString,
59-
},
54+
Type: schema.TypeSet,
55+
Elem: &schema.Schema{Type: schema.TypeString},
6056
Optional: true,
57+
Deprecated: "It has been deprecated from version 1.81.108.",
6158
Description: "Specify the host machine ip.",
6259
},
6360
},
@@ -637,16 +634,17 @@ func resourceTencentCloudCvmLaunchTemplateCreate(d *schema.ResourceData, meta in
637634
placement.HostIds = append(placement.HostIds, &hostIds)
638635
}
639636
}
637+
// It has been deprecated from version 1.81.108
640638
//if v, ok := dMap["host_ips"]; ok {
641639
// hostIpsSet := v.(*schema.Set).List()
642640
// for i := range hostIpsSet {
643641
// hostIps := hostIpsSet[i].(string)
644642
// placement.HostIps = append(placement.HostIps, &hostIps)
645643
// }
646644
//}
647-
// if v, ok := dMap["host_id"]; ok {
648-
// placement.HostId = helper.String(v.(string))
649-
// }
645+
if v, ok := dMap["host_id"]; ok {
646+
placement.HostId = helper.String(v.(string))
647+
}
650648
request.Placement = &placement
651649
}
652650

@@ -1020,6 +1018,7 @@ func resourceTencentCloudCvmLaunchTemplateRead(d *schema.ResourceData, meta inte
10201018
placementMap["host_ids"] = launchTemplateVersion.LaunchTemplateVersionData.Placement.HostIds
10211019
}
10221020

1021+
// It has been deprecated from version 1.81.108
10231022
//if launchTemplateVersion.LaunchTemplateVersionData.Placement.HostIps != nil {
10241023
// placementMap["host_ips"] = launchTemplateVersion.LaunchTemplateVersionData.Placement.HostIps
10251024
//}

‎tencentcloud/services/cvm/resource_tc_instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
889889
}
890890

891891
_ = d.Set("availability_zone", instance.Placement.Zone)
892-
_ = d.Set("dedicated_cluster_id", instance.DedicatedClusterId)
892+
//_ = d.Set("dedicated_cluster_id", instance.DedicatedClusterId)
893893
_ = d.Set("instance_name", instance.InstanceName)
894894
_ = d.Set("instance_type", instance.InstanceType)
895895
_ = d.Set("project_id", instance.Placement.ProjectId)

‎vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/regions
11681168
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860
11691169
## explicit; go 1.14
11701170
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip/v20221121
1171-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.959
1171+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960
11721172
## explicit; go 1.14
11731173
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312
11741174
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ In addition to all arguments above, the following attributes are exported:
7777
* `placement` - Availability zone.
7878
* `host_id` - The ID of the CDH to which the instance belongs, only used as an output parameter.
7979
* `host_ids` - ID list of CDHs from which the instance can be created. If you have purchased CDHs and specify this parameter, the instances you purchase will be randomly deployed on the CDHs.
80-
* `host_ips` - IPs of the hosts to create CVMs.
80+
* `host_ips` - (**Deprecated**) It has been deprecated from version 1.81.108. IPs of the hosts to create CVMs.
8181
* `project_id` - ID of the project to which the instance belongs. This parameter can be obtained from the projectId returned by DescribeProject. If this is left empty, the default project is used.
8282
* `zone` - ID of the availability zone where the instance resides. You can call the [DescribeZones](https://www.tencentcloud.com/document/product/213/35071) API and obtain the ID in the returned Zone field.
8383
* `serial_number` - Server serial number.

‎website/docs/r/cvm_launch_template.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ The `placement` object supports the following:
127127

128128
* `zone` - (Required, String) The available zone ID of the instance.
129129
* `host_ids` - (Optional, Set) The CDH ID list of the instance(input).
130-
* `host_ips` - (Optional, Set) Specify the host machine ip.
130+
* `host_ips` - (Optional, Set, **Deprecated**) It has been deprecated from version 1.81.108. Specify the host machine ip.
131131
* `project_id` - (Optional, Int) The project ID of the instance.
132132

133133
The `security_service` object of `enhanced_service` supports the following:

‎website/docs/r/instance.html.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ The following arguments are supported:
115115
* `cdh_host_id` - (Optional, String, ForceNew) Id of cdh instance. Note: it only works when instance_charge_type is set to `CDHPAID`.
116116
* `cdh_instance_type` - (Optional, String) Type of instance created on cdh, the value of this parameter is in the format of CDH_XCXG based on the number of CPU cores and memory capacity. Note: it only works when instance_charge_type is set to `CDHPAID`.
117117
* `data_disks` - (Optional, List, ForceNew) Settings for data disks.
118+
* `dedicated_cluster_id` - (Optional, String, ForceNew) Exclusive cluster id.
118119
* `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.
119120
* `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.
120121
* `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.

0 commit comments

Comments
 (0)