Skip to content

Commit e3bfd04

Browse files
SevenEarthSevenEarth
authored
fix(bh): [116555803] Fix errors in querying user group members (#2564)
* add * add * fix/bh * fix/bh * fix/bh
1 parent 9411778 commit e3bfd04

27 files changed

+159
-40
lines changed

‎.changelog/2564.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_dasb_user_group_members: Fix errors in querying user group members
3+
```

‎tencentcloud/provider.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2088,7 +2088,6 @@ Bastion Host(BH)
20882088
tencentcloud_dasb_device_group_members
20892089
tencentcloud_dasb_user_group_members
20902090
tencentcloud_dasb_bind_device_resource
2091-
tencentcloud_dasb_resource
20922091
tencentcloud_dasb_device
20932092
tencentcloud_dasb_user_group
20942093
tencentcloud_dasb_reset_user

‎tencentcloud/services/bh/resource_tc_dasb_acl.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,13 @@ func ResourceTencentCloudDasbAcl() *schema.Resource {
149149
},
150150
"validate_from": {
151151
Optional: true,
152+
Computed: true,
152153
Type: schema.TypeString,
153154
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.",
154155
},
155156
"validate_to": {
156157
Optional: true,
158+
Computed: true,
157159
Type: schema.TypeString,
158160
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.",
159161
},

‎tencentcloud/services/bh/resource_tc_dasb_bind_device_account_password.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,20 @@ Provides a resource to create a dasb bind_device_account_password
33
Example Usage
44

55
```hcl
6+
resource "tencentcloud_dasb_device" "example" {
7+
os_name = "Linux"
8+
ip = "192.168.0.1"
9+
port = 80
10+
name = "tf_example"
11+
}
12+
13+
resource "tencentcloud_dasb_device_account" "example" {
14+
device_id = tencentcloud_dasb_device.example.id
15+
account = "root"
16+
}
17+
618
resource "tencentcloud_dasb_bind_device_account_password" "example" {
7-
device_account_id = 16
19+
device_account_id = tencentcloud_dasb_device_account.example.id
820
password = "TerraformPassword"
921
}
1022
```

‎tencentcloud/services/bh/resource_tc_dasb_bind_device_account_private_key.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,20 @@ Provides a resource to create a dasb bind_device_account_private_key
33
Example Usage
44

55
```hcl
6+
resource "tencentcloud_dasb_device" "example" {
7+
os_name = "Linux"
8+
ip = "192.168.0.1"
9+
port = 80
10+
name = "tf_example"
11+
}
12+
13+
resource "tencentcloud_dasb_device_account" "example" {
14+
device_id = tencentcloud_dasb_device.example.id
15+
account = "root"
16+
}
17+
618
resource "tencentcloud_dasb_bind_device_account_private_key" "example" {
7-
device_account_id = 16
19+
device_account_id = tencentcloud_dasb_device_account.example.id
820
private_key = "MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUpwmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ51s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh"
921
private_key_password = "TerraformPassword"
1022
}

‎tencentcloud/services/bh/resource_tc_dasb_bind_device_resource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Example Usage
44

55
```hcl
66
resource "tencentcloud_dasb_bind_device_resource" "example" {
7-
resource_id = "bh-saas-ocmzo6lgxiv"
7+
resource_id = "bh-saas-weyosfym"
88
device_id_set = [17, 18]
99
}
1010
```

‎tencentcloud/services/bh/resource_tc_dasb_device.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ func ResourceTencentCloudDasbDevice() *schema.Resource {
5555
Type: schema.TypeSet,
5656
Elem: &schema.Schema{Type: schema.TypeString},
5757
Optional: true,
58+
Computed: true,
5859
Description: "Asset multi-node: fields ip and port.",
5960
},
6061
},
@@ -159,8 +160,8 @@ func resourceTencentCloudDasbDeviceRead(d *schema.ResourceData, meta interface{}
159160
_ = d.Set("os_name", device.OsName)
160161
}
161162

