From 1ba103523ae43a2d5ed7b265df0d55f7289e2008 Mon Sep 17 00:00:00 2001
From: neha_gupta <nehagupta161995@gmail.com>
Date: Tue, 4 Jul 2023 11:42:17 +0530
Subject: [PATCH] Fix nightly test (#3739)

<!-- PR description-->

---

#### Does this PR need a docs update or release note?

- [ ] :white_check_mark: Yes, it's included
- [ ] :clock1: Yes, but in a later PR
- [x] :no_entry: No

#### Type of change

<!--- Please check the type of change your PR introduces: --->
- [ ] :sunflower: Feature
- [ ] :bug: Bugfix
- [ ] :world_map: Documentation
- [ ] :robot: Supportability/Tests
- [ ] :computer: CI/Deployment
- [x] :broom: Tech Debt/Cleanup

#### Issue(s)

<!-- Can reference multiple issues. Use one of the following "magic words" - "closes, fixes" to auto-close the Github issue. -->
* #<issue>

#### Test Plan

<!-- How will this be tested prior to merging.-->
- [x] :muscle: Manual
- [x] :zap: Unit test
- [ ] :green_heart: E2E
---
 src/cli/config/account.go     | 3 +++
 src/cli/config/config.go      | 2 +-
 src/cli/config/config_test.go | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

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()