CLOUDP-352158: save config before logout (#4273)

Author: blva

internal/cli/auth/logout.go

@@ -123,11 +123,15 @@ func (opts *logoutOpts) Run(ctx context.Context) error {
 	opts.config.SetProjectID("")
 	opts.config.SetOrgID("")
 
+	if err := opts.config.Save(); err != nil {
+		return err
+	}
+
 	if !opts.keepConfig {
 		return opts.Delete(opts.config.Delete)
 	}
 
-	return opts.config.Save()
+	return nil
 }
 
 func LogoutBuilder() *cobra.Command {

internal/cli/auth/logout_test.go

@@ -165,11 +165,6 @@ func Test_logoutOpts_Run_Keep_UserAccount(t *testing.T) {
 
 	mockConfigCleanUp(mockConfig)
 	mockProjectAndOrgCleanUp(mockConfig)
-	mockConfig.
-		EXPECT().
-		Save().
-		Return(nil).
-		Times(1)
 
 	require.NoError(t, opts.Run(ctx))
 }
@@ -199,11 +194,6 @@ func Test_logoutOpts_Run_Keep_APIKeys(t *testing.T) {
 
 	mockConfigCleanUp(mockConfig)
 	mockProjectAndOrgCleanUp(mockConfig)
-	mockConfig.
-		EXPECT().
-		Save().
-		Return(nil).
-		Times(1)
 
 	require.NoError(t, opts.Run(ctx))
 }
@@ -236,11 +226,6 @@ func Test_logoutOpts_Run_Keep_ServiceAccount(t *testing.T) {
 
 	mockConfigCleanUp(mockConfig)
 	mockProjectAndOrgCleanUp(mockConfig)
-	mockConfig.
-		EXPECT().
-		Save().
-		Return(nil).
-		Times(1)
 
 	require.NoError(t, opts.Run(ctx))
 }
@@ -305,6 +290,12 @@ func mockConfigCleanUp(mockConfig *MockConfigDeleter) {
 		EXPECT().
 		SetPrivateAPIKey("").
 		Times(1)
+
+	mockConfig.
+		EXPECT().
+		Save().
+		Return(nil).
+		Times(1)
 }
 
 func mockProjectAndOrgCleanUp(mockConfig *MockConfigDeleter) {