Implement incremental Ignixa SDK adoption and FHIRPath seam

Directory.Packages.props

@@ -6,7 +6,7 @@
     <Hl7FhirLegacyVersion>5.11.0</Hl7FhirLegacyVersion>
     <DotNetSdkPackageVersion>10.0.10</DotNetSdkPackageVersion>
     <OpenIddictPackageVersion>6.2.0</OpenIddictPackageVersion>
-    <IgnixaPackageVersion>0.0.163</IgnixaPackageVersion>
+    <IgnixaPackageVersion>0.6.73</IgnixaPackageVersion>
   </PropertyGroup>
   <!-- SDK Packages -->
   <Choose>

build/build-variables.yml

@@ -17,17 +17,22 @@ variables:
   azureContainerRegistryName: 'healthplatformregistry'
   azureContainerRegistry: '$(azureContainerRegistryName).azurecr.io'
   DeploymentEnvironmentNameSql: '$(DeploymentEnvironmentName)-sql'
+  DeploymentEnvironmentNameSqlVNext: '$(DeploymentEnvironmentName)-svn'
+  SqlVNextElasticPoolName: '$(DeploymentEnvironmentName)-vnext-pool'
   DeploymentEnvironmentNameR4: '$(DeploymentEnvironmentName)-r4'
   DeploymentEnvironmentNameR4Sql: '$(DeploymentEnvironmentNameR4)-sql'
+  DeploymentEnvironmentNameR4SqlVNext: '$(DeploymentEnvironmentName)-r4vn'
   DeploymentEnvironmentNameR4B: '$(DeploymentEnvironmentName)-r4b'
   DeploymentEnvironmentNameR4BSql: '$(DeploymentEnvironmentNameR4B)-sql'
   DeploymentEnvironmentNameR5: '$(DeploymentEnvironmentName)-r5'
   DeploymentEnvironmentNameR5Sql: '$(DeploymentEnvironmentNameR5)-sql'
   AcaEnvironmentName: '$(DeploymentEnvironmentName)-acae'
   # Key Vault names (shorter due to 24 character limit)
   KeyVaultNameSql: '$(KeyVaultBaseName)-sql'
+  KeyVaultNameSqlVNext: '$(KeyVaultBaseName)-sql-vn'
   KeyVaultNameR4: '$(KeyVaultBaseName)-r4'
   KeyVaultNameR4Sql: '$(KeyVaultNameR4)-sql'
+  KeyVaultNameR4SqlVNext: '$(KeyVaultBaseName)-r4-vn'
   KeyVaultNameR4B: '$(KeyVaultBaseName)-r4b'
   KeyVaultNameR4BSql: '$(KeyVaultNameR4B)-sql'
   KeyVaultNameR5: '$(KeyVaultBaseName)-r5'

build/ci-deploy.yml

@@ -6,38 +6,74 @@
 name: $(SourceBranchName)-$(Date:yyyyMMdd)$(Rev:-r)
 trigger: none
 
+parameters:
+- name: buildImages
+  displayName: Build images
+  type: boolean
+  default: true
+- name: imageTagOverride
+  displayName: Existing image tag (required when images are not built)
+  type: string
+  default: ''
+
 variables:
 - template: ci-variables.yml
 - template: build-variables.yml
 
 stages:
-- stage: UpdateVersion
-  displayName: 'Determine Semver'
-  dependsOn: []
-  jobs:
-  - job: Semver
-    pool:
-      name: '$(InternalPool)'
-      demands:
-        - ImageOverride -equals $(InternalLinuxImage)
-    steps:
-    - template: ./jobs/update-semver.yml 
+- ${{ if eq(parameters.buildImages, true) }}:
+  - stage: UpdateVersion
+    displayName: 'Determine Semver'
+    dependsOn: []
+    jobs:
+    - job: Semver
+      pool:
+        name: '$(InternalPool)'
+        demands:
+          - ImageOverride -equals $(InternalLinuxImage)
+      steps:
+      - template: ./jobs/update-semver.yml
 
