Skip to content

[PDR-13603][bug] 修复 s3 接口无法对接其他平台问题 #1161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2021
Merged

[PDR-13603][bug] 修复 s3 接口无法对接其他平台问题 #1161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions reader/cloudtrail/cloudtrail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,12 @@ func newSyncManager(meta *reader.Meta, opts *syncOptions) (*syncManager, error)

func makeSyncSource(bucket, prefix string) string {
if prefix == "" {
return fmt.Sprintf("s3://%s", bucket)
return fmt.Sprintf("%s", bucket)
}
if strings.HasPrefix(prefix, "/") {
return fmt.Sprintf("s3://%s%s", bucket, prefix)
return fmt.Sprintf("%s%s", bucket, prefix)
}
return fmt.Sprintf("s3://%s/%s", bucket, prefix)
return fmt.Sprintf("%s/%s", bucket, prefix)
}

func (mgr *syncManager) startSync() {
Expand Down Expand Up @@ -319,9 +319,6 @@ func newSyncRunner(ctx *syncContext, quitChan chan struct{}) *syncRunner {
}

func (s *syncRunner) Sync() error {
if !validSource(s.source) {
return fmt.Errorf("invalid sync source %q", s.source)
}
if !validTarget(s.target) {
return fmt.Errorf("invalid sync target %q", s.target)
}
Expand Down Expand Up @@ -457,10 +454,20 @@ func (r *s3Url) keys() []string {

func lookupBucket(bucketName string, auth aws.Auth, region string, endpoint string) (*s3.Bucket, error) {
log.Infof("looking for bucket %q in region %q", bucketName, region)
rg := aws.Regions[region]
if endpoint != "" {
rg.S3Endpoint = endpoint

rg, ok := aws.Regions[region]
if !ok {
rg = aws.Region{
Name: region,
S3Endpoint: endpoint,
}
} else {
// replace default endpoint
if endpoint != "" {
rg.S3Endpoint = endpoint
}
}

s3 := s3.New(auth, rg)
bucket := s3.Bucket(bucketName)
_, err := bucket.List("", "", "", 0)
Expand Down