From 97ffe322ce736de8dd1d50f818521715dbe33260 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 7 Feb 2022 21:03:42 +0100 Subject: [PATCH 1/2] vm adp token --- .../networkWatchers/.parameters/parameters.json | 2 +- .../virtualMachines/parameters/parameters.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arm/Microsoft.Network/networkWatchers/.parameters/parameters.json b/arm/Microsoft.Network/networkWatchers/.parameters/parameters.json index 50bb40f6ee..f6edaef983 100644 --- a/arm/Microsoft.Network/networkWatchers/.parameters/parameters.json +++ b/arm/Microsoft.Network/networkWatchers/.parameters/parameters.json @@ -31,7 +31,7 @@ { "name": "<>-az-subnet-x-001(validation-rg)", "type": "AzureVM", - "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Compute/virtualMachines/adp-vm-001" + "resourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Compute/virtualMachines/adp-<>-vm-001" }, { "name": "Office Portal", diff --git a/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json b/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json index 2a44e5c537..f0eb990233 100644 --- a/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json +++ b/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "adp-vm-001" + "value": "adp-<>-vm-001" }, "vmSize": { "value": "Standard_B1s" From 1637cecaff618941ee63f2a07f92da604d2cb410 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 7 Feb 2022 21:06:37 +0100 Subject: [PATCH 2/2] Required osDisk --- arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep | 2 +- arm/Microsoft.Compute/virtualMachineScaleSets/readme.md | 2 +- arm/Microsoft.Compute/virtualMachines/deploy.bicep | 2 +- arm/Microsoft.Compute/virtualMachines/readme.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep b/arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep index 4f82713c5c..e794ca7156 100644 --- a/arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep +++ b/arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep @@ -251,7 +251,7 @@ param tags object = {} @description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') param cuaId string = '' -@description('Optional. The chosen OS type') +@description('Required. The chosen OS type') @allowed([ 'Windows' 'Linux' diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/readme.md b/arm/Microsoft.Compute/virtualMachineScaleSets/readme.md index 40342ff615..b03cc1db54 100644 --- a/arm/Microsoft.Compute/virtualMachineScaleSets/readme.md +++ b/arm/Microsoft.Compute/virtualMachineScaleSets/readme.md @@ -69,7 +69,7 @@ The following resources are required to be able to deploy this resource. | `name` | string | | | Required. Name of the VMSS. | | `nicConfigurations` | array | `[]` | | Required. Configures NICs and PIPs. | | `osDisk` | object | | | Required. Specifies the OS disk. | -| `osType` | string | | `[Windows, Linux]` | Optional. The chosen OS type | +| `osType` | string | | `[Windows, Linux]` | Required. The chosen OS type | | `overprovision` | bool | | | Optional. Specifies whether the Virtual Machine Scale Set should be overprovisioned. | | `pauseTimeBetweenBatches` | string | `PT0S` | | Optional. The wait time between completing the update for all virtual machines in one batch and starting the next batch. The time duration should be specified in ISO 8601 format | | `plan` | object | `{object}` | | Optional. Specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use. | diff --git a/arm/Microsoft.Compute/virtualMachines/deploy.bicep b/arm/Microsoft.Compute/virtualMachines/deploy.bicep index cad7950ad7..4aee297976 100644 --- a/arm/Microsoft.Compute/virtualMachines/deploy.bicep +++ b/arm/Microsoft.Compute/virtualMachines/deploy.bicep @@ -235,7 +235,7 @@ param baseTime string = utcNow('u') @description('Optional. SAS token validity length to use to download files from storage accounts. Usage: \'PT8H\' - valid for 8 hours; \'P5D\' - valid for 5 days; \'P1Y\' - valid for 1 year. When not provided, the SAS token will be valid for 8 hours.') param sasTokenValidityLength string = 'PT8H' -@description('Optional. The chosen OS type') +@description('Required. The chosen OS type') @allowed([ 'Windows' 'Linux' diff --git a/arm/Microsoft.Compute/virtualMachines/readme.md b/arm/Microsoft.Compute/virtualMachines/readme.md index 04571bd1a4..61c60671a7 100644 --- a/arm/Microsoft.Compute/virtualMachines/readme.md +++ b/arm/Microsoft.Compute/virtualMachines/readme.md @@ -66,7 +66,7 @@ This module deploys one Virtual Machine with one or multiple nics and optionally | `nicConfigurations` | array | | | Required. Configures NICs and PIPs. | | `nicMetricsToEnable` | array | `[AllMetrics]` | `[AllMetrics]` | Optional. The name of metrics that will be streamed. | | `osDisk` | object | | | Required. Specifies the OS disk. | -| `osType` | string | | `[Windows, Linux]` | Optional. The chosen OS type | +| `osType` | string | | `[Windows, Linux]` | Required. The chosen OS type | | `pipLogsToEnable` | array | `[DDoSProtectionNotifications, DDoSMitigationFlowLogs, DDoSMitigationReports]` | `[DDoSProtectionNotifications, DDoSMitigationFlowLogs, DDoSMitigationReports]` | Optional. The name of logs that will be streamed. | | `pipMetricsToEnable` | array | `[AllMetrics]` | `[AllMetrics]` | Optional. The name of metrics that will be streamed. | | `plan` | object | `{object}` | | Optional. Specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use. |