mirror/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-12-25 09:18:55 +00:00
Code Issues Releases Wiki Activity

Since upgrade to minio-go 4.0 remove workaround

Browse source 
We added previously a code to fix the issue of chaining
credentials, we do not need this anymore since the
upstream minio-go already has this relevant change.
This commit is contained in:
Harshavardhana 2017-12-09 01:56:49 -08:00
parent 4f46b4f393
commit 27ccea6371
1 changed files with 1 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
internal/backend/s3/s3.go
View file

@ -33,48 +33,6 @@ var _ restic.Backend = &Backend{}
const defaultLayout = "default" const defaultLayout = "default"
type chain struct {
Providers []credentials.Provider
curr credentials.Provider
}
// FIXME: Remove this code once restic migrates to minio-go 4.0.x
func newChainCredentials(providers []credentials.Provider) *credentials.Credentials {
return credentials.New(&chain{
Providers: append([]credentials.Provider{}, providers...),
})
}
// Retrieve returns the credentials value or error if no provider returned
// without error.
//
// If a provider is found it will be cached and any calls to IsExpired()
// will return the expired state of the cached provider.
func (c *chain) Retrieve() (credentials.Value, error) {
for _, p := range c.Providers {
creds, _ := p.Retrieve()
// If anonymous proceed to the next provider if any.
if creds.SignerType.IsAnonymous() {
continue
}
c.curr = p
return creds, nil
}
return credentials.Value{
SignerType: credentials.SignatureAnonymous,
}, nil
}
// IsExpired will returned the expired state of the currently cached provider
// if there is one. If there is no current provider, true will be returned.
func (c *chain) IsExpired() bool {
if c.curr != nil {
return c.curr.IsExpired()
}
return true
}
func open(cfg Config, rt http.RoundTripper) (*Backend, error) { func open(cfg Config, rt http.RoundTripper) (*Backend, error) {
debug.Log("open, config %#v", cfg) debug.Log("open, config %#v", cfg)
@ -89,7 +47,7 @@ func open(cfg Config, rt http.RoundTripper) (*Backend, error) {
// configured ec2 instances) // configured ec2 instances)
// AWS env variables such as AWS_ACCESS_KEY_ID // AWS env variables such as AWS_ACCESS_KEY_ID
// Minio env variables such as MINIO_ACCESS_KEY // Minio env variables such as MINIO_ACCESS_KEY
creds := newChainCredentials([]credentials.Provider{ creds := credentials.NewChainCredentials([]credentials.Provider{
&credentials.Static{ &credentials.Static{
Value: credentials.Value{ Value: credentials.Value{
AccessKeyID: cfg.KeyID, AccessKeyID: cfg.KeyID,