Skip to content

Commit d9f83cf

Browse files
authored
feat: support baidu iam user lastLoginTime (#87)
1 parent 5d85cec commit d9f83cf

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

collector/baidu/collector/iam/iam.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
)
2828

2929
type Detail struct {
30-
User api.UserModel
30+
User *api.GetUserResult
3131
LoginProfile *api.GetUserLoginProfileResult
3232
AccessKeys []api.AccessKeyModel
3333
Policies []api.PolicyModel
@@ -59,7 +59,7 @@ func GetInstanceDetail(ctx context.Context, service schema.ServiceInterface, res
5959

6060
for _, user := range users.Users {
6161
detail := Detail{
62-
User: user,
62+
User: getUserDetail(ctx, client, user.Name),
6363
LoginProfile: getUserLoginProfile(ctx, client, user.Name),
6464
AccessKeys: getUserAccessKey(ctx, client, user.Name),
6565
Policies: getUserPolicies(ctx, client, user.Name),
@@ -70,6 +70,15 @@ func GetInstanceDetail(ctx context.Context, service schema.ServiceInterface, res
7070
return nil
7171
}
7272

73+
func getUserDetail(ctx context.Context, client *iam.Client, name string) *api.GetUserResult {
74+
getUserResult, err := client.GetUser(name)
75+
if err != nil {
76+
log.CtxLogger(ctx).Error("GetUser error", zap.Error(err))
77+
return nil
78+
}
79+
return getUserResult
80+
}
81+
7382
func getUserLoginProfile(ctx context.Context, client *iam.Client, name string) *api.GetUserLoginProfileResult {
7483
resp, err := client.GetUserLoginProfile(name)
7584
if err != nil {

collector/baidu/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.0
55
replace github.com/core-sdk => ../core-sdk
66

77
require (
8-
github.com/baidubce/bce-sdk-go v0.9.229
8+
github.com/baidubce/bce-sdk-go v0.9.251
99
github.com/core-sdk v0.0.0-00010101000000-000000000000
1010
go.uber.org/zap v1.27.0
1111
)

collector/baidu/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/baidubce/bce-sdk-go v0.9.229 h1:oL+YlYDqeMrE6NHgPhkI+4T2geeIHz4PFVivvQ0ysug=
2-
github.com/baidubce/bce-sdk-go v0.9.229/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg=
1+
github.com/baidubce/bce-sdk-go v0.9.251 h1:gjNzXhu9FtHjwPZqmXtCiOJnX8TbpwvpjTY6mWzl/uM=
2+
github.com/baidubce/bce-sdk-go v0.9.251/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg=
33
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
44
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

collector/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ require (
160160
github.com/aws/aws-sdk-go-v2/service/sts v1.30.8 // indirect
161161
github.com/aws/aws-sdk-go-v2/service/wafv2 v1.55.5 // indirect
162162
github.com/aws/smithy-go v1.22.5 // indirect
163-
github.com/baidubce/bce-sdk-go v0.9.229 // indirect
163+
github.com/baidubce/bce-sdk-go v0.9.251 // indirect
164164
github.com/clbanning/mxj v1.8.4 // indirect
165165
github.com/clbanning/mxj/v2 v2.7.0 // indirect
166166
github.com/fsnotify/fsnotify v1.7.0 // indirect

collector/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,8 @@ github.com/aws/aws-sdk-go-v2/service/wafv2 v1.55.5 h1:Fqt5dudTu1FxJXxrcLxKmnSPVu
315315
github.com/aws/aws-sdk-go-v2/service/wafv2 v1.55.5/go.mod h1:SGymgXOuZBAnbdEO2NAPUHOXU2swMyT0+nHD1VlNxhk=
316316
github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw=
317317
github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
318-
github.com/baidubce/bce-sdk-go v0.9.229 h1:oL+YlYDqeMrE6NHgPhkI+4T2geeIHz4PFVivvQ0ysug=
319-
github.com/baidubce/bce-sdk-go v0.9.229/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg=
318+
github.com/baidubce/bce-sdk-go v0.9.251 h1:gjNzXhu9FtHjwPZqmXtCiOJnX8TbpwvpjTY6mWzl/uM=
319+
github.com/baidubce/bce-sdk-go v0.9.251/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg=
320320
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
321321
github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I=
322322
github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=

0 commit comments

Comments
 (0)