feat(app): add EnvironmentName app options to define current deployme…

…nt environment

src/Sitko.Core.App/Application.cs

@@ -46,6 +46,7 @@ protected Application(string[] args)
     public static string OptionsKey => nameof(Application);
 
     public Guid Id { get; } = Guid.NewGuid();
+    public string Environment => GetApplicationOptions().Environment;
 
     public string Name => GetApplicationOptions().Name;
     public string Version => GetApplicationOptions().Version;

src/Sitko.Core.App/ApplicationOptions.cs

@@ -1,14 +1,14 @@
-namespace Sitko.Core.App
+namespace Sitko.Core.App;
+
+public class ApplicationOptions
 {
-    public class ApplicationOptions
-    {
-        public const string BaseConsoleLogFormat =
-            "[{Timestamp:HH:mm:ss} {Level:u3} {SourceContext}]{NewLine}\t{Message:lj}{NewLine}{Exception}";
+    public const string BaseConsoleLogFormat =
+        "[{Timestamp:HH:mm:ss} {Level:u3} {SourceContext}]{NewLine}\t{Message:lj}{NewLine}{Exception}";
 
-        public string Name { get; set; } = "";
-        public string Version { get; set; } = "";
+    public string Name { get; set; } = "";
+    public string Version { get; set; } = "";
+    public string Environment { get; set; } = "";
 
-        public string ConsoleLogFormat { get; set; } = BaseConsoleLogFormat;
-        public bool? EnableConsoleLogging { get; set; }
-    }
+    public string ConsoleLogFormat { get; set; } = BaseConsoleLogFormat;
+    public bool? EnableConsoleLogging { get; set; }
 }

src/Sitko.Core.App/HostedApplication.cs

@@ -84,8 +84,7 @@ protected IHostBuilder ConfigureHostBuilder(Action<IHostBuilder>? configure = nu
 
         var startEnvironment = new HostingEnvironment
         {
-            ApplicationName = GetType().Assembly.FullName,
-            EnvironmentName = EnvHelper.GetEnvironmentName()
+            ApplicationName = GetType().Assembly.FullName, EnvironmentName = EnvHelper.GetEnvironmentName()
         };
 
         var configBuilder = new ConfigurationBuilder()
@@ -245,7 +244,7 @@ public HostedApplicationContext(Application application, IConfiguration configur
             configuration) =>
         this.environment = environment;
 
-    public override string EnvironmentName => environment.EnvironmentName;
+    public override string AspNetEnvironmentName => environment.EnvironmentName;
     public override bool IsDevelopment() => environment.IsDevelopment();
 
     public override bool IsProduction() => environment.IsProduction();

src/Sitko.Core.App/IApplicationContext.cs

@@ -16,7 +16,8 @@ public interface IApplicationContext
     ApplicationOptions Options { get; }
     IConfiguration Configuration { get; }
     ILogger Logger { get; }
-    string EnvironmentName { get; }
+    string Environment { get; }
+    string AspNetEnvironmentName { get; }
     bool IsDevelopment();
     bool IsProduction();
 }
@@ -42,10 +43,11 @@ protected BaseApplicationContext(Application application, IConfiguration configu
     public Guid Id { get; } = Guid.NewGuid();
     public string Name => Options.Name;
     public string Version => Options.Version;
+    public string Environment => Options.Environment;
 
     public IConfiguration Configuration { get; }
     public ILogger Logger { get; }
-    public abstract string EnvironmentName { get; }
+    public abstract string AspNetEnvironmentName { get; }
     public abstract bool IsDevelopment();
 
     public abstract bool IsProduction();
@@ -69,6 +71,11 @@ private ApplicationOptions GetApplicationOptions()
             applicationOptions.Version = application.GetType().Assembly.GetName().Version?.ToString() ?? "dev";
         }
 
+        if (string.IsNullOrEmpty(applicationOptions.Environment))
+        {
+            applicationOptions.Version = AspNetEnvironmentName;
+        }
+
         ConfigureApplicationOptions(applicationOptions);
         return applicationOptions;
     }
@@ -77,3 +84,4 @@ protected virtual void ConfigureApplicationOptions(ApplicationOptions options)
     {
     }
 }
+

src/Sitko.Core.Blazor.Wasm/WasmApplicationContext.cs

@@ -13,8 +13,9 @@ public class WasmApplicationContext : BaseApplicationContext
         : base(application, configuration) =>
         this.environment = environment;
 
-    public override string EnvironmentName => environment.Environment;
+    public override string AspNetEnvironmentName => environment.Environment;
     public override bool IsDevelopment() => environment.IsDevelopment();
 
     public override bool IsProduction() => environment.IsProduction();
 }
+

src/Sitko.Core.ElasticStack/ElasticStackModule.cs

@@ -93,7 +93,7 @@ public class ElasticStackModule : BaseApplicationModule<ElasticStackModuleOption
         if (options.LoggingEnabled)
         {
             var rolloverAlias = string.IsNullOrEmpty(options.LoggingLiferRolloverAlias)
-                ? $"dotnet-logs-{context.Name.ToLower(CultureInfo.InvariantCulture).Replace(".", "-")}-{context.EnvironmentName.ToLower(CultureInfo.InvariantCulture).Replace(".", "-")}"
+                ? $"dotnet-logs-{context.Name.ToLower(CultureInfo.InvariantCulture).Replace(".", "-")}-{context.Environment.ToLower(CultureInfo.InvariantCulture).Replace(".", "-")}"
                 : options.LoggingLiferRolloverAlias;
             var sinkOptions = new ElasticsearchSinkOptions(options.ElasticSearchUrls)
             {

src/Sitko.Core.Xunit/BaseTestScope.cs

@@ -45,7 +45,7 @@ public async Task ConfigureAsync(string name, ITestOutputHelper testOutputHelper
         scopeApplication.ConfigureAppConfiguration((applicationContext, builder) =>
         {
             builder.AddJsonFile("appsettings.json", true);
-            builder.AddJsonFile($"appsettings.{applicationContext.EnvironmentName}.json", true);
+            builder.AddJsonFile($"appsettings.{applicationContext.AspNetEnvironmentName}.json", true);
         });
 
         scopeApplication.ConfigureServices((context, services) =>