From 0bd41c0dabb2a0af7a317a0d53fdb5a3143a4a58 Mon Sep 17 00:00:00 2001
From: SevenEarth <391613297@qq.com>
Date: Fri, 15 Mar 2024 15:28:44 +0800
Subject: [PATCH 1/5] add
---
.../resource_tc_dasb_device_group_members.md | 20 +++++++++++++++----
.../services/bh/resource_tc_dasb_resource.md | 6 +++---
.../bh/resource_tc_dasb_user_group_members.go | 3 ++-
.../services/bh/service_tencentcloud_dasb.go | 2 ++
.../r/dasb_device_group_members.html.markdown | 20 +++++++++++++++----
website/docs/r/dasb_resource.html.markdown | 6 +++---
6 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/tencentcloud/services/bh/resource_tc_dasb_device_group_members.md b/tencentcloud/services/bh/resource_tc_dasb_device_group_members.md
index e22faef1ec..8006521780 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_device_group_members.md
+++ b/tencentcloud/services/bh/resource_tc_dasb_device_group_members.md
@@ -3,9 +3,21 @@ Provides a resource to create a dasb device_group_members
Example Usage
```hcl
-resource "tencentcloud_dasb_device_group_members" "example" {
- device_group_id = 3
- member_id_set = [1, 2, 3]
+resource "tencentcloud_dasb_user" "example" {
+ user_name = "tf_example"
+ real_name = "terraform"
+ phone = "+86|18345678782"
+ email = "demo@tencent.com"
+ auth_type = 0
+}
+
+resource "tencentcloud_dasb_user_group" "example" {
+ name = "tf_example_update"
+}
+
+resource "tencentcloud_dasb_user_group_members" "example" {
+ user_group_id = tencentcloud_dasb_user_group.example.id
+ member_id_set = [tencentcloud_dasb_user.example.id]
}
```
@@ -14,5 +26,5 @@ Import
dasb device_group_members can be imported using the id, e.g.
```
-terraform import tencentcloud_dasb_device_group_members.example 3#1,2,3
+terraform import tencentcloud_dasb_device_group_members.example 3#35
```
\ No newline at end of file
diff --git a/tencentcloud/services/bh/resource_tc_dasb_resource.md b/tencentcloud/services/bh/resource_tc_dasb_resource.md
index 36677e745c..89d06dc04e 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_resource.md
+++ b/tencentcloud/services/bh/resource_tc_dasb_resource.md
@@ -5,10 +5,10 @@ Example Usage
```hcl
resource "tencentcloud_dasb_resource" "example" {
deploy_region = "ap-guangzhou"
- vpc_id = "vpc-q1of50wz"
- subnet_id = "subnet-7uhvm46o"
+ vpc_id = "vpc-fmz6l9nz"
+ subnet_id = "subnet-g7jhwhi2"
resource_edition = "standard"
- resource_node = 2
+ resource_node = 50
time_unit = "m"
time_span = 1
auto_renew_flag = 1
diff --git a/tencentcloud/services/bh/resource_tc_dasb_user_group_members.go b/tencentcloud/services/bh/resource_tc_dasb_user_group_members.go
index 535f291e35..181d720e2c 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_user_group_members.go
+++ b/tencentcloud/services/bh/resource_tc_dasb_user_group_members.go
@@ -125,7 +125,8 @@ func resourceTencentCloudDasbUserGroupMembersRead(d *schema.ResourceData, meta i
return nil
}
- _ = d.Set("user_group_id", userGroupId)
+ userGroupIdInt, _ := strconv.Atoi(userGroupId)
+ _ = d.Set("user_group_id", userGroupIdInt)
_ = d.Set("member_id_set", UserGroupMembers)
return nil
diff --git a/tencentcloud/services/bh/service_tencentcloud_dasb.go b/tencentcloud/services/bh/service_tencentcloud_dasb.go
index 3824742390..04e5979426 100644
--- a/tencentcloud/services/bh/service_tencentcloud_dasb.go
+++ b/tencentcloud/services/bh/service_tencentcloud_dasb.go
@@ -308,6 +308,7 @@ func (me *DasbService) DescribeDasbDeviceGroupMembersById(ctx context.Context, d
request := dasb.NewDescribeDeviceGroupMembersRequest()
deviceGroupIdInt, _ := strconv.ParseUint(deviceGroupId, 10, 64)
request.Id = &deviceGroupIdInt
+ request.Bound = common.BoolPtr(true)
defer func() {
if errRet != nil {
@@ -378,6 +379,7 @@ func (me *DasbService) DescribeDasbUserGroupMembersById(ctx context.Context, use
request := dasb.NewDescribeUserGroupMembersRequest()
userGroupIdInt, _ := strconv.ParseUint(userGroupId, 10, 64)
request.Id = &userGroupIdInt
+ request.Bound = common.BoolPtr(true)
defer func() {
if errRet != nil {
diff --git a/website/docs/r/dasb_device_group_members.html.markdown b/website/docs/r/dasb_device_group_members.html.markdown
index 026a7cd220..0961263461 100644
--- a/website/docs/r/dasb_device_group_members.html.markdown
+++ b/website/docs/r/dasb_device_group_members.html.markdown
@@ -14,9 +14,21 @@ Provides a resource to create a dasb device_group_members
## Example Usage
```hcl
-resource "tencentcloud_dasb_device_group_members" "example" {
- device_group_id = 3
- member_id_set = [1, 2, 3]
+resource "tencentcloud_dasb_user" "example" {
+ user_name = "tf_example"
+ real_name = "terraform"
+ phone = "+86|18345678782"
+ email = "demo@tencent.com"
+ auth_type = 0
+}
+
+resource "tencentcloud_dasb_user_group" "example" {
+ name = "tf_example_update"
+}
+
+resource "tencentcloud_dasb_user_group_members" "example" {
+ user_group_id = tencentcloud_dasb_user_group.example.id
+ member_id_set = [tencentcloud_dasb_user.example.id]
}
```
@@ -40,6 +52,6 @@ In addition to all arguments above, the following attributes are exported:
dasb device_group_members can be imported using the id, e.g.
```
-terraform import tencentcloud_dasb_device_group_members.example 3#1,2,3
+terraform import tencentcloud_dasb_device_group_members.example 3#35
```
diff --git a/website/docs/r/dasb_resource.html.markdown b/website/docs/r/dasb_resource.html.markdown
index 25f59980a1..71e83e2f36 100644
--- a/website/docs/r/dasb_resource.html.markdown
+++ b/website/docs/r/dasb_resource.html.markdown
@@ -16,10 +16,10 @@ Provides a resource to create a dasb resource
```hcl
resource "tencentcloud_dasb_resource" "example" {
deploy_region = "ap-guangzhou"
- vpc_id = "vpc-q1of50wz"
- subnet_id = "subnet-7uhvm46o"
+ vpc_id = "vpc-fmz6l9nz"
+ subnet_id = "subnet-g7jhwhi2"
resource_edition = "standard"
- resource_node = 2
+ resource_node = 50
time_unit = "m"
time_span = 1
auto_renew_flag = 1
From ff1272bf63697b13bc1ed953e6e9e219bce046f0 Mon Sep 17 00:00:00 2001
From: SevenEarth <391613297@qq.com>
Date: Fri, 15 Mar 2024 15:31:24 +0800
Subject: [PATCH 2/5] add
---
.changelog/2564.txt | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 .changelog/2564.txt
diff --git a/.changelog/2564.txt b/.changelog/2564.txt
new file mode 100644
index 0000000000..8c22acfa83
--- /dev/null
+++ b/.changelog/2564.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_dasb_user_group_members: Fix errors in querying user group members
+```
\ No newline at end of file
From 64ca2b5ebb0a7ae1ffb3392c6f33405077d9ff08 Mon Sep 17 00:00:00 2001
From: SevenEarth <391613297@qq.com>
Date: Fri, 15 Mar 2024 17:43:16 +0800
Subject: [PATCH 3/5] fix/bh
---
tencentcloud/services/bh/resource_tc_dasb_device_account.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tencentcloud/services/bh/resource_tc_dasb_device_account.go b/tencentcloud/services/bh/resource_tc_dasb_device_account.go
index 438073fd44..573c71c88a 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_device_account.go
+++ b/tencentcloud/services/bh/resource_tc_dasb_device_account.go
@@ -67,7 +67,7 @@ func resourceTencentCloudDasbDeviceAccountCreate(d *schema.ResourceData, meta in
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
}
- if result == nil || result.Response.Id != nil {
+ if result == nil || result.Response.Id == nil {
e = fmt.Errorf("dasb DeviceAccount not exists")
return resource.NonRetryableError(e)
}
From 9e4338deda98f5dfbf277853f778e1b0efd0dffe Mon Sep 17 00:00:00 2001
From: SevenEarth <391613297@qq.com>
Date: Fri, 15 Mar 2024 18:34:50 +0800
Subject: [PATCH 4/5] fix/bh
---
...ce_tc_dasb_bind_device_account_password.md | 14 ++++++++++-
...tc_dasb_bind_device_account_private_key.md | 14 ++++++++++-
.../services/bh/resource_tc_dasb_device.go | 5 ++--
.../bh/resource_tc_dasb_device_account.md | 9 +++++++-
.../resource_tc_dasb_device_group_members.go | 3 ++-
.../resource_tc_dasb_device_group_members.md | 23 +++++++++----------
.../bh/resource_tc_dasb_user_group.md | 4 ++--
.../bh/resource_tc_dasb_user_group_members.md | 18 ++++++++++++---
8 files changed, 67 insertions(+), 23 deletions(-)
diff --git a/tencentcloud/services/bh/resource_tc_dasb_bind_device_account_password.md b/tencentcloud/services/bh/resource_tc_dasb_bind_device_account_password.md
index 78a1955a19..8e609b346b 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_bind_device_account_password.md
+++ b/tencentcloud/services/bh/resource_tc_dasb_bind_device_account_password.md
@@ -3,8 +3,20 @@ Provides a resource to create a dasb bind_device_account_password
Example Usage
```hcl
+resource "tencentcloud_dasb_device" "example" {
+ os_name = "Linux"
+ ip = "192.168.0.1"
+ port = 80
+ name = "tf_example"
+}
+
+resource "tencentcloud_dasb_device_account" "example" {
+ device_id = tencentcloud_dasb_device.example.id
+ account = "root"
+}
+
resource "tencentcloud_dasb_bind_device_account_password" "example" {
- device_account_id = 16
+ device_account_id = tencentcloud_dasb_device_account.example.id
password = "TerraformPassword"
}
```
\ No newline at end of file
diff --git a/tencentcloud/services/bh/resource_tc_dasb_bind_device_account_private_key.md b/tencentcloud/services/bh/resource_tc_dasb_bind_device_account_private_key.md
index 8e46909bf6..52a3fb4eb1 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_bind_device_account_private_key.md
+++ b/tencentcloud/services/bh/resource_tc_dasb_bind_device_account_private_key.md
@@ -3,8 +3,20 @@ Provides a resource to create a dasb bind_device_account_private_key
Example Usage
```hcl
+resource "tencentcloud_dasb_device" "example" {
+ os_name = "Linux"
+ ip = "192.168.0.1"
+ port = 80
+ name = "tf_example"
+}
+
+resource "tencentcloud_dasb_device_account" "example" {
+ device_id = tencentcloud_dasb_device.example.id
+ account = "root"
+}
+
resource "tencentcloud_dasb_bind_device_account_private_key" "example" {
- device_account_id = 16
+ device_account_id = tencentcloud_dasb_device_account.example.id
private_key = "MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUpwmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ51s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh"
private_key_password = "TerraformPassword"
}
diff --git a/tencentcloud/services/bh/resource_tc_dasb_device.go b/tencentcloud/services/bh/resource_tc_dasb_device.go
index 1e57e4352d..1026e36978 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_device.go
+++ b/tencentcloud/services/bh/resource_tc_dasb_device.go
@@ -55,6 +55,7 @@ func ResourceTencentCloudDasbDevice() *schema.Resource {
Type: schema.TypeSet,
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
+ Computed: true,
Description: "Asset multi-node: fields ip and port.",
},
},
@@ -159,8 +160,8 @@ func resourceTencentCloudDasbDeviceRead(d *schema.ResourceData, meta interface{}
_ = d.Set("os_name", device.OsName)
}
- if device.PublicIp != nil {
- _ = d.Set("ip", device.PublicIp)
+ if device.PrivateIp != nil {
+ _ = d.Set("ip", device.PrivateIp)
}
if device.Port != nil {
diff --git a/tencentcloud/services/bh/resource_tc_dasb_device_account.md b/tencentcloud/services/bh/resource_tc_dasb_device_account.md
index 24d0227fbc..3a8d1c8d4c 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_device_account.md
+++ b/tencentcloud/services/bh/resource_tc_dasb_device_account.md
@@ -3,8 +3,15 @@ Provides a resource to create a dasb device_account
Example Usage
```hcl
+resource "tencentcloud_dasb_device" "example" {
+ os_name = "Linux"
+ ip = "192.168.0.1"
+ port = 80
+ name = "tf_example"
+}
+
resource "tencentcloud_dasb_device_account" "example" {
- device_id = 100
+ device_id = tencentcloud_dasb_device.example.id
account = "root"
}
```
diff --git a/tencentcloud/services/bh/resource_tc_dasb_device_group_members.go b/tencentcloud/services/bh/resource_tc_dasb_device_group_members.go
index 847121a52a..fe80902277 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_device_group_members.go
+++ b/tencentcloud/services/bh/resource_tc_dasb_device_group_members.go
@@ -124,7 +124,8 @@ func resourceTencentCloudDasbDeviceGroupMembersRead(d *schema.ResourceData, meta
return nil
}
- _ = d.Set("device_group_id", deviceGroupId)
+ deviceGroupIdInt, _ := strconv.Atoi(deviceGroupId)
+ _ = d.Set("device_group_id", deviceGroupIdInt)
_ = d.Set("member_id_set", DeviceGroupMembers)
return nil
diff --git a/tencentcloud/services/bh/resource_tc_dasb_device_group_members.md b/tencentcloud/services/bh/resource_tc_dasb_device_group_members.md
index 8006521780..60f1eab6cf 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_device_group_members.md
+++ b/tencentcloud/services/bh/resource_tc_dasb_device_group_members.md
@@ -3,21 +3,20 @@ Provides a resource to create a dasb device_group_members
Example Usage
```hcl
-resource "tencentcloud_dasb_user" "example" {
- user_name = "tf_example"
- real_name = "terraform"
- phone = "+86|18345678782"
- email = "demo@tencent.com"
- auth_type = 0
+resource "tencentcloud_dasb_device" "example" {
+ os_name = "Linux"
+ ip = "192.168.0.1"
+ port = 80
+ name = "tf_example"
}
-resource "tencentcloud_dasb_user_group" "example" {
- name = "tf_example_update"
+resource "tencentcloud_dasb_device_group" "example" {
+ name = "tf_example"
}
-resource "tencentcloud_dasb_user_group_members" "example" {
- user_group_id = tencentcloud_dasb_user_group.example.id
- member_id_set = [tencentcloud_dasb_user.example.id]
+resource "tencentcloud_dasb_device_group_members" "example" {
+ device_group_id = tencentcloud_dasb_device_group.example.id
+ member_id_set = [tencentcloud_dasb_device.example.id]
}
```
@@ -26,5 +25,5 @@ Import
dasb device_group_members can be imported using the id, e.g.
```
-terraform import tencentcloud_dasb_device_group_members.example 3#35
+terraform import tencentcloud_dasb_device_group_members.example 53#102
```
\ No newline at end of file
diff --git a/tencentcloud/services/bh/resource_tc_dasb_user_group.md b/tencentcloud/services/bh/resource_tc_dasb_user_group.md
index 42bf9098af..74a3b54826 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_user_group.md
+++ b/tencentcloud/services/bh/resource_tc_dasb_user_group.md
@@ -4,7 +4,7 @@ Example Usage
```hcl
resource "tencentcloud_dasb_user_group" "example" {
- name = "tf_example_update"
+ name = "tf_example"
}
```
@@ -12,7 +12,7 @@ Or
```hcl
resource "tencentcloud_dasb_user_group" "example" {
- name = "tf_example_update"
+ name = "tf_example"
department_id = "1.2"
}
```
diff --git a/tencentcloud/services/bh/resource_tc_dasb_user_group_members.md b/tencentcloud/services/bh/resource_tc_dasb_user_group_members.md
index 147b40a4a1..7ae65bebd0 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_user_group_members.md
+++ b/tencentcloud/services/bh/resource_tc_dasb_user_group_members.md
@@ -3,9 +3,21 @@ Provides a resource to create a dasb user_group_members
Example Usage
```hcl
+resource "tencentcloud_dasb_user" "example" {
+ user_name = "tf_example"
+ real_name = "terraform"
+ phone = "+86|18345678782"
+ email = "demo@tencent.com"
+ auth_type = 0
+}
+
+resource "tencentcloud_dasb_user_group" "example" {
+ name = "tf_example"
+}
+
resource "tencentcloud_dasb_user_group_members" "example" {
- user_group_id = 3
- member_id_set = [1, 2, 3]
+ user_group_id = tencentcloud_dasb_user_group.example.id
+ member_id_set = [tencentcloud_dasb_user.example.id]
}
```
@@ -14,5 +26,5 @@ Import
dasb user_group_members can be imported using the id, e.g.
```
-terraform import tencentcloud_dasb_user_group_members.example 3#1,2,3
+terraform import tencentcloud_dasb_user_group_members.example 3#14
```
\ No newline at end of file
From 91180d69e01b666f90fc3325335da73018584fce Mon Sep 17 00:00:00 2001
From: SevenEarth <391613297@qq.com>
Date: Fri, 15 Mar 2024 19:36:07 +0800
Subject: [PATCH 5/5] fix/bh
---
tencentcloud/provider.md | 1 -
.../services/bh/resource_tc_dasb_acl.go | 2 ++
.../resource_tc_dasb_bind_device_resource.md | 2 +-
.../services/bh/resource_tc_dasb_resource.go | 4 +++-
.../services/bh/resource_tc_dasb_user.go | 3 +++
...bind_device_account_password.html.markdown | 14 ++++++++++-
...d_device_account_private_key.html.markdown | 14 ++++++++++-
.../r/dasb_bind_device_resource.html.markdown | 2 +-
.../docs/r/dasb_device_account.html.markdown | 9 +++++++-
.../r/dasb_device_group_members.html.markdown | 23 +++++++++----------
website/docs/r/dasb_user_group.html.markdown | 4 ++--
.../r/dasb_user_group_members.html.markdown | 18 ++++++++++++---
website/tencentcloud.erb | 3 ---
13 files changed, 72 insertions(+), 27 deletions(-)
diff --git a/tencentcloud/provider.md b/tencentcloud/provider.md
index 4ede571801..a163f4665f 100644
--- a/tencentcloud/provider.md
+++ b/tencentcloud/provider.md
@@ -2088,7 +2088,6 @@ Bastion Host(BH)
tencentcloud_dasb_device_group_members
tencentcloud_dasb_user_group_members
tencentcloud_dasb_bind_device_resource
- tencentcloud_dasb_resource
tencentcloud_dasb_device
tencentcloud_dasb_user_group
tencentcloud_dasb_reset_user
diff --git a/tencentcloud/services/bh/resource_tc_dasb_acl.go b/tencentcloud/services/bh/resource_tc_dasb_acl.go
index d142fa20dd..880d001c13 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_acl.go
+++ b/tencentcloud/services/bh/resource_tc_dasb_acl.go
@@ -149,11 +149,13 @@ func ResourceTencentCloudDasbAcl() *schema.Resource {
},
"validate_from": {
Optional: true,
+ Computed: true,
Type: schema.TypeString,
Description: "Access permission effective time, such as: 2021-09-22T00:00:00+08:00If the effective and expiry time are not filled in, the access rights will be valid for a long time.",
},
"validate_to": {
Optional: true,
+ Computed: true,
Type: schema.TypeString,
Description: "Access permission expiration time, such as: 2021-09-23T00:00:00+08:00If the effective and expiry time are not filled in, the access rights will be valid for a long time.",
},
diff --git a/tencentcloud/services/bh/resource_tc_dasb_bind_device_resource.md b/tencentcloud/services/bh/resource_tc_dasb_bind_device_resource.md
index b0228dfc9b..9ade33f175 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_bind_device_resource.md
+++ b/tencentcloud/services/bh/resource_tc_dasb_bind_device_resource.md
@@ -4,7 +4,7 @@ Example Usage
```hcl
resource "tencentcloud_dasb_bind_device_resource" "example" {
- resource_id = "bh-saas-ocmzo6lgxiv"
+ resource_id = "bh-saas-weyosfym"
device_id_set = [17, 18]
}
```
\ No newline at end of file
diff --git a/tencentcloud/services/bh/resource_tc_dasb_resource.go b/tencentcloud/services/bh/resource_tc_dasb_resource.go
index fc0269c51f..6ab9cdb3bd 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_resource.go
+++ b/tencentcloud/services/bh/resource_tc_dasb_resource.go
@@ -149,7 +149,7 @@ func resourceTencentCloudDasbResourceCreate(d *schema.ResourceData, meta interfa
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
}
- if result == nil || result.Response.ResourceId == nil {
+ if result == nil || *result.Response.ResourceId == "" {
e = fmt.Errorf("dasb Resource not exists")
return resource.NonRetryableError(e)
}
@@ -166,6 +166,8 @@ func resourceTencentCloudDasbResourceCreate(d *schema.ResourceData, meta interfa
resourceId = *response.Response.ResourceId
d.SetId(resourceId)
+ // deploy resource
+
// wait
describeRequest.ResourceIds = helper.Strings([]string{resourceId})
err = resource.Retry(tccommon.WriteRetryTimeout*4, func() *resource.RetryError {
diff --git a/tencentcloud/services/bh/resource_tc_dasb_user.go b/tencentcloud/services/bh/resource_tc_dasb_user.go
index 1e7e6b5d8c..3c96b788b9 100644
--- a/tencentcloud/services/bh/resource_tc_dasb_user.go
+++ b/tencentcloud/services/bh/resource_tc_dasb_user.go
@@ -47,16 +47,19 @@ func ResourceTencentCloudDasbUser() *schema.Resource {
},
"validate_from": {
Optional: true,
+ Computed: true,
Type: schema.TypeString,
Description: "User effective time, such as: 2021-09-22T00:00:00+00:00If the effective and expiry time are not filled in, the user will be valid for a long time.",
},
"validate_to": {
Optional: true,
+ Computed: true,
Type: schema.TypeString,
Description: "User expiration time, such as: 2021-09-23T00:00:00+00:00If the effective and expiry time are not filled in, the user will be valid for a long time.",
},
"group_id_set": {
Optional: true,
+ Computed: true,
Type: schema.TypeSet,
Elem: &schema.Schema{Type: schema.TypeInt},
Description: "The set of user group IDs to which it belongs.",
diff --git a/website/docs/r/dasb_bind_device_account_password.html.markdown b/website/docs/r/dasb_bind_device_account_password.html.markdown
index 70b97716e1..82d4c407eb 100644
--- a/website/docs/r/dasb_bind_device_account_password.html.markdown
+++ b/website/docs/r/dasb_bind_device_account_password.html.markdown
@@ -14,8 +14,20 @@ Provides a resource to create a dasb bind_device_account_password
## Example Usage
```hcl
+resource "tencentcloud_dasb_device" "example" {
+ os_name = "Linux"
+ ip = "192.168.0.1"
+ port = 80
+ name = "tf_example"
+}
+
+resource "tencentcloud_dasb_device_account" "example" {
+ device_id = tencentcloud_dasb_device.example.id
+ account = "root"
+}
+
resource "tencentcloud_dasb_bind_device_account_password" "example" {
- device_account_id = 16
+ device_account_id = tencentcloud_dasb_device_account.example.id
password = "TerraformPassword"
}
```
diff --git a/website/docs/r/dasb_bind_device_account_private_key.html.markdown b/website/docs/r/dasb_bind_device_account_private_key.html.markdown
index 4a5141bd6e..8d04c3339a 100644
--- a/website/docs/r/dasb_bind_device_account_private_key.html.markdown
+++ b/website/docs/r/dasb_bind_device_account_private_key.html.markdown
@@ -14,8 +14,20 @@ Provides a resource to create a dasb bind_device_account_private_key
## Example Usage
```hcl
+resource "tencentcloud_dasb_device" "example" {
+ os_name = "Linux"
+ ip = "192.168.0.1"
+ port = 80
+ name = "tf_example"
+}
+
+resource "tencentcloud_dasb_device_account" "example" {
+ device_id = tencentcloud_dasb_device.example.id
+ account = "root"
+}
+
resource "tencentcloud_dasb_bind_device_account_private_key" "example" {
- device_account_id = 16
+ device_account_id = tencentcloud_dasb_device_account.example.id
private_key = "MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUpwmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ51s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh"
private_key_password = "TerraformPassword"
}
diff --git a/website/docs/r/dasb_bind_device_resource.html.markdown b/website/docs/r/dasb_bind_device_resource.html.markdown
index 3cb966b6be..850b59a2c2 100644
--- a/website/docs/r/dasb_bind_device_resource.html.markdown
+++ b/website/docs/r/dasb_bind_device_resource.html.markdown
@@ -15,7 +15,7 @@ Provides a resource to create a dasb bind_device_resource
```hcl
resource "tencentcloud_dasb_bind_device_resource" "example" {
- resource_id = "bh-saas-ocmzo6lgxiv"
+ resource_id = "bh-saas-weyosfym"
device_id_set = [17, 18]
}
```
diff --git a/website/docs/r/dasb_device_account.html.markdown b/website/docs/r/dasb_device_account.html.markdown
index eb66ae3158..9063f29f8e 100644
--- a/website/docs/r/dasb_device_account.html.markdown
+++ b/website/docs/r/dasb_device_account.html.markdown
@@ -14,8 +14,15 @@ Provides a resource to create a dasb device_account
## Example Usage
```hcl
+resource "tencentcloud_dasb_device" "example" {
+ os_name = "Linux"
+ ip = "192.168.0.1"
+ port = 80
+ name = "tf_example"
+}
+
resource "tencentcloud_dasb_device_account" "example" {
- device_id = 100
+ device_id = tencentcloud_dasb_device.example.id
account = "root"
}
```
diff --git a/website/docs/r/dasb_device_group_members.html.markdown b/website/docs/r/dasb_device_group_members.html.markdown
index 0961263461..9798db1039 100644
--- a/website/docs/r/dasb_device_group_members.html.markdown
+++ b/website/docs/r/dasb_device_group_members.html.markdown
@@ -14,21 +14,20 @@ Provides a resource to create a dasb device_group_members
## Example Usage
```hcl
-resource "tencentcloud_dasb_user" "example" {
- user_name = "tf_example"
- real_name = "terraform"
- phone = "+86|18345678782"
- email = "demo@tencent.com"
- auth_type = 0
+resource "tencentcloud_dasb_device" "example" {
+ os_name = "Linux"
+ ip = "192.168.0.1"
+ port = 80
+ name = "tf_example"
}
-resource "tencentcloud_dasb_user_group" "example" {
- name = "tf_example_update"
+resource "tencentcloud_dasb_device_group" "example" {
+ name = "tf_example"
}
-resource "tencentcloud_dasb_user_group_members" "example" {
- user_group_id = tencentcloud_dasb_user_group.example.id
- member_id_set = [tencentcloud_dasb_user.example.id]
+resource "tencentcloud_dasb_device_group_members" "example" {
+ device_group_id = tencentcloud_dasb_device_group.example.id
+ member_id_set = [tencentcloud_dasb_device.example.id]
}
```
@@ -52,6 +51,6 @@ In addition to all arguments above, the following attributes are exported:
dasb device_group_members can be imported using the id, e.g.
```
-terraform import tencentcloud_dasb_device_group_members.example 3#35
+terraform import tencentcloud_dasb_device_group_members.example 53#102
```
diff --git a/website/docs/r/dasb_user_group.html.markdown b/website/docs/r/dasb_user_group.html.markdown
index d5c5b37db9..1cb5e0dc38 100644
--- a/website/docs/r/dasb_user_group.html.markdown
+++ b/website/docs/r/dasb_user_group.html.markdown
@@ -15,7 +15,7 @@ Provides a resource to create a dasb user_group
```hcl
resource "tencentcloud_dasb_user_group" "example" {
- name = "tf_example_update"
+ name = "tf_example"
}
```
@@ -23,7 +23,7 @@ resource "tencentcloud_dasb_user_group" "example" {
```hcl
resource "tencentcloud_dasb_user_group" "example" {
- name = "tf_example_update"
+ name = "tf_example"
department_id = "1.2"
}
```
diff --git a/website/docs/r/dasb_user_group_members.html.markdown b/website/docs/r/dasb_user_group_members.html.markdown
index bbdaf1d195..5e571e71be 100644
--- a/website/docs/r/dasb_user_group_members.html.markdown
+++ b/website/docs/r/dasb_user_group_members.html.markdown
@@ -14,9 +14,21 @@ Provides a resource to create a dasb user_group_members
## Example Usage
```hcl
+resource "tencentcloud_dasb_user" "example" {
+ user_name = "tf_example"
+ real_name = "terraform"
+ phone = "+86|18345678782"
+ email = "demo@tencent.com"
+ auth_type = 0
+}
+
+resource "tencentcloud_dasb_user_group" "example" {
+ name = "tf_example"
+}
+
resource "tencentcloud_dasb_user_group_members" "example" {
- user_group_id = 3
- member_id_set = [1, 2, 3]
+ user_group_id = tencentcloud_dasb_user_group.example.id
+ member_id_set = [tencentcloud_dasb_user.example.id]
}
```
@@ -40,6 +52,6 @@ In addition to all arguments above, the following attributes are exported:
dasb user_group_members can be imported using the id, e.g.
```
-terraform import tencentcloud_dasb_user_group_members.example 3#1,2,3
+terraform import tencentcloud_dasb_user_group_members.example 3#14
```
diff --git a/website/tencentcloud.erb b/website/tencentcloud.erb
index 989f098632..36ef59d840 100644
--- a/website/tencentcloud.erb
+++ b/website/tencentcloud.erb
@@ -462,9 +462,6 @@
tencentcloud_dasb_reset_user
-
- tencentcloud_dasb_resource
-
tencentcloud_dasb_user