Fixes

Author: brendankowitz

build/dotnet8-compat/global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.415"
+        "version": "8.0.416"
     }
 }

src/Microsoft.Health.Fhir.Core.UnitTests/Features/Search/Registry/SearchParameterCacheRefreshBackgroundServiceTests.cs

@@ -203,7 +203,7 @@ public async Task OnRefreshTimer_WhenCacheIsStale_ShouldCallGetAndApplySearchPar
             await _service.HandleAsync(new SearchParametersInitializedNotification(), CancellationToken.None);
 
             // Wait for the timer to fire at least once and allow async operations to complete
-            await Task.Delay(200);
+            await Task.Delay(500);
 
             // Assert - use at least 1 call since timer might fire multiple times in test environment
             await _searchParameterStatusManager.Received().EnsureCacheFreshnessAsync(Arg.Any<CancellationToken>());
@@ -224,7 +224,7 @@ public async Task OnRefreshTimer_WhenCacheIsFresh_ShouldNotCallGetAndApplySearch
             await _service.HandleAsync(new SearchParametersInitializedNotification(), CancellationToken.None);
 
             // Wait for the timer to fire at least once and allow async operations to complete
-            await Task.Delay(200);
+            await Task.Delay(500);
 
             // Assert - verify the timer is working and EnsureCacheFreshnessAsync was called
             await _searchParameterStatusManager.Received().EnsureCacheFreshnessAsync(Arg.Any<CancellationToken>());

src/Microsoft.Health.Fhir.Core/Features/Search/Registry/SearchParameterCacheRefreshBackgroundService.cs

@@ -30,7 +30,9 @@ public class SearchParameterCacheRefreshBackgroundService : BackgroundService, I
         private readonly TimeSpan _refreshInterval;
         private readonly Timer _refreshTimer;
         private readonly SemaphoreSlim _refreshSemaphore;
