Cosmos DB initialization logic to a new assembly

Microsoft.Health.Fhir.sln

@@ -199,6 +199,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerfTester", "tools\PerfTes
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlScriptRunner", "tools\SqlScriptRunner\SqlScriptRunner.csproj", "{76C29222-8D35-43A2-89C5-43114D113C10}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Health.Fhir.CosmosDb.Initialization", "src\Microsoft.Health.Fhir.CosmosDb.Initialization\Microsoft.Health.Fhir.CosmosDb.Initialization.csproj", "{10661BC9-01B0-4E35-9751-3B5CE97E25C0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Health.Fhir.CosmosDb.Initialization.UnitTests", "src\Microsoft.Health.Fhir.CosmosDb.Initialization.UnitTests\Microsoft.Health.Fhir.CosmosDb.Initialization.UnitTests.csproj", "{B9AAA11D-8C8C-44C3-AADE-801376EF82F0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Health.Fhir.CosmosDb.Core", "src\Microsoft.Health.Fhir.CosmosDb.Core\Microsoft.Health.Fhir.CosmosDb.Core.csproj", "{1CD46DC5-6022-4BBE-9A1C-6B13C3CEFC75}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -465,6 +471,18 @@ Global
 		{76C29222-8D35-43A2-89C5-43114D113C10}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{76C29222-8D35-43A2-89C5-43114D113C10}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76C29222-8D35-43A2-89C5-43114D113C10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10661BC9-01B0-4E35-9751-3B5CE97E25C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10661BC9-01B0-4E35-9751-3B5CE97E25C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10661BC9-01B0-4E35-9751-3B5CE97E25C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10661BC9-01B0-4E35-9751-3B5CE97E25C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9AAA11D-8C8C-44C3-AADE-801376EF82F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9AAA11D-8C8C-44C3-AADE-801376EF82F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9AAA11D-8C8C-44C3-AADE-801376EF82F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9AAA11D-8C8C-44C3-AADE-801376EF82F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1CD46DC5-6022-4BBE-9A1C-6B13C3CEFC75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CD46DC5-6022-4BBE-9A1C-6B13C3CEFC75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CD46DC5-6022-4BBE-9A1C-6B13C3CEFC75}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1CD46DC5-6022-4BBE-9A1C-6B13C3CEFC75}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -557,10 +575,13 @@ Global
 		{71A1A274-23A9-441B-BB47-1FC561FF0F35} = {B70945F4-01A6-4351-955B-C4A2943B5E3B}
 		{5E0B69FE-40DE-42E8-9F67-4BB7410AF67C} = {B70945F4-01A6-4351-955B-C4A2943B5E3B}
 		{76C29222-8D35-43A2-89C5-43114D113C10} = {B70945F4-01A6-4351-955B-C4A2943B5E3B}
+		{10661BC9-01B0-4E35-9751-3B5CE97E25C0} = {DC5A2CB1-8995-4D39-97FE-3CE80E892C69}
+		{B9AAA11D-8C8C-44C3-AADE-801376EF82F0} = {DC5A2CB1-8995-4D39-97FE-3CE80E892C69}
+		{1CD46DC5-6022-4BBE-9A1C-6B13C3CEFC75} = {DC5A2CB1-8995-4D39-97FE-3CE80E892C69}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E370FB31-CF95-47D1-B1E1-863A77973FF8}
 		RESX_SortFileContentOnSave = True
+		SolutionGuid = {E370FB31-CF95-47D1-B1E1-863A77973FF8}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		test\Microsoft.Health.Fhir.Shared.Tests.E2E.Common\Microsoft.Health.Fhir.Shared.Tests.E2E.Common.projitems*{0478b687-7105-40f6-a2dc-81057890e944}*SharedItemsImports = 13

R4.slnf

@@ -10,6 +10,9 @@
       "src\\Microsoft.Health.Fhir.Azure\\Microsoft.Health.Fhir.Azure.csproj",
       "src\\Microsoft.Health.Fhir.Core.UnitTests\\Microsoft.Health.Fhir.Core.UnitTests.csproj",
       "src\\Microsoft.Health.Fhir.Core\\Microsoft.Health.Fhir.Core.csproj",