162-
if device.PublicIp != nil {
163-
_ = d.Set("ip", device.PublicIp)
163+
if device.PrivateIp != nil {
164+
_ = d.Set("ip", device.PrivateIp)
164165
}
165166

166167
if device.Port != nil {

‎tencentcloud/services/bh/resource_tc_dasb_device_account.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func resourceTencentCloudDasbDeviceAccountCreate(d *schema.ResourceData, meta in
6767
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
6868
}
6969

70-
if result == nil || result.Response.Id != nil {
70+
if result == nil || result.Response.Id == nil {
7171
e = fmt.Errorf("dasb DeviceAccount not exists")
7272
return resource.NonRetryableError(e)
7373
}

‎tencentcloud/services/bh/resource_tc_dasb_device_account.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@ Provides a resource to create a dasb device_account
33
Example Usage
44

55
```hcl
6+
resource "tencentcloud_dasb_device" "example" {
7+
os_name = "Linux"
8+
ip = "192.168.0.1"
9+
port = 80
10+
name = "tf_example"
11+
}
12+
613
resource "tencentcloud_dasb_device_account" "example" {
7-
device_id = 100
14+
device_id = tencentcloud_dasb_device.example.id
815
account = "root"
916
}
1017
```

‎tencentcloud/services/bh/resource_tc_dasb_device_group_members.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ func resourceTencentCloudDasbDeviceGroupMembersRead(d *schema.ResourceData, meta
124124
return nil
125125
}
126126

127-
_ = d.Set("device_group_id", deviceGroupId)
127+
deviceGroupIdInt, _ := strconv.Atoi(deviceGroupId)
128+
_ = d.Set("device_group_id", deviceGroupIdInt)
128129
_ = d.Set("member_id_set", DeviceGroupMembers)
129130

130131
return nil

‎tencentcloud/services/bh/resource_tc_dasb_device_group_members.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,20 @@ Provides a resource to create a dasb device_group_members
33
Example Usage
44

55
```hcl
6+
resource "tencentcloud_dasb_device" "example" {
7+
os_name = "Linux"
8+
ip = "192.168.0.1"
9+
port = 80
10+
name = "tf_example"
11+
}
12+
13+
resource "tencentcloud_dasb_device_group" "example" {
14+
name = "tf_example"
15+
}
16+
617
resource "tencentcloud_dasb_device_group_members" "example" {
7-
device_group_id = 3
8-
member_id_set = [1, 2, 3]
18+
device_group_id = tencentcloud_dasb_device_group.example.id
19+
member_id_set = [tencentcloud_dasb_device.example.id]
920
}
1021
```
1122

@@ -14,5 +25,5 @@ Import
1425
dasb device_group_members can be imported using the id, e.g.
1526

1627
```
17-
terraform import tencentcloud_dasb_device_group_members.example 3#1,2,3
28+
terraform import tencentcloud_dasb_device_group_members.example 53#102
1829
```

‎tencentcloud/services/bh/resource_tc_dasb_resource.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func resourceTencentCloudDasbResourceCreate(d *schema.ResourceData, meta interfa
149149
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
150150
}
151151

152-
if result == nil || result.Response.ResourceId == nil {
152+
if result == nil || *result.Response.ResourceId == "" {
153153
e = fmt.Errorf("dasb Resource not exists")
154154
return resource.NonRetryableError(e)
155155
}
@@ -166,6 +166,8 @@ func resourceTencentCloudDasbResourceCreate(d *schema.ResourceData, meta interfa
166166
resourceId = *response.Response.ResourceId
167167
d.SetId(resourceId)
168168

169+
// deploy resource
170+
169171
// wait
170172
describeRequest.ResourceIds = helper.Strings([]string{resourceId})
171173
err = resource.Retry(tccommon.WriteRetryTimeout*4, func() *resource.RetryError {

‎tencentcloud/services/bh/resource_tc_dasb_resource.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Example Usage
55
```hcl
66
resource "tencentcloud_dasb_resource" "example" {
77
deploy_region = "ap-guangzhou"
8-
vpc_id = "vpc-q1of50wz"
9-
subnet_id = "subnet-7uhvm46o"
8+
vpc_id = "vpc-fmz6l9nz"
9+
subnet_id = "subnet-g7jhwhi2"
1010
resource_edition = "standard"
11-
resource_node = 2
11+
resource_node = 50
1212
time_unit = "m"
1313
time_span = 1
1414
auto_renew_flag = 1

‎tencentcloud/services/bh/resource_tc_dasb_user.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,19 @@ func ResourceTencentCloudDasbUser() *schema.Resource {
4747
},
4848
"validate_from": {
4949
Optional: true,
50+
Computed: true,
5051
Type: schema.TypeString,
5152
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.",
5253
},
5354
"validate_to": {
5455
Optional: true,
56+
Computed: true,
5557
Type: schema.TypeString,
5658
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.",
5759
},
5860
"group_id_set": {
5961
Optional: true,
62+
Computed: true,
6063
Type: schema.TypeSet,
6164
Elem: &schema.Schema{Type: schema.TypeInt},
6265
Description: "The set of user group IDs to which it belongs.",

‎tencentcloud/services/bh/resource_tc_dasb_user_group.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ Example Usage
44

55
```hcl
66
resource "tencentcloud_dasb_user_group" "example" {
7-
name = "tf_example_update"
7+
name = "tf_example"
88
}
99
```
1010

1111
Or
1212

1313
```hcl
1414
resource "tencentcloud_dasb_user_group" "example" {
15-
name = "tf_example_update"
15+
name = "tf_example"
1616
department_id = "1.2"
1717
}
1818
```

‎tencentcloud/services/bh/resource_tc_dasb_user_group_members.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ func resourceTencentCloudDasbUserGroupMembersRead(d *schema.ResourceData, meta i
125125
return nil
126126
}
127127

128-
_ = d.Set("user_group_id", userGroupId)
128+
userGroupIdInt, _ := strconv.Atoi(userGroupId)
129+
_ = d.Set("user_group_id", userGroupIdInt)
129130
_ = d.Set("member_id_set", UserGroupMembers)
130131

131132
return nil

‎tencentcloud/services/bh/resource_tc_dasb_user_group_members.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,21 @@ Provides a resource to create a dasb user_group_members
33
Example Usage
44

55
```hcl
6+
resource "tencentcloud_dasb_user" "example" {
7+
user_name = "tf_example"
8+
real_name = "terraform"
9+
phone = "+86|18345678782"
10+
email = "[email protected]"
11+
auth_type = 0
12+
}
13+
14+
resource "tencentcloud_dasb_user_group" "example" {
15+
name = "tf_example"
16+
}
17+
618
resource "tencentcloud_dasb_user_group_members" "example" {
7-
user_group_id = 3
8-
member_id_set = [1, 2, 3]
19+
user_group_id = tencentcloud_dasb_user_group.example.id
20+
member_id_set = [tencentcloud_dasb_user.example.id]
921
}
1022
```
1123

@@ -14,5 +26,5 @@ Import
1426
dasb user_group_members can be imported using the id, e.g.
1527

1628
```
17-
terraform import tencentcloud_dasb_user_group_members.example 3#1,2,3
29+
terraform import tencentcloud_dasb_user_group_members.example 3#14
1830
```

‎tencentcloud/services/bh/service_tencentcloud_dasb.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ func (me *DasbService) DescribeDasbDeviceGroupMembersById(ctx context.Context, d
308308
request := dasb.NewDescribeDeviceGroupMembersRequest()
309309
deviceGroupIdInt, _ := strconv.ParseUint(deviceGroupId, 10, 64)
310310
request.Id = &deviceGroupIdInt
311+
request.Bound = common.BoolPtr(true)
311312

312313
defer func() {
313314
if errRet != nil {
@@ -378,6 +379,7 @@ func (me *DasbService) DescribeDasbUserGroupMembersById(ctx context.Context, use
378379
request := dasb.NewDescribeUserGroupMembersRequest()
379380
userGroupIdInt, _ := strconv.ParseUint(userGroupId, 10, 64)
380381
request.Id = &userGroupIdInt
382+
request.Bound = common.BoolPtr(true)
381383

382384
defer func() {
383385
if errRet != nil {

‎website/docs/r/dasb_bind_device_account_password.html.markdown

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,20 @@ Provides a resource to create a dasb bind_device_account_password
1414
## Example Usage
1515

1616
```hcl
17+
resource "tencentcloud_dasb_device" "example" {
18+
os_name = "Linux"
19+
ip = "192.168.0.1"
20+
port = 80
21+
name = "tf_example"
22+
}
23+
24+
resource "tencentcloud_dasb_device_account" "example" {
25+
device_id = tencentcloud_dasb_device.example.id
26+
account = "root"
27+
}
28+
1729
resource "tencentcloud_dasb_bind_device_account_password" "example" {
18-
device_account_id = 16
30+
device_account_id = tencentcloud_dasb_device_account.example.id
1931
password = "TerraformPassword"
2032
}
2133
```

‎website/docs/r/dasb_bind_device_account_private_key.html.markdown

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,20 @@ Provides a resource to create a dasb bind_device_account_private_key
1414
## Example Usage
1515

1616
```hcl
17+
resource "tencentcloud_dasb_device" "example" {
18+
os_name = "Linux"
19+
ip = "192.168.0.1"
20+
port = 80
21+
name = "tf_example"
22+
}
23+
24+
resource "tencentcloud_dasb_device_account" "example" {
25+
device_id = tencentcloud_dasb_device.example.id
26+
account = "root"
27+
}
28+
1729
resource "tencentcloud_dasb_bind_device_account_private_key" "example" {
18-
device_account_id = 16
30+
device_account_id = tencentcloud_dasb_device_account.example.id
1931
private_key = "MIICXAIBAAKBgQCqGKukO1De7zhZj6+H0qtjTkVxwTCpvKe4eCZ0FPqri0cb2JZfXJ/DgYSF6vUpwmJG8wVQZKjeGcjDOL5UlsuusFncCzWBQ7RKNUSesmQRMSGkVb1/3j+skZ6UtW+5u09lHNsj6tQ51s1SPrCBkedbNf0Tp0GbMJDyR4e9T04ZZwIDAQABAoGAFijko56+qGyN8M0RVyaRAXz++xTqHBLh"
2032
private_key_password = "TerraformPassword"
2133
}

‎website/docs/r/dasb_bind_device_resource.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Provides a resource to create a dasb bind_device_resource
1515

1616
```hcl
1717
resource "tencentcloud_dasb_bind_device_resource" "example" {
18-
resource_id = "bh-saas-ocmzo6lgxiv"
18+
resource_id = "bh-saas-weyosfym"
1919
device_id_set = [17, 18]
2020
}
2121
```

‎website/docs/r/dasb_device_account.html.markdown

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,15 @@ Provides a resource to create a dasb device_account
1414
## Example Usage
1515

1616
```hcl
17+
resource "tencentcloud_dasb_device" "example" {
18+
os_name = "Linux"
19+
ip = "192.168.0.1"
20+
port = 80
21+
name = "tf_example"
22+
}
23+
1724
resource "tencentcloud_dasb_device_account" "example" {
18-
device_id = 100
25+
device_id = tencentcloud_dasb_device.example.id
1926
account = "root"
2027
}
2128
```

‎website/docs/r/dasb_device_group_members.html.markdown

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,20 @@ Provides a resource to create a dasb device_group_members
1414
## Example Usage
1515

1616
```hcl
17+
resource "tencentcloud_dasb_device" "example" {
18+
os_name = "Linux"
19+
ip = "192.168.0.1"
20+
port = 80
21+
name = "tf_example"
22+
}
23+
24+
resource "tencentcloud_dasb_device_group" "example" {
25+
name = "tf_example"
26+
}
27+
1728
resource "tencentcloud_dasb_device_group_members" "example" {
18-
device_group_id = 3
19-
member_id_set = [1, 2, 3]
29+
device_group_id = tencentcloud_dasb_device_group.example.id
30+
member_id_set = [tencentcloud_dasb_device.example.id]
2031
}
2132
```
2233

@@ -40,6 +51,6 @@ In addition to all arguments above, the following attributes are exported:
4051
dasb device_group_members can be imported using the id, e.g.
4152

4253
```
43-
terraform import tencentcloud_dasb_device_group_members.example 3#1,2,3
54+
terraform import tencentcloud_dasb_device_group_members.example 53#102
4455
```
4556

0 commit comments

Comments
 (0)