Merge branch 'dev' into feature/admin-ui-playwright-e2e

Author: arianamihailescu

.github/workflows/tests.yaml

@@ -64,6 +64,7 @@ jobs:
       HEALTH_CHECK_TIMEOUT: 60
       CHECK_INTERVAL: 10
       ADHOC_REPORT_TEST_DOWNLOAD_PATH: ./Tests/BackendE2ETests/TestResults/
+      LOCAL_APIHEALTH_ENABLE_ADMINBFF_AUTH_SUITE: false
 
     steps:
       - name: Checkout code

Azure_Pipelines/_deploy_all_services.yml

@@ -15,6 +15,7 @@ parameters:
       - dev-scale
       - scale-test
       - scale-qa
+      - scale-qa2
 
 variables:
 - group: link-cloud-variables
@@ -33,6 +34,8 @@ variables:
     value:  'test'
   ${{ if eq(parameters.environment, 'scale-qa') }}:
     value:  'qa'
+  ${{ if eq(parameters.environment, 'scale-qa2') }}:
+    value:  'qa2'
 
 jobs:
 

Azure_Pipelines/azure-pipelines.ec.cd.yaml

@@ -16,6 +16,7 @@ parameters:
     - DEV
     - TEST
     - QA
+    - QA2
 
 variables:
 - group: kafka_topics # variable group `kafka_topics`
@@ -35,6 +36,8 @@ variables:
     value:  '$(test-rest-url)'
   ${{ if eq(parameters.environment, 'QA') }}:
     value:  '$(qa-rest-url)'
+  ${{ if eq(parameters.environment, 'QA2') }}:
+    value:  '$(qa2-rest-url)'
 
 stages:
 - stage: Sync_Kafka_Topics_${{ parameters.environment }}

Azure_Pipelines/kafka-topics-sync.yaml

@@ -37,9 +37,8 @@ public class AutomationConfig
     /// </summary>
     public string FacilityFhirServerBase { get; set; } = "http://fhir-server:8080/fhir";
 
-    public string LokiBaseUrl { get; set; } = "http://localhost:3100";
-    public string LokiAppLabel { get; set; } = "link-cloud";
-    public string GrafanaBaseUrl { get; set; } = "http://localhost:3000";
+    public string LokiBaseUrl { get; set; } = string.Empty;
+    public string LokiAppLabel { get; set; } = string.Empty;
     public string? DownloadPath { get; set; }
 
     public OAuthConfig FhirServerOAuth { get; set; } = new();
@@ -53,8 +52,6 @@ public class AutomationConfig
     /// </summary>
     public FhirGenerationSettings FhirGeneration { get; set; } = new();
 
-    public DatabaseConfig Database { get; set; } = new();
-
     public KafkaConfig Kafka { get; set; } = new();
 
     public class FhirQuerySettings
@@ -91,18 +88,8 @@ public class FhirGenerationSettings
         };
     }
 
-    public class DatabaseConfig
-    {
-        public string Server { get; set; } = string.Empty;
-        public string UserId { get; set; } = string.Empty;
-        public string Password { get; set; } = string.Empty;
-    }
-
     public class KafkaConfig
     {
-        public string BootstrapServers { get; set; } = string.Empty;
         public string RestProxyBaseUrl { get; set; } = string.Empty;
-        public string User { get; set; } = string.Empty;
-        public string Password { get; set; } = string.Empty;
     }
 }

DotNet/Automation.Link/Configuration/AutomationConfig.cs

@@ -1,6 +1,7 @@
 using System.Threading.Channels;
 using LantanaGroup.Link.Automation.Link.Configuration;
 using LantanaGroup.Link.Automation.Link.Validation;
+using LantanaGroup.Link.Shared.Application.Models.Configs;
 
 namespace LantanaGroup.Link.Automation.Link.Helpers;
 
