From a0a0a76378ad3ce3745fbf27f69cafc506e4ed00 Mon Sep 17 00:00:00 2001 From: Tingluo Huang Date: Tue, 1 Apr 2025 12:24:01 -0400 Subject: [PATCH] Remove create session with broker in MessageListener. (#3782) --- src/Runner.Listener/MessageListener.cs | 17 --- src/Test/L0/Listener/MessageListenerL0.cs | 139 ---------------------- 2 files changed, 156 deletions(-) diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs index 831bde923..d8e2d3c2a 100644 --- a/src/Runner.Listener/MessageListener.cs +++ b/src/Runner.Listener/MessageListener.cs @@ -56,8 +56,6 @@ namespace GitHub.Runner.Listener private CancellationTokenSource _getMessagesTokenSource; private VssCredentials _creds; - private bool _isBrokerSession = false; - public override void Initialize(IHostContext hostContext) { base.Initialize(hostContext); @@ -114,16 +112,6 @@ namespace GitHub.Runner.Listener _settings.PoolId, taskAgentSession, token); - - if (_session.BrokerMigrationMessage != null) - { - Trace.Info("Runner session is in migration mode: Creating Broker session with BrokerBaseUrl: {0}", _session.BrokerMigrationMessage.BrokerBaseUrl); - - await _brokerServer.UpdateConnectionIfNeeded(_session.BrokerMigrationMessage.BrokerBaseUrl, _creds); - _session = await _brokerServer.CreateSessionAsync(taskAgentSession, token); - _isBrokerSession = true; - } - Trace.Info($"Session created."); if (encounteringError) { @@ -202,11 +190,6 @@ namespace GitHub.Runner.Listener using (var ts = new CancellationTokenSource(TimeSpan.FromSeconds(30))) { await _runnerServer.DeleteAgentSessionAsync(_settings.PoolId, _session.SessionId, ts.Token); - - if (_isBrokerSession) - { - await _brokerServer.DeleteSessionAsync(ts.Token); - } } } else diff --git a/src/Test/L0/Listener/MessageListenerL0.cs b/src/Test/L0/Listener/MessageListenerL0.cs index ccb0358ae..5b156fe98 100644 --- a/src/Test/L0/Listener/MessageListenerL0.cs +++ b/src/Test/L0/Listener/MessageListenerL0.cs @@ -92,68 +92,6 @@ namespace GitHub.Runner.Common.Tests.Listener } } - [Fact] - [Trait("Level", "L0")] - [Trait("Category", "Runner")] - public async void CreatesSessionWithBrokerMigration() - { - using (TestHostContext tc = CreateTestContext()) - using (var tokenSource = new CancellationTokenSource()) - { - Tracing trace = tc.GetTrace(); - - // Arrange. - var expectedSession = new TaskAgentSession() - { - OwnerName = "legacy", - BrokerMigrationMessage = new BrokerMigrationMessage(new Uri("https://broker.actions.github.com")) - }; - - var expectedBrokerSession = new TaskAgentSession() - { - OwnerName = "broker" - }; - - _runnerServer - .Setup(x => x.CreateAgentSessionAsync( - _settings.PoolId, - It.Is(y => y != null), - tokenSource.Token)) - .Returns(Task.FromResult(expectedSession)); - - _brokerServer - .Setup(x => x.CreateSessionAsync( - It.Is(y => y != null), - tokenSource.Token)) - .Returns(Task.FromResult(expectedBrokerSession)); - - _credMgr.Setup(x => x.LoadCredentials(It.IsAny())).Returns(new VssCredentials()); - _store.Setup(x => x.GetCredentials()).Returns(new CredentialData() { Scheme = Constants.Configuration.OAuthAccessToken }); - _store.Setup(x => x.GetMigratedCredentials()).Returns(default(CredentialData)); - - // Act. - MessageListener listener = new(); - listener.Initialize(tc); - - CreateSessionResult result = await listener.CreateSessionAsync(tokenSource.Token); - trace.Info("result: {0}", result); - - // Assert. - Assert.Equal(CreateSessionResult.Success, result); - - _runnerServer - .Verify(x => x.CreateAgentSessionAsync( - _settings.PoolId, - It.Is(y => y != null), - tokenSource.Token), Times.Once()); - - _brokerServer - .Verify(x => x.CreateSessionAsync( - It.Is(y => y != null), - tokenSource.Token), Times.Once()); - } - } - [Fact] [Trait("Level", "L0")] [Trait("Category", "Runner")] @@ -201,83 +139,6 @@ namespace GitHub.Runner.Common.Tests.Listener } } - [Fact] - [Trait("Level", "L0")] - [Trait("Category", "Runner")] - public async void DeleteSessionWithBrokerMigration() - { - using (TestHostContext tc = CreateTestContext()) - using (var tokenSource = new CancellationTokenSource()) - { - Tracing trace = tc.GetTrace(); - - // Arrange. - var expectedSession = new TaskAgentSession() - { - OwnerName = "legacy", - BrokerMigrationMessage = new BrokerMigrationMessage(new Uri("https://broker.actions.github.com")) - }; - - var expectedBrokerSession = new TaskAgentSession() - { - SessionId = Guid.NewGuid(), - OwnerName = "broker" - }; - - _runnerServer - .Setup(x => x.CreateAgentSessionAsync( - _settings.PoolId, - It.Is(y => y != null), - tokenSource.Token)) - .Returns(Task.FromResult(expectedSession)); - - _brokerServer - .Setup(x => x.CreateSessionAsync( - It.Is(y => y != null), - tokenSource.Token)) - .Returns(Task.FromResult(expectedBrokerSession)); - - _credMgr.Setup(x => x.LoadCredentials(It.IsAny())).Returns(new VssCredentials()); - _store.Setup(x => x.GetCredentials()).Returns(new CredentialData() { Scheme = Constants.Configuration.OAuthAccessToken }); - _store.Setup(x => x.GetMigratedCredentials()).Returns(default(CredentialData)); - - // Act. - MessageListener listener = new(); - listener.Initialize(tc); - - CreateSessionResult result = await listener.CreateSessionAsync(tokenSource.Token); - trace.Info("result: {0}", result); - - Assert.Equal(CreateSessionResult.Success, result); - - _runnerServer - .Verify(x => x.CreateAgentSessionAsync( - _settings.PoolId, - It.Is(y => y != null), - tokenSource.Token), Times.Once()); - - _brokerServer - .Verify(x => x.CreateSessionAsync( - It.Is(y => y != null), - tokenSource.Token), Times.Once()); - - _brokerServer - .Setup(x => x.DeleteSessionAsync(It.IsAny())) - .Returns(Task.CompletedTask); - - // Act. - await listener.DeleteSessionAsync(); - - - //Assert - _runnerServer - .Verify(x => x.DeleteAgentSessionAsync( - _settings.PoolId, expectedBrokerSession.SessionId, It.IsAny()), Times.Once()); - _brokerServer - .Verify(x => x.DeleteSessionAsync(It.IsAny()), Times.Once()); - } - } - [Fact] [Trait("Level", "L0")] [Trait("Category", "Runner")]