+      "src\Microsoft.Health.Fhir.CosmosDb.Core\Microsoft.Health.Fhir.CosmosDb.Core.csproj",
+      "src\Microsoft.Health.Fhir.CosmosDb.Initialization.UnitTests\Microsoft.Health.Fhir.CosmosDb.Initialization.UnitTests.csproj",
+      "src\Microsoft.Health.Fhir.CosmosDb.Initialization\Microsoft.Health.Fhir.CosmosDb.Initialization.csproj",
       "src\\Microsoft.Health.Fhir.CosmosDb.UnitTests\\Microsoft.Health.Fhir.CosmosDb.UnitTests.csproj",
       "src\\Microsoft.Health.Fhir.CosmosDb\\Microsoft.Health.Fhir.CosmosDb.csproj",
       "src\\Microsoft.Health.Fhir.R4.Api\\Microsoft.Health.Fhir.R4.Api.csproj",

R5.slnf

@@ -10,6 +10,9 @@
       "src\\Microsoft.Health.Fhir.Azure\\Microsoft.Health.Fhir.Azure.csproj",
       "src\\Microsoft.Health.Fhir.Core.UnitTests\\Microsoft.Health.Fhir.Core.UnitTests.csproj",
       "src\\Microsoft.Health.Fhir.Core\\Microsoft.Health.Fhir.Core.csproj",
+      "src\Microsoft.Health.Fhir.CosmosDb.Core\Microsoft.Health.Fhir.CosmosDb.Core.csproj",
+      "src\Microsoft.Health.Fhir.CosmosDb.Initialization.UnitTests\Microsoft.Health.Fhir.CosmosDb.Initialization.UnitTests.csproj",
+      "src\Microsoft.Health.Fhir.CosmosDb.Initialization\Microsoft.Health.Fhir.CosmosDb.Initialization.csproj",
       "src\\Microsoft.Health.Fhir.CosmosDb.UnitTests\\Microsoft.Health.Fhir.CosmosDb.UnitTests.csproj",
       "src\\Microsoft.Health.Fhir.CosmosDb\\Microsoft.Health.Fhir.CosmosDb.csproj",
       "src\\Microsoft.Health.Fhir.R5.Api\\Microsoft.Health.Fhir.R5.Api.csproj",

build/docker/Dockerfile

@@ -43,6 +43,12 @@ COPY ./src/Microsoft.Health.Fhir.Api/Microsoft.Health.Fhir.Api.csproj \
 COPY ./src/Microsoft.Health.Fhir.CosmosDb/Microsoft.Health.Fhir.CosmosDb.csproj \
      ./src/Microsoft.Health.Fhir.CosmosDb/Microsoft.Health.Fhir.CosmosDb.csproj
 
+COPY ./src/Microsoft.Health.Fhir.CosmosDb.Core/Microsoft.Health.Fhir.CosmosDb.Core.csproj \
+     ./src/Microsoft.Health.Fhir.CosmosDb.Core/Microsoft.Health.Fhir.CosmosDb.Core.csproj
+
+COPY ./src/Microsoft.Health.Fhir.CosmosDb.Initialization/Microsoft.Health.Fhir.CosmosDb.Initialization.csproj \
+     ./src/Microsoft.Health.Fhir.CosmosDb.Initialization/Microsoft.Health.Fhir.CosmosDb.Initialization.csproj
+
 COPY ./src/Microsoft.Health.Fhir.${FHIR_VERSION}.Core/Microsoft.Health.Fhir.${FHIR_VERSION}.Core.csproj \
      ./src/Microsoft.Health.Fhir.${FHIR_VERSION}.Core/Microsoft.Health.Fhir.${FHIR_VERSION}.Core.csproj
 

src/Microsoft.Health.Fhir.CosmosDb/Configs/CosmosCollectionConfiguration.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Configs/CosmosCollectionConfiguration.cs

@@ -3,7 +3,7 @@
 // Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // -------------------------------------------------------------------------------------------------
 
