Skip to content

Commit 5f55437

Browse files
SevenEarthSevenEarth
committed
add
1 parent 78933c0 commit 5f55437

File tree

12 files changed

+206
-21
lines changed

12 files changed

+206
-21
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.3.8
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.11
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.13
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.11
@@ -107,7 +107,7 @@ require (
107107

108108
require (
109109
github.com/hashicorp/go-uuid v1.0.3
110-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bh v1.3.7
110+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bh v1.3.13
111111
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/billing v1.1.31
112112
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdc v1.0.1149
113113
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwdoris v1.0.993

‎go.sum‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,8 +829,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.3.8 h1:v/G/D3bqU
829829
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.3.8/go.mod h1:DarTPk6LPu4LtKwDRbF2V2Af4KKXVXnzyteNhAifWm8=
830830
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.3.4 h1:hTOxj4qB+UX6MflqmIYT4cPbfEqtiJEfi9tR58DxkIw=
831831
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.3.4/go.mod h1:q7fZk23gy6BkZGcNw9NXFSj26R44tiJZKGxLFfOrMo0=
832-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bh v1.3.7 h1:EmqV7a3kxOzI+oPR9o8npRupCGfzgRRgIfF7KHAa1cs=
833-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bh v1.3.7/go.mod h1:jOm6mEGQbEzxX8hkRSoBfZRvCRqHtUG2jQ0gmyT8w68=
832+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bh v1.3.13 h1:pOznoI6ossizZtkQJ35N0h42Zlb5RVSm2cENkJfV9Uk=
833+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bh v1.3.13/go.mod h1:kjEHPYHinQoO3rf+S/CMshx1sQdUGpjur7oIzcigEsc=
834834
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824 h1:DVKvZ6h+qd7tadUrCjVAkCCmE3TsbK2ZmwGd3AJcpWc=
835835
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824/go.mod h1:DvBpDX/qdJG4KKLeULmRvhAjPYiw8za0HeTSu2y/lFw=
836836
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/billing v1.1.31 h1:teA14cAcXuGxas6+5YANQ5KCoPaQBKIb2Q8+sk08Mu0=
@@ -940,6 +940,9 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4/go.mod h1
940940
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.8/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
941941
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.11 h1:pexLAyZVjVcxS8dmGY5qtiYyXZ68vKUmKPamMqsAoso=
942942
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.11/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
943+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.7/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
944+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.13 h1:jB/0fwy3k35sshktv7MZ4H7lNLlzBDM7rj+QuK1Rvl0=
945+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.13/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
943946
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.1.51 h1:pGwrfCBBCt1u+EDHwfNj9NLQpvk5MVKVMcsE7SvwqM4=
944947
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.1.51/go.mod h1:aTEdZDUTIOTS0CMDMMpKIkoc0HqtQ5+dRlaZO1KF/gg=
945948
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=

‎tencentcloud/services/bh/resource_tc_bh_user.go‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,18 @@ func resourceTencentCloudBhUserRead(d *schema.ResourceData, meta interface{}) er
253253
}
254254

255255
if respData.DepartmentId != nil {
256-
_ = d.Set("department_id", respData.DepartmentId)
256+
dResp, err := service.DescribeBhDepartments(ctx)
257+
if err != nil {
258+
return err
259+
}
260+
261+
if dResp == nil {
262+
return fmt.Errorf("Departments is nil")
263+
}
264+
265+
if dResp.Enabled != nil && *dResp.Enabled {
266+
_ = d.Set("department_id", respData.DepartmentId)
267+
}
257268
}
258269

259270
if respData.Id != nil {

‎tencentcloud/services/bh/resource_tc_bh_user_directory.go‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,18 @@ func ResourceTencentCloudBhUserDirectory() *schema.Resource {
8686
Description: "IOA associated user source name.",
8787
},
8888

89-
"user_count": {
90-
Type: schema.TypeInt,
91-
Required: true,
92-
ForceNew: true,
93-
Description: "Number of users included in the directory.",
94-
},
95-
9689
// computed
9790
"directory_id": {
9891
Type: schema.TypeInt,
9992
Computed: true,
10093
Description: "Directory ID.",
10194
},
95+
96+
"user_count": {
97+
Type: schema.TypeInt,
98+
Computed: true,
99+
Description: "Number of users included in the directory.",
100+
},
102101
},
103102
}
104103
}
@@ -159,10 +158,6 @@ func resourceTencentCloudBhUserDirectoryCreate(d *schema.ResourceData, meta inte
159158
request.SourceName = helper.String(v.(string))
160159
}
161160

162-
if v, ok := d.GetOkExists("user_count"); ok {
163-
request.UserCount = helper.IntUint64(v.(int))
164-
}
165-
166161
reqErr := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
167162
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseBhV20230418Client().CreateUserDirectoryWithContext(ctx, request)
168163
if e != nil {

‎tencentcloud/services/bh/resource_tc_bh_user_directory.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ resource "tencentcloud_bh_user_directory" "example" {
2323
}
2424
source = 0
2525
source_name = "sourceName"
26-
user_count = 3
2726
}
2827
```
2928

‎tencentcloud/services/bh/resource_tc_bh_user_group.go‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,18 @@ func resourceTencentCloudBhUserGroupRead(d *schema.ResourceData, meta interface{
124124

125125
if respData.Department != nil {
126126
if respData.Department.Id != nil {
127-
_ = d.Set("department_id", respData.Department.Id)
127+
dResp, err := service.DescribeBhDepartments(ctx)
128+
if err != nil {
129+
return err
130+
}
131+
132+
if dResp == nil {
133+
return fmt.Errorf("Departments is nil")
134+
}
135+
136+
if dResp.Enabled != nil && *dResp.Enabled {
137+
_ = d.Set("department_id", respData.Department.Id)
138+
}
128139
}
129140
}
130141

‎tencentcloud/services/bh/service_tencentcloud_bh.go‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,44 @@ func (me *BhService) DescribeBhReconnectionSettingConfigById(ctx context.Context
364364
return
365365
}
366366

367+
func (me *BhService) DescribeBhDepartments(ctx context.Context) (ret *bhv20230418.Departments, errRet error) {
368+
logId := tccommon.GetLogId(ctx)
369+
370+
request := bhv20230418.NewDescribeDepartmentsRequest()
371+
response := bhv20230418.NewDescribeDepartmentsResponse()
372+
373+
defer func() {
374+
if errRet != nil {
375+
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
376+
}
377+
}()
378+
379+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
380+
ratelimit.Check(request.GetAction())
381+
result, e := me.client.UseBhV20230418Client().DescribeDepartments(request)
382+
if e != nil {
383+
return tccommon.RetryError(e)
384+
} else {
385+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
386+
}
387+
388+
if result == nil || result.Response == nil || result.Response.Departments == nil {
389+
return resource.NonRetryableError(fmt.Errorf("Describe departments failed, Response is nil."))
390+
}
391+
392+
response = result
393+
return nil
394+
})
395+
396+
if err != nil {
397+
errRet = err
398+
return
399+
}
400+
401+
ret = response.Response.Departments
402+
return
403+
}
404+
367405
func (me *BhService) DescribeBhUserById(ctx context.Context, userId string) (ret *bhv20230418.User, errRet error) {
368406
logId := tccommon.GetLogId(ctx)
369407

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bh/v20230418/client.go‎

Lines changed: 56 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bh/v20230418/models.go‎

Lines changed: 65 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)