Merge branch 'main' into LNK-2191

.dockerignore

@@ -21,5 +21,7 @@
 **/obj
 **/secrets.dev.yaml
 **/values.dev.yaml
+**/.idea
+*.iml
 LICENSE
 README.md

.gitignore

@@ -398,3 +398,12 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+## Maven
+**/target/

Azure_Pipelines/azure-pipelines.account.cd.yaml

@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - Account/*

Azure_Pipelines/azure-pipelines.audit.cd.yaml

@@ -1,11 +1,10 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - Audit/*
-pr: none
 
 pool:
   vmImage: 'ubuntu-latest'

Azure_Pipelines/azure-pipelines.census.cd.yaml

@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - Census/*

Azure_Pipelines/azure-pipelines.dataacquisition.cd.yaml

@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - DataAcquisition/*

Azure_Pipelines/azure-pipelines.demo.cd.yaml

@@ -0,0 +1,73 @@
+trigger:
+  branches:
+    include:
+    - main
+  paths:
+    include:
+    - DemoApp/*
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+variables:
+- group: Link_BOTW_Build_Package_Variables
+- name: tags1
+  value: 'latest'
+- name: tags2
+  value: '$(Build.BuildId)'
+- name: registry-repo-Name
+  value: 'link-demo-app'
+- name: dockerPath
+  value: '**/DemoApp/Dockerfile'
+- name: workingDir
+  value: 'DemoApp/'
+- name: serviceName
+  value: 'DemoApp'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
+
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '16.x'
+    displayName: 'Install Node.js'
+
+  - task: Npm@1  
+    displayName: 'Angular CLI 13.2.5'  
+    inputs:  
+      command: custom  
+      verbose: false  
+      customCommand: 'install -g @angular/cli'
+
+  - task: Npm@1  
+    displayName: 'npm install'  
+    inputs:
+      command: custom  
+      workingDir: $(workingDir)
+      customCommand: 'install'
+
+  - task: Npm@1  
+    displayName: Build  
+    inputs: 
+      command: custom  
+      verbose: false 
+      workingDir: $(workingDir)
+      customCommand: 'run build'
+
+  - task: Docker@2
+    displayName: "Build & Push DemoApiGateway Docker Image"
+    condition: always()
+    inputs:
+      containerRegistry: $(containerRegistry)
+      repository: $(registry-repo-name)
+      command: 'buildAndPush'
+      Dockerfile: $(dockerPath)
+      tags: |
+        $(tags1)
+        $(tags2)
+      buildContext: '$(workingDir)'
+
+  - task: PublishPipelineArtifact@1
+    inputs:
+      targetPath: '$(Build.ArtifactStagingDirectory)'
+      artifact: 'manifest'

Azure_Pipelines/azure-pipelines.demo.ci.yaml

@@ -0,0 +1,51 @@
+trigger:
+  paths:
+    include:
+    - DemoApp/*
+
+name: Demo API Gateway CI
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+variables:
+- group: Link_BOTW_Build_Package_Variables
+- name: project
+  value: 'DemoApiGateway/DemoApiGateway.csproj'
+- name: nugetPath
+  value: 'DemoApiGateway/nuget.config'
+- name: workingDir
+  value: 'DemoApp/'
+- name: serviceName
+  value: 'DemoApiGateway'
+
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '16.x'
+    displayName: 'Install Node.js'
+
+  - task: Npm@1  
+    displayName: 'Angular CLI 13.2.5'  
+    inputs:  
+      command: custom  
+      verbose: false  
+      workingDir: $(workingDir)
+      customCommand: 'install -g @angular/cli'
+
+  - task: Npm@1  
+    displayName: 'npm install'  
+    inputs:
+      command: custom
+      workingDir: $(workingDir)
+      customCommand: 'install'
+
+  - task: Npm@1  
+    displayName: Build  
+    inputs: 
+      command: custom  
+      verbose: false  
+      workingDir: $(workingDir)
+      customCommand: 'run build'        
+
+

Azure_Pipelines/azure-pipelines.gateway.cd.yaml

@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - DemoApiGateway/*
@@ -10,51 +10,26 @@ pool:
   vmImage: 'ubuntu-latest'
 
 variables:
-  project: 'DemoApiGateway/DemoApiGateway.csproj'
-  nugetPath: 'DemoApiGateway/nuget.config'
-  tags: |
-    latest
-    $(Build.BuildId)
-  registry-repo-Name: 'link-api-gw'
-  dockerPath: '**/DemoApiGateway/Dockerfile'
-  containerRegistry: 'NHSNLink ACR Premium'
+- group: Link_BOTW_Build_Package_Variables
+- name: project
+  value: 'DemoApiGateway/DemoApiGateway.csproj'
+- name: nugetPath
+  value: 'DemoApiGateway/nuget.config'
+- name: tags1
+  value: 'latest'
+- name: tags2
+  value: '$(Build.BuildId)'
+- name: registry-repo-Name
+  value: 'link-api-gw'
+- name: dockerPath
+  value: '**/DemoApiGateway/Dockerfile'
+- name: serviceName
+  value: 'DemoApiGateway'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
-  - task: PowerShell@2
-    displayName: 'Transform nuget.config'
-    inputs:
-      targetType: 'inline'
-      script: |
-        $path = '$(System.DefaultWorkingDirectory)/DemoApiGateway/nuget.config'
-        $nugetUrl = '$(nuget)'
-        $sharedUrl = '$(Shared_BOTW_Feed)'
-        $token = '$(ClearTextPassword)'
-        $basePath = '$(System.DefaultWorkingDirectory)'
-        
-        $xml = [xml](Get-Content -Path $path)
-        
-        $node = $xml.configuration.packageSources.add |
-                where { $_.key -eq 'nuget' }
-        $node.value = $nugetUrl
-        
-        Write-Host "updated nuget url:"
-        Write-Host $node.value
-        
-        $node = $xml.configuration.packageSources.add |
-                where { $_.key -eq 'Shared_BOTW_Feed' }
-        $node.value = $sharedUrl
-        
-        Write-Host "Shared botw url:"
-        Write-Host $node.value
-        
-        $node = $xml.configuration.packageSourceCredentials.Shared_BOTW_Feed.add |
-                where { $_.key -eq 'ClearTextPassword' }
-        $node.value = $token
-        
-        Write-Host "updated token:"
-        Write-Host $node.value
-        
-        $xml.Save($path)
+  - template: ../azure-nuget-package-source.yml
 
   - task: DotNetCoreCLI@2
     displayName: Restore