-        private bool _isInitialized;
+        private volatile bool _isInitialized;
+        private volatile bool _serviceStopped;
+        private volatile bool _startAsyncCalled;
         private CancellationToken _stoppingToken;
 
         public SearchParameterCacheRefreshBackgroundService(
@@ -57,9 +59,17 @@ public SearchParameterCacheRefreshBackgroundService(
             _refreshSemaphore = new SemaphoreSlim(1, 1);
         }
 
+        public override Task StartAsync(CancellationToken cancellationToken)
+        {
+            // Set flag and token before calling base.StartAsync
+            // This ensures HandleAsync can check if the service was started and if it was cancelled
+            _startAsyncCalled = true;
+            _stoppingToken = cancellationToken;
+            return base.StartAsync(cancellationToken);
+        }
+
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
-            _stoppingToken = stoppingToken;
             _logger.LogInformation("SearchParameterCacheRefreshBackgroundService starting...");
 
             try
@@ -92,6 +102,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             }
             finally
             {
+                _serviceStopped = true;
+
                 // Stop the timer when ExecuteAsync completes to prevent it from continuing to fire
                 // after the service has stopped and potentially after service provider disposal
                 _refreshTimer?.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
@@ -173,8 +185,11 @@ public async Task HandleAsync(SearchParametersInitializedNotification notificati
 
             _isInitialized = true;
 
-            // Only start the timer if the service hasn't been cancelled
-            if (!_stoppingToken.IsCancellationRequested)
+            // Only start the timer if:
+            // 1. Service hasn't been stopped, AND
+            // 2. Either StartAsync was never called OR it was called but not cancelled
+            // This prevents starting the timer when StartAsync was called with a cancelled token
+            if (!_serviceStopped && (!_startAsyncCalled || !_stoppingToken.IsCancellationRequested))
             {
                 // Start the timer now that search parameters are initialized
                 _refreshTimer.Change(TimeSpan.Zero, _refreshInterval);

src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/CosmosContainerProvider.cs

@@ -177,7 +177,8 @@ public Task StartAsync(CancellationToken cancellationToken)
             // The result is ignored and will be awaited in EnsureInitialized(). Exceptions are logged within CosmosClientInitializer.
             _initializationOperation.EnsureInitialized()
                 .AsTask()
-                .ContinueWith(_ => _mediator.PublishAsync(new StorageInitializedNotification(), CancellationToken.None), TaskScheduler.Default);
+                .ContinueWith(_ => _mediator.PublishAsync(new StorageInitializedNotification(), CancellationToken.None), TaskScheduler.Default)
+                .Unwrap();
 #pragma warning restore CS4014
 
             return Task.CompletedTask;

src/Microsoft.Health.Fhir.Shared.Core.UnitTests/Features/Search/SearchParameters/SearchParameterBehaviorTests.cs

@@ -172,7 +172,7 @@ public async Task GivenAnUpsertResourceRequest_WhenSearchParameterDoesNotExist_T
             var response = new UpsertResourceResponse(new SaveOutcome(new RawResourceElement(wrapper), SaveOutcomeType.Created));
 
             var behavior = new CreateOrUpdateSearchParameterBehavior<UpsertResourceRequest, UpsertResourceResponse>(_searchParameterOperations, _fhirDataStore);
-            await behavior.Handle(request, async (ct) => await Task.Run(() => response), CancellationToken.None);
+            await behavior.HandleAsync(request, async () => await Task.Run(() => response), CancellationToken.None);
 
             // Should call AddSearchParameterAsync since the resource doesn't exist
             await _searchParameterOperations.Received().AddSearchParameterAsync(Arg.Any<ITypedElement>(), Arg.Any<CancellationToken>());
@@ -199,7 +199,7 @@ public async Task GivenAnUpsertResourceRequest_WhenSearchParameterExists_ThenUpd
             var response = new UpsertResourceResponse(new SaveOutcome(new RawResourceElement(newWrapper), SaveOutcomeType.Updated));
 
             var behavior = new CreateOrUpdateSearchParameterBehavior<UpsertResourceRequest, UpsertResourceResponse>(_searchParameterOperations, _fhirDataStore);
-            await behavior.Handle(request, async (ct) => await Task.Run(() => response), CancellationToken.None);
+            await behavior.HandleAsync(request, async () => await Task.Run(() => response), CancellationToken.None);
 
             // Should call UpdateSearchParameterAsync since the resource exists
             await _searchParameterOperations.DidNotReceive().AddSearchParameterAsync(Arg.Any<ITypedElement>(), Arg.Any<CancellationToken>());

src/Microsoft.Health.Fhir.Shared.Core.UnitTests/Features/Validation/ValidateCapabilityPreProcessorTests.cs

@@ -4,6 +4,7 @@
 // -------------------------------------------------------------------------------------------------
 
 using System;
+using System.Net.Http;
 using System.Threading;
 using Hl7.Fhir.ElementModel;
 using Hl7.Fhir.Model;
@@ -48,8 +49,10 @@ public async Task GivenARequest_WhenValidatingCapability_ThenAllValidationRulesS
             var preProcessor = new ValidateCapabilityPreProcessor<GetResourceRequest, GetResourceResponse>(_conformanceProvider);
 
             var getResourceRequest = new GetResourceRequest("Observation", Guid.NewGuid().ToString(), bundleResourceContext: null);
+            var resource = Samples.GetDefaultObservation().UpdateId("observation1");
+            var mockResponse = new GetResourceResponse(CreateRawResourceElement(resource));
 
-            await preProcessor.HandleAsync(getResourceRequest, null, CancellationToken.None);
+            await preProcessor.HandleAsync(getResourceRequest, () => Task.FromResult(mockResponse), CancellationToken.None);
         }
 
         [Theory]
@@ -67,5 +70,20 @@ await Assert.ThrowsAsync<MethodNotAllowedException>(
                     () => Task.FromResult(new DeleteResourceResponse(new ResourceKey("Observation", "test-id"))),
                     CancellationToken.None));
         }
+
+        private static RawResourceElement CreateRawResourceElement(ResourceElement resource)
+        {
+            var rawResource = new RawResource("data", FhirResourceFormat.Json, isMetaSet: true);
+            var wrapper = new ResourceWrapper(
+                resource,
+                rawResource,
+                new ResourceRequest(HttpMethod.Post, "http://fhir"),
+                deleted: false,
+                searchIndices: null,
+                compartmentIndices: null,
+                lastModifiedClaims: null);
+
+            return new RawResourceElement(wrapper);
+        }
     }
 }

src/Microsoft.Health.Fhir.Shared.Core.UnitTests/Features/Validation/ValidateRequestPreProcessorTests.cs

@@ -3,11 +3,13 @@
 // Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // -------------------------------------------------------------------------------------------------
 
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using FluentValidation;
 using FluentValidation.Results;
 using Medino;
