From 4a79a414ff9496237c3714c7bad767e6cfeb0da3 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sat, 3 Sep 2022 12:53:12 +0200 Subject: [PATCH 1/9] Updated Galleries --- .github/workflows/ms.compute.galleries.yml | 3 +- .../.test/default/dependencies.bicep | 14 ++ .../galleries/.test/default/deploy.test.bicep | 54 +++++++ .../galleries/.test/images.parameters.json | 50 ------- .../galleries/.test/images/dependencies.bicep | 14 ++ .../galleries/.test/images/deploy.test.bicep | 84 +++++++++++ .../galleries/.test/parameters.json | 22 --- modules/Microsoft.Compute/galleries/readme.md | 138 +++++++++--------- 8 files changed, 236 insertions(+), 143 deletions(-) create mode 100644 modules/Microsoft.Compute/galleries/.test/default/dependencies.bicep create mode 100644 modules/Microsoft.Compute/galleries/.test/default/deploy.test.bicep delete mode 100644 modules/Microsoft.Compute/galleries/.test/images.parameters.json create mode 100644 modules/Microsoft.Compute/galleries/.test/images/dependencies.bicep create mode 100644 modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep delete mode 100644 modules/Microsoft.Compute/galleries/.test/parameters.json diff --git a/.github/workflows/ms.compute.galleries.yml b/.github/workflows/ms.compute.galleries.yml index e45bf278bd..3e340a80cc 100644 --- a/.github/workflows/ms.compute.galleries.yml +++ b/.github/workflows/ms.compute.galleries.yml @@ -106,8 +106,7 @@ jobs: - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]' uses: ./.github/actions/templates/validateModuleDeployment with: - templateFilePath: '${{ env.modulePath }}/deploy.bicep' - parameterFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' + templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' location: '${{ env.location }}' resourceGroupName: '${{ env.resourceGroupName }}' subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' diff --git a/modules/Microsoft.Compute/galleries/.test/default/dependencies.bicep b/modules/Microsoft.Compute/galleries/.test/default/dependencies.bicep new file mode 100644 index 0000000000..7371d4437b --- /dev/null +++ b/modules/Microsoft.Compute/galleries/.test/default/dependencies.bicep @@ -0,0 +1,14 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Managed Identity to create.') +param managedIdentityName string + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + diff --git a/modules/Microsoft.Compute/galleries/.test/default/deploy.test.bicep b/modules/Microsoft.Compute/galleries/.test/default/deploy.test.bicep new file mode 100644 index 0000000000..045b5b27a2 --- /dev/null +++ b/modules/Microsoft.Compute/galleries/.test/default/deploy.test.bicep @@ -0,0 +1,54 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.compute.galleries-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'cgdef' + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +module resourceGroupResources 'dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-paramNested' + params: { + managedIdentityName: 'dep-<>-msi-${serviceShort}' + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + lock: 'CanNotDelete' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + } +} diff --git a/modules/Microsoft.Compute/galleries/.test/images.parameters.json b/modules/Microsoft.Compute/galleries/.test/images.parameters.json deleted file mode 100644 index 78a802c198..0000000000 --- a/modules/Microsoft.Compute/galleries/.test/images.parameters.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>azsigweuimages001" - }, - "images": { - "value": [ - { - "name": "<>-az-imgd-x-003" - }, - { - "name": "<>-az-imgd-x-001", - "osType": "Windows", - "osState": "Generalized", - "publisher": "MicrosoftWindowsServer", - "offer": "WindowsServer", - "sku": "2022-datacenter-azure-edition", - "minRecommendedvCPUs": 2, - "maxRecommendedvCPUs": 8, - "minRecommendedMemory": 4, - "maxRecommendedMemory": 16, - "hyperVGeneration": "V1", - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - { - "name": "<>-az-imgd-x-002", - "osType": "Linux", - "osState": "Generalized", - "publisher": "canonical", - "offer": "0001-com-ubuntu-server-focal", - "sku": "20_04-lts-gen2", - "minRecommendedvCPUs": 1, - "maxRecommendedvCPUs": 4, - "minRecommendedMemory": 4, - "maxRecommendedMemory": 32, - "hyperVGeneration": "V2" - } - ] - } - } -} diff --git a/modules/Microsoft.Compute/galleries/.test/images/dependencies.bicep b/modules/Microsoft.Compute/galleries/.test/images/dependencies.bicep new file mode 100644 index 0000000000..7371d4437b --- /dev/null +++ b/modules/Microsoft.Compute/galleries/.test/images/dependencies.bicep @@ -0,0 +1,14 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Managed Identity to create.') +param managedIdentityName string + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + diff --git a/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep b/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep new file mode 100644 index 0000000000..33b142f965 --- /dev/null +++ b/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep @@ -0,0 +1,84 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.compute.galleries-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'cgimages' + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +module resourceGroupResources 'dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-paramNested' + params: { + managedIdentityName: 'dep-<>-msi-${serviceShort}' + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + images: [ + { + name: '<>-az-imgd-x-003' + } + { + hyperVGeneration: 'V1' + maxRecommendedMemory: 16 + maxRecommendedvCPUs: 8 + minRecommendedMemory: 4 + minRecommendedvCPUs: 2 + name: '<>-az-imgd-x-001' + offer: 'WindowsServer' + osState: 'Generalized' + osType: 'Windows' + publisher: 'MicrosoftWindowsServer' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + sku: '2022-datacenter-azure-edition' + } + { + hyperVGeneration: 'V2' + maxRecommendedMemory: 32 + maxRecommendedvCPUs: 4 + minRecommendedMemory: 4 + minRecommendedvCPUs: 1 + name: '<>-az-imgd-x-002' + offer: '0001-com-ubuntu-server-focal' + osState: 'Generalized' + osType: 'Linux' + publisher: 'canonical' + sku: '20_04-lts-gen2' + } + ] + } +} diff --git a/modules/Microsoft.Compute/galleries/.test/parameters.json b/modules/Microsoft.Compute/galleries/.test/parameters.json deleted file mode 100644 index 960e0365b2..0000000000 --- a/modules/Microsoft.Compute/galleries/.test/parameters.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>azsigweux001" - }, - "lock": { - "value": "CanNotDelete" - }, - "roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - } - } -} diff --git a/modules/Microsoft.Compute/galleries/readme.md b/modules/Microsoft.Compute/galleries/readme.md index 114cb04bcd..a7086b066c 100644 --- a/modules/Microsoft.Compute/galleries/readme.md +++ b/modules/Microsoft.Compute/galleries/readme.md @@ -157,7 +157,7 @@ The following module usage examples are retrieved from the content of the files >**Note**: The name of each example is based on the name of the file from which it is taken. >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. -

