larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix sanity test

Browse Source
This commit is contained in:
neha-Gupta1 2023-07-03 10:52:25 +05:30
parent 95ac1d2aa2
commit bf309321af
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/config/account.go
View File

@ -50,12 +50,14 @@ func configureAccount(
err error
)
if matchFromConfig {
if readConfigFromViper {
m365Cfg, err = m365ConfigsFromViper(vpr)
if err != nil {
return acct, clues.Wrap(err, "reading m365 configs from corso config file")
}
}
if matchFromConfig {
if err := mustMatchConfig(vpr, m365Overrides(overrides)); err != nil {
return acct, clues.Wrap(err, "verifying m365 configs in corso config file")
}

8
src/cli/config/storage.go
View File

@ -69,6 +69,10 @@ func configureStorage(
)
if readConfigFromViper {
if s3Cfg, err = s3ConfigsFromViper(vpr); err != nil {
return store, clues.Wrap(err, "reading s3 configs from corso config file")
}
if b, ok := overrides[storage.Bucket]; ok {
overrides[storage.Bucket] = common.NormalizeBucket(b)
}
@ -79,10 +83,6 @@ func configureStorage(
}
if matchFromConfig {
if s3Cfg, err = s3ConfigsFromViper(vpr); err != nil {
return store, clues.Wrap(err, "reading s3 configs from corso config file")
}
if err := mustMatchConfig(vpr, s3Overrides(overrides)); err != nil {
return store, clues.Wrap(err, "verifying s3 configs in corso config file")
}