@@ -76,6 +77,7 @@ public BackgroundDiagnosticsMonitor(
         IAutomationOutput output,
         LokiScraper lokiScraper,
         AutomationConfig config,
+        KafkaConnection kafkaConnection,
         int expectedPatientCount = 0,
         TimeSpan? pollInterval = null,
         bool forwardInternalLogsToOutput = true,
@@ -97,7 +99,10 @@ public BackgroundDiagnosticsMonitor(
 
         var reader = pipelineReader ?? BuildPipelineReader(config);
 
-        _kafkaMonitor = new KafkaErrorMonitor(eventingOutput, config);
+        _kafkaMonitor = new KafkaErrorMonitor(
+            eventingOutput,
+            config,
+            kafkaConnection);
         var progressMonitor = new ProgressMonitor(eventingOutput, expectedPatientCount, lokiScraper, reader, expectsDataAcquisition);
         _milestoneOrchestrator = new MilestoneValidationOrchestrator(eventingOutput, reader, expectedPatientCount, expectsDataAcquisition);
         _pollInterval = pollInterval ?? TimeSpan.FromSeconds(5);

DotNet/Automation.Link/Helpers/BackgroundDiagnosticsMonitor.cs

@@ -2,6 +2,7 @@
 using System.Text;
 using Confluent.Kafka;
 using LantanaGroup.Link.Automation.Link.Configuration;
+using LantanaGroup.Link.Shared.Application.Models.Configs;
 using Newtonsoft.Json.Linq;
 using RestSharp;
 
@@ -19,8 +20,7 @@ public class KafkaErrorMonitor : IAsyncDisposable
 {
     private readonly string _kafkaBootstrapServers;
     private readonly string _kafkaRestProxyBase;
-    private readonly string _kafkaUser;
-    private readonly string _kafkaPassword;
+    private readonly KafkaConnection _kafkaConnection;
 
     private readonly IAutomationOutput _output;
     private IConsumer<string, string>? _consumer;
@@ -76,13 +76,12 @@ private sealed record CapturedKafkaError(string? Key, string Message);
     private const int ResourceNormalizedValuePreviewLength = 4000;
     private const int ResourceNormalizedHeaderPreviewLength = 2000;
 
-    public KafkaErrorMonitor(IAutomationOutput output, AutomationConfig config)
+    public KafkaErrorMonitor(IAutomationOutput output, AutomationConfig config, KafkaConnection kafkaConnection)
     {
         _output = output;
-        _kafkaBootstrapServers = config.Kafka.BootstrapServers;
+        _kafkaConnection = kafkaConnection;
+        _kafkaBootstrapServers = string.Join(", ", kafkaConnection.BootstrapServers);
         _kafkaRestProxyBase = config.Kafka.RestProxyBaseUrl;
-        _kafkaUser = config.Kafka.User;
-        _kafkaPassword = config.Kafka.Password;
     }
 
     /// <summary>
@@ -136,17 +135,12 @@ public async Task InitializeAsync()
                 SocketTimeoutMs = 5000,
             };
 
-            // Only enable SASL when credentials are actually configured. The Link services
-            // gate SASL behind KafkaConnection.SaslProtocolEnabled (default false) and the
-            // local/dev/docker brokers use PLAINTEXT. Forcing SaslPlaintext/Plain here with
-            // empty credentials makes librdkafka throw "sasl.username and sasl.password must
-            // be set", which silently disabled dead-letter monitoring for the whole run.
-            if (!string.IsNullOrWhiteSpace(_kafkaUser) && !string.IsNullOrWhiteSpace(_kafkaPassword))
+            if (_kafkaConnection.SaslProtocolEnabled)
             {
-                config.SecurityProtocol = SecurityProtocol.SaslPlaintext;
-                config.SaslMechanism = SaslMechanism.Plain;
-                config.SaslUsername = _kafkaUser;
-                config.SaslPassword = _kafkaPassword;
+                config.SecurityProtocol = _kafkaConnection.Protocol;
+                config.SaslMechanism = _kafkaConnection.Mechanism;
+                config.SaslUsername = _kafkaConnection.SaslUsername;
+                config.SaslPassword = _kafkaConnection.SaslPassword;
             }
 
             _consumer = new ConsumerBuilder<string, string>(config)

DotNet/Automation.Link/Helpers/DatabaseConnectionFactory.cs

@@ -15,18 +15,16 @@ public LokiScraper(HttpClient lokiClient, IAutomationOutput output, AutomationCo
     {
         if (lokiClient.BaseAddress == null)
         {
-            var configuredBaseUrl = string.IsNullOrWhiteSpace(config.LokiBaseUrl)
-                ? "http://localhost:3100"
-                : config.LokiBaseUrl;
+            if (!Uri.TryCreate(config.LokiBaseUrl, UriKind.Absolute, out var lokiBaseUri))
+                throw new InvalidOperationException("LokiBaseUrl must be an absolute URI.");
 
-            if (Uri.TryCreate(configuredBaseUrl, UriKind.Absolute, out var lokiBaseUri))
-                lokiClient.BaseAddress = lokiBaseUri;
+            lokiClient.BaseAddress = lokiBaseUri;
         }
 
         _output = output;
         _lokiClient = lokiClient;
         _lokiAppLabel = string.IsNullOrWhiteSpace(config.LokiAppLabel)
-            ? "link-cloud"
+            ? throw new InvalidOperationException("LokiAppLabel is required.")
             : config.LokiAppLabel.Trim();
     }
 

DotNet/Automation.Link/Helpers/KafkaErrorMonitor.cs

@@ -201,7 +201,7 @@ public async Task<PipelineSummarySnapshot> BuildAsync(
             ? null
             : new ReportScheduleSnapshot
             {
-                ReportName = schedule.FacilityId,
+                ReportName = reportId,
                 StartDate = schedule.ReportStartDate?.ToString("u"),
                 EndDate = schedule.ReportEndDate?.ToString("u"),
                 AdHocType = schedule.AdHocType,