Fix merge issues

internal/servers/controller/handler.go

@@ -164,11 +164,13 @@ func handleGrpcGateway(c *Controller, props HandlerProperties) (http.Handler, er
 	}
 	if _, ok := currentServices[services.TargetService_ServiceDesc.ServiceName]; !ok {
 		ts, err := targets.NewService(
+			ctx,
 			c.kms,
 			c.TargetRepoFn,
 			c.IamRepoFn,
 			c.ServersRepoFn,
 			c.SessionRepoFn,
+			c.PluginHostRepoFn,
 			c.StaticHostRepoFn,
 			c.VaultCredentialRepoFn)
 		if err != nil {

internal/servers/controller/handlers/targets/target_service_test.go

@@ -2637,7 +2637,6 @@ func TestAuthorizeSession(t *testing.T) {
 	s, err := targets.NewService(ctx, kms, repoFn, iamRepoFn, serversRepoFn, sessionRepoFn, pluginHostRepoFn, staticHostRepoFn, credentialRepoFn)
 	require.NoError(t, err)
 
-	tar := tcp.TestTarget(t, conn, proj.GetPublicId(), "test")
 	hc := static.TestCatalogs(t, conn, proj.GetPublicId(), 1)[0]
 	h := static.TestHosts(t, conn, hc.GetPublicId(), 1)[0]
 	shs := static.TestSets(t, conn, hc.GetPublicId(), 1)[0]
@@ -2690,6 +2689,7 @@ func TestAuthorizeSession(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			tar := tcp.TestTarget(t, conn, proj.GetPublicId(), tc.name)
 			apiTar, err := s.AddTargetHostSets(ctx, &pbs.AddTargetHostSetsRequest{
 				Id:         tar.GetPublicId(),
 				Version:    tar.GetVersion(),