chore: deploy/use new test resources in dev tenant

build/ci-build.yml

@@ -18,6 +18,14 @@ parameters:
   - name: 'Package.Version.ManualTrigger'
     type: string
     default: 'preview'
+  - name: azureServiceConnection
+    displayName: 'Azure service connection'
+    type: string
+    default: 'Azure Codit-Arcus Service Principal'
+  - name: keyVaultName
+    displayName: 'Azure Key vault with integration test secrets'
+    type: string
+    default: 'arcus-observability-kv'
 
 resources:
   repositories:
@@ -111,17 +119,10 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
-          - task: UseDotNet@2
-            displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
-            inputs:
-              packageType: 'sdk'
-              version: '$(DotNet.Sdk.PreviousVersion)'
-          - template: test/run-integration-tests.yml@templates
+          - template: templates/run-self-contained-integration-tests.yml
             parameters:
-              dotnetSdkVersion: '$(DotNet.Sdk.Version)'
-              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
-              projectName: '$(Project).Tests.Integration'
-              category: 'Integration'
+              azureServiceConnection: '${{ parameters.azureServiceConnection }}'
+              keyVaultName: '${{ parameters.keyVaultName }}'
 
   - stage: DockerTests
     displayName: Docker Tests
@@ -138,11 +139,6 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
-          - task: UseDotNet@2
-            displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
-            inputs:
-              packageType: 'sdk'
-              version: '$(DotNet.Sdk.PreviousVersion)'
           - template: templates/run-docker-integration-tests.yml
             parameters:
               dockerProjectName: '$(Project).Tests.Runtimes.AzureFunction'

build/deploy-test-resources.yml

