From bf309321af153d6e9a638fb6905517a37abeba2f Mon Sep 17 00:00:00 2001 From: neha-Gupta1 Date: Mon, 3 Jul 2023 10:52:25 +0530 Subject: [PATCH] fix sanity test --- src/cli/config/account.go | 4 +++- src/cli/config/storage.go | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/cli/config/account.go b/src/cli/config/account.go index 950724b15..495845b42 100644 --- a/src/cli/config/account.go +++ b/src/cli/config/account.go @@ -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") } diff --git a/src/cli/config/storage.go b/src/cli/config/storage.go index 6adc223ce..5b8560e07 100644 --- a/src/cli/config/storage.go +++ b/src/cli/config/storage.go @@ -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") }