From cfe84931a957ff4f3d0546c166007ca1f851a137 Mon Sep 17 00:00:00 2001
From: Tim Ross <tim.ross@goteleport.com>
Date: Mon, 13 Jan 2025 13:18:57 -0500
Subject: [PATCH] Remove unused NewIdentityServiceV2

Includes https://github.com/gravitational/teleport.e/pull/5832
which removed the last invocations of the V2 function.
---
 e                                           | 2 +-
 lib/auth/auth.go                            | 2 +-
 lib/cache/cache.go                          | 2 +-
 lib/services/local/headlessauthn_watcher.go | 2 +-
 lib/services/local/users.go                 | 8 +-------
 lib/services/local/users_test.go            | 2 +-
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/e b/e
index 65fa473e50c72..6831bf6d75336 160000
--- a/e
+++ b/e
@@ -1 +1 @@
-Subproject commit 65fa473e50c72d8f79261033a1298cc2955ca15c
+Subproject commit 6831bf6d753367225b6bda5a01189e3065367c9d
diff --git a/lib/auth/auth.go b/lib/auth/auth.go
index aef1a77ed2564..641d9e8c0cded 100644
--- a/lib/auth/auth.go
+++ b/lib/auth/auth.go
@@ -194,7 +194,7 @@ func NewServer(cfg *InitConfig, opts ...ServerOption) (*Server, error) {
 		cfg.Provisioner = local.NewProvisioningService(cfg.Backend)
 	}
 	if cfg.Identity == nil {
-		cfg.Identity, err = local.NewIdentityServiceV2(cfg.Backend)
+		cfg.Identity, err = local.NewIdentityService(cfg.Backend)
 		if err != nil {
 			return nil, trace.Wrap(err)
 		}
diff --git a/lib/cache/cache.go b/lib/cache/cache.go
index 0c0f05febe720..06fd5c59098c5 100644
--- a/lib/cache/cache.go
+++ b/lib/cache/cache.go
@@ -1025,7 +1025,7 @@ func New(config Config) (*Cache, error) {
 		return nil, trace.Wrap(err)
 	}
 
-	identityService, err := local.NewIdentityServiceV2(config.Backend)
+	identityService, err := local.NewIdentityService(config.Backend)
 	if err != nil {
 		cancel()
 		return nil, trace.Wrap(err)
diff --git a/lib/services/local/headlessauthn_watcher.go b/lib/services/local/headlessauthn_watcher.go
index dee036fa363df..8239fa3b5da19 100644
--- a/lib/services/local/headlessauthn_watcher.go
+++ b/lib/services/local/headlessauthn_watcher.go
@@ -106,7 +106,7 @@ func NewHeadlessAuthenticationWatcher(ctx context.Context, cfg HeadlessAuthentic
 		return nil, trace.Wrap(err)
 	}
 
-	identityService, err := NewIdentityServiceV2(cfg.Backend)
+	identityService, err := NewIdentityService(cfg.Backend)
 	if err != nil {
 		return nil, trace.Wrap(err)
 	}
diff --git a/lib/services/local/users.go b/lib/services/local/users.go
index 1c4790bcda886..de1bfcf7555df 100644
--- a/lib/services/local/users.go
+++ b/lib/services/local/users.go
@@ -70,12 +70,6 @@ type IdentityService struct {
 	notificationsSvc *NotificationsService
 }
 
-// TODO(tross): DELETE ONCE e is updated to use  NewIdentityService
-// NewIdentityServiceV2 returns a new instance of IdentityService object
-func NewIdentityServiceV2(backend backend.Backend) (*IdentityService, error) {
-	return NewIdentityService(backend)
-}
-
 // NewIdentityService returns a new instance of IdentityService object
 func NewIdentityService(backend backend.Backend) (*IdentityService, error) {
 	notificationsSvc, err := NewNotificationsService(backend, backend.Clock())
@@ -100,7 +94,7 @@ func NewTestIdentityService(backend backend.Backend) (*IdentityService, error) {
 		panic("Attempted to create a test identity service outside of a test")
 	}
 
-	s, err := NewIdentityServiceV2(backend)
+	s, err := NewIdentityService(backend)
 	if err != nil {
 		return nil, trace.Wrap(err)
 	}
diff --git a/lib/services/local/users_test.go b/lib/services/local/users_test.go
index e55b6d6d7932f..0d6a9eb06e20c 100644
--- a/lib/services/local/users_test.go
+++ b/lib/services/local/users_test.go
@@ -278,7 +278,7 @@ func TestNotificationCleanupOnUserDelete(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	identitySvc, err := local.NewIdentityServiceV2(backend)
+	identitySvc, err := local.NewIdentityService(backend)
 	require.NoError(t, err)
 	notificationsSvc, err := local.NewNotificationsService(backend, backend.Clock())
 	require.NoError(t, err)