@@ -0,0 +1,83 @@
+name: Arcus Observability - Deploy test resources
+
+trigger: none
+pr: none
+
+parameters:
+  - name: azureServiceConnection
+    displayName: 'Azure service connection'
+    type: string
+    default: 'Azure Codit-Arcus Service Principal'
+  - name: resourceGroupName
+    displayName: 'Resource group name'
+    default: arcus-observability-dev-we-rg
+  - name: appInsightsName
+    displayName: 'Application Insights name'
+    default: arcus-observability-dev-we-app-insights
+  - name: variableGroupName
+    displayName: 'Variable group name'
+    default: Arcus Observability - Integration Testing
+
+variables:
+  - name: keyVaultName
+    value: 'arcus-observability-kv'
+  - template: ./variables/build.yml
+
+stages:
+  - stage: Deploy
+    jobs:
+      - job: DeployBicep
+        displayName: 'Deploy test resources'
+        pool:
+          vmImage: '$(Vm.Image)'
+        steps:
+          - task: AzureCLI@2
+            env:
+              SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+            inputs:
+              azureSubscription: '${{ parameters.azureServiceConnection }}'
+              addSpnToEnvironment: true
+              scriptType: 'pscore'
+              scriptLocation: 'inlineScript'
+              inlineScript: |
+                Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
+                Install-Module -Name Arcus.Scripting.DevOps -AllowClobber
+                az extension add --name application-insights
+
+                $objectId = (az ad sp show --id $env:servicePrincipalId | ConvertFrom-Json).id
+                $appInsightsOutput = az deployment sub create `
+                  --location westeurope `
+                  --template-file ./build/templates/deploy-test-resources.bicep `
+                  --parameters location=westeurope `
+                  --parameters resourceGroupName=${{ parameters.resourceGroupName }} `
+                  --parameters appInsightsName=${{ parameters.appInsightsName }} `
+                  --parameters keyVaultName=${{ variables.keyVaultName }} `
+                  --parameters servicePrincipal_objectId=$objectId `
+                  | ConvertFrom-Json
+
+                $apiKeyName = 'Arcus Observability Integration Tests API Key'
+                if (az monitor app-insights api-key show `
+                      --app ${{ parameters.appInsightsName }} `
+                      --resource-group ${{ parameters.resourceGroupName }} `
+                      --api-key $apiKeyName) {
+                  az monitor app-insights api-key delete `
+                  --api-key $apiKeyName `
+                  --app ${{ parameters.appInsightsName }} `
+                  --resource-group ${{ parameters.resourceGroupName }} `
+                  --yes
+                }
+
+                $apiKeyOutput = az monitor app-insights api-key create `
+                  --api-key $apiKeyName `
+                  --app ${{ parameters.appInsightsName }} `
+                  --resource-group ${{ parameters.resourceGroupName }} `
+                  --read-properties ReadTelemetry `
+                  | ConvertFrom-Json
+
+                az keyvault secret set `
+                  --vault-name ${{ variables.keyVaultName }} `
+                  --name 'ApplicationInsights-ApiKey' `
+                  --value $apiKeyOutput.apiKey `
+
+                $env:ArmOutputs = ConvertTo-Json $appInsightsOutput.properties.outputs
+                Set-AzDevOpsArmOutputsToVariableGroup -VariableGroupName '${{ parameters.variableGroupName }}'

build/nuget-release.yml

@@ -6,6 +6,14 @@ pr: none
 parameters:
   - name: 'Package.Version'
     type: 'string'
+  - name: azureServiceConnection
+    displayName: 'Azure service connection'
+    type: string
+    default: 'Azure Codit-Arcus Service Principal'
+  - name: keyVaultName
+    displayName: 'Azure Key vault with integration test secrets'
+    type: string
+    default: 'arcus-observability-kv'
 
 resources:
   repositories:
@@ -93,17 +101,10 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
-          - task: UseDotNet@2
-            displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
-            inputs:
-              packageType: 'sdk'
-              version: '$(DotNet.Sdk.PreviousVersion)'
-          - template: test/run-integration-tests.yml@templates
+          - template: templates/run-self-contained-integration-tests.yml
             parameters:
-              dotnetSdkVersion: '$(DotNet.Sdk.Version)'
-              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
-              projectName: '$(Project).Tests.Integration'
-              category: 'Integration'
+              azureServiceConnection: '${{ parameters.azureServiceConnection }}'
+              keyVaultName: '${{ parameters.keyVaultName }}'
 
   - stage: DockerTests
     displayName: Docker Tests
@@ -120,11 +121,6 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
-          - task: UseDotNet@2
-            displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
-            inputs:
-              packageType: 'sdk'
-              version: '$(DotNet.Sdk.PreviousVersion)'
           - template: templates/run-docker-integration-tests.yml
             parameters:
               dockerProjectName: '$(Project).Tests.Runtimes.AzureFunction'

build/templates/deploy-test-resources.bicep

@@ -0,0 +1,71 @@
+// Define the location for the deployment of the components.
+param location string
+
+// Define the name of the resource group where the components will be deployed.
+param resourceGroupName string
+
+// Define the name of the Application Insights component.
+param appInsightsName string
+
+// Define the name of the Key Vault.
+param keyVaultName string
+
+// Define the Service Principal ID that needs access full access to the deployed resource group.
+param servicePrincipal_objectId string
+
+targetScope='subscription'
+
+module resourceGroup 'br/public:avm/res/resources/resource-group:0.2.3' = {
+  name: 'resourceGroupDeployment'
+  params: {
+    name: resourceGroupName
+    location: location
+  }
+}
+
+resource rg 'Microsoft.Resources/resourceGroups@2021-04-01' existing = {
+  name: resourceGroupName
+}
+
+module workspace 'br/public:avm/res/operational-insights/workspace:0.3.4' = {
+  name: 'workspaceDeployment'
+  scope: rg
+  params: {
+    name: 'arcus-observability-dev-we-workspace'
+    location: location
+  }
+}
+
+module component 'br/public:avm/res/insights/component:0.3.0' = {
+  name: 'componentDeployment'
+  scope: rg
+  params: {
+    name: appInsightsName
+    workspaceResourceId: workspace.outputs.resourceId
+    location: location
+  }
+}
+
+module vault 'br/public:avm/res/key-vault/vault:0.6.1' = {
+  name: 'vaultDeployment'
+  scope: rg
+  params: {
+    name: keyVaultName
+    location: location
+    roleAssignments: [
+      {
+        principalId: servicePrincipal_objectId
+        roleDefinitionIdOrName: 'Key Vault Secrets officer'
+      }
+    ]
+    secrets: [
+      {
+        name: 'ApplicationInsights-InstrumentationKey'
+        value: component.outputs.instrumentationKey
+      }
+    ]
+  }
+}
+
+output ApplicationInsights_WorkspaceId string = workspace.outputs.resourceId
+output ApplicationInsights_ApplicationId string = component.outputs.applicationId

build/templates/run-docker-integration-tests.yml

@@ -15,6 +15,11 @@ steps:
     env:
       PROJECT_NAME: ${{ parameters.dockerProjectName }}
       HTTP_PORT: ${{ parameters.httpPort }}
+  - task: UseDotNet@2
+    displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
+    inputs:
+      packageType: 'sdk'
+      version: '$(DotNet.Sdk.PreviousVersion)'
   - task: UseDotNet@2
     displayName: 'Import .NET Core SDK ($(DotNet.Sdk.Version))'
     inputs:

build/templates/run-self-contained-integration-tests.yml

@@ -0,0 +1,22 @@
+parameters:
+  azureServiceConnection: ''
+  keyVaultName: ''
+
+steps:
+  - task: UseDotNet@2
+    displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
+    inputs:
+      packageType: 'sdk'
+      version: '$(DotNet.Sdk.PreviousVersion)'
+  - task: AzureKeyVault@2
+    displayName: 'Import secrets from Azure Key Vault'
+    inputs:
+      azureSubscription: '${{ parameters.azureServiceConnection }}'
+      KeyVaultName: '${{ parameters.keyVaultName }}'
+      SecretsFilter: '*'
+  - template: test/run-integration-tests.yml@templates
+    parameters:
+      dotnetSdkVersion: '$(DotNet.Sdk.Version)'
+      includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
+      projectName: '$(Project).Tests.Integration'
+      category: 'Integration'

src/Arcus.Observability.Tests.Integration/appsettings.json

@@ -1,8 +1,8 @@
 {
   "ApplicationInsights": {
-    "InstrumentationKey": "#{ApplicationInsights.InstrumentationKey}#",
-    "ApiKey": "#{ApplicationInsights.ApiKey}#",
-    "ApplicationId": "#{ApplicationInsights.ApplicationId}#"
+    "InstrumentationKey": "#{ApplicationInsights_InstrumentationKey}#",
+    "ApiKey": "#{ApplicationInsights_ApiKey}#",
+    "ApplicationId": "#{ApplicationInsights_ApplicationId}#"
   },
   "AzureFunctions": {
     "HttpPort":  "#{AzureFunctions.HttpPort}#"