yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V14: Server information (#15497)

Browse Source 
* Rename information endpoint to troubleshooting

* Rename information endpoint to troubleshooting

* Add new information endpoint

* Fix bad merge

* Add InformationServerController.cs back

* Update serverTime offset to non hard-coded value.

* Add dictionary to swagger models

* Update OpenApi.json file

* Rename map definition

* Add ServerConfigurationBaseModel

* Implement ServerConfigurationBaseModel.cs

* Updated OpenApi

* Updated endpoint to return correct type in openapi

* Use explicit class for server information

* Remove version endpoint, as that is contained in server information.

---------

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
Nikolaj Geisle
2023-12-22 10:21:11 +01:00
committed by GitHub
parent 8acb5665e8
commit fc71724386
21 changed files with 228 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/SystemInformationServiceTests.cs
View File

@@ -30,7 +30,7 @@ public class SystemInformationServiceTests
public void GetCorrectDefaultLanguageTest(string culture)
{
var userDataService = CreateSystemInformationService(culture);
var defaultLanguage = userDataService.GetSystemInformation().FirstOrDefault(x => x.Key == "Default Language");
var defaultLanguage = userDataService.GetTroubleshootingInformation().FirstOrDefault(x => x.Key == "Default Language");
Assert.Multiple(() =>
{
Assert.IsNotNull(defaultLanguage);
@@ -47,7 +47,7 @@ public class SystemInformationServiceTests
{
Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
var userDataService = CreateSystemInformationService(culture);
var currentCulture = userDataService.GetSystemInformation().FirstOrDefault(x => x.Key == "Current Culture");
var currentCulture = userDataService.GetTroubleshootingInformation().FirstOrDefault(x => x.Key == "Current Culture");
Assert.Multiple(() =>
{
Assert.IsNotNull(currentCulture);
@@ -64,7 +64,7 @@ public class SystemInformationServiceTests
{
Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture);
var userDataService = CreateSystemInformationService(culture);
var currentCulture = userDataService.GetSystemInformation().FirstOrDefault(x => x.Key == "Current UI Culture");
var currentCulture = userDataService.GetTroubleshootingInformation().FirstOrDefault(x => x.Key == "Current UI Culture");
Assert.Multiple(() =>
{
Assert.IsNotNull(currentCulture);
@@ -80,7 +80,7 @@ public class SystemInformationServiceTests
public void RunTimeInformationNotNullTest(string culture)
{
var userDataService = CreateSystemInformationService(culture);
var userData = userDataService.GetSystemInformation().ToList();
var userData = userDataService.GetTroubleshootingInformation().ToList();
Assert.Multiple(() =>
{
Assert.IsNotNull(userData.Select(x => x.Key == "Server OS"));
@@ -97,7 +97,7 @@ public class SystemInformationServiceTests
public void ReportsModelsModeCorrectly(ModelsMode modelsMode)
{
var userDataService = CreateSystemInformationService(modelsMode: modelsMode);
var userData = userDataService.GetSystemInformation().ToArray();
var userData = userDataService.GetTroubleshootingInformation().ToArray();
var actual = userData.FirstOrDefault(x => x.Key == "Models Builder Mode");
Assert.IsNotNull(actual.Value);
@@ -111,7 +111,7 @@ public class SystemInformationServiceTests
public void ReportsRuntimeModeCorrectly(RuntimeMode runtimeMode)
{
var userDataService = CreateSystemInformationService(runtimeMode: runtimeMode);
var userData = userDataService.GetSystemInformation().ToArray();
var userData = userDataService.GetTroubleshootingInformation().ToArray();
var actual = userData.FirstOrDefault(x => x.Key == "Runtime Mode");
Assert.IsNotNull(actual.Value);
@@ -124,14 +124,14 @@ public class SystemInformationServiceTests
public void ReportsDebugModeCorrectly(bool isDebug)
{
var userDataService = CreateSystemInformationService(isDebug: isDebug);
var userData = userDataService.GetSystemInformation().ToArray();
var userData = userDataService.GetTroubleshootingInformation().ToArray();
var actual = userData.FirstOrDefault(x => x.Key == "Debug Mode");
Assert.IsNotNull(actual.Value);
Assert.AreEqual(isDebug.ToString(), actual.Value);
}
private ISystemInformationService CreateSystemInformationService(
private ISystemTroubleshootingInformationService CreateSystemInformationService(
string culture = "",
ModelsMode modelsMode = ModelsMode.InMemoryAuto,
bool isDebug = true,
@@ -142,7 +142,7 @@ public class SystemInformationServiceTests
var databaseMock = new Mock<IUmbracoDatabase>();
databaseMock.Setup(x => x.DatabaseType.GetProviderName()).Returns("SQL");
return new SystemInformationTelemetryProvider(
return new SystemTroubleshootingInformationTelemetryProvider(
_umbracoVersion,
localizationService,
Mock.Of<IOptionsMonitor<ModelsBuilderSettings>>(x => x.CurrentValue == new ModelsBuilderSettings { ModelsMode = modelsMode }),

6
tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SystemInformationTelemetryProviderTests.cs → tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SystemTroubleshootingInformationTelemetryProviderTests.cs
View File

@@ -15,7 +15,7 @@ using Umbraco.Cms.Infrastructure.Telemetry.Providers;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Telemetry;
[TestFixture]
public class SystemInformationTelemetryProviderTests
public class SystemTroubleshootingInformationTelemetryProviderTests
{
[Test]
[TestCase(ModelsMode.Nothing)]
@@ -92,7 +92,7 @@ public class SystemInformationTelemetryProviderTests
Assert.AreEqual(environment, actual.Data);
}
private SystemInformationTelemetryProvider CreateProvider(
private SystemTroubleshootingInformationTelemetryProvider CreateProvider(
ModelsMode modelsMode = ModelsMode.InMemoryAuto,
bool isDebug = true,
string environment = "",
@@ -104,7 +104,7 @@ public class SystemInformationTelemetryProviderTests
var databaseMock = new Mock<IUmbracoDatabase>();
databaseMock.Setup(x => x.DatabaseType.GetProviderName()).Returns("SQL");
return new SystemInformationTelemetryProvider(
return new SystemTroubleshootingInformationTelemetryProvider(
Mock.Of<IUmbracoVersion>(),
Mock.Of<ILocalizationService>(),
Mock.Of<IOptionsMonitor<ModelsBuilderSettings>>(x => x.CurrentValue == new ModelsBuilderSettings { ModelsMode = modelsMode }),