diff --git a/src/cli/config/account.go b/src/cli/config/account.go index 7dd380551..495845b42 100644 --- a/src/cli/config/account.go +++ b/src/cli/config/account.go @@ -40,6 +40,7 @@ func m365Overrides(in map[string]string) map[string]string { func configureAccount( vpr *viper.Viper, readConfigFromViper bool, + matchFromConfig bool, overrides map[string]string, ) (account.Account, error) { var ( @@ -54,7 +55,9 @@ func configureAccount( 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/config.go b/src/cli/config/config.go index 74f3d8583..0d4391dc9 100644 --- a/src/cli/config/config.go +++ b/src/cli/config/config.go @@ -284,7 +284,7 @@ func getStorageAndAccountWithViper( config.RepoID = vpr.GetString(RepoID) } - config.Account, err = configureAccount(vpr, readConfigFromViper, overrides) + config.Account, err = configureAccount(vpr, readConfigFromViper, mustMatchFromConfig, overrides) if err != nil { return config, clues.Wrap(err, "retrieving account configuration details") } diff --git a/src/cli/config/config_test.go b/src/cli/config/config_test.go index 94b1387d6..444f6108d 100644 --- a/src/cli/config/config_test.go +++ b/src/cli/config/config_test.go @@ -270,7 +270,7 @@ func (suite *ConfigIntegrationSuite) TestGetStorageAndAccount() { err = vpr.ReadInConfig() require.NoError(t, err, "reading repo config", clues.ToCore(err)) - config, err := getStorageAndAccountWithViper(vpr, true, false, nil) + config, err := getStorageAndAccountWithViper(vpr, true, true, nil) require.NoError(t, err, "getting storage and account from config", clues.ToCore(err)) readS3Cfg, err := config.Storage.S3Config()