Example 1: Images

+

Example 1: Default

@@ -165,10 +165,73 @@ The following module usage examples are retrieved from the content of the files ```bicep module galleries './Microsoft.Compute/galleries/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-Galleries' + name: '${uniqueString(deployment().name)}-test-cgdef' params: { // Required parameters - name: '<>azsigweuimages001' + name: '<>cgdef001' + // Non-required parameters + lock: 'CanNotDelete' + roleAssignments: [ + { + principalIds: [ + '' + ] + roleDefinitionIdOrName: 'Reader' + } + ] + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + // Required parameters + "name": { + "value": "<>cgdef001" + }, + // Non-required parameters + "lock": { + "value": "CanNotDelete" + }, + "roleAssignments": { + "value": [ + { + "principalIds": [ + "" + ], + "roleDefinitionIdOrName": "Reader" + } + ] + } + } +} +``` + +
+

+ +

Example 2: Images

+ +
+ +via Bicep module + +```bicep +module galleries './Microsoft.Compute/galleries/deploy.bicep' = { + name: '${uniqueString(deployment().name)}-test-cgimages' + params: { + // Required parameters + name: '<>cgimages001' // Non-required parameters images: [ { @@ -188,7 +251,7 @@ module galleries './Microsoft.Compute/galleries/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -227,7 +290,7 @@ module galleries './Microsoft.Compute/galleries/deploy.bicep' = { "parameters": { // Required parameters "name": { - "value": "<>azsigweuimages001" + "value": "<>cgimages001" }, // Non-required parameters "images": { @@ -249,7 +312,7 @@ module galleries './Microsoft.Compute/galleries/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -277,66 +340,3 @@ module galleries './Microsoft.Compute/galleries/deploy.bicep' = {

- -

Example 2: Parameters

- -
- -via Bicep module - -```bicep -module galleries './Microsoft.Compute/galleries/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-Galleries' - params: { - // Required parameters - name: '<>azsigweux001' - // Non-required parameters - lock: 'CanNotDelete' - roleAssignments: [ - { - principalIds: [ - '<>' - ] - roleDefinitionIdOrName: 'Reader' - } - ] - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - // Required parameters - "name": { - "value": "<>azsigweux001" - }, - // Non-required parameters - "lock": { - "value": "CanNotDelete" - }, - "roleAssignments": { - "value": [ - { - "principalIds": [ - "<>" - ], - "roleDefinitionIdOrName": "Reader" - } - ] - } - } -} -``` - -
-

From d63d042e28f4309f7ed0b941646418bc6376e896 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 8 Sep 2022 19:20:29 +0200 Subject: [PATCH 2/9] Updated folder default to common. --- .../galleries/.test/{default => common}/dependencies.bicep | 0 .../galleries/.test/{default => common}/deploy.test.bicep | 0 modules/Microsoft.Compute/galleries/readme.md | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename modules/Microsoft.Compute/galleries/.test/{default => common}/dependencies.bicep (100%) rename modules/Microsoft.Compute/galleries/.test/{default => common}/deploy.test.bicep (100%) diff --git a/modules/Microsoft.Compute/galleries/.test/default/dependencies.bicep b/modules/Microsoft.Compute/galleries/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/galleries/.test/default/dependencies.bicep rename to modules/Microsoft.Compute/galleries/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Compute/galleries/.test/default/deploy.test.bicep b/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.Compute/galleries/.test/default/deploy.test.bicep rename to modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.Compute/galleries/readme.md b/modules/Microsoft.Compute/galleries/readme.md index a7086b066c..1b1439f8a6 100644 --- a/modules/Microsoft.Compute/galleries/readme.md +++ b/modules/Microsoft.Compute/galleries/readme.md @@ -157,7 +157,7 @@ The following module usage examples are retrieved from the content of the files >**Note**: The name of each example is based on the name of the file from which it is taken. >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. -

Example 1: Default

+

Example 1: Common

From 779baf5178cd737819341aa01732a457dfe0239d Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 12:52:44 +0200 Subject: [PATCH 3/9] Update to latest --- .../galleries/.test/common/deploy.test.bicep | 4 ++-- .../galleries/.test/images/deploy.test.bicep | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep b/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep index 045b5b27a2..d39f45f70d 100644 --- a/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep @@ -10,8 +10,8 @@ param resourceGroupName string = 'ms.compute.galleries-${serviceShort}-rg' @description('Optional. The location to deploy resources to') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') -param serviceShort string = 'cgdef' +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'cgcom' // =========== // // Deployments // diff --git a/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep b/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep index 33b142f965..365a0207d9 100644 --- a/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep +++ b/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.compute.galleries-${serviceShort}-rg' @description('Optional. The location to deploy resources to') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') param serviceShort string = 'cgimages' // =========== // From 03716e74b09b474953fc68b1b7ed3fe098d614aa Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 13:06:02 +0200 Subject: [PATCH 4/9] Update to latest --- .../galleries/.test/common/deploy.test.bicep | 6 +++--- .../galleries/.test/images/deploy.test.bicep | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep b/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep index d39f45f70d..4841dd7621 100644 --- a/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep @@ -3,14 +3,14 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes') +@description('Optional. The name of the resource group to deploy for a testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.compute.galleries-${serviceShort}-rg' -@description('Optional. The location to deploy resources to') +@description('Optional. The location to deploy resources to.') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') param serviceShort string = 'cgcom' // =========== // diff --git a/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep b/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep index 365a0207d9..29c2ba7f64 100644 --- a/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep +++ b/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep @@ -3,14 +3,14 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes') +@description('Optional. The name of the resource group to deploy for a testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.compute.galleries-${serviceShort}-rg' -@description('Optional. The location to deploy resources to') +@description('Optional. The location to deploy resources to.') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') param serviceShort string = 'cgimages' // =========== // From 92e041de7dbbab60ed80af6502497d19e724af79 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 14:18:23 +0200 Subject: [PATCH 5/9] Update to latest --- modules/Microsoft.Compute/galleries/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/Microsoft.Compute/galleries/readme.md b/modules/Microsoft.Compute/galleries/readme.md index 4ec3022a09..93ba3a6f41 100644 --- a/modules/Microsoft.Compute/galleries/readme.md +++ b/modules/Microsoft.Compute/galleries/readme.md @@ -166,10 +166,10 @@ The following module usage examples are retrieved from the content of the files ```bicep module galleries './Microsoft.Compute/galleries/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-test-cgdef' + name: '${uniqueString(deployment().name)}-test-cgcom' params: { // Required parameters - name: '<>cgdef001' + name: '<>cgcom001' // Non-required parameters lock: 'CanNotDelete' roleAssignments: [ @@ -198,7 +198,7 @@ module galleries './Microsoft.Compute/galleries/deploy.bicep' = { "parameters": { // Required parameters "name": { - "value": "<>cgdef001" + "value": "<>cgcom001" }, // Non-required parameters "lock": { From a7a6d5395d75f84ce24380be50431483a955833d Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 19 Sep 2022 08:21:00 +0200 Subject: [PATCH 6/9] Update modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep --- .../Microsoft.Compute/galleries/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep b/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep index 4841dd7621..ca9eafbd53 100644 --- a/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Compute/galleries/.test/common/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes.') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.compute.galleries-${serviceShort}-rg' From 7611dd0acafe9c563c66f686a2f02aeb3902a80a Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 19 Sep 2022 08:21:14 +0200 Subject: [PATCH 7/9] Update modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep --- .../Microsoft.Compute/galleries/.test/images/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep b/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep index 29c2ba7f64..a2605364d7 100644 --- a/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep +++ b/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes.') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.compute.galleries-${serviceShort}-rg' From 4a2c838520cafbcd7d8c775760c40b00ee73180d Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Fri, 14 Oct 2022 09:51:38 +0200 Subject: [PATCH 8/9] Update modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../Microsoft.Compute/galleries/.test/images/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep b/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep index a2605364d7..fe7a001f4a 100644 --- a/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep +++ b/modules/Microsoft.Compute/galleries/.test/images/deploy.test.bicep @@ -43,7 +43,7 @@ module testDeployment '../../deploy.bicep' = { name: '<>${serviceShort}001' images: [ { - name: '<>-az-imgd-x-003' + name: '<>-${serviceShort}-imgd-001' } { hyperVGeneration: 'V1' From 55b003a01f16b340a129dd999ba826ff186c0753 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 14 Oct 2022 09:54:00 +0200 Subject: [PATCH 9/9] Updated docs --- modules/Microsoft.Compute/galleries/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/Microsoft.Compute/galleries/readme.md b/modules/Microsoft.Compute/galleries/readme.md index 42b6f80894..c61b2aa3f1 100644 --- a/modules/Microsoft.Compute/galleries/readme.md +++ b/modules/Microsoft.Compute/galleries/readme.md @@ -238,7 +238,7 @@ module galleries './Microsoft.Compute/galleries/deploy.bicep' = { // Non-required parameters images: [ { - name: '<>-az-imgd-x-003' + name: '<>-cgimages-imgd-001' } { hyperVGeneration: 'V1' @@ -299,7 +299,7 @@ module galleries './Microsoft.Compute/galleries/deploy.bicep' = { "images": { "value": [ { - "name": "<>-az-imgd-x-003" + "name": "<>-cgimages-imgd-001" }, { "hyperVGeneration": "V1",