Skip to content

Commit 8ac0600

Browse files
committed
update docs
1 parent b89b725 commit 8ac0600

File tree

4 files changed

+61
-61
lines changed

4 files changed

+61
-61
lines changed

tencentcloud/services/cdn/resource_tc_cdn_domain.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ func ResourceTencentCloudCdnDomain() *schema.Resource {
634634
"header_mode": {
635635
Type: schema.TypeString,
636636
Required: true,
637-
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.",
637+
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.",
638638
},
639639
"header_name": {
640640
Type: schema.TypeString,
Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Provide a resource to create a emr cluster.
1+
Provide a resource to create an emr cluster.
22

33
Example Usage
44

@@ -8,14 +8,14 @@ variable "availability_zone" {
88
}
99
1010
data "tencentcloud_instance_types" "cvm4c8m" {
11-
exclude_sold_out=true
12-
cpu_core_count=4
13-
memory_size=8
14-
filter {
15-
name = "instance-charge-type"
16-
values = ["POSTPAID_BY_HOUR"]
17-
}
18-
filter {
11+
exclude_sold_out = true
12+
cpu_core_count = 4
13+
memory_size = 8
14+
filter {
15+
name = "instance-charge-type"
16+
values = ["POSTPAID_BY_HOUR"]
17+
}
18+
filter {
1919
name = "zone"
2020
values = [var.availability_zone]
2121
}
@@ -41,52 +41,52 @@ resource "tencentcloud_security_group" "emr_sg" {
4141
}
4242
4343
resource "tencentcloud_emr_cluster" "emr_cluster" {
44-
product_id=38
45-
vpc_settings={
46-
vpc_id=tencentcloud_vpc.emr_vpc.id
47-
subnet_id=tencentcloud_subnet.emr_subnet.id
48-
}
49-
softwares = [
50-
"hdfs-2.8.5",
51-
"knox-1.6.1",
52-
"openldap-2.4.44",
53-
"yarn-2.8.5",
54-
"zookeeper-3.6.3",
55-
]
56-
support_ha=0
57-
instance_name="emr-cluster-test"
58-
resource_spec {
59-
master_resource_spec {
60-
mem_size=8192
61-
cpu=4
62-
disk_size=100
63-
disk_type="CLOUD_PREMIUM"
64-
spec="CVM.${data.tencentcloud_instance_types.cvm4c8m.instance_types.0.family}"
65-
storage_type=5
66-
root_size=50
67-
}
68-
core_resource_spec {
69-
mem_size=8192
70-
cpu=4
71-
disk_size=100
72-
disk_type="CLOUD_PREMIUM"
73-
spec="CVM.${data.tencentcloud_instance_types.cvm4c8m.instance_types.0.family}"
74-
storage_type=5
75-
root_size=50
76-
}
77-
master_count=1
78-
core_count=2
79-
}
80-
login_settings={
81-
password="Tencent@cloud123"
82-
}
83-
time_span=3600
84-
time_unit="s"
85-
pay_mode=0
86-
placement_info={
87-
zone=var.availability_zone
88-
project_id=0
89-
}
90-
sg_id=tencentcloud_security_group.emr_sg.id
44+
product_id = 38
45+
vpc_settings = {
46+
vpc_id = tencentcloud_vpc.emr_vpc.id
47+
subnet_id = tencentcloud_subnet.emr_subnet.id
48+
}
49+
softwares = [
50+
"hdfs-2.8.5",
51+
"knox-1.6.1",
52+
"openldap-2.4.44",
53+
"yarn-2.8.5",
54+
"zookeeper-3.6.3",
55+
]
56+
support_ha = 0
57+
instance_name = "emr-cluster-test"
58+
resource_spec {
59+
master_resource_spec {
60+
mem_size = 8192
61+
cpu = 4
62+
disk_size = 100
63+
disk_type = "CLOUD_PREMIUM"
64+
spec = "CVM.${data.tencentcloud_instance_types.cvm4c8m.instance_types.0.family}"
65+
storage_type = 5
66+
root_size = 50
67+
}
68+
core_resource_spec {
69+
mem_size = 8192
70+
cpu = 4
71+
disk_size = 100
72+
disk_type = "CLOUD_PREMIUM"
73+
spec = "CVM.${data.tencentcloud_instance_types.cvm4c8m.instance_types.0.family}"
74+
storage_type = 5
75+
root_size = 50
76+
}
77+
master_count = 1
78+
core_count = 2
79+
}
80+
login_settings = {
81+
password = "Tencent@cloud123"
82+
}
83+
time_span = 3600
84+
time_unit = "s"
85+
pay_mode = 0
86+
placement_info {
87+
zone = var.availability_zone
88+
project_id = 0
89+
}
90+
sg_id = tencentcloud_security_group.emr_sg.id
9191
}
9292
```

website/docs/r/cdn_domain.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ The `force_redirect` object of `https_config` supports the following:
277277

278278
The `header_rules` object of `request_header` supports the following:
279279

280-
* `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.
280+
* `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.
281281
* `header_name` - (Required, String) Http header name.
282282
* `header_value` - (Required, String) Http header value, optional when Mode is `del`, Required when Mode is `add`/`set`.
283283
* `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.

website/docs/r/emr_cluster.html.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ layout: "tencentcloud"
44
page_title: "TencentCloud: tencentcloud_emr_cluster"
55
sidebar_current: "docs-tencentcloud-resource-emr_cluster"
66
description: |-
7-
Provide a resource to create a emr cluster.
7+
Provide a resource to create an emr cluster.
88
---
99

1010
# tencentcloud_emr_cluster
1111

12-
Provide a resource to create a emr cluster.
12+
Provide a resource to create an emr cluster.
1313

1414
## Example Usage
1515

@@ -94,7 +94,7 @@ resource "tencentcloud_emr_cluster" "emr_cluster" {
9494
time_span = 3600
9595
time_unit = "s"
9696
pay_mode = 0
97-
placement_info = {
97+
placement_info {
9898
zone = var.availability_zone
9999
project_id = 0
100100
}

0 commit comments

Comments
 (0)