From bd6be323bfb21532c5de2b361a01120739830480 Mon Sep 17 00:00:00 2001 From: Luke Tomlinson Date: Fri, 19 Jan 2024 13:40:30 -0800 Subject: [PATCH] lint + tests --- src/Runner.Listener/MessageListener.cs | 14 +++++++------- src/Sdk/WebApi/WebApi/BrokerHttpClient.cs | 9 +++++---- src/Test/L0/Listener/MessageListenerL0.cs | 4 ++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs index 48c4e7548..5dd54241f 100644 --- a/src/Runner.Listener/MessageListener.cs +++ b/src/Runner.Listener/MessageListener.cs @@ -240,21 +240,21 @@ namespace GitHub.Runner.Listener // Decrypt the message body if the session is using encryption message = DecryptMessage(message); - + if (message != null && message.MessageType == BrokerMigrationMessage.MessageType) { Trace.Info("BrokerMigration message received. Polling Broker for messages..."); - var migrationMessage = JsonUtility.FromString(message.Body); + var migrationMessage = JsonUtility.FromString(message.Body); var brokerServer = HostContext.GetService(); await brokerServer.ConnectAsync(migrationMessage.BrokerBaseUrl, _creds); - message = await brokerServer.GetRunnerMessageAsync(token, - _session.SessionId, - runnerStatus, + message = await brokerServer.GetRunnerMessageAsync(token, + _session.SessionId, + runnerStatus, BuildConstants.RunnerPackage.Version, - VarUtil.OS, - VarUtil.OSArchitecture, + VarUtil.OS, + VarUtil.OSArchitecture, _settings.DisableUpdate); } diff --git a/src/Sdk/WebApi/WebApi/BrokerHttpClient.cs b/src/Sdk/WebApi/WebApi/BrokerHttpClient.cs index 0f4492554..eaeb776b2 100644 --- a/src/Sdk/WebApi/WebApi/BrokerHttpClient.cs +++ b/src/Sdk/WebApi/WebApi/BrokerHttpClient.cs @@ -118,9 +118,10 @@ namespace GitHub.Actions.RunService.WebApi throw new Exception($"Failed to get job message: {result.Error}"); } - public async Task CreateSessionAsync( - TaskAgentSession session, - CancellationToken cancellationToken = default) + public async Task CreateSessionAsync( + + TaskAgentSession session, + CancellationToken cancellationToken = default) { var requestUri = new Uri(Client.BaseAddress, "session"); @@ -137,7 +138,7 @@ namespace GitHub.Actions.RunService.WebApi return result.Value; } - if (result.StatusCode == HttpStatusCode.Forbidden) + if (result.StatusCode == HttpStatusCode.Forbidden) { throw new AccessDeniedException(result.Error); } diff --git a/src/Test/L0/Listener/MessageListenerL0.cs b/src/Test/L0/Listener/MessageListenerL0.cs index 7cd6035e1..9c319aa8b 100644 --- a/src/Test/L0/Listener/MessageListenerL0.cs +++ b/src/Test/L0/Listener/MessageListenerL0.cs @@ -24,6 +24,8 @@ namespace GitHub.Runner.Common.Tests.Listener private Mock _credMgr; private Mock _store; + private Mock _brokerServer; + public MessageListenerL0() { _settings = new RunnerSettings { AgentId = 1, AgentName = "myagent", PoolId = 123, PoolName = "default", ServerUrl = "http://myserver", WorkFolder = "_work" }; @@ -32,6 +34,7 @@ namespace GitHub.Runner.Common.Tests.Listener _runnerServer = new Mock(); _credMgr = new Mock(); _store = new Mock(); + _brokerServer = new Mock(); } private TestHostContext CreateTestContext([CallerMemberName] String testName = "") @@ -41,6 +44,7 @@ namespace GitHub.Runner.Common.Tests.Listener tc.SetSingleton(_runnerServer.Object); tc.SetSingleton(_credMgr.Object); tc.SetSingleton(_store.Object); + tc.SetSingleton(_brokerServer.Object); return tc; }