Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pr-fix: use workspace id
Browse files Browse the repository at this point in the history
stijnmoreels committed Aug 1, 2024
1 parent 16a11f2 commit 26f3beb
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build/deploy-test-resources.yml
Original file line number Diff line number Diff line change
@@ -40,6 +40,6 @@ stages:
--parameters location=westeurope `
--parameters resourceGroupName=${{ parameters.resourceGroupName }} `
--parameters instrumentationKey_secretName=${{ variables['Arcus.Observability.ApplicationInsights.InstrumentationKey.SecretName'] }} `
--parameters resourceId_secretName=${{ variables['Arcus.Observability.LogAnalyticsWorkspace.ResourceId.SecretName'] }} `
--parameters workspaceId_secretName=${{ variables['Arcus.Observability.LogAnalytics.WorkspaceId.SecretName'] }} `
--parameters keyVaultName=${{ variables['Arcus.Observability.KeyVault.Name'] }} `
--parameters servicePrincipal_objectId=$objectId
6 changes: 3 additions & 3 deletions build/templates/deploy-test-resources.bicep
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ param resourceGroupName string
param instrumentationKey_secretName string

// Define the name of the secret that will store the Application Insights workspace resource ID.
param resourceId_secretName string
param workspaceId_secretName string

// Define the name of the Key Vault.
param keyVaultName string
@@ -82,8 +82,8 @@ module vault 'br/public:avm/res/key-vault/vault:0.6.1' = {
value: component.outputs.instrumentationKey
}
{
name: resourceId_secretName
value: workspace.outputs.resourceId
name: workspaceId_secretName
value: workspace.outputs.logAnalyticsWorkspaceId
}
]
}
4 changes: 2 additions & 2 deletions build/templates/import-keyvault-secrets.yml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ steps:
$instrumentationKeySecret = az keyvault secret show --name "$instrumentationKey_secretName" --vault-name "$keyVaultName" | ConvertFrom-Json
Set-AzDevOpsVariable -AsSecret -Name 'Arcus.Observability.ApplicationInsights.InstrumentationKey' -Value $instrumentationKeySecret.value
$resourceId_secretName = $env:ARCUS_OBSERVABILITY_LOGANALYTICSWORKSPACE_RESOURCEID_SECRETNAME
$resourceId_secretName = $env:ARCUS_OBSERVABILITY_LOGANALYTICS_WORKSPACEID_SECRETNAME
Write-Host "Importing secret: $resourceId_secretName"
$resourceIdSecret = az keyvault secret show --name "$resourceId_secretName" --vault-name "$keyVaultName" | ConvertFrom-Json
Set-AzDevOpsVariable -AsSecret -Name 'Arcus.Observability.ApplicationInsights.LogAnalyticsWorkspace.ResourceId' -Value $resourceIdSecret.value
Set-AzDevOpsVariable -AsSecret -Name 'Arcus.Observability.ApplicationInsights.LogAnalytics.WorkspaceId' -Value $resourceIdSecret.value
2 changes: 1 addition & 1 deletion build/variables/test.yml
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@ variables:
AzureFunctions.HttpPort: 5000
Arcus.Observability.KeyVault.Name: 'arcus-observability-kv'
Arcus.Observability.ApplicationInsights.InstrumentationKey.SecretName: 'ApplicationInsights-InstrumentationKey'
Arcus.Observability.LogAnalyticsWorkspace.ResourceId.SecretName: 'LogAnalytics-Workspace-ResourceId'
Arcus.Observability.LogAnalytics.WorkspaceId.SecretName: 'LogAnalytics-WorkspaceId'

0 comments on commit 26f3beb

Please sign in to comment.