Remove deprecated code and fix new project tests

alexmt · Apr 16, 2020 · d8a3a5e · d8a3a5e
1 parent e94869a
commit d8a3a5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/server/project/project_test.go b/server/project/project_test.go
@@ -330,7 +330,7 @@ func TestProjectServer(t *testing.T) {
 	})
 
 	t.Run("TestCreateTokenWithIDSuccessfully", func(t *testing.T) {
-		sessionMgr := session.NewSessionManager(settingsMgr, "")
+		sessionMgr := session.NewSessionManager(settingsMgr, "", newSessionCache())
 		projectWithRole := existingProj.DeepCopy()
 		projectWithRole.Spec.Roles = []v1alpha1.ProjectRole{{Name: tokenName}}
 		projectServer := NewServer("default", fake.NewSimpleClientset(), apps.NewSimpleClientset(projectWithRole), enforcer, util.NewKeyLock(), sessionMgr)
@@ -348,7 +348,7 @@ func TestProjectServer(t *testing.T) {
 	})
 
 	t.Run("TestCreateTokenWithSameIdDeny", func(t *testing.T) {
-		sessionMgr := session.NewSessionManager(settingsMgr, "")
+		sessionMgr := session.NewSessionManager(settingsMgr, "", newSessionCache())
 		projectWithRole := existingProj.DeepCopy()
 		projectWithRole.Spec.Roles = []v1alpha1.ProjectRole{{Name: tokenName}}
 		projectServer := NewServer("default", fake.NewSimpleClientset(), apps.NewSimpleClientset(projectWithRole), enforcer, util.NewKeyLock(), sessionMgr)
@@ -423,7 +423,7 @@ p, role:admin, projects, update, *, allow`)
 p, role:admin, projects, update, *, allow`)
 
 	t.Run("TestDeleteTokenByIdSuccessfully", func(t *testing.T) {
-		sessionMgr := session.NewSessionManager(settingsMgr, "")
+		sessionMgr := session.NewSessionManager(settingsMgr, "", newSessionCache())
 		projWithToken := existingProj.DeepCopy()
 		issuedAt := int64(1)
 		secondIssuedAt := issuedAt + 1

diff --git a/util/session/sessionmanager.go b/util/session/sessionmanager.go
@@ -86,11 +86,6 @@ const (
 	envLoginMaxCacheSize  = "ARGOCD_SESSION_MAX_CACHE_SIZE"
 )
 
-// Returns the cache key to use for a given user
-func getSessionCacheKeyForUser(username string) string {
-	return fmt.Sprintf("%s|%s", loginAttemptsCacheKey, username)
-}
-
 // Helper function to parse a number from an environment variable. Returns a
 // default if env is not set, is not parseable to a number, exceeds max (if
 // max is greater than 0) or is less than min.
@@ -330,18 +325,10 @@ func (mgr *SessionManager) updateFailureCount(username string, failed bool) {
 	if failed {
 		attempt.FailCount += 1
 		attempt.LastFailed = time.Now()
-		err := mgr.cache.SetItem(getSessionCacheKeyForUser(username), attempt, 0, false)
-		if err != nil {
-			log.Errorf("Could not update session cache: %s", err.Error())
-		}
 		failures[username] = attempt
 		log.Warnf("User %s failed login %d time(s)", username, attempt.FailCount)
 	} else {
 		if attempt.FailCount > 0 {
-			err := mgr.cache.SetItem(getSessionCacheKeyForUser(username), attempt, 0, true)
-			if err != nil {
-				log.Errorf("Could not update session cache: %s", err.Error())
-			}
 			// Forget username for cache size enforcement, since entry in cache was deleted
 			delete(failures, username)
 		}