TMS-432: Fix

testit-tms · Apr 25, 2024 · 61e518e · 61e518e
1 parent bdccdd3
commit 61e518e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/Tms.Adapter.Core/Configurator/Configurator.cs b/Tms.Adapter.Core/Configurator/Configurator.cs
@@ -1,3 +1,4 @@
+using System.Configuration;
 using System.Text.Json;
 
 namespace Tms.Adapter.Core.Configurator;
@@ -44,8 +45,10 @@ public static TmsSettings GetConfig()
             Console.WriteLine($"Configuration file was not found at {defaultJsonConfigPath}");
         }
 
+        ApplyEnv(config);
+        Validate(config);
 
-        return ApplyEnv(config);
+        return config;
     }
 
     private static string GetConfigFileName()
@@ -106,4 +109,37 @@ private static TmsSettings ApplyEnv(TmsSettings settings)
 
         return settings;
     }
+
+    private static void Validate(TmsSettings settings)
+    {
+
+        if (!Uri.IsWellFormedUriString(settings.Url, UriKind.Absolute))
+        {
+            throw new ConfigurationErrorsException("Url is invalid");
+        }
+
+        if (string.IsNullOrWhiteSpace(settings.PrivateToken))
+        {
+            throw new ConfigurationErrorsException("Private token is invalid");
+        }
+
+        if (!Guid.TryParse(settings.ProjectId, out var _))
+        {
+            throw new ConfigurationErrorsException("Project id is invalid");
+        }
+
+        if (!Guid.TryParse(settings.ConfigurationId, out var _))
+        {
+            throw new ConfigurationErrorsException("Configuration id is invalid");
+        }
+
+        if (!string.IsNullOrWhiteSpace(settings.TestRunId))
+        {
+            if (!Guid.TryParse(settings.TestRunId, out var _))
+            {
+                throw new ConfigurationErrorsException(
+                    "Config contains not valid test run id.");
+            }
+        }
+    }
 }
diff --git a/Tms.Adapter.Core/Tms.Adapter.Core.csproj b/Tms.Adapter.Core/Tms.Adapter.Core.csproj
@@ -46,6 +46,7 @@
       <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
       <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
       <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+      <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
       <PackageReference Include="System.Text.Json" Version="7.0.2" />
       <PackageReference Include="TestIt.ApiClient" Version="2.6.0" />
     </ItemGroup>