Skip to content

Commit e7e544b

Browse files
committed
[PDR-13603][bug] logkit 配置 aws cloudtrail 类型数据时预取报错
1 parent 54998fb commit e7e544b

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

reader/cloudtrail/cloudtrail.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ type Reader struct {
7373
}
7474

7575
func NewReader(meta *reader.Meta, conf conf.MapConf) (reader.Reader, error) {
76-
opts, err := buildSyncOptions(conf)
76+
opts, err := buildSyncOptions(meta, conf)
7777
if err != nil {
7878
return nil, err
7979
}
@@ -182,17 +182,14 @@ func GetS3UserInfo(conf conf.MapConf) (bucket, prefix, region, endpoint, ak, sk
182182
return
183183
}
184184

185-
func buildSyncOptions(conf conf.MapConf) (*syncOptions, error) {
185+
func buildSyncOptions(meta *reader.Meta, conf conf.MapConf) (*syncOptions, error) {
186186
var opts syncOptions
187187
var err error
188188
opts.bucket, opts.prefix, opts.region, opts.endpoint, opts.accessKey, opts.secretKey, err = GetS3UserInfo(conf)
189189
if err != nil {
190190
return nil, err
191191
}
192-
runnerName, err := conf.GetString(KeyRunnerName)
193-
if err != nil {
194-
return nil, err
195-
}
192+
runnerName, _ := conf.GetStringOr(KeyRunnerName, meta.RunnerName)
196193
opts.directory, _ = conf.GetStringOr(KeySyncDirectory, "")
197194
if opts.directory == "" {
198195
_, opts.directory = GetDefaultSyncDir(opts.bucket, opts.prefix, opts.region, opts.accessKey, opts.secretKey, runnerName)

0 commit comments

Comments
 (0)