Skip to content
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

Jump to bottom

br: fix backup to aliyum OSS not support ak/sk as env #54150

Merged
merged 9 commits into from
Jul 2, 2024
Merged

br: fix backup to aliyum OSS not support ak/sk as env #54150

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a2fd7f
fix
RidRisR May 27, 2024
81dcd24
lint
RidRisR Jun 21, 2024
df0ec9b
fix format
RidRisR Jun 21, 2024
d0b6ce6
fixed
RidRisR Jun 27, 2024
69ae239
simplify
RidRisR Jun 27, 2024
68b98ce
del log
RidRisR Jun 27, 2024
26ccc61
Update br/pkg/storage/s3.go
RidRisR Jun 27, 2024
52c74eb
lint
RidRisR Jun 27, 2024
246b973
add chain creds
RidRisR Jun 27, 2024
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
18 changes: 15 additions & 3 deletions br/pkg/storage/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,22 @@ func autoNewCred(qs *backuppb.S3) (cred *credentials.Credentials, err error) {
func createOssRAMCred() (*credentials.Credentials, error) {
cred, err := aliproviders.NewInstanceMetadataProvider().Retrieve()
if err != nil {
return nil, errors.Annotate(err, "Alibaba RAM Provider Retrieve")
log.Warn("failed to get aliyun ram credential", zap.Error(err))
return nil, nil
}
var aliCred, ok = cred.(*alicred.StsTokenCredential)
if !ok {
return nil, errors.Errorf("invalid credential type %T", cred)
}
newCred := credentials.NewChainCredentials([]credentials.Provider{
&credentials.EnvProvider{},
&credentials.SharedCredentialsProvider{},
&credentials.StaticProvider{Value: credentials.Value{AccessKeyID: aliCred.AccessKeyId, SecretAccessKey: aliCred.AccessKeySecret, SessionToken: aliCred.AccessKeyStsToken, ProviderName: ""}},
})
if _, err := newCred.Get(); err != nil {
return nil, errors.Trace(err)
}
ncred := cred.(*alicred.StsTokenCredential)
return credentials.NewStaticCredentials(ncred.AccessKeyId, ncred.AccessKeySecret, ncred.AccessKeyStsToken), nil
return newCred, nil
}

// NewS3Storage initialize a new s3 storage for metadata.
Expand Down
Loading