diff --git a/.changelog/3113.txt b/.changelog/3113.txt new file mode 100644 index 0000000000..9fac48afcf --- /dev/null +++ b/.changelog/3113.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_cdn_domain: `header_mode` support `set` +``` diff --git a/tencentcloud/services/cdn/resource_tc_cdn_domain.go b/tencentcloud/services/cdn/resource_tc_cdn_domain.go index 84ab13b111..140ffd32d3 100644 --- a/tencentcloud/services/cdn/resource_tc_cdn_domain.go +++ b/tencentcloud/services/cdn/resource_tc_cdn_domain.go @@ -634,7 +634,7 @@ func ResourceTencentCloudCdnDomain() *schema.Resource { "header_mode": { Type: schema.TypeString, Required: true, - Description: "Http header setting method. The following types are supported: `add`: add a head, if a head already exists, there will be a duplicate head, `del`: delete the head.", + Description: "Http header setting method. The following types are supported: `set`: sets a value for an existing header parameter, a new header parameter, or multiple header parameters. Multiple header parameters will be merged into one; `del`: deletes a header parameter; `add`: adds a header parameter. By default, you can repeat the same action to add the same header parameter, which may affect browser response. Please consider the set operation first.", }, "header_name": { Type: schema.TypeString, diff --git a/tencentcloud/services/emr/resource_tc_emr_cluster.md b/tencentcloud/services/emr/resource_tc_emr_cluster.md index 53c57ff5d6..6e6f43e052 100644 --- a/tencentcloud/services/emr/resource_tc_emr_cluster.md +++ b/tencentcloud/services/emr/resource_tc_emr_cluster.md @@ -1,4 +1,4 @@ -Provide a resource to create a emr cluster. +Provide a resource to create an emr cluster. Example Usage @@ -8,14 +8,14 @@ variable "availability_zone" { } data "tencentcloud_instance_types" "cvm4c8m" { - exclude_sold_out=true - cpu_core_count=4 - memory_size=8 - filter { - name = "instance-charge-type" - values = ["POSTPAID_BY_HOUR"] - } - filter { + exclude_sold_out = true + cpu_core_count = 4 + memory_size = 8 + filter { + name = "instance-charge-type" + values = ["POSTPAID_BY_HOUR"] + } + filter { name = "zone" values = [var.availability_zone] } @@ -41,52 +41,52 @@ resource "tencentcloud_security_group" "emr_sg" { } resource "tencentcloud_emr_cluster" "emr_cluster" { - product_id=38 - vpc_settings={ - vpc_id=tencentcloud_vpc.emr_vpc.id - subnet_id=tencentcloud_subnet.emr_subnet.id - } - softwares = [ - "hdfs-2.8.5", - "knox-1.6.1", - "openldap-2.4.44", - "yarn-2.8.5", - "zookeeper-3.6.3", - ] - support_ha=0 - instance_name="emr-cluster-test" - resource_spec { - master_resource_spec { - mem_size=8192 - cpu=4 - disk_size=100 - disk_type="CLOUD_PREMIUM" - spec="CVM.${data.tencentcloud_instance_types.cvm4c8m.instance_types.0.family}" - storage_type=5 - root_size=50 - } - core_resource_spec { - mem_size=8192 - cpu=4 - disk_size=100 - disk_type="CLOUD_PREMIUM" - spec="CVM.${data.tencentcloud_instance_types.cvm4c8m.instance_types.0.family}" - storage_type=5 - root_size=50 - } - master_count=1 - core_count=2 - } - login_settings={ - password="Tencent@cloud123" - } - time_span=3600 - time_unit="s" - pay_mode=0 - placement_info={ - zone=var.availability_zone - project_id=0 - } - sg_id=tencentcloud_security_group.emr_sg.id + product_id = 38 + vpc_settings = { + vpc_id = tencentcloud_vpc.emr_vpc.id + subnet_id = tencentcloud_subnet.emr_subnet.id + } + softwares = [ + "hdfs-2.8.5", + "knox-1.6.1", + "openldap-2.4.44", + "yarn-2.8.5", + "zookeeper-3.6.3", + ] + support_ha = 0 + instance_name = "emr-cluster-test" + resource_spec { + master_resource_spec { + mem_size = 8192 + cpu = 4 + disk_size = 100 + disk_type = "CLOUD_PREMIUM" + spec = "CVM.${data.tencentcloud_instance_types.cvm4c8m.instance_types.0.family}" + storage_type = 5 + root_size = 50 + } + core_resource_spec { + mem_size = 8192 + cpu = 4 + disk_size = 100 + disk_type = "CLOUD_PREMIUM" + spec = "CVM.${data.tencentcloud_instance_types.cvm4c8m.instance_types.0.family}" + storage_type = 5 + root_size = 50 + } + master_count = 1 + core_count = 2 + } + login_settings = { + password = "Tencent@cloud123" + } + time_span = 3600 + time_unit = "s" + pay_mode = 0 + placement_info { + zone = var.availability_zone + project_id = 0 + } + sg_id = tencentcloud_security_group.emr_sg.id } ``` \ No newline at end of file diff --git a/website/docs/r/cdn_domain.html.markdown b/website/docs/r/cdn_domain.html.markdown index fe10e75712..75169e283b 100644 --- a/website/docs/r/cdn_domain.html.markdown +++ b/website/docs/r/cdn_domain.html.markdown @@ -277,7 +277,7 @@ The `force_redirect` object of `https_config` supports the following: The `header_rules` object of `request_header` supports the following: -* `header_mode` - (Required, String) Http header setting method. The following types are supported: `add`: add a head, if a head already exists, there will be a duplicate head, `del`: delete the head. +* `header_mode` - (Required, String) Http header setting method. The following types are supported: `set`: sets a value for an existing header parameter, a new header parameter, or multiple header parameters. Multiple header parameters will be merged into one; `del`: deletes a header parameter; `add`: adds a header parameter. By default, you can repeat the same action to add the same header parameter, which may affect browser response. Please consider the set operation first. * `header_name` - (Required, String) Http header name. * `header_value` - (Required, String) Http header value, optional when Mode is `del`, Required when Mode is `add`/`set`. * `rule_paths` - (Required, List) Matching content under the corresponding type of CacheType: `all`: fill *, `file`: fill in the suffix name, such as jpg, txt, `directory`: fill in the path, such as /xxx/test, `path`: fill in the absolute path, such as /xxx/test.html. diff --git a/website/docs/r/emr_cluster.html.markdown b/website/docs/r/emr_cluster.html.markdown index 923b9012cc..97c83cb8e5 100644 --- a/website/docs/r/emr_cluster.html.markdown +++ b/website/docs/r/emr_cluster.html.markdown @@ -4,12 +4,12 @@ layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_emr_cluster" sidebar_current: "docs-tencentcloud-resource-emr_cluster" description: |- - Provide a resource to create a emr cluster. + Provide a resource to create an emr cluster. --- # tencentcloud_emr_cluster -Provide a resource to create a emr cluster. +Provide a resource to create an emr cluster. ## Example Usage @@ -94,7 +94,7 @@ resource "tencentcloud_emr_cluster" "emr_cluster" { time_span = 3600 time_unit = "s" pay_mode = 0 - placement_info = { + placement_info { zone = var.availability_zone project_id = 0 }