From b40f8f338f78d97ad179103f9eeb9890b2894d82 Mon Sep 17 00:00:00 2001 From: oliverpei Date: Wed, 9 Dec 2020 11:02:30 +0800 Subject: [PATCH] optimize document --- CHANGELOG.md | 5 +++ tencentcloud/data_source_tc_cbs_storages.go | 4 +- tencentcloud/resource_tc_cbs_storage.go | 2 +- tencentcloud/resource_tc_cdn_domain.go | 10 ++--- tencentcloud/resource_tc_cos_bucket.go | 4 +- tencentcloud/resource_tc_instance.go | 6 +-- website/docs/d/cbs_storages.html.markdown | 4 +- .../d/service_template_groups.html.markdown | 39 ---------------- .../docs/d/service_templates.html.markdown | 39 ---------------- website/docs/r/cbs_storage.html.markdown | 2 +- website/docs/r/cdn_domain.html.markdown | 10 ++--- website/docs/r/cos_bucket.html.markdown | 4 +- website/docs/r/instance.html.markdown | 6 +-- website/docs/r/service_template.html.markdown | 45 ------------------- .../r/service_template_group.html.markdown | 45 ------------------- 15 files changed, 31 insertions(+), 194 deletions(-) delete mode 100644 website/docs/d/service_template_groups.html.markdown delete mode 100644 website/docs/d/service_templates.html.markdown delete mode 100644 website/docs/r/service_template.html.markdown delete mode 100644 website/docs/r/service_template_group.html.markdown diff --git a/CHANGELOG.md b/CHANGELOG.md index c10e81f320..010fcc44e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## 1.50.1 (Unreleased) + +ENHANCEMENTS: + +* Doc: optimize document. + ## 1.50.0 (December 08, 2020) FEATURES: diff --git a/tencentcloud/data_source_tc_cbs_storages.go b/tencentcloud/data_source_tc_cbs_storages.go index 017b6a2c2e..7a2e848080 100644 --- a/tencentcloud/data_source_tc_cbs_storages.go +++ b/tencentcloud/data_source_tc_cbs_storages.go @@ -51,12 +51,12 @@ func dataSourceTencentCloudCbsStorages() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateFunc: validateAllowedStringValue(CBS_STORAGE_TYPE), - Description: "Types of storage medium, and available values include CLOUD_BASIC, CLOUD_PREMIUM and CLOUD_SSD.", + Description: "Filter by cloud disk media type (`CLOUD_BASIC`: HDD cloud disk | `CLOUD_PREMIUM`: Premium Cloud Storage | `CLOUD_SSD`: SSD cloud disk).", }, "storage_usage": { Type: schema.TypeString, Optional: true, - Description: "Types of CBS, and available values include SYSTEM_DISK and DATA_DISK.", + Description: "Filter by cloud disk type (`SYSTEM_DISK`: system disk | `DATA_DISK`: data disk).", }, "result_output_file": { Type: schema.TypeString, diff --git a/tencentcloud/resource_tc_cbs_storage.go b/tencentcloud/resource_tc_cbs_storage.go index 1c0a4f6a4a..2901ee0de3 100644 --- a/tencentcloud/resource_tc_cbs_storage.go +++ b/tencentcloud/resource_tc_cbs_storage.go @@ -89,7 +89,7 @@ func resourceTencentCloudCbsStorage() *schema.Resource { Optional: true, Computed: true, ValidateFunc: validateAllowedStringValue(CBS_PREPAID_RENEW_FLAG), - Description: "When enabled, the CBS instance will be renew automatically when it reach the end of the prepaid tenancy. Valid values are `NOTIFY_AND_AUTO_RENEW`, `NOTIFY_AND_MANUAL_RENEW` and `DISABLE_NOTIFY_AND_MANUAL_RENEW`. NOTE: it only works when charge_type is set to `PREPAID`.", + Description: "Auto Renewal flag. Value range: `NOTIFY_AND_AUTO_RENEW`: Notify expiry and renew automatically, `NOTIFY_AND_MANUAL_RENEW`: Notify expiry but do not renew automatically, `DISABLE_NOTIFY_AND_MANUAL_RENEW`: Neither notify expiry nor renew automatically. Default value range: `NOTIFY_AND_MANUAL_RENEW`: Notify expiry but do not renew automatically. NOTE: it only works when charge_type is set to `PREPAID`.", }, "availability_zone": { Type: schema.TypeString, diff --git a/tencentcloud/resource_tc_cdn_domain.go b/tencentcloud/resource_tc_cdn_domain.go index 171491aa5e..d60ac03d74 100644 --- a/tencentcloud/resource_tc_cdn_domain.go +++ b/tencentcloud/resource_tc_cdn_domain.go @@ -116,7 +116,7 @@ func resourceTencentCloudCdnDomain() *schema.Resource { Required: true, ForceNew: true, ValidateFunc: validateAllowedStringValue(CDN_SERVICE_TYPE), - Description: "Service type of Acceleration domain name. Valid values are `web`, `download` and `media`.", + Description: "Acceleration domain name service type. `web`: static acceleration, `download`: download acceleration, `media`: streaming media VOD acceleration.", }, "project_id": { Type: schema.TypeInt, @@ -128,7 +128,7 @@ func resourceTencentCloudCdnDomain() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateFunc: validateAllowedStringValue(CDN_AREA), - Description: "Domain name acceleration region. Valid values are `mainland`, `overseas` and `global`.", + Description: "Domain name acceleration region. `mainland`: acceleration inside mainland China, `overseas`: acceleration outside mainland China, `global`: global acceleration. Overseas acceleration service must be enabled to use overseas acceleration and global acceleration.", }, "full_url_cache": { Type: schema.TypeBool, @@ -147,7 +147,7 @@ func resourceTencentCloudCdnDomain() *schema.Resource { Type: schema.TypeString, Required: true, ValidateFunc: validateAllowedStringValue(CDN_ORIGIN_TYPE), - Description: "Master origin server type. Valid values are `domain`, `cos`, `ip`, `ipv6` and `ip_ipv6`.", + Description: "Master origin server type. The following types are supported: `domain`: domain name type, `cos`: COS origin, `ip`: IP list used as origin server, `ipv6`: origin server list is a single IPv6 address, `ip_ipv6`: origin server list is multiple IPv4 addresses and an IPv6 address.", }, "origin_list": { Type: schema.TypeList, @@ -171,13 +171,13 @@ func resourceTencentCloudCdnDomain() *schema.Resource { Optional: true, Default: CDN_ORIGIN_PULL_PROTOCOL_HTTP, ValidateFunc: validateAllowedStringValue(CDN_ORIGIN_PULL_PROTOCOL), - Description: "Origin-pull protocol configuration. Valid values are `http`, `https` and `follow`. Default value is `http`.", + Description: "Origin-pull protocol configuration. `http`: forced HTTP origin-pull, `follow`: protocol follow origin-pull, `https`: forced HTTPS origin-pull. This only supports origin server port 443 for origin-pull.", }, "backup_origin_type": { Type: schema.TypeString, Optional: true, ValidateFunc: validateAllowedStringValue(CDN_BACKUP_ORIGIN_TYPE), - Description: "Backup origin server type. Valid values are `domain` and `ip`.", + Description: "Backup origin server type, which supports the following types: `domain`: domain name type, `ip`: IP list used as origin server.", }, "backup_origin_list": { Type: schema.TypeList, diff --git a/tencentcloud/resource_tc_cos_bucket.go b/tencentcloud/resource_tc_cos_bucket.go index 5bca0c1071..68aad3e866 100644 --- a/tencentcloud/resource_tc_cos_bucket.go +++ b/tencentcloud/resource_tc_cos_bucket.go @@ -159,7 +159,7 @@ func resourceTencentCloudCosBucket() *schema.Resource { Type: schema.TypeList, Required: true, Elem: &schema.Schema{Type: schema.TypeString}, - Description: "Specifies which methods are allowed. Can be GET, PUT, POST, DELETE or HEAD.", + Description: "Specifies which methods are allowed. Can be `GET`, `PUT`, `POST`, `DELETE` or `HEAD`.", }, "allowed_headers": { Type: schema.TypeList, @@ -215,7 +215,7 @@ func resourceTencentCloudCosBucket() *schema.Resource { Type: schema.TypeString, Required: true, ValidateFunc: validateAllowedStringValue(availableCosStorageClass), - Description: "Specifies the storage class to which you want the object to transition. Available values include STANDARD, STANDARD_IA and ARCHIVE.", + Description: "Specifies the storage class to which you want the object to transition. Available values include `STANDARD`, `STANDARD_IA` and `ARCHIVE`.", }, }, }, diff --git a/tencentcloud/resource_tc_instance.go b/tencentcloud/resource_tc_instance.go index b19ac0c60b..c08bb1da7e 100644 --- a/tencentcloud/resource_tc_instance.go +++ b/tencentcloud/resource_tc_instance.go @@ -173,7 +173,7 @@ func resourceTencentCloudInstance() *schema.Resource { Optional: true, Computed: true, ValidateFunc: validateAllowedStringValue(CVM_PREPAID_RENEW_FLAG), - Description: "When enabled, the CVM instance will be renew automatically when it reach the end of the prepaid tenancy. Valid values are `NOTIFY_AND_AUTO_RENEW`, `NOTIFY_AND_MANUAL_RENEW` and `DISABLE_NOTIFY_AND_MANUAL_RENEW`. NOTE: it only works when instance_charge_type is set to `PREPAID`.", + Description: "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`.", }, "spot_instance_type": { Type: schema.TypeString, @@ -244,7 +244,7 @@ func resourceTencentCloudInstance() *schema.Resource { Default: CVM_DISK_TYPE_CLOUD_BASIC, ForceNew: true, ValidateFunc: validateAllowedStringValue(CVM_DISK_TYPE), - Description: "Type of the system disk. Valid values are `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM`. default value is `CLOUD_BASIC`. NOTE: `LOCAL_BASIC` and `LOCAL_SSD` are deprecated.", + Description: "System disk type. For more information on limits of system 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, `CLOUD_BASIC`: HDD cloud disk, `CLOUD_SSD`: SSD, `CLOUD_PREMIUM`: Premium Cloud Storage. NOTE: `LOCAL_BASIC` and `LOCAL_SSD` are deprecated.", }, "system_disk_size": { Type: schema.TypeInt, @@ -274,7 +274,7 @@ func resourceTencentCloudInstance() *schema.Resource { Required: true, ForceNew: true, ValidateFunc: validateAllowedStringValue(CVM_DISK_TYPE), - Description: "Type of the data disk. Valid values are `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM`. NOTE: `LOCAL_BASIC` and `LOCAL_SSD` are deprecated.", + Description: "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, `CLOUD_BASIC`: HDD cloud disk, `CLOUD_PREMIUM`: Premium Cloud Storage, `CLOUD_SSD`: SSD, `CLOUD_HSSD`: Enhanced SSD. NOTE: `LOCAL_BASIC` and `LOCAL_SSD` are deprecated.", }, "data_disk_size": { Type: schema.TypeInt, diff --git a/website/docs/d/cbs_storages.html.markdown b/website/docs/d/cbs_storages.html.markdown index 3bc3638691..0c2955629d 100644 --- a/website/docs/d/cbs_storages.html.markdown +++ b/website/docs/d/cbs_storages.html.markdown @@ -29,8 +29,8 @@ The following arguments are supported: * `result_output_file` - (Optional) Used to save results. * `storage_id` - (Optional) ID of the CBS to be queried. * `storage_name` - (Optional) Name of the CBS to be queried. -* `storage_type` - (Optional) Types of storage medium, and available values include CLOUD_BASIC, CLOUD_PREMIUM and CLOUD_SSD. -* `storage_usage` - (Optional) Types of CBS, and available values include SYSTEM_DISK and DATA_DISK. +* `storage_type` - (Optional) Filter by cloud disk media type (`CLOUD_BASIC`: HDD cloud disk | `CLOUD_PREMIUM`: Premium Cloud Storage | `CLOUD_SSD`: SSD cloud disk). +* `storage_usage` - (Optional) Filter by cloud disk type (`SYSTEM_DISK`: system disk | `DATA_DISK`: data disk). ## Attributes Reference diff --git a/website/docs/d/service_template_groups.html.markdown b/website/docs/d/service_template_groups.html.markdown deleted file mode 100644 index 9979c61d68..0000000000 --- a/website/docs/d/service_template_groups.html.markdown +++ /dev/null @@ -1,39 +0,0 @@ ---- -subcategory: "VPC" -layout: "tencentcloud" -page_title: "TencentCloud: tencentcloud_service_template_groups" -sidebar_current: "docs-tencentcloud-datasource-service_template_groups" -description: |- - Use this data source to query detailed information of service template groups. ---- - -# tencentcloud_service_template_groups - -Use this data source to query detailed information of service template groups. - -## Example Usage - -```hcl -data "tencentcloud_service_template" "name" { - name = "test" -} -``` - -## Argument Reference - -The following arguments are supported: - -* `id` - (Optional) Id of the service template group to query. -* `name` - (Optional) Name of the service template group to query. -* `result_output_file` - (Optional) Used to save results. - -## Attributes Reference - -In addition to all arguments above, the following attributes are exported: - -* `group_list` - Information list of the dedicated service template groups. - * `id` - Id of the service template group. - * `name` - Name of service template group. - * `template_ids` - ID set of the service template. - - diff --git a/website/docs/d/service_templates.html.markdown b/website/docs/d/service_templates.html.markdown deleted file mode 100644 index 5b34c5825d..0000000000 --- a/website/docs/d/service_templates.html.markdown +++ /dev/null @@ -1,39 +0,0 @@ ---- -subcategory: "VPC" -layout: "tencentcloud" -page_title: "TencentCloud: tencentcloud_service_templates" -sidebar_current: "docs-tencentcloud-datasource-service_templates" -description: |- - Use this data source to query detailed information of service templates. ---- - -# tencentcloud_service_templates - -Use this data source to query detailed information of service templates. - -## Example Usage - -```hcl -data "tencentcloud_service_template" "name" { - name = "test" -} -``` - -## Argument Reference - -The following arguments are supported: - -* `id` - (Optional) Id of the service template to query. -* `name` - (Optional) Name of the service template to query. -* `result_output_file` - (Optional) Used to save results. - -## Attributes Reference - -In addition to all arguments above, the following attributes are exported: - -* `template_list` - Information list of the dedicated service templates. - * `id` - Id of the service template. - * `name` - Name of service template. - * `services` - Set of the services. - - diff --git a/website/docs/r/cbs_storage.html.markdown b/website/docs/r/cbs_storage.html.markdown index 6eec7d2d2b..c97b76230d 100644 --- a/website/docs/r/cbs_storage.html.markdown +++ b/website/docs/r/cbs_storage.html.markdown @@ -41,7 +41,7 @@ The following arguments are supported: * `force_delete` - (Optional) Indicate whether to delete CBS instance directly or not. Default is false. If set true, the instance will be deleted instead of staying recycle bin. * `period` - (Optional, **Deprecated**) It has been deprecated from version 1.33.0. Set `prepaid_period` instead. The purchased usage period of CBS. Valid values: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36]. * `prepaid_period` - (Optional) The tenancy (time unit is month) of the prepaid instance, NOTE: it only works when charge_type is set to `PREPAID`. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36. -* `prepaid_renew_flag` - (Optional) When enabled, the CBS instance will be renew automatically when it reach the end of the prepaid tenancy. Valid values are `NOTIFY_AND_AUTO_RENEW`, `NOTIFY_AND_MANUAL_RENEW` and `DISABLE_NOTIFY_AND_MANUAL_RENEW`. NOTE: it only works when charge_type is set to `PREPAID`. +* `prepaid_renew_flag` - (Optional) Auto Renewal flag. Value range: `NOTIFY_AND_AUTO_RENEW`: Notify expiry and renew automatically, `NOTIFY_AND_MANUAL_RENEW`: Notify expiry but do not renew automatically, `DISABLE_NOTIFY_AND_MANUAL_RENEW`: Neither notify expiry nor renew automatically. Default value range: `NOTIFY_AND_MANUAL_RENEW`: Notify expiry but do not renew automatically. NOTE: it only works when charge_type is set to `PREPAID`. * `project_id` - (Optional) ID of the project to which the instance belongs. * `snapshot_id` - (Optional) ID of the snapshot. If specified, created the CBS by this snapshot. * `tags` - (Optional) The available tags within this CBS. diff --git a/website/docs/r/cdn_domain.html.markdown b/website/docs/r/cdn_domain.html.markdown index 29cdd435ec..dedbd7d6b6 100644 --- a/website/docs/r/cdn_domain.html.markdown +++ b/website/docs/r/cdn_domain.html.markdown @@ -86,8 +86,8 @@ The following arguments are supported: * `domain` - (Required, ForceNew) Name of the acceleration domain. * `origin` - (Required) Origin server configuration. It's a list and consist of at most one item. -* `service_type` - (Required, ForceNew) Service type of Acceleration domain name. Valid values are `web`, `download` and `media`. -* `area` - (Optional) Domain name acceleration region. Valid values are `mainland`, `overseas` and `global`. +* `service_type` - (Required, ForceNew) Acceleration domain name service type. `web`: static acceleration, `download`: download acceleration, `media`: streaming media VOD acceleration. +* `area` - (Optional) Domain name acceleration region. `mainland`: acceleration inside mainland China, `overseas`: acceleration outside mainland China, `global`: global acceleration. Overseas acceleration service must be enabled to use overseas acceleration and global acceleration. * `full_url_cache` - (Optional) Whether to enable full-path cache. Default value is `true`. * `https_config` - (Optional) HTTPS acceleration configuration. It's a list and consist of at most one item. * `project_id` - (Optional) The project CDN belongs to, default to 0. @@ -117,12 +117,12 @@ The `https_config` object supports the following: The `origin` object supports the following: * `origin_list` - (Required) Master origin server list. Valid values can be ip or domain name. When modifying the origin server, you need to enter the corresponding `origin_type`. -* `origin_type` - (Required) Master origin server type. Valid values are `domain`, `cos`, `ip`, `ipv6` and `ip_ipv6`. +* `origin_type` - (Required) Master origin server type. The following types are supported: `domain`: domain name type, `cos`: COS origin, `ip`: IP list used as origin server, `ipv6`: origin server list is a single IPv6 address, `ip_ipv6`: origin server list is multiple IPv4 addresses and an IPv6 address. * `backup_origin_list` - (Optional) Backup origin server list. Valid values can be ip or domain name. When modifying the backup origin server, you need to enter the corresponding `backup_origin_type`. -* `backup_origin_type` - (Optional) Backup origin server type. Valid values are `domain` and `ip`. +* `backup_origin_type` - (Optional) Backup origin server type, which supports the following types: `domain`: domain name type, `ip`: IP list used as origin server. * `backup_server_name` - (Optional) Host header used when accessing the backup origin server. If left empty, the ServerName of master origin server will be used by default. * `cos_private_access` - (Optional) When OriginType is COS, you can specify if access to private buckets is allowed. Valid values are `on` and `off`. and default value is `off`. -* `origin_pull_protocol` - (Optional) Origin-pull protocol configuration. Valid values are `http`, `https` and `follow`. Default value is `http`. +* `origin_pull_protocol` - (Optional) Origin-pull protocol configuration. `http`: forced HTTP origin-pull, `follow`: protocol follow origin-pull, `https`: forced HTTPS origin-pull. This only supports origin server port 443 for origin-pull. * `server_name` - (Optional) Host header used when accessing the master origin server. If left empty, the acceleration domain name will be used by default. The `server_certificate_config` object supports the following: diff --git a/website/docs/r/cos_bucket.html.markdown b/website/docs/r/cos_bucket.html.markdown index fcd1072570..bf6fa8f4f0 100644 --- a/website/docs/r/cos_bucket.html.markdown +++ b/website/docs/r/cos_bucket.html.markdown @@ -90,7 +90,7 @@ The following arguments are supported: The `cors_rules` object supports the following: * `allowed_headers` - (Required) Specifies which headers are allowed. -* `allowed_methods` - (Required) Specifies which methods are allowed. Can be GET, PUT, POST, DELETE or HEAD. +* `allowed_methods` - (Required) Specifies which methods are allowed. Can be `GET`, `PUT`, `POST`, `DELETE` or `HEAD`. * `allowed_origins` - (Required) Specifies which origins are allowed. * `expose_headers` - (Optional) Specifies expose header in the response. * `max_age_seconds` - (Optional) Specifies time in seconds that browser can cache the response for a preflight request. @@ -108,7 +108,7 @@ The `lifecycle_rules` object supports the following: The `transition` object supports the following: -* `storage_class` - (Required) Specifies the storage class to which you want the object to transition. Available values include STANDARD, STANDARD_IA and ARCHIVE. +* `storage_class` - (Required) Specifies the storage class to which you want the object to transition. Available values include `STANDARD`, `STANDARD_IA` and `ARCHIVE`. * `date` - (Optional) Specifies the date after which you want the corresponding action to take effect. * `days` - (Optional) Specifies the number of days after object creation when the specific rule action takes effect. diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index 281537ac5f..2ca8db3902 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -89,7 +89,7 @@ The following arguments are supported: * `force_delete` - (Optional) 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. * `hostname` - (Optional, ForceNew) 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 (-). * `instance_charge_type_prepaid_period` - (Optional) 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. -* `instance_charge_type_prepaid_renew_flag` - (Optional) When enabled, the CVM instance will be renew automatically when it reach the end of the prepaid tenancy. Valid values are `NOTIFY_AND_AUTO_RENEW`, `NOTIFY_AND_MANUAL_RENEW` and `DISABLE_NOTIFY_AND_MANUAL_RENEW`. NOTE: it only works when instance_charge_type is set to `PREPAID`. +* `instance_charge_type_prepaid_renew_flag` - (Optional) 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`. * `instance_charge_type` - (Optional, ForceNew) The charge type of instance. Valid values are `PREPAID`, `POSTPAID_BY_HOUR` and `SPOTPAID`. The default is `POSTPAID_BY_HOUR`. Note: TencentCloud International only supports `POSTPAID_BY_HOUR`. `PREPAID` instance may not allow to delete before expired. `SPOTPAID` instance must set `spot_instance_type` and `spot_max_price` at the same time. * `instance_name` - (Optional) The name of the instance. The max length of instance_name is 60, and default value is `Terraform-CVM-Instance`. * `instance_type` - (Optional) The type of the instance. @@ -108,7 +108,7 @@ The following arguments are supported: * `subnet_id` - (Optional) The ID of a VPC subnet. If you want to create instances in a VPC network, this parameter must be set. * `system_disk_id` - (Optional) 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. * `system_disk_size` - (Optional, ForceNew) Size of the system disk. Valid value ranges: (50~1000). and unit is GB. Default is 50GB. -* `system_disk_type` - (Optional, ForceNew) Type of the system disk. Valid values are `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM`. default value is `CLOUD_BASIC`. NOTE: `LOCAL_BASIC` and `LOCAL_SSD` are deprecated. +* `system_disk_type` - (Optional, ForceNew) System disk type. For more information on limits of system 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, `CLOUD_BASIC`: HDD cloud disk, `CLOUD_SSD`: SSD, `CLOUD_PREMIUM`: Premium Cloud Storage. NOTE: `LOCAL_BASIC` and `LOCAL_SSD` are deprecated. * `tags` - (Optional) A mapping of tags to assign to the resource. For tag limits, please refer to [Use Limits](https://intl.cloud.tencent.com/document/product/651/13354). * `user_data_raw` - (Optional, ForceNew) The user data to be injected into this instance, in plain text. Conflicts with `user_data`. Up to 16 KB after base64 encoded. * `user_data` - (Optional, ForceNew) The user data to be injected into this instance. Must be base64 encoded and up to 16 KB. @@ -117,7 +117,7 @@ The following arguments are supported: The `data_disks` object supports the following: * `data_disk_size` - (Required, ForceNew) Size of the data disk, and unit is GB. If disk type is `CLOUD_SSD`, the size range is [100, 16000], and the others are [10-16000]. -* `data_disk_type` - (Required, ForceNew) Type of the data disk. Valid values are `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM`. NOTE: `LOCAL_BASIC` and `LOCAL_SSD` are deprecated. +* `data_disk_type` - (Required, 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, `CLOUD_BASIC`: HDD cloud disk, `CLOUD_PREMIUM`: Premium Cloud Storage, `CLOUD_SSD`: SSD, `CLOUD_HSSD`: Enhanced SSD. NOTE: `LOCAL_BASIC` and `LOCAL_SSD` are deprecated. * `data_disk_id` - (Optional) Data disk ID used to initialize the data disk. When data disk type is `LOCAL_BASIC` and `LOCAL_SSD`, disk id is not supported. * `data_disk_snapshot_id` - (Optional, ForceNew) Snapshot ID of the data disk. The selected data disk snapshot size must be smaller than the data disk size. * `delete_with_instance` - (Optional, ForceNew) Decides whether the disk is deleted with instance(only applied to `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM` disk with `POSTPAID_BY_HOUR` instance), default is true. diff --git a/website/docs/r/service_template.html.markdown b/website/docs/r/service_template.html.markdown deleted file mode 100644 index 45e1197e82..0000000000 --- a/website/docs/r/service_template.html.markdown +++ /dev/null @@ -1,45 +0,0 @@ ---- -subcategory: "VPC" -layout: "tencentcloud" -page_title: "TencentCloud: tencentcloud_service_template" -sidebar_current: "docs-tencentcloud-resource-service_template" -description: |- - Provides a resource to manage service template. ---- - -# tencentcloud_service_template - -Provides a resource to manage service template. - -## Example Usage - -```hcl -resource "tencentcloud_service_template" "foo" { - name = "service-template-test" - services = ["tcp:80", "udp:all", "icmp:10-30"] -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required, ForceNew) Name of the service template. -* `services` - (Required) Service list. Valid protocols are `tcp`, `udp`, `icmp`, `gre`. Single port(tcp:80), multi-port(tcp:80,443), port range(tcp:3306-20000), all(tcp:all) format are support. Protocol `icmp` and `gre` cannot specify port. - -## Attributes Reference - -In addition to all arguments above, the following attributes are exported: - -* `id` - ID of the resource. - - - -## Import - -CAM user can be imported using the service template, e.g. - -``` -$ terraform import tencentcloud_service_template.foo ppm-nwrggd14 -``` - diff --git a/website/docs/r/service_template_group.html.markdown b/website/docs/r/service_template_group.html.markdown deleted file mode 100644 index 204722d8a6..0000000000 --- a/website/docs/r/service_template_group.html.markdown +++ /dev/null @@ -1,45 +0,0 @@ ---- -subcategory: "VPC" -layout: "tencentcloud" -page_title: "TencentCloud: tencentcloud_service_template_group" -sidebar_current: "docs-tencentcloud-resource-service_template_group" -description: |- - Provides a resource to manage service template group. ---- - -# tencentcloud_service_template_group - -Provides a resource to manage service template group. - -## Example Usage - -```hcl -resource "tencentcloud_service_template_group" "foo" { - name = "group-test" - services = ["ipl-axaf24151", "ipl-axaf24152"] -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required, ForceNew) Name of the service template group. -* `template_ids` - (Required) Service template ID list. - -## Attributes Reference - -In addition to all arguments above, the following attributes are exported: - -* `id` - ID of the resource. - - - -## Import - -CAM user can be imported using the service template, e.g. - -``` -$ terraform import tencentcloud_service_template.foo ppmg-0np3u974 -``` -