-namespace Microsoft.Health.Fhir.CosmosDb.Configs
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Configs
 {
     public class CosmosCollectionConfiguration
     {

src/Microsoft.Health.Fhir.CosmosDb/Configs/CosmosDataStoreConfiguration.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Configs/CosmosDataStoreConfiguration.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using Microsoft.Azure.Cosmos;
 
-namespace Microsoft.Health.Fhir.CosmosDb.Configs
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Configs
 {
     public class CosmosDataStoreConfiguration
     {

src/Microsoft.Health.Fhir.CosmosDb/Configs/CosmosDataStoreParallelQueryOptions.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Configs/CosmosDataStoreParallelQueryOptions.cs

@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Microsoft.Health.Fhir.CosmosDb.Configs
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Configs
 {
     public class CosmosDataStoreParallelQueryOptions
     {

src/Microsoft.Health.Fhir.CosmosDb/Configs/CosmosDataStoreRetryOptions.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Configs/CosmosDataStoreRetryOptions.cs

@@ -3,7 +3,7 @@
 // Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // -------------------------------------------------------------------------------------------------
 
-namespace Microsoft.Health.Fhir.CosmosDb.Configs
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Configs
 {
     public class CosmosDataStoreRetryOptions
     {

src/Microsoft.Health.Fhir.CosmosDb.Core/Constants.cs

@@ -0,0 +1,13 @@
+// -------------------------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// -------------------------------------------------------------------------------------------------
+
+namespace Microsoft.Health.Fhir.CosmosDb.Core
+{
+    public static class Constants
+    {
+        public const string CollectionConfigurationName = "fhirCosmosDb";
+        public const string RawResource = "rawResource";
+    }
+}

src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/CosmosClientExtensions.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/CosmosClientExtensions.cs

@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using Microsoft.Azure.Cosmos;
 
-namespace Microsoft.Health.Fhir.CosmosDb.Features.Storage
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage
 {
     public static class CosmosClientExtensions
     {

src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/Versioning/ICollectionUpdater.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/ICollectionDataUpdater.cs

@@ -7,9 +7,9 @@
 using System.Threading.Tasks;
 using Microsoft.Azure.Cosmos;
 
-namespace Microsoft.Health.Fhir.CosmosDb.Features.Storage.Versioning
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage
 {
-    public interface ICollectionUpdater
+    public interface ICollectionDataUpdater
     {
         Task ExecuteAsync(Container container, CancellationToken cancellationToken);
     }

src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/ICollectionInitializer.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/ICollectionInitializer.cs

@@ -6,11 +6,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Azure.Cosmos;
+using Polly;
 
-namespace Microsoft.Health.Fhir.CosmosDb.Features.Storage
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage
 {
     public interface ICollectionInitializer
     {
-        Task<Container> InitializeCollectionAsync(CosmosClient client, CancellationToken cancellationToken = default);
+        Task<Container> InitializeCollectionAsync(CosmosClient client, AsyncPolicy retryPolicy, CancellationToken cancellationToken = default);
     }
 }

src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/ICollectionSetup.cs

@@ -0,0 +1,21 @@
+// -------------------------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// -------------------------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Polly;
+
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage
+{
+    public interface ICollectionSetup
+    {
+        public Task CreateDatabaseAsync(AsyncPolicy retryPolicy, CancellationToken cancellationToken);
+
+        public Task CreateCollectionAsync(IEnumerable<ICollectionInitializer> collectionInitializers, AsyncPolicy retryPolicy, CancellationToken cancellationToken = default);
+
+        public Task UpdateFhirCollectionSettingsAsync(CancellationToken cancellationToken);
+    }
+}

src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/ICosmosClientInitializer.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/ICosmosClientInitializer.cs

@@ -7,9 +7,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Azure.Cosmos;
-using Microsoft.Health.Fhir.CosmosDb.Configs;
+using Microsoft.Health.Fhir.CosmosDb.Core.Configs;
 
-namespace Microsoft.Health.Fhir.CosmosDb.Features.Storage
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage
 {
     /// <summary>
     /// Provides methods for creating a CosmosClient instance and initializing a collection.
@@ -32,16 +32,6 @@ public interface ICosmosClientInitializer
         /// <param name="cosmosCollectionConfiguration">The collection configuration for the query to use</param>
         Task OpenCosmosClient(CosmosClient client, CosmosDataStoreConfiguration configuration, CosmosCollectionConfiguration cosmosCollectionConfiguration);
 
-        /// <summary>
-        /// Ensures that the necessary database and collection exist with the proper indexing policy and stored procedures
-        /// </summary>
-        /// <param name="client">The <see cref="CosmosClient"/> instance to use for initialization.</param>
-        /// <param name="cosmosDataStoreConfiguration">The data store configuration.</param>
-        /// <param name="collectionInitializers">The collection of collection initializers.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task</returns>
-        Task InitializeDataStoreAsync(CosmosClient client, CosmosDataStoreConfiguration cosmosDataStoreConfiguration, IEnumerable<ICollectionInitializer> collectionInitializers, CancellationToken cancellationToken = default);
-
         /// <summary>
         /// Creates a new Container instance for access the Cosmos API
         /// </summary>

src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/ICosmosClientTestProvider.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/ICosmosClientTestProvider.cs

@@ -6,9 +6,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Azure.Cosmos;
-using Microsoft.Health.Fhir.CosmosDb.Configs;
+using Microsoft.Health.Fhir.CosmosDb.Core.Configs;
 
-namespace Microsoft.Health.Fhir.CosmosDb.Features.Storage
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage
 {
     public interface ICosmosClientTestProvider
     {

src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/ICosmosDbDistributedLock.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/ICosmosDbDistributedLock.cs

@@ -7,7 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.Health.Fhir.CosmosDb.Features.Storage
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage
 {
     public interface ICosmosDbDistributedLock : IAsyncDisposable, IDisposable
     {

src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/ICosmosDbDistributedLockFactory.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/ICosmosDbDistributedLockFactory.cs

@@ -5,7 +5,7 @@
 
 using Microsoft.Azure.Cosmos;
 
-namespace Microsoft.Health.Fhir.CosmosDb.Features.Storage
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage
 {
     public interface ICosmosDbDistributedLockFactory
     {

src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/KnownDocumentProperties.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/KnownDocumentProperties.cs

@@ -3,7 +3,7 @@
 // Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // -------------------------------------------------------------------------------------------------
 
-namespace Microsoft.Health.Fhir.CosmosDb.Features.Storage
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage
 {
     public static class KnownDocumentProperties
     {

src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/StoreProcedures/IStoredProcedure.cs

@@ -0,0 +1,15 @@
+// -------------------------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// -------------------------------------------------------------------------------------------------
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Azure.Cosmos.Scripts;
+
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage.StoredProcedures
+{
+    public interface IStoredProcedure
+    {
+         Task<StoredProcedureExecuteResponse<T>> ExecuteStoredProcAsync<T>(Scripts client, string partitionId, CancellationToken cancellationToken, params object[] parameters);
+    }
+}

src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/StoreProcedures/IStoredProcedureInstaller.cs

@@ -0,0 +1,16 @@
+// -------------------------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// -------------------------------------------------------------------------------------------------
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Azure.Cosmos;
+
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage.StoredProcedures
+{
+    public interface IStoredProcedureInstaller
+    {
+        Task ExecuteAsync(Container container, CancellationToken cancellationToken);
+    }
+}

src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/StoredProcedures/IStoredProcedure.cs → src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/StoreProcedures/IStoredProcedureMetadata.cs

@@ -5,9 +5,9 @@
 
 using Microsoft.Azure.Cosmos.Scripts;
 
-namespace Microsoft.Health.Fhir.CosmosDb.Features.Storage.StoredProcedures
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage.StoredProcedures
 {
-    public interface IStoredProcedure
+    public interface IStoredProcedureMetadata
     {
         string FullName { get; }
 

src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/StoreProcedures/StoredProcedureBase.cs

@@ -0,0 +1,43 @@
+// -------------------------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// -------------------------------------------------------------------------------------------------
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EnsureThat;
+using Microsoft.Azure.Cosmos;
+using Microsoft.Azure.Cosmos.Scripts;
+using Microsoft.Health.Core.Extensions;
+
+namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage.StoredProcedures
+{
+    public abstract class StoredProcedureBase : IStoredProcedure
+    {
+        private readonly IStoredProcedureMetadata _storedProcedureMetadata;
+
+        protected StoredProcedureBase(IStoredProcedureMetadata storedProcedureMetadata)
+        {
+            EnsureArg.IsNotNull(storedProcedureMetadata, nameof(storedProcedureMetadata));
+
+            _storedProcedureMetadata = storedProcedureMetadata;
+        }
+
+        public string FullName => _storedProcedureMetadata.FullName;
+
+        public async Task<StoredProcedureExecuteResponse<T>> ExecuteStoredProcAsync<T>(Scripts client, string partitionId, CancellationToken cancellationToken, params object[] parameters)
+        {
+            EnsureArg.IsNotNull(client, nameof(client));
+            EnsureArg.IsNotNull(partitionId, nameof(partitionId));
+
+            StoredProcedureExecuteResponse<T> results = await client.ExecuteStoredProcedureAsync<T>(
+                    FullName,
+                    new PartitionKey(partitionId),
+                    parameters,
+                    cancellationToken: cancellationToken);
+
+            return results;
+        }
+    }
+}