@@ -78,7 +53,9 @@ steps:
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
-      tags: '$(tags)'
+      tags: |
+        $(tags1)
+        $(tags2)
       buildContext: '$(Build.Repository.LocalPath)'
 
   - task: PublishPipelineArtifact@1

Azure_Pipelines/azure-pipelines.gateway.ci.yaml

@@ -3,49 +3,22 @@ trigger:
     include:
     - DemoApiGateway/*
 
+name: Demo API Gateway CI
+
 pool:
   vmImage: 'ubuntu-latest'
 
 variables:
-  project: 'DemoApiGateway/DemoApiGateway.csproj'
-  nugetPath: 'DemoApiGateway/nuget.config'
+- group: Link_BOTW_Build_Package_Variables
+- name: project
+  value: 'DemoApiGateway/DemoApiGateway.csproj'
+- name: nugetPath
+  value: 'DemoApiGateway/nuget.config'
+- name: serviceName
+  value: 'DemoApiGateway'
 
 steps:
-  - task: PowerShell@2
-    displayName: 'Transform nuget.config'
-    inputs:
-      targetType: 'inline'
-      script: |
-        $path = '$(System.DefaultWorkingDirectory)/DemoApiGateway/nuget.config'
-        $nugetUrl = '$(nuget)'
-        $sharedUrl = '$(Shared_BOTW_Feed)'
-        $token = '$(ClearTextPassword)'
-        $basePath = '$(System.DefaultWorkingDirectory)'
-        
-        $xml = [xml](Get-Content -Path $path)
-        
-        $node = $xml.configuration.packageSources.add |
-                where { $_.key -eq 'nuget' }
-        $node.value = $nugetUrl
-        
-        Write-Host "updated nuget url:"
-        Write-Host $node.value
-        
-        $node = $xml.configuration.packageSources.add |
-                where { $_.key -eq 'Shared_BOTW_Feed' }
-        $node.value = $sharedUrl
-        
-        Write-Host "Shared botw url:"
-        Write-Host $node.value
-        
-        $node = $xml.configuration.packageSourceCredentials.Shared_BOTW_Feed.add |
-                where { $_.key -eq 'ClearTextPassword' }
-        $node.value = $token
-        
-        Write-Host "updated token:"
-        Write-Host $node.value
-        
-        $xml.Save($path)
+  - template: ../azure-nuget-package-source.yml
 
   - task: DotNetCoreCLI@2
     displayName: Restore
@@ -54,6 +27,7 @@ steps:
       projects: '$(project)'
       nugetConfigPath: '$(nugetPath)'
       feedsToUse: config
+      verbosityRestore: Diagnostic
 
   - task: DotNetCoreCLI@2
     displayName: Build

Azure_Pipelines/azure-pipelines.measureeval.cd.yaml

@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - MeasureEval/*

Azure_Pipelines/azure-pipelines.normalization.cd.yaml

@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - Normalization/*

Azure_Pipelines/azure-pipelines.notification.cd.yaml

@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - Notification/*

Azure_Pipelines/azure-pipelines.patientlist.cd.yaml

@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - PatientList/*

Azure_Pipelines/azure-pipelines.patientstoquery.cd.yaml

@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - PatientsToQuery/*