Adjust env variable naming

Author: Tsingis

.env.example

@@ -1,11 +1,10 @@
 ASPNETCORE_ENVIRONMENT=Development
+ASPNETCORE_URLS=http://localhost:8080;https://localhost:8081
 ASPNETCORE_HTTP_PORTS=8080
 ASPNETCORE_HTTPS_PORTS=8081
-ASPNETCORE_URLS=http://localhost:8080;https://localhost:8081
 KEY_VAULT_NAME=key-vault-name
 USE_JSON_FORMATTING=false
 USE_OUTPUT_CACHE=true
-USE_MOCKING=true
-SHOW_MOCKING_LOGS=false
+USE_MOCK_SERVER=true
+SHOW_MOCK_SERVER_LOGS=false
 TESTING_LOG_LEVEL=Information
-MARKET_CLIENT_URL=http://localhost:9091

.github/workflows/test.yml

@@ -39,8 +39,8 @@ jobs:
           dotnet test -c Release --no-restore --no-build \
           --settings tests/coverage.runsettings --results-directory ${{ github.workspace }}/test-results
         env:
-          USE_MOCKING: ${{ vars.USE_MOCKING }}
-          SHOW_MOCKING_LOGS: ${{ vars.SHOW_MOCKING_LOGS }}
+          USE_MOCK_SERVER: ${{ vars.USE_MOCK_SERVER }}
+          SHOW_MOCK_SERVER_LOGS: ${{ vars.SHOW_MOCK_SERVER_LOGS }}
           TESTING_LOG_LEVEL: ${{ vars.TESTING_LOG_LEVEL }}
       - name: Find coverage files and generate report
         run: |

docker-compose.yml

@@ -14,8 +14,8 @@ services:
       KEY_VAULT_NAME: $KEY_VAULT_NAME
       USE_OUTPUT_CACHE: $USE_OUTPUT_CACHE
       USE_JSON_FORMATTING: $USE_JSON_FORMATTING
-      USE_MOCKING: $USE_MOCKING
-      SHOW_MOCKING_LOGS: $SHOW_MOCKING_LOGS
+      USE_MOCK_SERVER: $USE_MOCK_SERVER
+      SHOW_MOCK_SERVER_LOGS: $SHOW_MOCKING_LOGS
       MARKET_CLIENT_URL: http://wiremock:8080
     user: app
     read_only: true

src/Api/Setup/DateOnlyExampleProvider.cs

@@ -7,7 +7,7 @@ namespace Api.Setup;
 
 public sealed class DateOnlyExampleProvider : IExampleProvider<DateOnly>
 {
-    public static DateOnly GenerateExample() => EnvVarAccessors.UseMocking ? new DateOnly(2025, 8, 30) : DateOnly.FromDateTime(DateTime.UtcNow);
+    public static DateOnly GenerateExample() => EnvVarAccessors.UseMockServer ? new DateOnly(2025, 8, 30) : DateOnly.FromDateTime(DateTime.UtcNow);
 }
 
 [JsonSerializable(typeof(DateOnly))]

src/Common/EnvVarsHelper.cs

@@ -6,18 +6,18 @@ public static class EnvVarKeys
     public const string UseJsonFormatting = "USE_JSON_FORMATTING";
     public const string UseOutputCache = "USE_OUTPUT_CACHE";
     public const string MarketClientUrl = "MARKET_CLIENT_URL";
-    public const string UseMocking = "USE_MOCKING";
-    public const string ShowMockingLogs = "SHOW_MOCKING_LOGS";
+    public const string UseMockServer = "USE_MOCK_SERVER";
+    public const string ShowMockServerLogs = "SHOW_MOCK_SERVER_LOGS";
     public const string TestingLogLevel = "TESTING_LOG_LEVEL";
 }
 
 public static class EnvVarAccessors
 {
-    public static bool UseMocking =>
-        bool.TryParse(Environment.GetEnvironmentVariable(EnvVarKeys.UseMocking), out var value) && value;
+    public static bool UseMockServer =>
+        bool.TryParse(Environment.GetEnvironmentVariable(EnvVarKeys.UseMockServer), out var value) && value;
 
-    public static bool ShowMockingLogs =>
-        bool.TryParse(Environment.GetEnvironmentVariable(EnvVarKeys.ShowMockingLogs), out var value) && value;
+    public static bool ShowMockServerLogs =>
+        bool.TryParse(Environment.GetEnvironmentVariable(EnvVarKeys.ShowMockServerLogs), out var value) && value;
 
     public static bool UseJsonFormatting =>
         bool.TryParse(Environment.GetEnvironmentVariable(EnvVarKeys.UseJsonFormatting), out var value) && value;

tests/IntegrationTests/Setup/Fixture.cs

@@ -18,7 +18,7 @@ public Fixture()
     {
         DotNetEnv.Env.TraversePath().Load();
 
-        if (EnvVarAccessors.UseMocking)
+        if (EnvVarAccessors.UseMockServer)
         {
             var image = GetImage("wiremock", Path.Join(AppContext.BaseDirectory, "docker-compose.yml"));
 
@@ -53,7 +53,7 @@ public async ValueTask InitializeAsync()
             TestContext.Current.SendDiagnosticMessage("Starting Wiremock container");
             await _wireMockContainer.StartAsync(ct).ConfigureAwait(false);
 
-            if (EnvVarAccessors.ShowMockingLogs)
+            if (EnvVarAccessors.ShowMockServerLogs)
             {
                 var (Stdout, _) = await _wireMockContainer.GetLogsAsync(ct: ct).ConfigureAwait(false);
                 TestContext.Current.SendDiagnosticMessage($"[WireMock] {Stdout}");

tests/IntegrationTests/Setup/TestApplicationFactory.cs

@@ -18,7 +18,7 @@ public sealed class TestApplicationFactory(Fixture fixture) : WebApplicationFact
 {
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
-        if (EnvVarAccessors.UseMocking)
+        if (EnvVarAccessors.UseMockServer)
         {
             builder?.ConfigureAppConfiguration((context, builder) =>
             {