Skip to content

Commit 1526083

Browse files
tongyimingmikatong
andauthored
update emr login_settings doc (#2515)
* update emr login_settings doc * update doc and add changelog --------- Co-authored-by: mikatong <[email protected]>
1 parent 61ee10e commit 1526083

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

.changelog/2515.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_emr_cluster: update `login_settings` description
3+
```

tencentcloud/services/emr/resource_tc_emr_cluster.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,12 @@ func ResourceTencentCloudEmrCluster() *schema.Resource {
165165
Description: "The unit of time in which the instance was purchased. When PayMode is 0, TimeUnit can only take values of s(second). When PayMode is 1, TimeUnit can only take the value m(month).",
166166
},
167167
"login_settings": {
168-
Type: schema.TypeMap,
169-
Optional: true,
170-
Sensitive: true,
171-
Description: "Instance login settings.",
168+
Type: schema.TypeMap,
169+
Optional: true,
170+
Sensitive: true,
171+
Description: "Instance login settings. There are two optional fields:" +
172+
"- password: Instance login password: 8-16 characters, including uppercase letters, lowercase letters, numbers and special characters. Special symbols only support! @% ^ *. The first bit of the password cannot be a special character;" +
173+
"- public_key_id: Public key id. After the key is associated, the instance can be accessed through the corresponding private key.",
172174
},
173175
"extend_fs_field": {
174176
Type: schema.TypeString,

website/docs/r/emr_cluster.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ The following arguments are supported:
126126
* `vpc_settings` - (Required, Map, ForceNew) The private net config of EMR instance.
127127
* `display_strategy` - (Optional, String, **Deprecated**) It will be deprecated in later versions. Display strategy of EMR instance.
128128
* `extend_fs_field` - (Optional, String) Access the external file system.
129-
* `login_settings` - (Optional, Map) Instance login settings.
129+
* `login_settings` - (Optional, Map) Instance login settings. There are two optional fields:- password: Instance login password: 8-16 characters, including uppercase letters, lowercase letters, numbers and special characters. Special symbols only support! @% ^ *. The first bit of the password cannot be a special character;- public_key_id: Public key id. After the key is associated, the instance can be accessed through the corresponding private key.
130130
* `need_master_wan` - (Optional, String, ForceNew) Whether to enable the cluster Master node public network. Value range:
131131
- NEED_MASTER_WAN: Indicates that the cluster Master node public network is enabled.
132132
- NOT_NEED_MASTER_WAN: Indicates that it is not turned on.

0 commit comments

Comments
 (0)