mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

azure: deduplicate cli and default credentials case

This commit is contained in:
Michael Eischer 2024-05-18 22:15:38 +02:00
parent 355f520936
commit c56ecec9aa
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/backend/azure/azure.go
View File

@ -101,24 +101,22 @@ func open(cfg Config, rt http.RoundTripper) (*Backend, error) {
if err != nil { if err != nil {
return nil, errors.Wrap(err, "NewAccountSASClientFromEndpointToken") return nil, errors.Wrap(err, "NewAccountSASClientFromEndpointToken")
} }
} else if cfg.ForceCliCredential { } else {
debug.Log(" - using AzureCLICredential") var cred azcore.TokenCredential
cred, err := azidentity.NewAzureCLICredential(nil) if cfg.ForceCliCredential {
debug.Log(" - using AzureCLICredential")
cred, err = azidentity.NewAzureCLICredential(nil)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "NewAzureCLICredential") return nil, errors.Wrap(err, "NewAzureCLICredential")
} }
client, err = azContainer.NewClient(url, cred, opts)
if err != nil {
return nil, errors.Wrap(err, "NewClient")
}
} else { } else {
debug.Log(" - using DefaultAzureCredential") debug.Log(" - using DefaultAzureCredential")
cred, err := azidentity.NewDefaultAzureCredential(nil) cred, err = azidentity.NewDefaultAzureCredential(nil)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "NewDefaultAzureCredential") return nil, errors.Wrap(err, "NewDefaultAzureCredential")
} }
}
client, err = azContainer.NewClient(url, cred, opts) client, err = azContainer.NewClient(url, cred, opts)
if err != nil { if err != nil {