From 56777f46a0755d9bbd0200ae88bdcb520da9296d Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 5 Jul 2022 16:06:41 +0200 Subject: [PATCH 1/3] Update to latest --- .../diskEncryptionSets/parameters/parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/pipelines/dependencies/Microsoft.Compute/diskEncryptionSets/parameters/parameters.json b/utilities/pipelines/dependencies/Microsoft.Compute/diskEncryptionSets/parameters/parameters.json index 8fab464122..8b6d687ee5 100644 --- a/utilities/pipelines/dependencies/Microsoft.Compute/diskEncryptionSets/parameters/parameters.json +++ b/utilities/pipelines/dependencies/Microsoft.Compute/diskEncryptionSets/parameters/parameters.json @@ -5,7 +5,7 @@ "name": { "value": "adp-<>-az-des-x-001" }, - "keyVaultId": { + "keyVaultResourceId": { "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001" }, "keyUrl": { From e731796adba3b4d7329c1e2d92dfc3c00dc5e344 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 5 Jul 2022 17:15:09 +0200 Subject: [PATCH 2/3] Fixed name param --- .../diskEncryptionSets/parameters/parameters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/pipelines/dependencies/Microsoft.Compute/diskEncryptionSets/parameters/parameters.json b/utilities/pipelines/dependencies/Microsoft.Compute/diskEncryptionSets/parameters/parameters.json index 8b6d687ee5..9e9aa46c42 100644 --- a/utilities/pipelines/dependencies/Microsoft.Compute/diskEncryptionSets/parameters/parameters.json +++ b/utilities/pipelines/dependencies/Microsoft.Compute/diskEncryptionSets/parameters/parameters.json @@ -8,8 +8,8 @@ "keyVaultResourceId": { "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001" }, - "keyUrl": { - "value": "https://adp-<>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5" // ID must be updated for new keys + "keyName": { + "value": "keyEncryptionKey" } } } From f4a6ae959c496e475c8aeb5a6a8548f8599be873 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 6 Jul 2022 09:13:56 +0200 Subject: [PATCH 3/3] wonderful --- .github/workflows/platform.dependencies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/platform.dependencies.yml b/.github/workflows/platform.dependencies.yml index 209f018f3e..141e959aa9 100644 --- a/.github/workflows/platform.dependencies.yml +++ b/.github/workflows/platform.dependencies.yml @@ -1251,7 +1251,7 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/validateModuleDeployment with: - templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' + templateFilePath: 'modules/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.location }}' resourceGroupName: '${{ env.defaultResourceGroupName }}'