-- stage: DockerBuild  
-  displayName: 'Build images'
-  dependsOn:
-  - UpdateVersion
-  variables:
-    assemblySemFileVer: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.assemblySemFileVer']]
-  jobs:
-  - template: ./jobs/docker-build-all.yml
-    parameters: 
-      tag: $(ImageTag)
-      buildPlatform: $(publicDockerImagePlatforms)
+  - stage: DockerBuild
+    displayName: 'Build images'
+    dependsOn:
+    - UpdateVersion
+    variables:
+      assemblySemFileVer: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.assemblySemFileVer']]
+    jobs:
+    - template: ./jobs/docker-build-all.yml
+      parameters:
+        tag: $(ImageTag)
+        buildPlatform: $(publicDockerImagePlatforms)
+
+- ${{ if eq(parameters.buildImages, false) }}:
+  - stage: ValidateRecoveryParameters
+    displayName: 'Validate recovery parameters'
+    dependsOn: []
+    jobs:
+    - job: ValidateRecoveryParameters
+      displayName: 'Validate recovery parameters'
+      pool:
+        name: '$(AzurePipelinesPool)'
+        vmImage: '$(LinuxVmImage)'
+      steps:
+      - task: PowerShell@2
+        displayName: 'Require an existing image tag'
+        env:
+          IMAGE_TAG_OVERRIDE: ${{ parameters.imageTagOverride }}
+        inputs:
+          targetType: inline
+          pwsh: true
+          script: |
+            if ([string]::IsNullOrWhiteSpace($env:IMAGE_TAG_OVERRIDE)) {
+                throw "Parameter 'imageTagOverride' must be non-empty when 'buildImages' is false."
+            }
 
 - stage: provisionEnvironment
   displayName: Provision Environment
-  dependsOn: []
+  dependsOn:
+  - ${{ if eq(parameters.buildImages, false) }}:
+    - ValidateRecoveryParameters
   jobs:
   - template: ./jobs/cleanup-resourcegroup-aad.yml
   - job: provision
@@ -168,11 +204,27 @@ stages:
       dbMinCapacity: 0
       dbMaxCapacity: 8
 
+- stage: deploySqlVNextElasticPool
+  displayName: 'Deploy SQL vNext Elastic Pool (CI)'
+  dependsOn:
+  - deploySqlServer
+  jobs:
+  - template: ./jobs/provision-sqlElasticPool.yml
+    parameters:
+      resourceGroup: $(ResourceGroupName)
+      sqlServerName: $(DeploymentEnvironmentName)
+      elasticPoolName: $(SqlVNextElasticPoolName)
+      capacity: 4
+      maxSizeBytes: '68719476736'
+      dbMinCapacity: 0
+      dbMaxCapacity: 2
+
 - stage: deployStu3
   displayName: 'Deploy STU3 CosmosDB Site'
   dependsOn:
   - aadTestEnvironment
-  - DockerBuild
+  - ${{ if eq(parameters.buildImages, true) }}:
+    - DockerBuild
   - createNsp
   - createAcaEnvironment
   jobs:
@@ -186,14 +238,18 @@ stages:
       subscription: $(ConnectedServiceName)
       resourceGroup: $(ResourceGroupName)
       testEnvironmentUrl: $(TestApplicationResource)
-      imageTag: $(ImageTag)
+      ${{ if eq(parameters.buildImages, true) }}:
+        imageTag: $(ImageTag)
+      ${{ else }}:
+        imageTag: ${{ parameters.imageTagOverride }}
       reindexEnabled: true
 
 - stage: deployStu3Sql
   displayName: 'Deploy STU3 SQL Site'
   dependsOn:
   - aadTestEnvironment
-  - DockerBuild
+  - ${{ if eq(parameters.buildImages, true) }}:
+    - DockerBuild
   - deploySqlServer
   - deploySqlElasticPool
   - createAcaEnvironment
@@ -208,18 +264,53 @@ stages:
       subscription: $(ConnectedServiceName)
       resourceGroup: $(ResourceGroupName)
       testEnvironmentUrl: $(TestApplicationResource)
-      imageTag: $(ImageTag)
+      ${{ if eq(parameters.buildImages, true) }}:
+        imageTag: $(ImageTag)
+      ${{ else }}:
+        imageTag: ${{ parameters.imageTagOverride }}
       schemaAutomaticUpdatesEnabled: 'auto'
       sqlServerName: $(DeploymentEnvironmentName)
       sqlComputeTier: 'Hyperscale'
       sqlElasticPoolName: $(DeploymentEnvironmentName)-pool
       reindexEnabled: true
 
+- stage: deployStu3SqlVNext
+  displayName: 'Deploy STU3 SQL vNext SDK Site'
+  dependsOn:
+  - aadTestEnvironment
+  - ${{ if eq(parameters.buildImages, true) }}:
+    - DockerBuild
+  - deploySqlServer
+  - deploySqlVNextElasticPool
+  - createAcaEnvironment
+  jobs:
+  - template: ./jobs/provision-deploy.yml
+    parameters:
+      dataStore: sql
+      version: Stu3
+      webAppName: $(DeploymentEnvironmentNameSqlVNext)
+      acaEnvironmentName: $(AcaEnvironmentName)
+      keyVaultName: $(KeyVaultNameSqlVNext)
+      subscription: $(ConnectedServiceName)
+      resourceGroup: $(ResourceGroupName)
+      testEnvironmentUrl: $(TestApplicationResource)
+      ${{ if eq(parameters.buildImages, true) }}:
+        imageTag: $(ImageTag)
+      ${{ else }}:
+        imageTag: ${{ parameters.imageTagOverride }}
+      schemaAutomaticUpdatesEnabled: 'auto'
+      sqlServerName: $(DeploymentEnvironmentName)
+      sqlElasticPoolName: $(SqlVNextElasticPoolName)
+      sqlDatabaseName: FHIRStu3VNext
+      fhirSdkProviderDefault: Ignixa
+      reindexEnabled: true
+
 - stage: deployR4
   displayName: 'Deploy R4 CosmosDB Site'
   dependsOn:
   - aadTestEnvironment