+using Microsoft.Health.Fhir.Core.Extensions;
 using Microsoft.Health.Fhir.Core.Features.Persistence;
 using Microsoft.Health.Fhir.Core.Features.Validation;
 using Microsoft.Health.Fhir.Core.Messages.Upsert;
@@ -31,8 +33,9 @@ public async Task GivenARequest_WhenValidatingThatType_ThenAllValidationRulesSho
 
             var validators = new[] { mockValidator1, mockValidator2 };
             var upsertValidationHandler = new ValidateRequestPreProcessor<UpsertResourceRequest, UpsertResourceResponse>(validators);
-            var upsertResourceRequest = new UpsertResourceRequest(Samples.GetDefaultObservation());
-            var mockResponse = new UpsertResourceResponse(new SaveOutcome(null, SaveOutcomeType.Created));
+            var resource = Samples.GetDefaultObservation().UpdateId("observation1");
+            var upsertResourceRequest = new UpsertResourceRequest(resource);
+            var mockResponse = new UpsertResourceResponse(new SaveOutcome(CreateRawResourceElement(resource), SaveOutcomeType.Created));
 
             await upsertValidationHandler.HandleAsync(
                 upsertResourceRequest,
@@ -55,7 +58,8 @@ public async Task GivenARequest_WhenValidatingThatTypeWithFailingRule_ThenAValid
 
             var validators = new[] { mockValidator1, mockValidator2 };
             var upsertValidationHandler = new ValidateRequestPreProcessor<UpsertResourceRequest, UpsertResourceResponse>(validators);
-            var upsertResourceRequest = new UpsertResourceRequest(Samples.GetDefaultObservation());
+            var resource = Samples.GetDefaultObservation().UpdateId("observation1");
+            var upsertResourceRequest = new UpsertResourceRequest(resource);
 
             var validationError = Task.FromResult(new ValidationResult(new[] { new ValidationFailure("Id", "Id should not be null") }));
 
@@ -68,7 +72,7 @@ public async Task GivenARequest_WhenValidatingThatTypeWithFailingRule_ThenAValid
             await Assert.ThrowsAsync<ResourceNotValidException>(
                 async () => await upsertValidationHandler.HandleAsync(
                     upsertResourceRequest,
-                    () => Task.FromResult(new UpsertResourceResponse(new SaveOutcome(null, SaveOutcomeType.Created))),
+                    () => Task.FromResult(new UpsertResourceResponse(new SaveOutcome(CreateRawResourceElement(resource), SaveOutcomeType.Created))),
                     CancellationToken.None));
         }
 
@@ -79,7 +83,8 @@ public async Task GivenARequest_WhenReturningFhirValidationFailure_ThenOperation
 
             var validators = new[] { mockValidator };
             var upsertValidationHandler = new ValidateRequestPreProcessor<UpsertResourceRequest, UpsertResourceResponse>(validators);
-            var upsertResourceRequest = new UpsertResourceRequest(Samples.GetDefaultObservation());
+            var resource = Samples.GetDefaultObservation().UpdateId("observation1");
+            var upsertResourceRequest = new UpsertResourceRequest(resource);
 
             var operationOutcomeIssue = new OperationOutcomeIssue(
                 OperationOutcomeConstants.IssueSeverity.Error,
@@ -98,10 +103,25 @@ public async Task GivenARequest_WhenReturningFhirValidationFailure_ThenOperation
             var exception = await Assert.ThrowsAsync<ResourceNotValidException>(
                 async () => await upsertValidationHandler.HandleAsync(
                     upsertResourceRequest,
-                    () => Task.FromResult(new UpsertResourceResponse(new SaveOutcome(null, SaveOutcomeType.Created))),
+                    () => Task.FromResult(new UpsertResourceResponse(new SaveOutcome(CreateRawResourceElement(resource), SaveOutcomeType.Created))),
                     CancellationToken.None));
 
             Assert.Contains(operationOutcomeIssue, exception.Issues);
         }
+
+        private static RawResourceElement CreateRawResourceElement(ResourceElement resource)
+        {
+            var rawResource = new RawResource("data", FhirResourceFormat.Json, isMetaSet: true);
+            var wrapper = new ResourceWrapper(
+                resource,
+                rawResource,
+                new ResourceRequest(HttpMethod.Post, "http://fhir"),
+                deleted: false,
+                searchIndices: null,
+                compartmentIndices: null,
+                lastModifiedClaims: null);
+
+            return new RawResourceElement(wrapper);
+        }
     }
 }