diff --git a/src/Tgstation.Server.Api/Models/Response/ByondResponse.cs b/src/Tgstation.Server.Api/Models/Response/ByondResponse.cs
index e289de30a2..aff07a3954 100644
--- a/src/Tgstation.Server.Api/Models/Response/ByondResponse.cs
+++ b/src/Tgstation.Server.Api/Models/Response/ByondResponse.cs
@@ -3,13 +3,13 @@
namespace Tgstation.Server.Api.Models.Response
{
///
- /// Represents an installed .
+ /// Represents an installed .
///
public sealed class ByondResponse
{
///
- /// The represented .
+ /// The represented . If that indicates none were found.
///
- public EngineVersion? Version { get; set; }
+ public EngineVersion? EngineVersion { get; set; }
}
}
diff --git a/src/Tgstation.Server.Host/Controllers/ByondController.cs b/src/Tgstation.Server.Host/Controllers/ByondController.cs
index c5857f5487..33b9d55ee1 100644
--- a/src/Tgstation.Server.Host/Controllers/ByondController.cs
+++ b/src/Tgstation.Server.Host/Controllers/ByondController.cs
@@ -98,7 +98,7 @@ namespace Tgstation.Server.Host.Controllers
Json(
new ByondResponse
{
- Version = instance.EngineManager.ActiveVersion,
+ EngineVersion = instance.EngineManager.ActiveVersion,
})));
///
@@ -122,10 +122,10 @@ namespace Tgstation.Server.Host.Controllers
.InstalledVersions
.Select(x => new ByondResponse
{
- Version = x,
+ EngineVersion = x,
})
.AsQueryable()
- .OrderBy(x => x.Version))),
+ .OrderBy(x => x.EngineVersion))),
null,
page,
pageSize,
diff --git a/tests/Tgstation.Server.Client.Tests/TestApiClient.cs b/tests/Tgstation.Server.Client.Tests/TestApiClient.cs
index 0edc228b18..e0156fc0f4 100644
--- a/tests/Tgstation.Server.Client.Tests/TestApiClient.cs
+++ b/tests/Tgstation.Server.Client.Tests/TestApiClient.cs
@@ -26,7 +26,7 @@ namespace Tgstation.Server.Client.Tests
{
var sample = new ByondResponse
{
- Version = new EngineVersion
+ EngineVersion = new EngineVersion
{
Engine = EngineType.Byond,
Version = new Version(511, 1385)
@@ -50,9 +50,9 @@ namespace Tgstation.Server.Client.Tests
var client = new ApiClient(httpClient.Object, new Uri("http://fake.com"), new ApiHeaders(new ProductHeaderValue("fake"), "fake"), null, false);
var result = await client.Read(Routes.Byond, default);
- Assert.AreEqual(sample.Version, result.Version);
- Assert.AreEqual(0, result.Version.Version.Build); // sucks but we can't do better really
- Assert.IsFalse(result.Version.CustomIteration.HasValue);
+ Assert.AreEqual(sample.EngineVersion, result.EngineVersion);
+ Assert.AreEqual(0, result.EngineVersion.Version.Build); // sucks but we can't do better really
+ Assert.IsFalse(result.EngineVersion.CustomIteration.HasValue);
}
[TestMethod]
@@ -60,7 +60,7 @@ namespace Tgstation.Server.Client.Tests
{
var sample = new ByondResponse
{
- Version = new EngineVersion
+ EngineVersion = new EngineVersion
{
Engine = EngineType.Byond,
Version = new Version(511, 1385)
diff --git a/tests/Tgstation.Server.Tests/Live/Instance/ByondTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/ByondTest.cs
index a6525a8d92..77135b84c4 100644
--- a/tests/Tgstation.Server.Tests/Live/Instance/ByondTest.cs
+++ b/tests/Tgstation.Server.Tests/Live/Instance/ByondTest.cs
@@ -182,8 +182,8 @@ namespace Tgstation.Server.Tests.Live.Instance
var newVersions = await byondClient.InstalledVersions(null, cancellationToken);
Assert.IsNotNull(newVersions);
Assert.AreEqual(1, newVersions.Count);
- Assert.AreEqual(testVersion.Version.Semver(), newVersions[0].Version.Version.Semver());
- Assert.AreEqual(1, newVersions[0].Version.CustomIteration);
+ Assert.AreEqual(testVersion.Version.Semver(), newVersions[0].EngineVersion.Version.Semver());
+ Assert.AreEqual(1, newVersions[0].EngineVersion.CustomIteration);
}
async Task TestInstallFakeVersion(CancellationToken cancellationToken)
@@ -214,8 +214,8 @@ namespace Tgstation.Server.Tests.Live.Instance
Assert.IsNotNull(test.InstallJob);
await WaitForJob(test.InstallJob, 180, false, null, cancellationToken);
var currentShit = await byondClient.ActiveVersion(cancellationToken);
- Assert.AreEqual(newModel, currentShit.Version);
- Assert.IsFalse(currentShit.Version.CustomIteration.HasValue);
+ Assert.AreEqual(newModel, currentShit.EngineVersion);
+ Assert.IsFalse(currentShit.EngineVersion.CustomIteration.HasValue);
var dreamMaker = "DreamMaker";
if (new PlatformIdentifier().IsWindows)
@@ -235,7 +235,7 @@ namespace Tgstation.Server.Tests.Live.Instance
var allVersionsTask = byondClient.InstalledVersions(null, cancellationToken);
var currentShit = await byondClient.ActiveVersion(cancellationToken);
Assert.IsNotNull(currentShit);
- Assert.IsNull(currentShit.Version);
+ Assert.IsNull(currentShit.EngineVersion);
var otherShit = await allVersionsTask;
Assert.IsNotNull(otherShit);
Assert.AreEqual(0, otherShit.Count);
@@ -299,8 +299,8 @@ namespace Tgstation.Server.Tests.Live.Instance
await WaitForJob(test2.InstallJob, 30, false, null, cancellationToken);
var newSettings = await byondClient.ActiveVersion(cancellationToken);
- Assert.AreEqual(new Version(testVersion.Version.Major, testVersion.Version.Minor, 0), newSettings.Version.Version);
- Assert.AreEqual(2, newSettings.Version.CustomIteration);
+ Assert.AreEqual(new Version(testVersion.Version.Major, testVersion.Version.Minor, 0), newSettings.EngineVersion.Version);
+ Assert.AreEqual(2, newSettings.EngineVersion.CustomIteration);
// test a few switches
var installResponse = await byondClient.SetActiveVersion(new ByondVersionRequest
diff --git a/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs
index d7d1e79b08..69435c0674 100644
--- a/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs
+++ b/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs
@@ -206,8 +206,8 @@ namespace Tgstation.Server.Tests.Live.Instance
Assert.IsNotNull(compatVersion.SourceSHA);
Assert.AreNotEqual(Limits.MaximumCommitShaLength, compatVersion.SourceSHA.Length);
var activeVersion = await instanceClient.Byond.ActiveVersion(cancellationToken);
- Assert.AreEqual(Limits.MaximumCommitShaLength, activeVersion.Version.SourceSHA.Length);
- Assert.AreEqual(compatVersion, activeVersion.Version);
+ Assert.AreEqual(Limits.MaximumCommitShaLength, activeVersion.EngineVersion.SourceSHA.Length);
+ Assert.AreEqual(compatVersion, activeVersion.EngineVersion);
}
var configSetupTask = new ConfigurationTest(instanceClient.Configuration, instanceClient.Metadata).SetupDMApiTests(cancellationToken);
diff --git a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs
index 2224e63520..7f96f041c5 100644
--- a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs
+++ b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs
@@ -94,17 +94,17 @@ namespace Tgstation.Server.Tests.Live.Instance
Assert.AreEqual(1, list.Count);
var byondVersion = list[0];
- Assert.AreEqual(1, byondVersion.Version.CustomIteration);
- Assert.AreEqual(testVersion.Engine, byondVersion.Version.Engine);
+ Assert.AreEqual(1, byondVersion.EngineVersion.CustomIteration);
+ Assert.AreEqual(testVersion.Engine, byondVersion.EngineVersion.Engine);
if (testVersion.Version != null)
{
- Assert.AreEqual(testVersion.Version.Major, byondVersion.Version.Version.Major);
- Assert.AreEqual(testVersion.Version.Minor, byondVersion.Version.Version.Minor);
+ Assert.AreEqual(testVersion.Version.Major, byondVersion.EngineVersion.Version.Major);
+ Assert.AreEqual(testVersion.Version.Minor, byondVersion.EngineVersion.Version.Minor);
}
else
{
- Assert.IsNull(byondVersion.Version.Version);
- Assert.AreEqual(testVersion.SourceSHA, byondVersion.Version.SourceSHA);
+ Assert.IsNull(byondVersion.EngineVersion.Version);
+ Assert.AreEqual(testVersion.SourceSHA, byondVersion.EngineVersion.SourceSHA);
}
}
@@ -244,7 +244,7 @@ namespace Tgstation.Server.Tests.Live.Instance
var testCustomRevision = 1;
var currentByond = await instanceClient.Byond.ActiveVersion(cancellationToken);
Assert.IsNotNull(currentByond);
- Assert.AreEqual(testVersion, currentByond.Version);
+ Assert.AreEqual(testVersion, currentByond.EngineVersion);
// Change the active version and check we get delayed while deleting the old one because the watchdog is using it
var setActiveResponse = await instanceClient.Byond.SetActiveVersion(
@@ -976,7 +976,7 @@ namespace Tgstation.Server.Tests.Live.Instance
var versionToInstall = testVersion;
var currentByondVersion = await instanceClient.Byond.ActiveVersion(cancellationToken);
- Assert.AreNotEqual(versionToInstall, currentByondVersion.Version);
+ Assert.AreNotEqual(versionToInstall, currentByondVersion.EngineVersion);
var initialStatus = await instanceClient.DreamDaemon.Read(cancellationToken);