-  - DockerBuild
+  - ${{ if eq(parameters.buildImages, true) }}:
+    - DockerBuild
   - createNsp
   - createAcaEnvironment
   jobs:
@@ -233,14 +324,18 @@ stages:
       subscription: $(ConnectedServiceName)
       resourceGroup: $(ResourceGroupName)
       testEnvironmentUrl: $(TestApplicationResource)
-      imageTag: $(ImageTag)
+      ${{ if eq(parameters.buildImages, true) }}:
+        imageTag: $(ImageTag)
+      ${{ else }}:
+        imageTag: ${{ parameters.imageTagOverride }}
       reindexEnabled: true
 
 - stage: deployR4Sql
   displayName: 'Deploy R4 SQL Site'
   dependsOn:
   - aadTestEnvironment
-  - DockerBuild
+  - ${{ if eq(parameters.buildImages, true) }}:
+    - DockerBuild
   - deploySqlServer
   - deploySqlElasticPool
   - createAcaEnvironment
@@ -255,18 +350,53 @@ stages:
       subscription: $(ConnectedServiceName)
       resourceGroup: $(ResourceGroupName)
       testEnvironmentUrl: $(TestApplicationResource)
-      imageTag: $(ImageTag)
+      ${{ if eq(parameters.buildImages, true) }}:
+        imageTag: $(ImageTag)
+      ${{ else }}:
+        imageTag: ${{ parameters.imageTagOverride }}
       schemaAutomaticUpdatesEnabled: 'auto'
       sqlServerName: $(DeploymentEnvironmentName)
       sqlComputeTier: 'Hyperscale'
       sqlElasticPoolName: $(DeploymentEnvironmentName)-pool
       reindexEnabled: true
 
+- stage: deployR4SqlVNext
+  displayName: 'Deploy R4 SQL vNext SDK Site'
+  dependsOn:
+  - aadTestEnvironment
+  - ${{ if eq(parameters.buildImages, true) }}:
+    - DockerBuild
+  - deploySqlServer
+  - deploySqlVNextElasticPool
+  - createAcaEnvironment
+  jobs:
+  - template: ./jobs/provision-deploy.yml
+    parameters:
+      dataStore: sql
+      version: R4
+      webAppName: $(DeploymentEnvironmentNameR4SqlVNext)
+      acaEnvironmentName: $(AcaEnvironmentName)
+      keyVaultName: $(KeyVaultNameR4SqlVNext)
+      subscription: $(ConnectedServiceName)
+      resourceGroup: $(ResourceGroupName)
+      testEnvironmentUrl: $(TestApplicationResource)
+      ${{ if eq(parameters.buildImages, true) }}:
+        imageTag: $(ImageTag)
+      ${{ else }}:
+        imageTag: ${{ parameters.imageTagOverride }}
+      schemaAutomaticUpdatesEnabled: 'auto'
+      sqlServerName: $(DeploymentEnvironmentName)
+      sqlElasticPoolName: $(SqlVNextElasticPoolName)
+      sqlDatabaseName: FHIRR4VNext
+      fhirSdkProviderDefault: Ignixa
+      reindexEnabled: true
+
 - stage: deployR5Sql
   displayName: 'Deploy R5 SQL Site'
   dependsOn:
   - aadTestEnvironment
-  - DockerBuild
+  - ${{ if eq(parameters.buildImages, true) }}:
+    - DockerBuild
   - deploySqlServer
   - deploySqlElasticPool
   - createAcaEnvironment
@@ -281,7 +411,10 @@ stages:
       subscription: $(ConnectedServiceName)
       resourceGroup: $(ResourceGroupName)
       testEnvironmentUrl: $(TestApplicationResource)
-      imageTag: $(ImageTag)
+      ${{ if eq(parameters.buildImages, true) }}:
+        imageTag: $(ImageTag)
+      ${{ else }}:
+        imageTag: ${{ parameters.imageTagOverride }}
       schemaAutomaticUpdatesEnabled: 'auto'
       sqlServerName: $(DeploymentEnvironmentName)
       sqlComputeTier: 'Hyperscale'