Skip to content

Commit 650dec1

Browse files
authored
[Tests] Add new configurations to support ValidateConfiguration (#5195)
* Add new configurations to support Validate configuration * Adding sanity treatment.
1 parent a0750fd commit 650dec1

3 files changed

Lines changed: 16 additions & 7 deletions

File tree

src/Microsoft.Health.Fhir.Core/Configs/ValidateOperationConfiguration.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@ namespace Microsoft.Health.Fhir.Core.Configs
77
{
88
public class ValidateOperationConfiguration
99
{
10+
public const int DefaultCacheDurationInSeconds = 14400;
11+
public const int DefaultMaxExpansionSize = 20000;
12+
1013
/// <summary>
1114
/// For how long we cache profile in memory.
1215
/// </summary>
13-
public int CacheDurationInSeconds { get; set; } = 14400;
16+
public int CacheDurationInSeconds { get; set; } = DefaultCacheDurationInSeconds;
1417

1518
/// <summary>
1619
/// Max number of codes in a ValueSet.
1720
/// </summary>
18-
public int MaxExpansionSize { get; set; } = 20000;
21+
public int MaxExpansionSize { get; set; } = DefaultMaxExpansionSize;
1922
}
2023
}

src/Microsoft.Health.Fhir.Shared.Core/Features/Validation/ProfileValidator.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ public ProfileValidator(
4242

4343
try
4444
{
45+
int cacheDuration = options.Value.CacheDurationInSeconds <= 0 ? ValidateOperationConfiguration.DefaultCacheDurationInSeconds : options.Value.CacheDurationInSeconds;
46+
_maxExpansionSize = options.Value.MaxExpansionSize <= 0 ? ValidateOperationConfiguration.DefaultMaxExpansionSize : options.Value.MaxExpansionSize;
47+
4548
_logger.LogInformation(
4649
"Creating ProfileValidator with: CacheDuration {CacheDurationInSeconds}; and MaxExpansionSize {MaxExpansionSize}.",
47-
options.Value.CacheDurationInSeconds,
48-
options.Value.MaxExpansionSize);
49-
50-
int cacheDuration = options.Value.CacheDurationInSeconds;
51-
_maxExpansionSize = options.Value.MaxExpansionSize;
50+
cacheDuration,
51+
_maxExpansionSize);
5252

5353
_resolver = new MultiResolver(new CachedResolver(ZipSource.CreateValidationSource(), cacheDuration), profilesResolver);
5454
}

test/Microsoft.Health.Fhir.Shared.Tests.E2E/Rest/InProcTestFhirServer.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using Microsoft.Extensions.DependencyInjection;
2121
using Microsoft.Extensions.Options;
2222
using Microsoft.Health.Fhir.Api.OpenIddict.Extensions;
23+
using Microsoft.Health.Fhir.Core.Configs;
2324
using Microsoft.Health.Fhir.Core.Models;
2425
using Microsoft.Health.Fhir.CosmosDb.Features.Storage;
2526
using Microsoft.Health.Fhir.Tests.Common.FixtureParameters;
@@ -69,6 +70,11 @@ public InProcTestFhirServer(DataStore dataStore, Type startupType)
6970
configuration["FhirServer:Operations:Import:DisableOptionalIndexesForImport"] = "false";
7071
configuration["FhirServer:Operations:Import:DisableUniqueOptionalIndexesForImport"] = "false";
7172

73+
// Validate operation settings
74+
var validateConfiguration = new ValidateOperationConfiguration();
75+
configuration["FhirServer:Operations:Validate:CacheDurationInSeconds"] = validateConfiguration.CacheDurationInSeconds.ToString();
76+
configuration["FhirServer:Operations:Validate:MaxExpansionSize"] = validateConfiguration.MaxExpansionSize.ToString();
77+
7278
// Enable background jobs.
7379
configuration["TaskHosting:Enabled"] = "true";
7480
configuration["TaskHosting:MaxRunningTaskCount"] = "2";

0 commit comments

Comments
 (0)