status-im/cs-codex-dist-tests
2
0
Fork 0
mirror of synced 2025-01-11 09:06:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up core accessibility

Browse Source
This commit is contained in:
ThatBen 2023-09-14 15:40:15 +02:00
parent ae7ab3d84b
commit fb7488769d
11 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CodexPlugin/CodexAccess.cs
View File

@ -1,6 +1,5 @@
using Core;
using KubernetesWorkflow;
using Utils;
namespace CodexPlugin
{
@ -83,7 +82,7 @@ namespace CodexPlugin
return Container.Name;
}
private Http Http()
private IHttp Http()
{
return tools.CreateHttp(Container.Address, baseUrl: "/api/codex/v1", CheckContainerCrashed, Container.Name);
}

1
Core/CoreInterface.cs
View File

@ -25,6 +25,7 @@ namespace Core
{
var workflow = entryPoint.Tools.CreateWorkflow();
var file = entryPoint.Tools.GetLog().CreateSubfile();
entryPoint.Tools.GetLog().Log($"Downloading container log for '{container.Name}' to file '{file.FullFilename}'...");
var logHandler = new LogDownloadHandler(container.Name, file);
workflow.DownloadContainerLog(container, logHandler, tailLines);
return logHandler.DownloadLog();

4
Core/DownloadedLog.cs
View File

@ -9,11 +9,11 @@ namespace Core
void DeleteFile();
}
public class DownloadedLog : IDownloadedLog
internal class DownloadedLog : IDownloadedLog
{
private readonly LogFile logFile;
public DownloadedLog(LogFile logFile)
internal DownloadedLog(LogFile logFile)
{
this.logFile = logFile;
}

18
Core/Http.cs
View File

@ -7,7 +7,19 @@ using Utils;
namespace Core
{
public class Http
public interface IHttp
{
string HttpGetString(string route);
T HttpGetJson<T>(string route);
TResponse HttpPostJson<TRequest, TResponse>(string route, TRequest body);
string HttpPostJson<TRequest>(string route, TRequest body);
string HttpPostString(string route, string body);
string HttpPostStream(string route, Stream stream);
Stream HttpGetStream(string route);
T TryJsonDeserialize<T>(string json);
}
internal class Http : IHttp
{
private readonly ILog log;
private readonly ITimeSet timeSet;
@ -16,12 +28,12 @@ namespace Core
private readonly Action<HttpClient> onClientCreated;
private readonly string? logAlias;
public Http(ILog log, ITimeSet timeSet, Address address, string baseUrl, string? logAlias = null)
internal Http(ILog log, ITimeSet timeSet, Address address, string baseUrl, string? logAlias = null)
: this(log, timeSet, address, baseUrl, DoNothing, logAlias)
{
}
public Http(ILog log, ITimeSet timeSet, Address address, string baseUrl, Action<HttpClient> onClientCreated, string? logAlias = null)
internal Http(ILog log, ITimeSet timeSet, Address address, string baseUrl, Action<HttpClient> onClientCreated, string? logAlias = null)
{
this.log = log;
this.timeSet = timeSet;

6
Core/LogDownloadHandler.cs
View File

@ -3,11 +3,11 @@ using Logging;
namespace Core
{
public class LogDownloadHandler : LogHandler, ILogHandler
internal class LogDownloadHandler : LogHandler, ILogHandler
{
private readonly LogFile log;
public LogDownloadHandler(string description, LogFile log)
internal LogDownloadHandler(string description, LogFile log)
{
this.log = log;
@ -15,7 +15,7 @@ namespace Core
log.WriteRaw(description);
}
public IDownloadedLog DownloadLog()
internal IDownloadedLog DownloadLog()
{
return new DownloadedLog(log);
}

4
Core/PluginFinder.cs
View File

@ -2,11 +2,11 @@
namespace Core
{
public static class PluginFinder
internal static class PluginFinder
{
private static Type[]? pluginTypes = null;
public static Type[] GetPluginTypes()
internal static Type[] GetPluginTypes()
{
if (pluginTypes != null) return pluginTypes;

10
Core/PluginManager.cs
View File

@ -1,6 +1,6 @@
namespace Core
{
public class PluginManager
internal class PluginManager
{
private readonly List<IProjectPlugin> projectPlugins = new List<IProjectPlugin>();
@ -16,12 +16,12 @@
}
}
public void AnnouncePlugins()
internal void AnnouncePlugins()
{
foreach (var plugin in projectPlugins) plugin.Announce();
}
public PluginMetadata GatherPluginMetadata()
internal PluginMetadata GatherPluginMetadata()
{
var metadata = new PluginMetadata();
foreach (var plugin in projectPlugins)
@ -34,12 +34,12 @@
return metadata;
}
public void DecommissionPlugins()
internal void DecommissionPlugins()
{
foreach (var plugin in projectPlugins) plugin.Decommission();
}
public T GetPlugin<T>() where T : IProjectPlugin
internal T GetPlugin<T>() where T : IProjectPlugin
{
return (T)projectPlugins.Single(p => p.GetType() == typeof(T));
}

4
Core/PluginMetadata.cs
View File

@ -1,6 +1,6 @@
namespace Core
{
public interface IPluginMetadata
internal interface IPluginMetadata
{
Dictionary<string, string> Get();
}
@ -10,7 +10,7 @@
void Add(string key, string value);
}
public class PluginMetadata : IPluginMetadata, IAddMetadata
internal class PluginMetadata : IPluginMetadata, IAddMetadata
{
private readonly Dictionary<string, string> metadata = new Dictionary<string, string>();

10
Core/PluginTools.cs
View File

@ -21,8 +21,8 @@ namespace Core
public interface IHttpFactoryTool
{
Http CreateHttp(Address address, string baseUrl, Action<HttpClient> onClientCreated, string? logAlias = null);
Http CreateHttp(Address address, string baseUrl, string? logAlias = null);
IHttp CreateHttp(Address address, string baseUrl, Action<HttpClient> onClientCreated, string? logAlias = null);
IHttp CreateHttp(Address address, string baseUrl, string? logAlias = null);
}
public interface IFileTool
@ -37,7 +37,7 @@ namespace Core
private readonly IFileManager fileManager;
private ILog log;
public PluginTools(ILog log, WorkflowCreator workflowCreator, string fileManagerRootFolder, ITimeSet timeSet)
internal PluginTools(ILog log, WorkflowCreator workflowCreator, string fileManagerRootFolder, ITimeSet timeSet)
{
this.log = log;
this.workflowCreator = workflowCreator;
@ -50,12 +50,12 @@ namespace Core
log = new LogPrefixer(log, prefix);
}
public Http CreateHttp(Address address, string baseUrl, Action<HttpClient> onClientCreated, string? logAlias = null)
public IHttp CreateHttp(Address address, string baseUrl, Action<HttpClient> onClientCreated, string? logAlias = null)
{
return new Http(log, timeSet, address, baseUrl, onClientCreated, logAlias);
}
public Http CreateHttp(Address address, string baseUrl, string? logAlias = null)
public IHttp CreateHttp(Address address, string baseUrl, string? logAlias = null)
{
return new Http(log, timeSet, address, baseUrl, logAlias);
}

11
DistTestCore/TestLifecycle.cs
View File

@ -81,22 +81,13 @@ namespace DistTestCore
public void DownloadAllLogs()
{
var workflow = entryPoint.Tools.CreateWorkflow();
foreach (var rc in runningContainers)
{
foreach (var c in rc.Containers)
{
DownloadContainerLog(workflow, c);
CoreInterface.DownloadLog(c);
}
}
}
private void DownloadContainerLog(IStartupWorkflow workflow, RunningContainer c)
{
var file = Log.CreateSubfile();
Log.Log($"Downloading container log for '{c.Name}' to file '{file.FullFilename}'...");
var handler = new LogDownloadHandler(c.Name, file);
workflow.DownloadContainerLog(c, handler);
}
}
}

2
MetricsPlugin/MetricsQuery.cs
View File

@ -6,7 +6,7 @@ namespace MetricsPlugin
{
public class MetricsQuery
{
private readonly Http http;
private readonly IHttp http;
public MetricsQuery(IPluginTools tools, RunningContainer runningContainer)
{